From nobody Thu Mar 28 09:49:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1534252892720461.8194954221376; Tue, 14 Aug 2018 06:21:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2F366307D85A; Tue, 14 Aug 2018 13:21:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E47DE9A6AE; Tue, 14 Aug 2018 13:21:29 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 83E9018037F4; Tue, 14 Aug 2018 13:21:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7EDLISp032658 for ; Tue, 14 Aug 2018 09:21:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id A6F1D2142F21; Tue, 14 Aug 2018 13:21:18 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5F952142F20; Tue, 14 Aug 2018 13:21:17 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Tue, 14 Aug 2018 15:21:09 +0200 Message-Id: <4a76a847918c8bb0ac6cd67f486edd2d0831de49.1534252679.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 4/5] qemu: capabilities: Always assume QEMU_CAPS_ADD_FD X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 14 Aug 2018 13:21:30 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The capability was usable since qemu 1.3 so we can remove all the detection code. Signed-off-by: Peter Krempa --- Note that the *replies files need to be renumbered. I've split that to a separate patch for ease of review. Notably because it was done automatically by tests/qemucapsfixreplies. src/qemu/qemu_capabilities.c | 17 ------------ src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 32 ++++++++++--------= ---- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 +- .../caps_2.10.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../caps_2.10.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../caps_2.11.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 3 +- .../caps_2.12.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 +- .../caps_2.12.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 +- .../caps_2.6.0.aarch64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 3 +- .../qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 17 ------------ tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 3 +- tests/qemuxml2argvtest.c | 2 -- 60 files changed, 43 insertions(+), 570 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e6e199b2c6..434e5e152c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1008,7 +1008,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "query-vnc", QEMU_CAPS_VNC }, { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, - { "add-fd", QEMU_CAPS_ADD_FD }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE }, { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, @@ -2122,22 +2121,6 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, ncommands, commands); virStringListFreeCount(commands, ncommands); - /* QMP add-fd was introduced in 1.2, but did not support - * management control of set numbering, and did not have a - * counterpart -add-fd command line option. We require the - * add-fd features from 1.3 or later. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - int fd =3D open("/dev/null", O_RDONLY); - if (fd < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unable to probe for add-fd")); - return -1; - } - if (qemuMonitorAddFd(mon, 0, fd, "/dev/null") < 0) - virQEMUCapsClear(qemuCaps, QEMU_CAPS_ADD_FD); - VIR_FORCE_CLOSE(fd); - } - /* Probe for active commit of qemu 2.1 (for now, we are choosing * to ignore the fact that qemu 2.0 can also do active commit) */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 26813a908c..888a6b2b27 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -225,7 +225,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 125 */ QEMU_CAPS_DEVICE_USB_SERIAL, /* -device usb-serial */ QEMU_CAPS_DEVICE_USB_NET, /* -device usb-net */ - QEMU_CAPS_ADD_FD, /* -add-fd */ + X_QEMU_CAPS_ADD_FD, /* -add-fd */ QEMU_CAPS_NBD_SERVER, /* nbd-server-start QMP command */ QEMU_CAPS_DEVICE_VIRTIO_RNG, /* virtio-rng device */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fa66b8affb..63b90f41fd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9622,7 +9622,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, const virDomainTPMDef *tpm =3D def->tpm; virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *type =3D NULL; - char *cancel_path =3D NULL, *devset =3D NULL; + char *cancel_path =3D NULL; + char *devset =3D NULL; + char *cancelset =3D NULL; const char *tpmdev; *tpmfd =3D -1; @@ -9648,30 +9650,24 @@ qemuBuildTPMBackendStr(const virDomainDef *def, if (!(cancel_path =3D virTPMCreateCancelPath(tpmdev))) goto error; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ADD_FD)) { - if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, can= celfd) < 0) - goto error; + if (qemuBuildTPMOpenBackendFDs(tpmdev, cancel_path, tpmfd, cancelf= d) < 0) + goto error; - virCommandPassFD(cmd, *tpmfd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT); - devset =3D qemuVirCommandGetDevSet(cmd, *tpmfd); - if (devset =3D=3D NULL) - goto error; + virCommandPassFD(cmd, *tpmfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + if (!(devset =3D qemuVirCommandGetDevSet(cmd, *tpmfd))) + goto error; - virCommandPassFD(cmd, *cancelfd, - VIR_COMMAND_PASS_FD_CLOSE_PARENT); - VIR_FREE(cancel_path); - cancel_path =3D qemuVirCommandGetDevSet(cmd, *cancelfd); - if (cancel_path =3D=3D NULL) - goto error; - } + virCommandPassFD(cmd, *cancelfd, VIR_COMMAND_PASS_FD_CLOSE_PARENT); + if (!(cancelset =3D qemuVirCommandGetDevSet(cmd, *cancelfd))) + goto error; virBufferAddLit(&buf, ",path=3D"); - virQEMUBuildBufferEscapeComma(&buf, devset ? devset : tpmdev); + virQEMUBuildBufferEscapeComma(&buf, devset); virBufferAddLit(&buf, ",cancel-path=3D"); - virQEMUBuildBufferEscapeComma(&buf, cancel_path); + virQEMUBuildBufferEscapeComma(&buf, cancelset); VIR_FREE(devset); + VIR_FREE(cancelset); VIR_FREE(cancel_path); break; diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.5.3.x86_64.replies index de7d441deb..6468691609 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -331,23 +331,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.5.3.x86_64.xml index a8dd69f4fa..2a98e8a3c6 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -60,7 +60,6 @@ - @@ -109,7 +108,7 @@ 1005003 0 - 51089 + 50896 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.6.0.x86_64.replies index 53cd0819dd..028dd103fb 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -337,23 +337,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.6.0.x86_64.xml index 536e0e19eb..67bb5c5971 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -114,7 +113,7 @@ 1006000 0 - 49318 + 49125 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_1.7.0.x86_64.replies index 7985f280b6..1e99156710 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -346,23 +346,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.7.0.x86_64.xml index 41f57963fa..2df50c71c7 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -116,7 +115,7 @@ 1007000 0 - 54762 + 54569 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/q= emucapabilitiesdata/caps_2.1.1.x86_64.replies index 646dce8250..c0bfec0c3a 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -379,23 +379,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.1.1.x86_64.xml index 28f2db1fbc..bc1c5d553f 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -61,7 +61,6 @@ - @@ -132,7 +131,7 @@ 2001001 0 - 63558 + 63365 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests= /qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 4bc6433601..2397471eb3 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -490,23 +490,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index 078507f57d..e20dc7e9cb 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -46,7 +46,6 @@ - @@ -161,7 +160,7 @@ 2010000 0 - 307647 + 307454 (v2.10.0) aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/q= emucapabilitiesdata/caps_2.10.0.ppc64.replies index a3a4deb87d..bc882826e7 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -487,23 +487,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index 75c2230b25..26611801f1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -160,7 +159,7 @@ 2010000 0 - 386992 + 386799 (v2.10.0) ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/q= emucapabilitiesdata/caps_2.10.0.s390x.replies index 4feada0473..eb8b3ffffe 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -499,23 +499,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index 5d134f4708..067ec07daa 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -121,7 +120,7 @@ 2010000 0 - 307899 + 307706 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/= qemucapabilitiesdata/caps_2.10.0.x86_64.replies index aee8d1a2c2..f92b9d9a02 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -496,23 +496,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index e5905d727c..1a7715f806 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -205,7 +204,7 @@ 2010000 0 - 367995 + 367802 (v2.10.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/q= emucapabilitiesdata/caps_2.11.0.s390x.replies index 2b03c251fc..a1e44d95b4 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -508,23 +508,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index df70c7d3e9..77d9633b33 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -128,7 +127,7 @@ 2011000 0 - 346751 + 346558 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/= qemucapabilitiesdata/caps_2.11.0.x86_64.replies index bfa7adc988..34768db3fd 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -505,23 +505,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.11.0.x86_64.xml index c22d8507a6..516a07d7f4 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -59,7 +59,6 @@ - @@ -209,7 +208,7 @@ 2011000 0 - 371455 + 371262 (v2.11.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests= /qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 9a8e54c63d..2c98faf651 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -523,23 +523,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 20, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index 72407c9990..2a0382c846 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -46,7 +46,6 @@ - @@ -172,7 +171,7 @@ 2011090 0 - 347550 + 347357 v2.12.0-rc0 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/q= emucapabilitiesdata/caps_2.12.0.ppc64.replies index 4f819150fe..bf241ba5c9 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -520,23 +520,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index d94082600f..413d6011bd 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -170,7 +169,7 @@ 2011090 0 - 428334 + 428141 v2.12.0-rc0 ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/q= emucapabilitiesdata/caps_2.12.0.s390x.replies index 0a028a2fe6..5a38b8f307 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -532,23 +532,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 18, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index e5b7ffc433..76aadd6a18 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -136,7 +135,7 @@ 2012000 0 - 375999 + 375806 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/= qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 6f37e4301e..be759fa019 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -538,23 +538,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index d34d762ca8..20f270daef 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -59,7 +59,6 @@ - @@ -214,7 +213,7 @@ 2011090 0 - 416196 + 416003 v2.12.0-rc0 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_2.4.0.x86_64.replies index 5c44a6aae5..39fdf0c792 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -427,23 +427,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 13, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.4.0.x86_64.xml index 8b480889b8..5dc67aa2ae 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -158,7 +157,7 @@ 2004000 0 - 80332 + 80139 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_2.5.0.x86_64.replies index 20d0000c84..565561d7f0 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -454,23 +454,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.5.0.x86_64.xml index 1055b367fb..95cd458f4e 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -164,7 +163,7 @@ 2005000 0 - 221513 + 221320 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_2.6.0.aarch64.replies index fd08db576a..1072038e2a 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -457,23 +457,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_2.6.0.aarch64.xml index 31f78d3a7a..f5a43378e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -48,7 +48,6 @@ - @@ -145,7 +144,7 @@ 2006000 0 - 232358 + 232165 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_2.6.0.ppc64.replies index 4406214e62..f6627ece81 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -454,23 +454,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.6.0.ppc64.xml index be091167d3..b4fad48121 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -140,7 +139,7 @@ 2006000 0 - 267184 + 266991 ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_2.6.0.x86_64.replies index c8b8f44e95..472b609c94 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -460,23 +460,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.6.0.x86_64.xml index ea2623c9ef..a9011a22f1 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -176,7 +175,7 @@ 2006000 0 - 232317 + 232124 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_2.7.0.s390x.replies index f92b8f9803..b304445238 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -466,23 +466,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.7.0.s390x.xml index adc3877bd8..3b2870a2e7 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -108,7 +107,7 @@ 2007000 0 - 220792 + 220599 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_2.7.0.x86_64.replies index 89ad92f3ea..33e90a2387 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -469,23 +469,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.7.0.x86_64.xml index 00557a9783..50d46de5c1 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -181,7 +180,7 @@ 2007000 0 - 244005 + 243812 (v2.7.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_2.8.0.s390x.replies index 135f22ab89..034acd036b 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -478,23 +478,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.8.0.s390x.xml index fdaea3fabb..f33792c087 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -111,7 +110,7 @@ 2007093 0 - 246206 + 246013 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_2.8.0.x86_64.replies index 8f80e733db..12a415eb1d 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -472,23 +472,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.8.0.x86_64.xml index 71548b6326..c14bd11bf9 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -184,7 +183,7 @@ 2008000 0 - 260660 + 260467 (v2.8.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_2.9.0.ppc64.replies index 0c97fc3ad8..5daf8655fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -478,23 +478,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index c4ebb73d21..b3cd5a5750 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -44,7 +44,6 @@ - @@ -151,7 +150,7 @@ 2009000 0 - 350708 + 350515 (v2.9.0) ppc64 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qe= mucapabilitiesdata/caps_2.9.0.s390x.replies index 94ab7feb62..3f86d5927e 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -490,23 +490,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 16, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.s390x.xml index 302cc5ffa1..8b9aa41e3f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -28,7 +28,6 @@ - @@ -115,7 +114,7 @@ 2009000 0 - 269625 + 269432 s390x diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_2.9.0.x86_64.replies index 7d10d68abd..0fe8da66fc 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -487,23 +487,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 15, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index c0bfb3f07a..df1b5182cd 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -61,7 +61,6 @@ - @@ -199,7 +198,7 @@ 2009000 0 - 343984 + 343791 (v2.9.0) x86_64 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_3.0.0.ppc64.replies index f759823f6c..fa770f825c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -565,23 +565,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 19, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index 64033dee51..4fae9b7461 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -45,7 +45,6 @@ - @@ -170,7 +169,7 @@ 2012050 0 - 446771 + 446578 v2.12.0-1689-g518d23a ppc64 diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/q= emucapabilitiesdata/caps_3.0.0.x86_64.replies index b2f8377248..9846f4ae42 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -583,23 +583,6 @@ "id": "libvirt-4" } -{ - "execute": "add-fd", - "arguments": { - "fdset-id": 0, - "opaque": "/dev/null" - }, - "id": "libvirt-5" -} - -{ - "return": { - "fd": 17, - "fdset-id": 0 - }, - "id": "libvirt-5" -} - { "execute": "block-commit", "arguments": { diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index efddcbc6a5..bb5d8b0634 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -59,7 +59,6 @@ - @@ -217,7 +216,7 @@ 2012090 0 - 438109 + 437916 v3.0.0-rc0-31-g633e824037 x86_64 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5c01fba6f0..8a7b82a1f2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2061,10 +2061,8 @@ mymain(void) QEMU_CAPS_KVM); DO_TEST("tpm-passthrough", - QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_TIS); DO_TEST("tpm-passthrough-crb", - QEMU_CAPS_ADD_FD, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE_TPM_CRB); DO_TEST_PARSE_ERROR("tpm-no-backend-invalid", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, QEMU_CAPS_DEVICE= _TPM_TIS); --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list