From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Cornelia Huck <cohuck@redhat.com>,
qemu-stable@nongnu.org, Eric Auger <eric.auger@redhat.com>
Subject: [PULL v2 15/15] virtio-iommu-pci: force virtio version 1
Date: Fri, 18 Sep 2020 12:20:40 -0400 [thread overview]
Message-ID: <20200918161836.318893-16-mst@redhat.com> (raw)
In-Reply-To: <20200918161836.318893-1-mst@redhat.com>
From: Eric Auger <eric.auger@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 virtio-iommu-pci:
qemu-system-aarch64: -device virtio-iommu-pci: device is modern-only,
use disable-legacy=on
virtio-iommu was introduced after the release of VIRTIO 1.0
specifications, so it should be 'modern-only'.
This patch forces virtio version 1 and removes the 'transitional_name'
property removing the need to specify 'disable-legacy=on' on
virtio-iommu-pci device.
Cc: qemu-stable@nongnu.org
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200908193309.20569-3-eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-iommu-pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/virtio-iommu-pci.c b/hw/virtio/virtio-iommu-pci.c
index 76540e57b1..378f63b210 100644
--- a/hw/virtio/virtio-iommu-pci.c
+++ b/hw/virtio/virtio-iommu-pci.c
@@ -69,6 +69,7 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
object_property_set_link(OBJECT(dev), "primary-bus",
OBJECT(pci_get_bus(&vpci_dev->pci_dev)),
&error_abort);
+ virtio_pci_force_virtio_1(vpci_dev);
qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
}
@@ -98,7 +99,6 @@ static void virtio_iommu_pci_instance_init(Object *obj)
static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info = {
.base_name = TYPE_VIRTIO_IOMMU_PCI,
.generic_name = "virtio-iommu-pci",
- .transitional_name = "virtio-iommu-pci-transitional",
.non_transitional_name = "virtio-iommu-pci-non-transitional",
.instance_size = sizeof(VirtIOIOMMUPCI),
.instance_init = virtio_iommu_pci_instance_init,
--
MST
next prev parent reply other threads:[~2020-09-18 16:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 16:19 [PULL v2 00/15] virtio,pc,acpi: fixes, tests Michael S. Tsirkin
2020-09-18 16:19 ` [PULL v2 01/15] linux headers: sync to 5.9-rc4 Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 04/15] virtio-mem: detach the element from the virtqueue when error occurs Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 05/15] pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 06/15] vhost: recheck dev state in the vhost_migration_log routine Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 07/15] vhost: check queue state in the vhost_dev_set_log routine Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 08/15] tests/qtest/vhost-user-test: prepare the tests for adding new dev class Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 09/15] tests/qtest/libqos/virtio-blk: add support for vhost-user-blk Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 10/15] tests/qtest/vhost-user-test: add support for the vhost-user-blk device Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 11/15] tests/qtest/vhost-user-test: add migrate_reconnect test Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 12/15] tests/qtest/vhost-user-test: enable the reconnect tests Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 13/15] cphp: remove deprecated cpu-add command(s) Michael S. Tsirkin
2020-09-18 16:20 ` [PULL v2 14/15] virtio-iommu: Check gtrees are non null before destroying them Michael S. Tsirkin
2020-09-18 16:20 ` Michael S. Tsirkin [this message]
2020-09-18 16:21 ` [PULL v2 02/15] vhost: switch to use IOTLB v2 format Michael S. Tsirkin
2020-09-18 16:21 ` [PULL v2 03/15] vhost-vdpa: batch updating IOTLB mappings Michael S. Tsirkin
2020-09-18 16:20 ` Michael S. Tsirkin
2020-09-18 16:35 ` [PULL v2 00/15] virtio,pc,acpi: fixes, tests Michael S. Tsirkin
2020-09-18 16:46 ` Peter Maydell
2020-09-18 17:01 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200918161836.318893-16-mst@redhat.com \
--to=mst@redhat.com \
--cc=cohuck@redhat.com \
--cc=eric.auger@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).