From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNMGQ-00022T-IU for qemu-devel@nongnu.org; Wed, 03 Apr 2013 07:54:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNMGP-0007Aj-0k for qemu-devel@nongnu.org; Wed, 03 Apr 2013 07:54:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45480) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNMGO-0007AS-PP for qemu-devel@nongnu.org; Wed, 03 Apr 2013 07:54:00 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r33BrxmP005527 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Apr 2013 07:53:59 -0400 Message-ID: <515C1853.6060805@redhat.com> Date: Wed, 03 Apr 2013 13:53:55 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> <1364914749-11141-25-git-send-email-pbonzini@redhat.com> <20130403104335.GB18803@redhat.com> In-Reply-To: <20130403104335.GB18803@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 24/35] hw: move VFIO and ivshmem to hw/pci/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: qemu-devel@nongnu.org Il 03/04/2013 12:43, Michael S. Tsirkin ha scritto: > On Tue, Apr 02, 2013 at 04:58:58PM +0200, Paolo Bonzini wrote: >> 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%) > > > Please don't. pci is just an interconnect. > hw/pci is pci core and let's keep it clear of devices please. > Let's sort devices by their function, not > by an interconnect they happen to have. Again, these are the exceptions, not the rule. Here the interconnect is really an integral part of the device, so I couldn't think of any other place than hw/pci. Paolo >> 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 >> 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 >> -- >> 1.8.1.4 >> >>