hw: move more files to hw/xen/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 48ed8d4413c8977bf391b17b79bc00c7401677b5..89aaff5faaee89ccae3fae75e43cda20d135d69a 100644 (file)
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -33,3 +33,4 @@ CONFIG_PCI_HOTPLUG=y
 CONFIG_MC146818RTC=y
 CONFIG_WDT_IB700=y
 CONFIG_PC_SYSFW=y
+CONFIG_XEN_I386=$(CONFIG_XEN)

diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 58b33cfa24ec9677912e0688a6e988fe95d4ebb3..c34f8f87597e7f81ce327dc535efe4d89ac31ae2 100644 (file)
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -33,3 +33,4 @@ CONFIG_PCI_HOTPLUG=y
 CONFIG_MC146818RTC=y
 CONFIG_WDT_IB700=y
 CONFIG_PC_SYSFW=y
+CONFIG_XEN_I386=$(CONFIG_XEN)

diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index fe0123489c7b3fcf86516b2005ed4070231f8465..c85bb3df1bc00e001df340e70b3ee4be5febf996 100644 (file)
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -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
 

diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs
index 4b209a7b9a56e7fd34f7e11dc3e5ac7319497649..20175602b6c8deea0658e1b1a32b6efe3bd75230 100644 (file)
--- a/hw/xen/Makefile.objs
+++ b/hw/xen/Makefile.objs
@@ -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

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