From nobody Thu Mar 28 08:45:12 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 1534324756578431.1368903268917; Wed, 15 Aug 2018 02:19:16 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A859307D840; Wed, 15 Aug 2018 09:19:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B0A05D6B5; Wed, 15 Aug 2018 09:19:14 +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 DF26B38B7; Wed, 15 Aug 2018 09:19:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7F9IuoL020007 for ; Wed, 15 Aug 2018 05:18:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 04AA610EE961; Wed, 15 Aug 2018 09:18:56 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 585F410EE964 for ; Wed, 15 Aug 2018 09:18:55 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 15 Aug 2018 11:18:41 +0200 Message-Id: <8e7d84ed1d7575cb2eee25ceef0a3d67f9d93559.1534324576.git.pkrempa@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 04/10] qemu: capabilities: Detect active block commit via QMP schema probing if possible 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 15 Aug 2018 09:19:15 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" For versions where we can probe that the arguments are optional we can perform the probing by a schema query rather than sending a separate command to do so. Signed-off-by: Peter Krempa Reviewed-by: John Ferlan --- src/qemu/qemu_capabilities.c | 8 +++++--- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 16 --------------= -- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 2 +- 47 files changed, 28 insertions(+), 394 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e6e199b2c6..755a666ab1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1306,6 +1306,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_Q= COW2_LUKS }, { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS }, { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE }, + { "block-commit/arg-type/*top", QEMU_CAPS_ACTIVE_COMMIT }, }; typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; @@ -2138,9 +2139,10 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, 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) && + /* Probe for active commit of qemu 2.1. We don't need to query directly + * if we have QMP schema support */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_QMP_SCHEMA) && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT) && qemuMonitorSupportsActiveCommit(mon)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_ACTIVE_COMMIT); diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests= /qemucapabilitiesdata/caps_2.10.0.aarch64.replies index 4bc6433601..e9712caad0 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -507,22 +507,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index 078507f57d..97318fa72f 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -161,7 +161,7 @@ 2010000 0 - 307647 + 307434 (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..12c7611891 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -504,22 +504,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index 75c2230b25..35b79569dc 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -160,7 +160,7 @@ 2010000 0 - 386992 + 386779 (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..6dc6a96d8d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -516,22 +516,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index 5d134f4708..a763a9e9be 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -121,7 +121,7 @@ 2010000 0 - 307899 + 307686 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..d9c59b04c7 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -513,22 +513,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..8ca64d6178 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -205,7 +205,7 @@ 2010000 0 - 367995 + 367782 (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..c9057fcea3 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -525,22 +525,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index df70c7d3e9..79656e6b95 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -128,7 +128,7 @@ 2011000 0 - 346751 + 346538 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..96d03d256d 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -522,22 +522,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..69f3f2c82f 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml @@ -209,7 +209,7 @@ 2011000 0 - 371455 + 371242 (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..17c7b3f34f 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -540,22 +540,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index 72407c9990..926db70f80 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -172,7 +172,7 @@ 2011090 0 - 347550 + 347337 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..a6365cf43c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -537,22 +537,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index d94082600f..66a77638a5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -170,7 +170,7 @@ 2011090 0 - 428334 + 428121 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..ec84f16d31 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -549,22 +549,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index e5b7ffc433..f7c54df0d7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -136,7 +136,7 @@ 2012000 0 - 375999 + 375786 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..95e8ef1174 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -555,22 +555,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..8453883fe8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -214,7 +214,7 @@ 2011090 0 - 416196 + 415983 v2.12.0-rc0 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..c1a124adf2 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -471,22 +471,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..ffa2b87f8b 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -164,7 +164,7 @@ 2005000 0 - 221513 + 221300 x86_64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/= qemucapabilitiesdata/caps_2.6.0.aarch64.replies index fd08db576a..ec0cc7e55e 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -474,22 +474,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_2.6.0.aarch64.xml index 31f78d3a7a..70b5c4896f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -145,7 +145,7 @@ 2006000 0 - 232358 + 232145 aarch64 diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qe= mucapabilitiesdata/caps_2.6.0.ppc64.replies index 4406214e62..c803001670 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -471,22 +471,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.6.0.ppc64.xml index be091167d3..0155c85971 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -140,7 +140,7 @@ 2006000 0 - 267184 + 266971 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..9733d48be6 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -477,22 +477,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..e7bf91cc64 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -176,7 +176,7 @@ 2006000 0 - 232317 + 232104 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..621aea5896 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -483,22 +483,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.7.0.s390x.xml index adc3877bd8..459f2da46c 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -108,7 +108,7 @@ 2007000 0 - 220792 + 220579 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..4f7be9337f 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -486,22 +486,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..defd5554e6 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -181,7 +181,7 @@ 2007000 0 - 244005 + 243792 (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..52de79df75 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -495,22 +495,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.8.0.s390x.xml index fdaea3fabb..564c6c481a 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -111,7 +111,7 @@ 2007093 0 - 246206 + 245993 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..e0783e7e7e 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -489,22 +489,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..318059bba1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -184,7 +184,7 @@ 2008000 0 - 260660 + 260447 (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..53a3c0a580 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -495,22 +495,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index c4ebb73d21..ea81b431f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -151,7 +151,7 @@ 2009000 0 - 350708 + 350495 (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..5c28c38ccd 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -507,22 +507,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.s390x.xml index 302cc5ffa1..a1e0152f95 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -115,7 +115,7 @@ 2009000 0 - 269625 + 269412 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..a432c5b9d2 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -504,22 +504,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" 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..54c4e4ce57 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -199,7 +199,7 @@ 2009000 0 - 343984 + 343771 (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..533404112c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -582,22 +582,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.0.0.ppc64.xml index 64033dee51..85848ecdae 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml @@ -170,7 +170,7 @@ 2012050 0 - 446771 + 446558 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 dc34d74ca3..2c822a5034 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -600,22 +600,6 @@ "id": "libvirt-5" } -{ - "execute": "block-commit", - "arguments": { - "device": "bogus" - }, - "id": "libvirt-6" -} - -{ - "id": "libvirt-6", - "error": { - "class": "DeviceNotFound", - "desc": "Device 'bogus' not found" - } -} - { "execute": "query-kvm", "id": "libvirt-7" diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_3.0.0.x86_64.xml index c8da1c5696..02939f178f 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml @@ -217,7 +217,7 @@ 3000000 0 - 427797 + 427584 v3.0.0 x86_64 --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list