[libvirt PATCH 09/12] qemu: assume QEMU_CAPS_VIRTIO_PACKED_QUEUES

Added by QEMU commit: commit 74b3e46630446568aecb0be1c77c4875d7a52f6d Author: Jason Wang <jasowang(a)redhat.com&gt; CommitDate: 2019-10-25 07:46:22 -0400 virtio: add property to enable packed virtqueue Signed-off-by: Jason Wang <jasowang(a)redhat.com&gt; Signed-off-by: Eugenio Pérez <eperezma(a)redhat.com&gt; Reviewed-by: Jens Freimann <jfreimann(a)redhat.com&gt; Message-Id: <20191025083527.30803-9-eperezma(a)redhat.com&gt; Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com&gt; Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com&gt; git describe: v4.1.0-1780-g74b3e46630 contains: v4.2.0-rc0~32^2~17 Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_validate.c | 10 +--------- .../virtio-options-controller-packed.err | 1 - .../qemuxml2argvdata/virtio-options-disk-packed.err | 1 - tests/qemuxml2argvdata/virtio-options-fs-packed.err | 1 - .../virtio-options-input-packed.err | 1 - .../virtio-options-memballoon-packed.err | 1 - .../qemuxml2argvdata/virtio-options-net-packed.err | 1 - .../qemuxml2argvdata/virtio-options-rng-packed.err | 1 - .../virtio-options-video-packed.err | 1 - tests/qemuxml2argvtest.c | 13 ------------- 10 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 tests/qemuxml2argvdata/virtio-options-controller-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-disk-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-fs-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-input-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-memballoon-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-net-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-rng-packed.err delete mode 100644 tests/qemuxml2argvdata/virtio-options-video-packed.err diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index bf7228e3ea..b12a873bc8 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1771,19 +1771,11 @@ qemuValidateNetSupportsCoalesce(virDomainNetType type) static int qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { if (!virtio) return 0; - if (virtio->packed != VIR_TRISTATE_SWITCH_ABSENT && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PACKED_QUEUES)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("the packed setting is not supported with this " - "QEMU binary")); - return -1; - } - return 0; } diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.err b/tests/qemuxml2argvdata/virtio-options-controller-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.err b/tests/qemuxml2argvdata/virtio-options-disk-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.err b/tests/qemuxml2argvdata/virtio-options-fs-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.err b/tests/qemuxml2argvdata/virtio-options-input-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.err b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.err b/tests/qemuxml2argvdata/virtio-options-net-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.err b/tests/qemuxml2argvdata/virtio-options-rng-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.err b/tests/qemuxml2argvdata/virtio-options-video-packed.err deleted file mode 100644 index b17ed8d359..0000000000 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: the packed setting is not supported with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index facbda9d02..27b45f6900 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3092,20 +3092,7 @@ mymain(void) DO_TEST_CAPS_LATEST("virtio-options-net-packed"); DO_TEST_CAPS_LATEST("virtio-options-rng-packed"); DO_TEST_CAPS_LATEST("virtio-options-video-packed"); - DO_TEST_PARSE_ERROR("virtio-options-controller-packed", QEMU_CAPS_VIRTIO_SCSI); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-disk-packed"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-fs-packed"); - DO_TEST_PARSE_ERROR("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_KEYBOARD); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-packed"); DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-memballoon-freepage-reporting"); - DO_TEST_PARSE_ERROR_NOCAPS("virtio-options-net-packed"); - DO_TEST_PARSE_ERROR("virtio-options-rng-packed", QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_PARSE_ERROR("virtio-options-video-packed", QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VHOST_USER_GPU); DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); -- 2.37.1