Commit edf88417 authored Dec 16, 2007 by Avi Kivity

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: Avi Kivity <avi@qumranet.com>

parent 9584bf2c

arch/x86/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -1599,4 +1599,6 @@ source "security/Kconfig"

		source "crypto/Kconfig"

		source "arch/x86/kvm/Kconfig"

		source "lib/Kconfig"

arch/x86/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

drivers/kvm/Kconfig→arch/x86/kvm/Kconfig

+0 −0

File moved.

drivers/kvm/Makefile→arch/x86/kvm/Makefile

+6 −1

Original line number	Diff line number	Diff line
		@@ -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

drivers/kvm/i8259.c→arch/x86/kvm/i8259.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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