From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNOMh-0001Jo-A8 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 10:08:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UNOMS-0007gy-LC for qemu-devel@nongnu.org; Wed, 03 Apr 2013 10:08:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UNOMS-0007gp-62 for qemu-devel@nongnu.org; Wed, 03 Apr 2013 10:08:24 -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 r33E8NrL003532 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 3 Apr 2013 10:08:23 -0400 Date: Wed, 3 Apr 2013 17:09:17 +0300 From: "Michael S. Tsirkin" Message-ID: <20130403140917.GF22200@redhat.com> References: <1364914749-11141-1-git-send-email-pbonzini@redhat.com> <1364914749-11141-25-git-send-email-pbonzini@redhat.com> <20130403104335.GB18803@redhat.com> <515C1853.6060805@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <515C1853.6060805@redhat.com> 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: Paolo Bonzini Cc: qemu-devel@nongnu.org On Wed, Apr 03, 2013 at 01:53:55PM +0200, Paolo Bonzini wrote: > 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 ivshmem is a memory device really. > >> 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 > >> > >>