summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/i386/Makefile.objs5
-rw-r--r--hw/i386/kvm/Makefile.objs1
-rw-r--r--hw/i386/kvm/apic.c (renamed from hw/kvm/apic.c)0
-rw-r--r--hw/i386/kvm/clock.c (renamed from hw/kvm/clock.c)0
-rw-r--r--hw/i386/kvm/i8254.c (renamed from hw/kvm/i8254.c)0
-rw-r--r--hw/i386/kvm/i8259.c (renamed from hw/kvm/i8259.c)0
-rw-r--r--hw/i386/kvm/ioapic.c (renamed from hw/kvm/ioapic.c)0
-rw-r--r--hw/i386/kvm/pci-assign.c (renamed from hw/kvm/pci-assign.c)0
-rw-r--r--hw/kvm/Makefile.objs1
9 files changed, 2 insertions, 5 deletions
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index c1d73a88a6..205d22e4aa 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 0000000000..d8bce209bf
--- /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
index c6ff9821e3..c6ff9821e3 100644
--- a/hw/kvm/apic.c
+++ b/hw/i386/kvm/apic.c
diff --git a/hw/kvm/clock.c b/hw/i386/kvm/clock.c
index fa40e283f7..fa40e283f7 100644
--- a/hw/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
diff --git a/hw/kvm/i8254.c b/hw/i386/kvm/i8254.c
index da90711853..da90711853 100644
--- a/hw/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
diff --git a/hw/kvm/i8259.c b/hw/i386/kvm/i8259.c
index ea77be8638..ea77be8638 100644
--- a/hw/kvm/i8259.c
+++ b/hw/i386/kvm/i8259.c
diff --git a/hw/kvm/ioapic.c b/hw/i386/kvm/ioapic.c
index a3bd519b4d..a3bd519b4d 100644
--- a/hw/kvm/ioapic.c
+++ b/hw/i386/kvm/ioapic.c
diff --git a/hw/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index c1e08ec1a0..c1e08ec1a0 100644
--- a/hw/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
diff --git a/hw/kvm/Makefile.objs b/hw/kvm/Makefile.objs
deleted file mode 100644
index f620d7ff85..0000000000
--- 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