From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:50321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmrTA-0000jy-1S for qemu-devel@nongnu.org; Thu, 24 Jan 2019 21:43:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmrT9-0000R6-2K for qemu-devel@nongnu.org; Thu, 24 Jan 2019 21:43:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmrT8-0000Qp-ST for qemu-devel@nongnu.org; Thu, 24 Jan 2019 21:43:47 -0500 Date: Thu, 24 Jan 2019 21:43:44 -0500 From: "Michael S. Tsirkin" Message-ID: <20190124214330-mutt-send-email-mst@kernel.org> References: <20190123065618.3520-1-yang.zhong@intel.com> <20190123065618.3520-30-yang.zhong@intel.com> <20190123092224-mutt-send-email-mst@kernel.org> <20190125021053.GA26802@yangzhon-Virtual> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190125021053.GA26802@yangzhon-Virtual> Subject: Re: [Qemu-devel] [RFC PATCH v4 29/44] hw/pci/Makefile.objs: make pcie configurable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yang Zhong Cc: qemu-devel@nongnu.org, pbonzini@redhat.com, thuth@redhat.com, peter.maydell@linaro.org, ehabkost@redhat.com, sameo@linux.intel.com On Fri, Jan 25, 2019 at 10:10:53AM +0800, Yang Zhong wrote: > On Wed, Jan 23, 2019 at 09:23:49AM -0500, Michael S. Tsirkin wrote: > > On Wed, Jan 23, 2019 at 02:56:03PM +0800, Yang Zhong wrote: > > > Make pcie splited from pci and make it configurable. > > > > > > Signed-off-by: Yang Zhong > > > Cc: Michael S. Tsirkin > > > Reviewed-by: Thomas Huth > > > --- > > > default-configs/pci.mak | 1 + > > > hw/pci/Kconfig | 3 +++ > > > hw/pci/Makefile.objs | 5 +++-- > > > 3 files changed, 7 insertions(+), 2 deletions(-) > > > > > > diff --git a/default-configs/pci.mak b/default-configs/pci.mak > > > index f7b3690bbd..b17b456b1e 100644 > > > --- a/default-configs/pci.mak > > > +++ b/default-configs/pci.mak > > > @@ -1,4 +1,5 @@ > > > CONFIG_PCI=y > > > +CONFIG_PCI_EXPRESS=y > > > # For now, CONFIG_IDE_CORE requires ISA, so we enable it here > > > CONFIG_ISA_BUS=y > > > CONFIG_VIRTIO_PCI=y > > > diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig > > > index d3d2205577..81533b9dc0 100644 > > > --- a/hw/pci/Kconfig > > > +++ b/hw/pci/Kconfig > > > @@ -1,2 +1,5 @@ > > > config PCI > > > bool > > > + > > > +config PCI_EXPRESS > > > + bool > > > > Hmm this allows PCIE without PCI. > > Should PCI_EXPRESS select PCI? > > > > It's selected itself so can't depend on PCI. > > > Hello Michael, > > I did this in patch 30 as below: > > diff --git a/hw/pci/Kconfig b/hw/pci/Kconfig > index 81533b9dc0..4ca2537980 100644 > --- a/hw/pci/Kconfig > +++ b/hw/pci/Kconfig > @@ -3,3 +3,4 @@ config PCI > > config PCI_EXPRESS > bool > + select PCI > > Regards, > > Yang Maybe squash this into patch 29 then. > > > > > diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs > > > index 9f905e6344..d30eb32cbb 100644 > > > --- a/hw/pci/Makefile.objs > > > +++ b/hw/pci/Makefile.objs > > > @@ -2,8 +2,9 @@ common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o > > > common-obj-$(CONFIG_PCI) += msix.o msi.o > > > common-obj-$(CONFIG_PCI) += shpc.o > > > common-obj-$(CONFIG_PCI) += slotid_cap.o > > > -common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o > > > -common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o > > > +common-obj-$(CONFIG_PCI) += pci_host.o > > > +common-obj-$(CONFIG_PCI_EXPRESS) += pcie.o pcie_aer.o > > > +common-obj-$(CONFIG_PCI_EXPRESS) += pcie_port.o pcie_host.o > > > > > > common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o > > > common-obj-$(CONFIG_ALL) += pci-stub.o > > > -- > > > 2.17.1