From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43123) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxjQI-0006U7-TN for qemu-devel@nongnu.org; Thu, 28 Sep 2017 20:45:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxjQF-0007fU-Q3 for qemu-devel@nongnu.org; Thu, 28 Sep 2017 20:44:58 -0400 Received: from ozlabs.org ([103.22.144.67]:40077) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxjQE-0007b8-O1 for qemu-devel@nongnu.org; Thu, 28 Sep 2017 20:44:55 -0400 Date: Fri, 29 Sep 2017 10:35:53 +1000 From: David Gibson Message-ID: <20170929003553.GB7712@umbus.fritz.box> References: <20170927195635.16014-1-ehabkost@redhat.com> <20170927195635.16014-3-ehabkost@redhat.com> <20170928040809.GA12504@umbus> <20170928130644.GO4115@localhost.localdomain> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hQiwHBbRI9kgIhsi" Content-Disposition: inline In-Reply-To: <20170928130644.GO4115@localhost.localdomain> Subject: Re: [Qemu-devel] [PATCH v2 2/5] pci: Add interface names to hybrid PCI devices List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: qemu-devel@nongnu.org, David Gibson , Alistair Francis , Laine Stump , Alex Williamson , "Michael S. Tsirkin" , Marcel Apfelbaum , Dmitry Fleytman , Jason Wang , Paolo Bonzini , Gerd Hoffmann List-ID: --hQiwHBbRI9kgIhsi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Sep 28, 2017 at 10:06:44AM -0300, Eduardo Habkost wrote: > On Thu, Sep 28, 2017 at 02:08:09PM +1000, David Gibson wrote: > > On Wed, Sep 27, 2017 at 04:56:32PM -0300, Eduardo Habkost wrote: > > > The following devices support both PCI Express and Conventional > > > PCI, by including special code to handle the QEMU_PCI_CAP_EXPRESS > > > flag and/or conditional pcie_endpoint_cap_init() calls: > > >=20 > > > * vfio-pci (is_express=3D1, but legacy PCI handled by > > > vfio_populate_device()) > >=20 > > In the case of VFIO, won't this depend on the capabilities of the > > device on the host? >=20 > Yes. But the interface names are static data about the device > type, which really supports both cases. Ok, makes sense. > Deciding where exactly a VFIO device can be plugged before > running the VM will require additional data about the host, and > that can't be provided by QEMU (because it's not running yet). Right, obviously. >=20 > >=20 > > > * vmxnet3 (is_express=3D0, but PCIe handled by vmxnet3_realize()) > > > * pvscsi (is_express=3D0, but PCIe handled by pvscsi_realize()) > > > * virtio-pci (is_express=3D0, but PCIe handled by > > > virtio_pci_dc_realize(), and additional legacy PCI code at > > > virtio_pci_realize()) > > > * base-xhci (is_express=3D1, but pcie_endpoint_cap_init() call > > > is conditional on pci_bus_is_express(dev->bus) > > > * Note that xhci does not clear QEMU_PCI_CAP_EXPRESS like the > > > other hybrid devices > > >=20 > > > Cc: Dmitry Fleytman > > > Cc: Jason Wang > > > Cc: Paolo Bonzini > > > Cc: Gerd Hoffmann > > > Cc: Alex Williamson > > > Cc: "Michael S. Tsirkin" > > > Signed-off-by: Eduardo Habkost > >=20 > > Except for the query above, > >=20 > > Reviewed-by: David Gibson > >=20 > > > --- > > > Changes v1 -> v2: > > > * s/legacy/conventional/ > > > * Suggested-by: Alex Williamson > > > * Mark base-xhci as hybrid too > > > --- > > > hw/net/vmxnet3.c | 5 +++++ > > > hw/scsi/vmw_pvscsi.c | 2 ++ > > > hw/usb/hcd-xhci.c | 5 +++++ > > > hw/vfio/pci.c | 5 +++++ > > > hw/virtio/virtio-pci.c | 5 +++++ > > > 5 files changed, 22 insertions(+) > > >=20 > > > diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c > > > index a19a7a31dd..f99d9a69ec 100644 > > > --- a/hw/net/vmxnet3.c > > > +++ b/hw/net/vmxnet3.c > > > @@ -2651,6 +2651,11 @@ static const TypeInfo vmxnet3_info =3D { > > > .instance_size =3D sizeof(VMXNET3State), > > > .class_init =3D vmxnet3_class_init, > > > .instance_init =3D vmxnet3_instance_init, > > > + .interfaces =3D (InterfaceInfo[]) { > > > + { INTERFACE_PCIE_DEVICE }, > > > + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > > > + { } > > > + }, > > > }; > > > =20 > > > static void vmxnet3_register_types(void) > > > diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c > > > index 6d3f0bf11d..d6b315f8b2 100644 > > > --- a/hw/scsi/vmw_pvscsi.c > > > +++ b/hw/scsi/vmw_pvscsi.c > > > @@ -1300,6 +1300,8 @@ static const TypeInfo pvscsi_info =3D { > > > .class_init =3D pvscsi_class_init, > > > .interfaces =3D (InterfaceInfo[]) { > > > { TYPE_HOTPLUG_HANDLER }, > > > + { INTERFACE_PCIE_DEVICE }, > > > + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > > > { } > > > } > > > }; > > > diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c > > > index d75c085d94..af3a9d88de 100644 > > > --- a/hw/usb/hcd-xhci.c > > > +++ b/hw/usb/hcd-xhci.c > > > @@ -3670,6 +3670,11 @@ static const TypeInfo xhci_info =3D { > > > .instance_size =3D sizeof(XHCIState), > > > .class_init =3D xhci_class_init, > > > .abstract =3D true, > > > + .interfaces =3D (InterfaceInfo[]) { > > > + { INTERFACE_PCIE_DEVICE }, > > > + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > > > + { } > > > + }, > > > }; > > > =20 > > > static void qemu_xhci_class_init(ObjectClass *klass, void *data) > > > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > > > index 31e1edf447..913433d6ba 100644 > > > --- a/hw/vfio/pci.c > > > +++ b/hw/vfio/pci.c > > > @@ -3023,6 +3023,11 @@ static const TypeInfo vfio_pci_dev_info =3D { > > > .class_init =3D vfio_pci_dev_class_init, > > > .instance_init =3D vfio_instance_init, > > > .instance_finalize =3D vfio_instance_finalize, > > > + .interfaces =3D (InterfaceInfo[]) { > > > + { INTERFACE_PCIE_DEVICE }, > > > + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > > > + { } > > > + }, > > > }; > > > =20 > > > static void register_vfio_pci_dev_type(void) > > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > > > index 8b0d6b69cd..67c8ab63ad 100644 > > > --- a/hw/virtio/virtio-pci.c > > > +++ b/hw/virtio/virtio-pci.c > > > @@ -1958,6 +1958,11 @@ static const TypeInfo virtio_pci_info =3D { > > > .class_init =3D virtio_pci_class_init, > > > .class_size =3D sizeof(VirtioPCIClass), > > > .abstract =3D true, > > > + .interfaces =3D (InterfaceInfo[]) { > > > + { INTERFACE_PCIE_DEVICE }, > > > + { INTERFACE_CONVENTIONAL_PCI_DEVICE }, > > > + { } > > > + }, > > > }; > > > =20 > > > /* virtio-blk-pci */ > >=20 >=20 >=20 >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --hQiwHBbRI9kgIhsi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAlnNlWkACgkQbDjKyiDZ s5Lq5w//R80tU8vIgCTA+dqoL2A8WBPDrEvNQlc1TZ2GAXjhnO8iyHzByG1/H836 B7RGKs5p0PpwJr+Zj3O1BDt4YJFf12H1paoZAa/UlmIR2neypXxwhVKUGLCvyEmk Dffee/rqyGFuPirpQsfsU4GrLHJ7CYOVQ0RW/sv5JXNMUmOYYCIVZGKPh6+m8VXr EeMHzuHhdxukvXClYOPxhy1XQwKCBwVGA7LrpM9k1UPtKFje96ZGODlzAcyZcr48 ru0VdX1608b/KVpuiE9S+VDeSk6xBM2YgutlovRGwX3UGX8QlvylViquvML7ihEq QIckxRa0xjM2p/yplg04K5u7OHO+SSy3/v5Z1ttB2GMPRLZwqAjoNm755N/Kveb+ kRiLLR0WYqtJVhLOuDufMXLnJMP870Z7CGYozdxdjU3fhekABbjxPIDzn93SXllL y7eEmb2Wr2g669YomiKVEYNcCbaX+PwT4dFi6p9ZSD3gBOK7rjHOORALIi/kjvdE 0IaytvdN5JReX9c45V/3QYoVnX9nYT+l6qPdLp+RXxRsXa6lvvLtqXqrgltlf68K QVWfVDWmrkZoy9hrBDhJ5Nsy71IApYqGCqrkSiPfBPme3x/bQDLPr8MsdsYj1EpQ 1es/FMt1JAQ+6Z8QYCfpyWLisDpNA+RzOyWPqU6PVcrAV8zC7n0= =S+sV -----END PGP SIGNATURE----- --hQiwHBbRI9kgIhsi--