From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c3fxe-0003kz-K6 for qemu-devel@nongnu.org; Mon, 07 Nov 2016 04:11:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c3fxZ-0008LX-MA for qemu-devel@nongnu.org; Mon, 07 Nov 2016 04:11:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32928) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c3fxZ-0008Kt-Du for qemu-devel@nongnu.org; Mon, 07 Nov 2016 04:11:21 -0500 References: <1478257275-30365-1-git-send-email-mst@redhat.com> <1478257275-30365-2-git-send-email-mst@redhat.com> From: Jason Wang Message-ID: Date: Mon, 7 Nov 2016 17:11:12 +0800 MIME-Version: 1.0 In-Reply-To: <1478257275-30365-2-git-send-email-mst@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/2] virtio: allow per-device-class legacy features List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" , qemu-devel@nongnu.org Cc: dgilbert@redhat.com, Cornelia Huck , Christian Borntraeger , Richard Henderson , Alexander Graf On 2016=E5=B9=B411=E6=9C=8804=E6=97=A5 19:01, Michael S. Tsirkin wrote: > Legacy features are those that transitional devices only > expose on the legacy interface. > Allow different ones per device class. > > Signed-off-by: Michael S. Tsirkin > --- > include/hw/virtio/virtio.h | 5 +++++ > hw/s390x/virtio-ccw.c | 4 +++- > hw/virtio/virtio-pci.c | 4 +++- > hw/virtio/virtio.c | 2 ++ > 4 files changed, 13 insertions(+), 2 deletions(-) > > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index f12a1a8..bdb3c4b 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -113,6 +113,11 @@ typedef struct VirtioDeviceClass { > void (*set_config)(VirtIODevice *vdev, const uint8_t *config); > void (*reset)(VirtIODevice *vdev); > void (*set_status)(VirtIODevice *vdev, uint8_t val); > + /* For transitional devices, this is a bitmap of features > + * that are only exposed on the legacy interface but not > + * the modern one. > + */ > + uint64_t legacy_features; > /* Test and clear event pending status. > * Should be called after unmask to avoid losing events. > * If backend does not support masking, > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index 7d7f8f6..f5c1d98 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -303,6 +303,8 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > if (!ccw.cda) { > ret =3D -EFAULT; > } else { > + VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_GET_CLASS(vdev); > + > features.index =3D address_space_ldub(&address_space_memo= ry, > ccw.cda > + sizeof(features.fea= tures), > @@ -312,7 +314,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) > if (dev->revision >=3D 1) { > /* Don't offer legacy features for modern devices= . */ > features.features =3D (uint32_t) > - (vdev->host_features & ~VIRTIO_LEGACY_FEATURES= ); > + (vdev->host_features & ~vdc->legacy_features); > } else { > features.features =3D (uint32_t)vdev->host_featur= es; > } > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 62001b4..97b32fe 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -1175,7 +1175,9 @@ static uint64_t virtio_pci_common_read(void *opaq= ue, hwaddr addr, > break; > case VIRTIO_PCI_COMMON_DF: > if (proxy->dfselect <=3D 1) { > - val =3D (vdev->host_features & ~VIRTIO_LEGACY_FEATURES) >> > + VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_GET_CLASS(vdev); > + > + val =3D (vdev->host_features & ~vdc->legacy_features) >> > (32 * proxy->dfselect); > } > break; > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 1df5f4e..72ee06b 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -2214,6 +2214,8 @@ static void virtio_device_class_init(ObjectClass = *klass, void *data) > dc->props =3D virtio_properties; > vdc->start_ioeventfd =3D virtio_device_start_ioeventfd_impl; > vdc->stop_ioeventfd =3D virtio_device_stop_ioeventfd_impl; > + > + vdc->legacy_features |=3D VIRTIO_LEGACY_FEATURES; > } > =20 > bool virtio_device_ioeventfd_enabled(VirtIODevice *vdev) Acked-by: Jason Wang