From patchwork Tue Apr 2 14:58:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 233053 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 BDF2A2C0108 for ; Wed, 3 Apr 2013 02:13:53 +1100 (EST) Received: from localhost ([::1]:39306 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2uF-0008N1-QT for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 11:13:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2t3-0007Qf-8Y for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:12:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN2t2-0006aj-2l for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:12:37 -0400 Received: from mail-ea0-x235.google.com ([2a00:1450:4013:c01::235]:36144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN2gx-0001j8-RG for qemu-devel@nongnu.org; Tue, 02 Apr 2013 11:00:07 -0400 Received: by mail-ea0-f181.google.com with SMTP id z10so275314ead.40 for ; Tue, 02 Apr 2013 08:00:07 -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=qMqE0m+46/wPKjFV0K4aWvrw2ugjRzuKrerNzghDpF4=; b=T9RRkyZdpX9Q0WFq2++NLWEb/2/af1Jg/L/o4GA0Io6VzoLaL93hi0wrMq1p81uWGZ wjvr2v4t1/v8/+DkWLr0kb2dLad4N1ZTMAwMpbYhZ57/odesph8uBmnPIz0fKBlsBc2q LA+SdXA3dMJ+upwlwxuMEEGZuhH4ZtYwlbmQSv7Y4juMjCEnJ8pJcuggbPiE2ps7PByN FWMRyRl0gIT1/vXXyTSoGXX+hGDt2sepfEG2v6fEK97Qmnya+pjTwnaPJQmOmBd5w4cA tqLkz1duwiTxzFvonBCZGA2pH3fa9T+ET1SP9wGCJnvNAvCvqkv+byxbK/GIQI0lIPW/ NMIQ== X-Received: by 10.14.184.68 with SMTP id r44mr37545239eem.40.1364914807013; Tue, 02 Apr 2013 08:00:07 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id n2sm3179353eeo.10.2013.04.02.08.00.05 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 08:00:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:58:58 +0200 Message-Id: <1364914749-11141-25-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> References: <1364914749-11141-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:4013:c01::235 Subject: [Qemu-devel] [PATCH 24/35] hw: move VFIO and ivshmem to hw/pci/ 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 --- hw/Makefile.objs | 10 ---------- hw/pci/Makefile.objs | 5 +++++ hw/{ => pci}/ivshmem.c | 0 hw/{vfio_pci.c => pci/vfio.c} | 0 4 files changed, 5 insertions(+), 10 deletions(-) rename hw/{ => pci}/ivshmem.c (100%) rename hw/{vfio_pci.c => pci/vfio.c} (100%) diff --git a/hw/ivshmem.c b/hw/pci/ivshmem.c similarity index 100% rename from hw/ivshmem.c rename to hw/pci/ivshmem.c diff --git a/hw/vfio_pci.c b/hw/pci/vfio.c similarity index 100% rename from hw/vfio_pci.c rename to hw/pci/vfio.c diff --git a/hw/Makefile.objs b/hw/Makefile.objs index b2be078..dc30f74 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -28,13 +28,3 @@ devices-dirs-$(CONFIG_SOFTMMU) += xen/ common-obj-y += core/ common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) - -ifeq ($(CONFIG_SOFTMMU),y) - -# Inter-VM PCI shared memory & VFIO PCI device assignment -ifeq ($(CONFIG_PCI), y) -obj-$(CONFIG_KVM) += ivshmem.o -obj-$(CONFIG_LINUX) += vfio_pci.o -endif - -endif diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index 8b20135..9086b3b 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -26,6 +26,11 @@ common-obj-$(CONFIG_PPCE500_PCI) += host-ppce500.o # ARM devices common-obj-$(CONFIG_VERSATILE_PCI) += host-versatile.o +ifeq ($(CONFIG_PCI), y) +obj-$(CONFIG_KVM) += ivshmem.o +obj-$(CONFIG_LINUX) += vfio.o +endif + obj-$(CONFIG_PCI_APB) += host-apb.o obj-$(CONFIG_FULONG) += host-bonito.o obj-$(CONFIG_PCI_PIIX) += host-piix.o