Commit edf88417 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Move arch dependent files to new directory arch/x86/kvm/



This paves the way for multiple architecture support.  Note that while
ioapic.c could potentially be shared with ia64, it is also moved.
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 9584bf2c
......@@ -1599,4 +1599,6 @@ source "security/Kconfig"
source "crypto/Kconfig"
source "arch/x86/kvm/Kconfig"
source "lib/Kconfig"
......@@ -7,6 +7,8 @@ else
KBUILD_DEFCONFIG := $(ARCH)_defconfig
endif
core-$(CONFIG_KVM) += arch/x86/kvm/
# BITS is used as extension for files which are available in a 32 bit
# and a 64 bit version to simplify shared Makefiles.
# e.g.: obj-y += foo_$(BITS).o
......
......@@ -2,7 +2,12 @@
# Makefile for Kernel-based Virtual Machine module
#
kvm-objs := kvm_main.o x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o ioapic.o
common-objs = $(addprefix ../../../drivers/kvm/, kvm_main.o)
EXTRA_CFLAGS += -I drivers/kvm
kvm-objs := $(common-objs) x86.o mmu.o x86_emulate.o i8259.o irq.o lapic.o \
ioapic.o
obj-$(CONFIG_KVM) += kvm.o
kvm-intel-objs = vmx.o
obj-$(CONFIG_KVM_INTEL) += kvm-intel.o
......
......@@ -27,7 +27,8 @@
*/
#include <linux/mm.h>
#include "irq.h"
#include "kvm.h"
#include <linux/kvm_host.h>
/*
* set irq level. If an edge is detected, then the IRR is set to 1
......
......@@ -26,9 +26,7 @@
* Based on Xen 3.1 code.
*/
#include "kvm.h"
#include "x86.h"
#include <linux/kvm_host.h>
#include <linux/kvm.h>
#include <linux/mm.h>
#include <linux/highmem.h>
......
......@@ -20,9 +20,8 @@
*/
#include <linux/module.h>
#include <linux/kvm_host.h>
#include "kvm.h"
#include "x86.h"
#include "irq.h"
/*
......
......@@ -24,9 +24,8 @@
#include <linux/mm_types.h>
#include <linux/hrtimer.h>
#include <asm/kvm.h>
#include <linux/kvm_host.h>
#include "iodev.h"
#include "kvm.h"
struct kvm;
struct kvm_vcpu;
......
......@@ -4,10 +4,10 @@
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/list.h>
#include <linux/kvm_host.h>
#include <asm/msr.h>
#include "svm.h"
#include "kvm.h"
static const u32 host_save_user_msrs[] = {
#ifdef CONFIG_X86_64
......
......@@ -17,9 +17,7 @@
* the COPYING file in the top-level directory.
*/
#include "kvm.h"
#include "x86.h"
#include <linux/kvm_host.h>
#include <linux/kvm.h>
#include <linux/mm.h>
#include <linux/highmem.h>
......
......@@ -18,10 +18,9 @@
*/
#include "vmx.h"
#include "kvm.h"
#include "x86.h"
#include "mmu.h"
#include <linux/kvm_host.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/mm.h>
......
#ifndef __KVM_X86_MMU_H
#define __KVM_X86_MMU_H
#include "kvm.h"
#include <linux/kvm_host.h>
static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)
{
......
......@@ -13,9 +13,9 @@
* the COPYING file in the top-level directory.
*
*/
#include "x86.h"
#include <linux/kvm_host.h>
#include "kvm_svm.h"
#include "x86_emulate.h"
#include "irq.h"
#include "mmu.h"
......
......@@ -15,14 +15,12 @@
*
*/
#include "kvm.h"
#include "x86.h"
#include "x86_emulate.h"
#include "irq.h"
#include "vmx.h"
#include "segment_descriptor.h"
#include "mmu.h"
#include <linux/kvm_host.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/mm.h>
......
......@@ -14,9 +14,7 @@
*
*/
#include "kvm.h"
#include "x86.h"
#include "x86_emulate.h"
#include <linux/kvm_host.h>
#include "segment_descriptor.h"
#include "irq.h"
#include "mmu.h"
......
......@@ -25,12 +25,11 @@
#include <public/xen.h>
#define DPRINTF(_f, _a ...) printf(_f , ## _a)
#else
#include "kvm.h"
#include "x86.h"
#include <linux/kvm_host.h>
#define DPRINTF(x...) do {} while (0)
#endif
#include "x86_emulate.h"
#include <linux/module.h>
#include <asm/kvm_x86_emulate.h>
/*
* Opcode effective-address decode tables.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment