hw: move hw/kvm/ to hw/i386/kvm

Peter requested the KVM GIC to be in hw/intc. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2013-02-05 16:36:44 +01:00 · 2013-02-05 16:36:44 +01:00 · 54976b75fb
parent 0434e30afb
commit 54976b75fb
9 changed files with 2 additions and 5 deletions
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@ -1,7 +1,4 @@
-obj-y += kvm/
-
-obj-y := $(addprefix ../,$(obj-y))
-
+obj-$(CONFIG_KVM) += kvm/
 obj-y += multiboot.o smbios.o
 obj-y += pc.o pc_piix.o pc_q35.o
 obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
--- a/hw/i386/kvm/Makefile.objs
+++ b/hw/i386/kvm/Makefile.objs
@ -0,0 +1 @@
+obj-y += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o
--- a/hw/i386/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
--- a/hw/i386/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
--- a/hw/i386/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
--- a/hw/kvm/Makefile.objs
+++ b/hw/kvm/Makefile.objs
@ -1 +0,0 @@
-obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o
				`@ -0,0 +1 @@`
				`obj-y += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o`
				`@ -1 +0,0 @@`
				`obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o`