summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-02-05 15:22:56 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-03-01 15:01:19 +0100
commit8786b05e7bf3c4fc7a25fa14f1736a716cd8a8c4 (patch)
tree915301ce6eff38ac6dec5c56a826128785b6d3b5
parentdd285b06490d7ef5f7b2f5e6c87b85ddf4345078 (diff)
downloadqemu-8786b05e7bf3c4fc7a25fa14f1736a716cd8a8c4.tar.gz
i386: move files referencing CPU to hw/i386/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/i386/Makefile.objs4
-rw-r--r--hw/i386/kvmvapic.c (renamed from hw/kvmvapic.c)0
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 5d071f418e..a78c0b2921 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -1,5 +1,5 @@
obj-y += mc146818rtc.o
-obj-y += apic_common.o apic.o kvmvapic.o
+obj-y += apic_common.o apic.o
obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o
obj-y += vmport.o
obj-y += pci/pci-hotplug.o wdt_ib700.o
@@ -18,3 +18,5 @@ obj-y := $(addprefix ../,$(obj-y))
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
+
+obj-y += kvmvapic.o
diff --git a/hw/kvmvapic.c b/hw/i386/kvmvapic.c
index c151c95c3e..c151c95c3e 100644
--- a/hw/kvmvapic.c
+++ b/hw/i386/kvmvapic.c