diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 13:25:08 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:14 +0200 |
| commit | 80b4ecc86dd5ccd779f96c8bd11feb031d327614 (patch) | |
| tree | 8ee50e34fdb12139fede5ec0a53a2e61ff32635f | |
| parent | 53a5500244a9d38505174bac56d81a8be2979f39 (diff) | |
hw: move more files to hw/xen/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/i386/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/xen/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/xen/xen-host-pci-device.c (renamed from hw/xen-host-pci-device.c) | 0 | ||||
| -rw-r--r-- | hw/xen/xen_apic.c (renamed from hw/xen_apic.c) | 0 | ||||
| -rw-r--r-- | hw/xen/xen_platform.c (renamed from hw/xen_platform.c) | 0 | ||||
| -rw-r--r-- | hw/xen/xen_pt.c (renamed from hw/xen_pt.c) | 0 | ||||
| -rw-r--r-- | hw/xen/xen_pt_config_init.c (renamed from hw/xen_pt_config_init.c) | 0 | ||||
| -rw-r--r-- | hw/xen/xen_pt_msi.c (renamed from hw/xen_pt_msi.c) | 0 |
10 files changed, 6 insertions, 3 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 48ed8d4413..89aaff5faa 100644 --- 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 58b33cfa24..c34f8f8759 100644 --- 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 fe0123489c..c85bb3df1b 100644 --- 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 4b209a7b9a..20175602b6 100644 --- 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 index ff2e876b3d..ff2e876b3d 100644 --- a/hw/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c diff --git a/hw/xen_apic.c b/hw/xen/xen_apic.c index a2eb8a159a..a2eb8a159a 100644 --- a/hw/xen_apic.c +++ b/hw/xen/xen_apic.c diff --git a/hw/xen_platform.c b/hw/xen/xen_platform.c index b6c6793e1e..b6c6793e1e 100644 --- a/hw/xen_platform.c +++ b/hw/xen/xen_platform.c diff --git a/hw/xen_pt.c b/hw/xen/xen_pt.c index 0cc45387ba..0cc45387ba 100644 --- a/hw/xen_pt.c +++ b/hw/xen/xen_pt.c diff --git a/hw/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 3ee2adfb9e..3ee2adfb9e 100644 --- a/hw/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c diff --git a/hw/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index dcdfc5c64d..dcdfc5c64d 100644 --- a/hw/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c |