[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v4 17/48] vhost-vsock-pci: force virtio version 1
From: |
Michael S. Tsirkin |
Subject: |
[PULL v4 17/48] vhost-vsock-pci: force virtio version 1 |
Date: |
Tue, 29 Sep 2020 03:21:37 -0400 |
From: Stefano Garzarella <sgarzare@redhat.com>
Commit 9b3a35ec82 ("virtio: verify that legacy support is not
accidentally on") added a safety check that requires to set
'disable-legacy=on' on vhost-vsock-pci device:
$ ./qemu-system-x86_64 ... -device vhost-vsock-pci,guest-cid=5
qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=5:
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'.
In addition Cornelia verified that forcing a legacy mode on
vhost-vsock-pci device using x86-64 host and s390x guest, so with
different endianness, produces strange behaviours.
This patch forces virtio version 1 and removes the 'transitional_name'
property removing the need to specify 'disable-legacy=on' on
vhost-vsock-pci device.
To avoid migration issues, we force virtio version 1 only when
legacy check is enabled in the new machine types (>= 5.1).
As the transitional device name is not commonly used, we do not
provide compatibility handling for it.
Cc: qemu-stable@nongnu.org
Reported-by: Qian Cai <caiqian@redhat.com>
Reported-by: Qinghua Cheng <qcheng@redhat.com>
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1868449
Suggested-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200921122506.82515-3-sgarzare@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/vhost-vsock-pci.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/vhost-vsock-pci.c b/hw/virtio/vhost-vsock-pci.c
index e56067b427..205da8d1f5 100644
--- a/hw/virtio/vhost-vsock-pci.c
+++ b/hw/virtio/vhost-vsock-pci.c
@@ -44,6 +44,15 @@ static void vhost_vsock_pci_realize(VirtIOPCIProxy
*vpci_dev, Error **errp)
{
VHostVSockPCI *dev = VHOST_VSOCK_PCI(vpci_dev);
DeviceState *vdev = DEVICE(&dev->vdev);
+ VirtIODevice *virtio_dev = VIRTIO_DEVICE(vdev);
+
+ /*
+ * To avoid migration issues, we force virtio version 1 only when
+ * legacy check is enabled in the new machine types (>= 5.1).
+ */
+ if (!virtio_legacy_check_disabled(virtio_dev)) {
+ virtio_pci_force_virtio_1(vpci_dev);
+ }
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
}
@@ -73,7 +82,6 @@ static void vhost_vsock_pci_instance_init(Object *obj)
static const VirtioPCIDeviceTypeInfo vhost_vsock_pci_info = {
.base_name = TYPE_VHOST_VSOCK_PCI,
.generic_name = "vhost-vsock-pci",
- .transitional_name = "vhost-vsock-pci-transitional",
.non_transitional_name = "vhost-vsock-pci-non-transitional",
.instance_size = sizeof(VHostVSockPCI),
.instance_init = vhost_vsock_pci_instance_init,
--
MST
- [PULL v4 06/48] vhost: recheck dev state in the vhost_migration_log routine, (continued)
- [PULL v4 06/48] vhost: recheck dev state in the vhost_migration_log routine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 07/48] vhost: check queue state in the vhost_dev_set_log routine, Michael S. Tsirkin, 2020/09/29
- [PULL v4 08/48] tests/qtest/vhost-user-test: prepare the tests for adding new dev class, Michael S. Tsirkin, 2020/09/29
- [PULL v4 10/48] virtio-iommu: Check gtrees are non null before destroying them, Michael S. Tsirkin, 2020/09/29
- [PULL v4 11/48] virtio-iommu-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 09/48] cphp: remove deprecated cpu-add command(s), Michael S. Tsirkin, 2020/09/29
- [PULL v4 13/48] util/hexdump: introduce qemu_hexdump_line(), Michael S. Tsirkin, 2020/09/29
- [PULL v4 14/48] vhost-vdpa: add trace-events, Michael S. Tsirkin, 2020/09/29
- [PULL v4 15/48] configure: Fix build dependencies with vhost-vdpa., Michael S. Tsirkin, 2020/09/29
- [PULL v4 16/48] virtio: skip legacy support check on machine types less than 5.1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 17/48] vhost-vsock-pci: force virtio version 1,
Michael S. Tsirkin <=
- [PULL v4 18/48] vhost-user-vsock-pci: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 19/48] vhost-vsock-ccw: force virtio version 1, Michael S. Tsirkin, 2020/09/29
- [PULL v4 22/48] x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use, Michael S. Tsirkin, 2020/09/29
- [PULL v4 21/48] x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features, Michael S. Tsirkin, 2020/09/29
- [PULL v4 24/48] acpi: add aml_land() and aml_break() primitives, Michael S. Tsirkin, 2020/09/29
- [PULL v4 25/48] tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff, Michael S. Tsirkin, 2020/09/29
- [PULL v4 26/48] x86: ich9: expose "smi_negotiated_features" as a QOM property, Michael S. Tsirkin, 2020/09/29
- [PULL v4 27/48] x86: acpi: introduce AcpiPmInfo::smi_on_cpuhp, Michael S. Tsirkin, 2020/09/29
- [PULL v4 28/48] x86: acpi: introduce the PCI0.SMI0 ACPI device, Michael S. Tsirkin, 2020/09/29
- [PULL v4 29/48] x68: acpi: trigger SMI before sending hotplug Notify event to OSPM, Michael S. Tsirkin, 2020/09/29