From patchwork Mon Jan 27 12:01:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 314369 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A2CF62C00A0 for ; Mon, 27 Jan 2014 23:02:07 +1100 (EST) Received: from localhost ([::1]:59075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7kt8-0000an-Rd for incoming@patchwork.ozlabs.org; Mon, 27 Jan 2014 07:02:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7ksb-00089M-Oy for qemu-devel@nongnu.org; Mon, 27 Jan 2014 07:01:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W7ksX-0007zn-1J for qemu-devel@nongnu.org; Mon, 27 Jan 2014 07:01:29 -0500 Received: from smtp.citrix.com ([66.165.176.89]:22423) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W7ksW-0007zb-Re for qemu-devel@nongnu.org; Mon, 27 Jan 2014 07:01:24 -0500 X-IronPort-AV: E=Sophos;i="4.95,728,1384300800"; d="scan'208";a="96770431" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 27 Jan 2014 12:01:16 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Mon, 27 Jan 2014 07:01:16 -0500 Received: from dt47.uk.xensource.com ([10.80.229.47] helo=dt47.uk.xensource.com.) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1W7ksM-0000QC-VT; Mon, 27 Jan 2014 12:01:14 +0000 From: Wei Liu To: , Date: Mon, 27 Jan 2014 12:01:11 +0000 Message-ID: <1390824074-21006-4-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390824074-21006-1-git-send-email-wei.liu2@citrix.com> References: <1390824074-21006-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: anthony.perard@citrix.com, peter.maydell@linaro.org, pbonzini@redhat.com, Wei Liu , stefano.stabellini@eu.citrix.com Subject: [Qemu-devel] [PATCH RFC V2 3/6] xen: move Xen HVM files under hw/i386/xen X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Wei Liu --- hw/i386/Makefile.objs | 2 +- hw/i386/xen/Makefile.objs | 1 + hw/{ => i386}/xen/xen_apic.c | 0 hw/{ => i386}/xen/xen_platform.c | 0 hw/{ => i386}/xen/xen_pvdevice.c | 0 hw/xen/Makefile.objs | 1 - 6 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 hw/i386/xen/Makefile.objs rename hw/{ => i386}/xen/xen_apic.c (100%) rename hw/{ => i386}/xen/xen_platform.c (100%) rename hw/{ => i386}/xen/xen_pvdevice.c (100%) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 0faccd7..77dcf06 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -2,7 +2,7 @@ obj-$(CONFIG_KVM) += kvm/ obj-y += multiboot.o smbios.o obj-y += pc.o pc_piix.o pc_q35.o obj-y += pc_sysfw.o -obj-$(CONFIG_XEN) += ../xenpv/ +obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o diff --git a/hw/i386/xen/Makefile.objs b/hw/i386/xen/Makefile.objs new file mode 100644 index 0000000..801a68d --- /dev/null +++ b/hw/i386/xen/Makefile.objs @@ -0,0 +1 @@ +obj-y += xen_platform.o xen_apic.o xen_pvdevice.o diff --git a/hw/xen/xen_apic.c b/hw/i386/xen/xen_apic.c similarity index 100% rename from hw/xen/xen_apic.c rename to hw/i386/xen/xen_apic.c diff --git a/hw/xen/xen_platform.c b/hw/i386/xen/xen_platform.c similarity index 100% rename from hw/xen/xen_platform.c rename to hw/i386/xen/xen_platform.c diff --git a/hw/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c similarity index 100% rename from hw/xen/xen_pvdevice.c rename to hw/i386/xen/xen_pvdevice.c diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs index ce640c6..a0ca0aa 100644 --- a/hw/xen/Makefile.objs +++ b/hw/xen/Makefile.objs @@ -1,6 +1,5 @@ # 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 xen_pvdevice.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