From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:32900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gp-0005lV-5t for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2gm-0001PB-Tz for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:59:59 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:46568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gm-0001Ot-No for qemu-devel@nongnu.org; Tue, 02 Apr 2013 10:59:56 -0400 Received: by mail-ee0-f45.google.com with SMTP id b57so273261eek.18 for ; Tue, 02 Apr 2013 07:59:55 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 2 Apr 2013 16:58:52 +0200 Message-Id: <1364914749-11141-19-git-send-email-pbonzini@redhat.com> In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 18/35] hw: move more files to hw/xen/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- 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/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 46c28a0..6723051 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 606b8ee..f0e5595 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 fe01234..c85bb3d 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 4b209a7..2017560 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 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 -- 1.8.1.4