From patchwork Thu Apr 4 19:22:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233922 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 04E442C0099 for ; Fri, 5 Apr 2013 06:35:30 +1100 (EST) Received: from localhost ([::1]:41595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNpwV-0001WE-Ur for incoming@patchwork.ozlabs.org; Thu, 04 Apr 2013 15:35:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47418) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplX-0001ki-VV for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNplT-0001vY-R3 for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:07 -0400 Received: from mail-we0-x22b.google.com ([2a00:1450:400c:c03::22b]:42780) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNplT-0001vB-Im for qemu-devel@nongnu.org; Thu, 04 Apr 2013 15:24:03 -0400 Received: by mail-we0-f171.google.com with SMTP id d46so2240731wer.2 for ; Thu, 04 Apr 2013 12:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=XppVL/wXa2TCYdF/23osXzG/putnMW/7wYPcrDJL7Lk=; b=cIdBU9sLLN8ocVSKQXdMu0CDnlfmwzgDYtjXJywgtdBE3c4bcErFiCyg4XBe74AHvZ I6Tbd8GmrYuTxEkkhjh6NJPyWBpiOgMBWnMwOYWC1qmrywpuitBBzZqpL9UfbujHsZzg NRTVp2xdJTO6MvfvXfX199LPu0Cl6T8lw0AQ7pS+bpEQnWdtpLS4NGVqZjtr9FucSvgd SbaghW/TUY2iRQm9aXUKF8aul3E6zYS/LrfczjQWjrPfmadGmi+zSodDbJBOXpSKsO+R eFo2ftO3HJYCpTa1zowiHjwLsnFxdqpi+NbOIshWki4cLV/5hAUZCu/QigCYn12+mriA wofg== X-Received: by 10.180.188.141 with SMTP id ga13mr31810359wic.9.1365103442860; Thu, 04 Apr 2013 12:24:02 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id du2sm33093079wib.0.2013.04.04.12.24.01 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Apr 2013 12:24:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 4 Apr 2013 21:22:59 +0200 Message-Id: <1365103395-11547-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> References: <1365103395-11547-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::22b Subject: [Qemu-devel] [PATCH 19/35] hw: move more files to hw/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: 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/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 diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 48ed8d4..89aaff5 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 58b33cf..c34f8f8 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