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>
qemu · Apr 8, 2013 · 54976b7 · 54976b7
1 parent 0434e30
commit 54976b7
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 5 deletions.
diff --git 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

diff --git 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
diff --git a/hw/kvm/apic.c → hw/i386/kvm/apic.c b/hw/kvm/apic.c → hw/i386/kvm/apic.c
diff --git a/hw/kvm/clock.c → hw/i386/kvm/clock.c b/hw/kvm/clock.c → hw/i386/kvm/clock.c
diff --git a/hw/kvm/i8254.c → hw/i386/kvm/i8254.c b/hw/kvm/i8254.c → hw/i386/kvm/i8254.c
diff --git a/hw/kvm/i8259.c → hw/i386/kvm/i8259.c b/hw/kvm/i8259.c → hw/i386/kvm/i8259.c
diff --git a/hw/kvm/ioapic.c → hw/i386/kvm/ioapic.c b/hw/kvm/ioapic.c → hw/i386/kvm/ioapic.c
diff --git a/hw/kvm/pci-assign.c → hw/i386/kvm/pci-assign.c b/hw/kvm/pci-assign.c → hw/i386/kvm/pci-assign.c
diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs