| Message ID | 20200819105156.54163-3-sgarzare@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vhost-vsock: force virtio version 1 | expand |
On Wed, 19 Aug 2020 12:51:55 +0200 Stefano Garzarella <sgarzare@redhat.com> wrote: > Commit 9b3a35ec82 ("virtio: verify that legacy support is not > accidentally on") added a safety checks that requires to set > 'disable-legacy=on' on vhost-user-vsock-pci device: > > $ ./qemu-system-x86_64 ... \ > -chardev socket,id=char0,reconnect=0,path=/tmp/vhost4.socket \ > -device vhost-user-vsock-pci,chardev=char0 > qemu-system-x86_64: -device vhost-user-vsock-pci,chardev=char0: > device is modern-only, use disable-legacy=on > > virtio-vsock was introduced after the release of VIRTIO 1.0 > specifications, so it should be 'modern-only'. > > This patch forces virtio version 1 and remove 'transitional_name' > properties, as done for vhost-vsock-pci, removing the need to specify > 'disable-legacy=on' on vhost-user-vsock-pci device. > > Cc: qemu-stable@nongnu.org > Suggested-by: Cornelia Huck <cohuck@redhat.com> > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> > --- > hw/virtio/vhost-user-vsock-pci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Same nits for the patch description as for patch 1, otherwise Reviewed-by: Cornelia Huck <cohuck@redhat.com>
diff --git a/hw/virtio/vhost-user-vsock-pci.c b/hw/virtio/vhost-user-vsock-pci.c index f4cf95873d..3e17cf0480 100644 --- a/hw/virtio/vhost-user-vsock-pci.c +++ b/hw/virtio/vhost-user-vsock-pci.c @@ -40,6 +40,7 @@ static void vhost_user_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) VHostUserVSockPCI *dev = VHOST_USER_VSOCK_PCI(vpci_dev); DeviceState *vdev = DEVICE(&dev->vdev); + virtio_pci_force_virtio_1(vpci_dev); qdev_realize(vdev, BUS(&vpci_dev->bus), errp); } @@ -68,7 +69,6 @@ static void vhost_user_vsock_pci_instance_init(Object *obj) static const VirtioPCIDeviceTypeInfo vhost_user_vsock_pci_info = { .base_name = TYPE_VHOST_USER_VSOCK_PCI, .generic_name = "vhost-user-vsock-pci", - .transitional_name = "vhost-user-vsock-pci-transitional", .non_transitional_name = "vhost-user-vsock-pci-non-transitional", .instance_size = sizeof(VHostUserVSockPCI), .instance_init = vhost_user_vsock_pci_instance_init,
Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety checks that requires to set 'disable-legacy=on' on vhost-user-vsock-pci device: $ ./qemu-system-x86_64 ... \ -chardev socket,id=char0,reconnect=0,path=/tmp/vhost4.socket \ -device vhost-user-vsock-pci,chardev=char0 qemu-system-x86_64: -device vhost-user-vsock-pci,chardev=char0: device is modern-only, use disable-legacy=on virtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'. This patch forces virtio version 1 and remove 'transitional_name' properties, as done for vhost-vsock-pci, removing the need to specify 'disable-legacy=on' on vhost-user-vsock-pci device. Cc: qemu-stable@nongnu.org Suggested-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> --- hw/virtio/vhost-user-vsock-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)