@@ -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
new file mode 100644
@@ -0,0 +1 @@
+obj-y += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o
similarity index 100%
rename from hw/kvm/apic.c
rename to hw/i386/kvm/apic.c
similarity index 100%
rename from hw/kvm/clock.c
rename to hw/i386/kvm/clock.c
similarity index 100%
rename from hw/kvm/i8254.c
rename to hw/i386/kvm/i8254.c
similarity index 100%
rename from hw/kvm/i8259.c
rename to hw/i386/kvm/i8259.c
similarity index 100%
rename from hw/kvm/ioapic.c
rename to hw/i386/kvm/ioapic.c
similarity index 100%
rename from hw/kvm/pci-assign.c
rename to hw/i386/kvm/pci-assign.c
deleted file mode 100644
@@ -1 +0,0 @@
-obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o
Peter requested the KVM GIC to be in hw/intc. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/i386/Makefile.objs | 5 +---- hw/i386/kvm/Makefile.objs | 1 + hw/{ => i386}/kvm/apic.c | 0 hw/{ => i386}/kvm/clock.c | 0 hw/{ => i386}/kvm/i8254.c | 0 hw/{ => i386}/kvm/i8259.c | 0 hw/{ => i386}/kvm/ioapic.c | 0 hw/{ => i386}/kvm/pci-assign.c | 0 hw/kvm/Makefile.objs | 1 - 9 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 hw/i386/kvm/Makefile.objs rename hw/{ => i386}/kvm/apic.c (100%) rename hw/{ => i386}/kvm/clock.c (100%) rename hw/{ => i386}/kvm/i8254.c (100%) rename hw/{ => i386}/kvm/i8259.c (100%) rename hw/{ => i386}/kvm/ioapic.c (100%) rename hw/{ => i386}/kvm/pci-assign.c (100%) delete mode 100644 hw/kvm/Makefile.objs