From: Paolo Bonzini Date: Tue, 5 Feb 2013 15:36:44 +0000 (+0100) Subject: hw: move hw/kvm/ to hw/i386/kvm X-Git-Tag: v1.5.0-rc0~313^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=54976b75fb159ca175636b7fef1cd08130cb662f;p=thirdparty%2Fqemu.git hw: move hw/kvm/ to hw/i386/kvm Peter requested the KVM GIC to be in hw/intc. Signed-off-by: Paolo Bonzini --- diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index c1d73a88a6b..205d22e4aa8 100644 --- 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 new file mode 100644 index 00000000000..d8bce209bfe --- /dev/null +++ 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 b/hw/i386/kvm/apic.c similarity index 100% rename from hw/kvm/apic.c rename to hw/i386/kvm/apic.c diff --git a/hw/kvm/clock.c b/hw/i386/kvm/clock.c similarity index 100% rename from hw/kvm/clock.c rename to hw/i386/kvm/clock.c diff --git a/hw/kvm/i8254.c b/hw/i386/kvm/i8254.c similarity index 100% rename from hw/kvm/i8254.c rename to hw/i386/kvm/i8254.c diff --git a/hw/kvm/i8259.c b/hw/i386/kvm/i8259.c similarity index 100% rename from hw/kvm/i8259.c rename to hw/i386/kvm/i8259.c diff --git a/hw/kvm/ioapic.c b/hw/i386/kvm/ioapic.c similarity index 100% rename from hw/kvm/ioapic.c rename to hw/i386/kvm/ioapic.c diff --git a/hw/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c similarity index 100% rename from hw/kvm/pci-assign.c rename to hw/i386/kvm/pci-assign.c diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs deleted file mode 100644 index f620d7ff85e..00000000000 --- a/hw/kvm/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -obj-$(CONFIG_KVM) += clock.o apic.o i8259.o ioapic.o i8254.o pci-assign.o