@@ -33,3 +33,4 @@ CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_WDT_IB700=y
CONFIG_PC_SYSFW=y
+CONFIG_XEN_I386=$(CONFIG_XEN)
@@ -33,3 +33,4 @@ CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_WDT_IB700=y
CONFIG_PC_SYSFW=y
+CONFIG_XEN_I386=$(CONFIG_XEN)
@@ -3,9 +3,6 @@ obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o
obj-y += vmport.o
obj-y += debugcon.o debugexit.o
obj-y += lpc_ich9.o q35.o
-obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
-obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o
obj-y += kvm/
obj-y += pc-testdev.o
@@ -1,2 +1,6 @@
# xen backend driver support
common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o
+
+obj-$(CONFIG_XEN_I386) += xen_platform.o xen_apic.o
+obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
+obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- default-configs/i386-softmmu.mak | 1 + default-configs/x86_64-softmmu.mak | 1 + hw/i386/Makefile.objs | 3 --- hw/xen/Makefile.objs | 4 ++++ hw/{ => xen}/xen-host-pci-device.c | 0 hw/{ => xen}/xen_apic.c | 0 hw/{ => xen}/xen_platform.c | 0 hw/{ => xen}/xen_pt.c | 0 hw/{ => xen}/xen_pt_config_init.c | 0 hw/{ => xen}/xen_pt_msi.c | 0 10 files changed, 6 insertions(+), 3 deletions(-) rename hw/{ => xen}/xen-host-pci-device.c (100%) rename hw/{ => xen}/xen_apic.c (100%) rename hw/{ => xen}/xen_platform.c (100%) rename hw/{ => xen}/xen_pt.c (100%) rename hw/{ => xen}/xen_pt_config_init.c (100%) rename hw/{ => xen}/xen_pt_msi.c (100%) diff --git a/hw/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c similarity index 100% rename from hw/xen-host-pci-device.c rename to hw/xen/xen-host-pci-device.c diff --git a/hw/xen_apic.c b/hw/xen/xen_apic.c similarity index 100% rename from hw/xen_apic.c rename to hw/xen/xen_apic.c diff --git a/hw/xen_platform.c b/hw/xen/xen_platform.c similarity index 100% rename from hw/xen_platform.c rename to hw/xen/xen_platform.c diff --git a/hw/xen_pt.c b/hw/xen/xen_pt.c similarity index 100% rename from hw/xen_pt.c rename to hw/xen/xen_pt.c diff --git a/hw/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c similarity index 100% rename from hw/xen_pt_config_init.c rename to hw/xen/xen_pt_config_init.c diff --git a/hw/xen_pt_msi.c b/hw/xen/xen_pt_msi.c similarity index 100% rename from hw/xen_pt_msi.c rename to hw/xen/xen_pt_msi.c