From nobody Sun Sep 7 23:35:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756306133; cv=none; d=zohomail.com; s=zohoarc; b=Mr4yR32gqX/a5dYtxJ53zKvDWfCNgteZtkePQ0h2Vi41eALK89Adsdp9yWevSPQqRQSou0NUBgRLecvXWjBONgeEXp90EhGMCDofQ2RZOztSowSvsZBUaUJEGt9rTeiOSB6AynK6WR9sF5I/XI0t5ZZ2FPMrRko4M9T/NPAxkXQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756306133; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=EjwIbhL8t139lawqE3D1oYDwY3MQvCveVyoKRM52/eE=; b=DVGnpmjtYl6UhXE940n7yftwLDOVhpOHasseCNB3btLYX+BfiHwJchwCitEXWIt7F4WKmTQA90ZaK3BkB4dAy7f7T+q8A8fSOh49PjCu9FtSDCEeKo8RNpB4HosnKfAVqSjZ5UWGjL9dCrbDuAmHUneMIEPbJsUTap2Nn4ePH3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756306133008602.7335495450226; Wed, 27 Aug 2025 07:48:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 85A65441FB; Wed, 27 Aug 2025 10:48:52 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id A2AA3440D3; Wed, 27 Aug 2025 10:47:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7540843E80; Wed, 27 Aug 2025 10:47:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D52204407E for ; Wed, 27 Aug 2025 10:46:59 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-658-EHujaZSxOKa2lZ4Rp-RHRw-1; Wed, 27 Aug 2025 10:46:58 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 636321955F42 for ; Wed, 27 Aug 2025 14:46:57 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9E54130001A6 for ; Wed, 27 Aug 2025 14:46:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EjwIbhL8t139lawqE3D1oYDwY3MQvCveVyoKRM52/eE=; b=AE0iEocbB3HlBfDzP+Tp4AaN6s1EerTaHRhZiUbh0kcjU45WzgyqDTITt3RhaN/Ypikeua 6WHBlXhYMc/L1LblHfBvlQISxGkR38+bBvRkM48IO7pHGHLTrha/sQh3kV0zddW+IVxGqW qKktKk3N3HW76GAGpldoBl1erhRFTDs= X-MC-Unique: EHujaZSxOKa2lZ4Rp-RHRw-1 X-Mimecast-MFC-AGG-ID: EHujaZSxOKa2lZ4Rp-RHRw_1756306017 To: devel@lists.libvirt.org Subject: [PATCH 01/10] qemu: Always assume support for QEMU_CAPS_MIGRATE_RDMA Date: Wed, 27 Aug 2025 16:46:44 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QEajaMdamE2XYAYC4nLWXsKQ93JFfCmVNX4Fa6MIv-E_1756306017 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: U4PHLQFEUKHOXZ3B6ERKHG5K3J4ZTBN2 X-Message-ID-Hash: U4PHLQFEUKHOXZ3B6ERKHG5K3J4ZTBN2 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756306134571124100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Libvirt detects QEMU_CAPS_MIGRATE_RDMA by probing 'query-migrate-capabilities' for the presence of 'rdma-pin-all'. In qemu the entry in 'query-migrate-capabilities' existed since the introduction of the command in qemu-2.0. We thus always detect this capability. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration.c | 26 +++++++------------------- src/qemu/qemu_migration.h | 3 +-- src/qemu/qemu_process.c | 2 +- 3 files changed, 9 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b22248e3b9..a8f4dd489c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2387,20 +2387,14 @@ qemuMigrationDstOPDRelocate(virQEMUDriver *driver G= _GNUC_UNUSED, int -qemuMigrationDstCheckProtocol(virQEMUCaps *qemuCaps, - const char *migrateFrom) +qemuMigrationDstCheckProtocol(const char *migrateFrom) { - if (STRPREFIX(migrateFrom, "rdma")) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_RDMA)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("incoming RDMA migration is not supported wit= h this QEMU binary")); - return -1; - } - } else if (!STRPREFIX(migrateFrom, "tcp") && - !STRPREFIX(migrateFrom, "exec") && - !STRPREFIX(migrateFrom, "fd") && - !STRPREFIX(migrateFrom, "unix") && - STRNEQ(migrateFrom, "stdio")) { + if (!STRPREFIX(migrateFrom, "tcp") && + !STRPREFIX(migrateFrom, "exec") && + !STRPREFIX(migrateFrom, "fd") && + !STRPREFIX(migrateFrom, "unix") && + !STRPREFIX(migrateFrom, "rdma") && + STRNEQ(migrateFrom, "stdio")) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("unknown migration protocol")); return -1; @@ -5330,7 +5324,6 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, qemuMigrationParams *migParams, const char *nbdURI) { - qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virURI) uribits =3D NULL; int ret =3D -1; qemuMigrationSpec spec; @@ -5353,11 +5346,6 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver, } if (STREQ(uribits->scheme, "rdma")) { - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_RDMA)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("outgoing RDMA migration is not supported wit= h this QEMU binary")); - return -1; - } if (!virMemoryLimitIsSet(vm->def->mem.hard_limit)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot start RDMA migration with no memory h= ard limit set")); diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index beb888160a..36865040df 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -274,8 +274,7 @@ qemuMigrationDstErrorReport(virQEMUDriver *driver, const char *name); int -qemuMigrationDstCheckProtocol(virQEMUCaps *qemuCaps, - const char *migrateFrom); +qemuMigrationDstCheckProtocol(const char *migrateFrom); char * qemuMigrationDstGetURI(const char *migrateFrom, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a81c02c9d5..059834648d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4997,7 +4997,7 @@ qemuProcessIncomingDefNew(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; qemuProcessIncomingDef *inc =3D NULL; - if (qemuMigrationDstCheckProtocol(priv->qemuCaps, migrateFrom) < 0) + if (qemuMigrationDstCheckProtocol(migrateFrom) < 0) return NULL; inc =3D g_new0(qemuProcessIncomingDef, 1); --=20 2.51.0 From nobody Sun Sep 7 23:35:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756306348; cv=none; d=zohomail.com; s=zohoarc; b=XIlIGZWUZA7IxJD1qx5Izi6HzS6wL86yf3B5hNGpCzaJ82ANPly1Z8qjn9FnAzNnVR3kOpr+CC/4XaPPGRziErhh/s6QpUkAfJNOR3auRwxeFPbzYckAqx0MtUmWZRxSeQAWP/FVkOGuGMGJLEiwasJ+iRdA81nLp9/x1ZpwbEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756306348; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=kVaGVpqh8e/JGWhKXgoYFyF3ZNwRz1rNLZORuXXOJLA=; b=St5WFUjWrgj2Y6cusXHPO/K2K6/RKlW9m4oSsIcoKpDa2ejgaOcH9pnxQgBa+sCnG9SsVclyCLw+1EyrBEN5Tj9pSfVFYxMxQqVjMQkmfpkKvScELndJHSO7GEWVd+NSGANMKP72LWggN+K3CbGgI5JgsrZ37tJJK0i4kGobuUo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756306348392845.3646761410602; Wed, 27 Aug 2025 07:52:28 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4A41744152; Wed, 27 Aug 2025 10:52:27 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C2FE8440AC; Wed, 27 Aug 2025 10:48:01 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 2D2F343F87; Wed, 27 Aug 2025 10:47:26 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 69CB343F87 for ; Wed, 27 Aug 2025 10:47:01 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-632-GPqxbZ1ONT6SKf_K1EHnEQ-1; Wed, 27 Aug 2025 10:46:59 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 022211956087 for ; Wed, 27 Aug 2025 14:46:59 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D941A30001A5 for ; Wed, 27 Aug 2025 14:46:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kVaGVpqh8e/JGWhKXgoYFyF3ZNwRz1rNLZORuXXOJLA=; b=cteTTkYoa41+t2OFbCeJ8ajEa3ap9qSiT6Sjw1Uhyf7wgBj1jkf7odh9VlpR2oXmDKlVya uzYKQ6G9Iog1B3qfwzF02380yp2P97z5T3y0vO8XFTpAlhGHYM8EJDpDXFRKQGD685kTm+ FTb18xrr5zvebRCzvsJQu9hzl0ks9q0= X-MC-Unique: GPqxbZ1ONT6SKf_K1EHnEQ-1 X-Mimecast-MFC-AGG-ID: GPqxbZ1ONT6SKf_K1EHnEQ_1756306019 To: devel@lists.libvirt.org Subject: [PATCH 02/10] qemu: capabilities: Retire QEMU_CAPS_MIGRATE_RDMA Date: Wed, 27 Aug 2025 16:46:45 +0200 Message-ID: <38e76566ca59b510f9a397f7e3642926905c3180.1756305881.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: IM9YtUFBBYt9VaFIZHiOSJODS3ENABE_XDh1Y4SFi8M_1756306019 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TKUPMKGXBFS5YCDNOWJUFZXN5S3GYEHY X-Message-ID-Hash: TKUPMKGXBFS5YCDNOWJUFZXN5S3GYEHY X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756306350521116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The capability is always present and not checked any more. Retire it. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml | 1 - tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 - tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 - tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 - 35 files changed, 2 insertions(+), 36 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index af238894b5..2291c84673 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -311,7 +311,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "iothread", /* X_QEMU_CAPS_OBJECT_IOTHREAD */ /* 175 */ - "migrate-rdma", /* QEMU_CAPS_MIGRATE_RDMA */ + "migrate-rdma", /* X_QEMU_CAPS_MIGRATE_RDMA */ "ivshmem", /* X_QEMU_CAPS_DEVICE_IVSHMEM */ "drive-iotune-max", /* X_QEMU_CAPS_DRIVE_IOTUNE_MAX */ "VGA.vgamem_mb", /* QEMU_CAPS_VGA_VGAMEM */ @@ -1259,7 +1259,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { }; struct virQEMUCapsStringFlags virQEMUCapsMigration[] =3D { - { "rdma-pin-all", QEMU_CAPS_MIGRATE_RDMA }, }; struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 55b05bea84..8916973364 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -291,7 +291,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_OBJECT_IOTHREAD, /* -object iothread */ /* 175 */ - QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */ + X_QEMU_CAPS_MIGRATE_RDMA, /* have rdma migration */ X_QEMU_CAPS_DEVICE_IVSHMEM, /* -device ivshmem */ X_QEMU_CAPS_DRIVE_IOTUNE_MAX, /* -drive bps_max=3D and friends */ QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml b/tests/qem= ucapabilitiesdata/caps_10.0.0_aarch64.xml index 200873b3a2..2b071735a9 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml @@ -38,7 +38,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml b/tests/qemuc= apabilitiesdata/caps_10.0.0_ppc64.xml index 0c57798255..29736a9ccb 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml @@ -42,7 +42,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemuc= apabilitiesdata/caps_10.0.0_s390x.xml index 070e673d0b..baf15e7173 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tes= ts/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml index c8104c967f..4f15e424e7 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemu= capabilitiesdata/caps_10.0.0_x86_64.xml index ad1ffcff32..9946ed7d3b 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml b/t= ests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml index 4be89b68d9..e79a4f3e81 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml @@ -40,7 +40,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml b/tests/qemu= capabilitiesdata/caps_10.1.0_x86_64.xml index a2162e20a4..dc3088ba2c 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml index 31292f153f..4635793fde 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -38,7 +38,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index 2f12e33818..4404b68315 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml index affe9c7ed2..82639920ca 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -44,7 +44,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index c24da85151..13f055fede 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml index beafad1e70..e8f75aa235 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -43,7 +43,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 1a60fbb4d1..14d0e5dd82 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml index 8dcf050c54..1cec2a7d9a 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -42,7 +42,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 5afd3661d2..1757370528 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index 31bc690a0b..496d3983ec 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index b66eab47de..555b078971 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.1.0_s390x.xml index acbb7caa20..5be33298b7 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -23,7 +23,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index 94786bea70..5e44997c91 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_8.2.0_aarch64.xml index 95a141c521..e5f1568531 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -41,7 +41,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_armv7l.xml index cb46dd1977..143708873f 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -43,7 +43,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/= qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 39e36e5aa0..a56f28051b 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -41,7 +41,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.2.0_s390x.xml index 23e3bc827c..a6d013214c 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -23,7 +23,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_x86_64.xml index a20c1dc3ba..232a060750 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemuca= pabilitiesdata/caps_9.0.0_sparc.xml index 11507557d3..f9b1d046d4 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -11,7 +11,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.0.0_x86_64.xml index a6190aba3c..4d3066bb11 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -49,7 +49,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_9.1.0_riscv64.xml index 0f7ce7ce1b..a0bae85971 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -42,7 +42,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_9.1.0_s390x.xml index 59e7207ed1..10e0884561 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.1.0_x86_64.xml index bf463fbb77..e203286df1 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/= qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index aa964b4885..50d78138f5 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -32,7 +32,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_9.2.0_s390x.xml index 27a9b4c924..a2f29f59ae 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -26,7 +26,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/test= s/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml index b660de997a..e94093a201 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -48,7 +48,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.2.0_x86_64.xml index bcc89fcff0..889576d1f7 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -48,7 +48,6 @@ - --=20 2.51.0 From nobody Sun Sep 7 23:35:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756306755; cv=none; d=zohomail.com; s=zohoarc; b=Gnw9DC2k5Aygph71RVh7pLNKT5JXl+gkmrf87mIUoDONcPJrwZ2dkFhdXC+A8H0SUH+NOhMGNQHXlWpkNR2cuAgBHO+uoaek01UFaV9BwHm/ycJGeoWkTZAby/pD8x+WzOXHl6D5O3LzkXjX063GLgtvtaSdHzJlAMv1PiiqBgc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756306755; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=MH4LpXQy/XjpcNtVO62bXlKXg2sAnvAvwLy+zozYJfM=; b=Yovtr0fUM8kFvxv1LIlpdM8NgAgKKjTFq3Ztyhko3wTuC4PmpK2q9frpI9jdwV+fvVBLWW+E0Rs54Tt7LZ3BhlPgnkxsm/4wdXIJiq/TsKi/gwEOWjfbdE4rx3zYqwMQ1hM9UFuDbPvtXhxlPTYEYsItQqqsO+NeGfJQV2ialTU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756306755225918.9834174002624; Wed, 27 Aug 2025 07:59:15 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1F90643FE6; Wed, 27 Aug 2025 10:59:14 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0E3CD44137; Wed, 27 Aug 2025 10:48:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 9219043FEF; Wed, 27 Aug 2025 10:47:27 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 574F544083 for ; Wed, 27 Aug 2025 10:47:03 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-680-HCJkK4etNU-l4wv0AvJ5vA-1; Wed, 27 Aug 2025 10:47:01 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 68078180036E for ; Wed, 27 Aug 2025 14:47:00 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5B09C30001A5 for ; Wed, 27 Aug 2025 14:46:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MH4LpXQy/XjpcNtVO62bXlKXg2sAnvAvwLy+zozYJfM=; b=fXvpqapxH7K7cVxVKyFXV1g3aFzayMHuvOsb4LmjKmFfrVLWUt4+dSd636EUKjBis2pMnX PXUWAXdeKKwaCntVMsHqD49dNZ1SB+lkLjtBh8uUhitlDtIJ30mnk2wqE0OA56eJ7wYDFl GbqDzQg0aXVXaVuzDbOOrN022Qiu87s= X-MC-Unique: HCJkK4etNU-l4wv0AvJ5vA-1 X-Mimecast-MFC-AGG-ID: HCJkK4etNU-l4wv0AvJ5vA_1756306020 To: devel@lists.libvirt.org Subject: [PATCH 03/10] qemu: capabilities: Drop probe of 'query-migrate-capabilities' Date: Wed, 27 Aug 2025 16:46:46 +0200 Message-ID: <366c3cd90f9cb845a893e4a53d314db1e4a9d84c.1756305881.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Gq1oJMrX0J9fq1r7KsthjS2LDRj070ImwtGT6qGG95U_1756306020 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WGMAUUIW7CRENNNWRLYT2KTPT4UEBUZT X-Message-ID-Hash: WGMAUUIW7CRENNNWRLYT2KTPT4UEBUZT X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756306758519116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa There is currently noting being probed from the reply of the command. In addition in most cases a feature can be now probed via the QMP schema which covers the return values in 'query-migrate-capabilities'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 22 --- .../caps_10.0.0_aarch64.replies | 111 +-------------- .../caps_10.0.0_ppc64.replies | 99 -------------- .../caps_10.0.0_s390x.replies | 107 +-------------- .../caps_10.0.0_x86_64+amdsev.replies | 119 ++-------------- .../caps_10.0.0_x86_64.replies | 119 ++-------------- .../caps_10.1.0_x86_64+inteltdx.replies | 123 ++--------------- .../caps_10.1.0_x86_64.replies | 123 ++--------------- .../caps_6.2.0_ppc64.replies | 87 ------------ .../caps_6.2.0_x86_64.replies | 107 ++------------- .../caps_7.0.0_ppc64.replies | 87 ------------ .../caps_7.0.0_x86_64.replies | 107 ++------------- .../caps_7.1.0_ppc64.replies | 95 ------------- .../caps_7.1.0_x86_64.replies | 115 ++-------------- .../caps_7.2.0_ppc.replies | 95 ------------- .../caps_7.2.0_x86_64+hvf.replies | 115 ++-------------- .../caps_7.2.0_x86_64.replies | 115 ++-------------- .../caps_8.0.0_x86_64.replies | 115 ++-------------- .../caps_8.1.0_s390x.replies | 107 +-------------- .../caps_8.1.0_x86_64.replies | 123 ++--------------- .../caps_8.2.0_aarch64.replies | 115 +--------------- .../caps_8.2.0_armv7l.replies | 115 +--------------- .../caps_8.2.0_loongarch64.replies | 107 +-------------- .../caps_8.2.0_s390x.replies | 107 +-------------- .../caps_8.2.0_x86_64.replies | 123 ++--------------- .../caps_9.0.0_sparc.replies | 107 --------------- .../caps_9.0.0_x86_64.replies | 127 ++---------------- .../caps_9.1.0_riscv64.replies | 103 +------------- .../caps_9.1.0_s390x.replies | 107 +-------------- .../caps_9.1.0_x86_64.replies | 119 ++-------------- .../caps_9.2.0_aarch64+hvf.replies | 111 +-------------- .../caps_9.2.0_s390x.replies | 107 +-------------- .../caps_9.2.0_x86_64+amdsev.replies | 119 ++-------------- .../caps_9.2.0_x86_64.replies | 119 ++-------------- 34 files changed, 208 insertions(+), 3469 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2291c84673..75ce877b58 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1258,9 +1258,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "blockdev-set-active", QEMU_CAPS_BLOCKDEV_SET_ACTIVE }, }; -struct virQEMUCapsStringFlags virQEMUCapsMigration[] =3D { -}; - struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] =3D { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, @@ -3550,23 +3547,6 @@ virQEMUCapsProbeQMPCommandLine(virQEMUCaps *qemuCaps, return 0; } -static int -virQEMUCapsProbeQMPMigrationCapabilities(virQEMUCaps *qemuCaps, - qemuMonitor *mon) -{ - g_auto(GStrv) caps =3D NULL; - - if (qemuMonitorGetMigrationCapabilities(mon, &caps) < 0) - return -1; - - virQEMUCapsProcessStringFlags(qemuCaps, - G_N_ELEMENTS(virQEMUCapsMigration), - virQEMUCapsMigration, - caps); - - return 0; -} - /** * virQEMUCapsProbeQMPGICCapabilities: * @qemuCaps: QEMU binary capabilities @@ -5785,8 +5765,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, return -1; if (virQEMUCapsProbeQMPCommandLine(qemuCaps, mon) < 0) return -1; - if (virQEMUCapsProbeQMPMigrationCapabilities(qemuCaps, mon) < 0) - return -1; if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0) return -1; if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0) diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies b/tests= /qemucapabilitiesdata/caps_10.0.0_aarch64.replies index bb0176f94d..7bee1a2933 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies @@ -35784,108 +35784,9 @@ "id": "libvirt-40" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-41" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-41" -} - { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -35901,7 +35802,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -35912,7 +35813,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -35945,7 +35846,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -35960,11 +35861,11 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { - "id": "libvirt-44", + "id": "libvirt-43", "error": { "class": "GenericError", "desc": "Parameter 'model.props.hv-passthrough' is unexpected" diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies b/tests/q= emucapabilitiesdata/caps_10.0.0_ppc64.replies index f119984c3f..e57c577b8b 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies @@ -36528,105 +36528,6 @@ "id": "libvirt-40" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-41" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-41" -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/q= emucapabilitiesdata/caps_10.0.0_s390x.replies index 1fe6526a3f..1188b5945a 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies @@ -33140,105 +33140,6 @@ "id": "libvirt-40" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-41" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-41" -} - { "execute": "query-cpu-model-expansion", "arguments": { @@ -33247,7 +33148,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -33319,7 +33220,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-41" } { @@ -33330,7 +33231,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -33486,7 +33387,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-42" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies b= /tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies index 327999a524..cc32a73026 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies @@ -38907,108 +38907,9 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -39019,16 +38920,16 @@ "pdh": "AQAAAAE3AAADEAAAAwAAAAIAAAAZzB1NV5cz0ISI+tYZQHDF/dw77x1Zz+u2jw= 0cUf+KR3u958kjxZlN5IFNIo7sUgkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8eYMemS1wynFwg= VIgw9ZdHI+6qmsr91sCHKjJHGGBLRF3DHGYtdCLEsYQCVmJQywAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAC/3y8ro5Ah= FTmPkAnaWckGQXhPEnSKInCUEpNnGgufIttDMtWgsjaAX7Jve/Hjcg8AAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAADe6oGDni6/LfA/HHDe0vBW4xoma82CBGyydXkq/PJfhO6fra1H9symYAiEd6db4n= 8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAA=3D", "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD= +qQRCYS9joBYSHMD1g+rmjY+MmVw=3D=3D" }, - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -39043,7 +38944,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39444,7 +39345,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39458,7 +39359,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39859,7 +39760,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39874,7 +39775,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -40386,7 +40287,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/= qemucapabilitiesdata/caps_10.0.0_x86_64.replies index ddcdee8464..fd1de1198e 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies @@ -39704,112 +39704,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -39818,11 +39719,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -39837,7 +39738,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -40238,7 +40139,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -40252,7 +40153,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -40653,7 +40554,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -40668,7 +40569,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -41180,7 +41081,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies= b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies index b755c5a0df..79525a0da7 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies @@ -37710,112 +37710,13 @@ "id": "libvirt-44" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-45" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-45" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-46" + "id": "libvirt-45" } { - "id": "libvirt-46", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -37824,7 +37725,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -37852,7 +37753,7 @@ ], "flc": true }, - "id": "libvirt-47" + "id": "libvirt-46" } { @@ -37863,7 +37764,7 @@ "name": "host" } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -38268,7 +38169,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -38282,7 +38183,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -38687,7 +38588,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -38698,7 +38599,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39214,7 +39115,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39229,7 +39130,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39745,7 +39646,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies b/tests/= qemucapabilitiesdata/caps_10.1.0_x86_64.replies index 7c92b5a66a..27f56d62b8 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies @@ -40586,112 +40586,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -40700,11 +40601,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -40719,7 +40620,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -41124,7 +41025,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -41138,7 +41039,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -41543,7 +41444,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -41554,7 +41455,7 @@ "name": "host" } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -42073,7 +41974,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -42088,7 +41989,7 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { @@ -42607,7 +42508,7 @@ } } }, - "id": "libvirt-53" + "id": "libvirt-52" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies b/tests/qe= mucapabilitiesdata/caps_6.2.0_ppc64.replies index ceced46e4b..ecbec17817 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies @@ -30119,93 +30119,6 @@ "id": "libvirt-40" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-41" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - } - ], - "id": "libvirt-41" -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.2.0_x86_64.replies index 6d6072cab5..8e889d7bbe 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies @@ -31846,100 +31846,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -31948,11 +31861,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -31967,7 +31880,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -32300,7 +32213,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -32314,7 +32227,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -32647,7 +32560,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -32662,7 +32575,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -32995,7 +32908,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies b/tests/qe= mucapabilitiesdata/caps_7.0.0_ppc64.replies index 0183997caf..bc08815d62 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies @@ -30775,93 +30775,6 @@ "id": "libvirt-41" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-42" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - } - ], - "id": "libvirt-42" -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.0.0_x86_64.replies index 16fad62b37..cf18d9abb7 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies @@ -32447,100 +32447,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -32549,7 +32462,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -32570,7 +32483,7 @@ } ] }, - "id": "libvirt-49" + "id": "libvirt-48" } { @@ -32581,7 +32494,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -32918,7 +32831,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -32932,7 +32845,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -33269,7 +33182,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -33284,7 +33197,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -33621,7 +33534,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies b/tests/qe= mucapabilitiesdata/caps_7.1.0_ppc64.replies index 931d1c3206..78f794fd96 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies @@ -31482,101 +31482,6 @@ "id": "libvirt-41" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-42" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - } - ], - "id": "libvirt-42" -} - { "execute": "qmp_capabilities", "id": "libvirt-1" diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.1.0_x86_64.replies index ff560438f9..ef6d322490 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies @@ -33151,108 +33151,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -33261,11 +33166,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -33280,7 +33185,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33618,7 +33523,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -33632,7 +33537,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -33970,7 +33875,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -33985,7 +33890,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -34323,7 +34228,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies b/tests/qemu= capabilitiesdata/caps_7.2.0_ppc.replies index 5cd0d7e87d..5e65d77589 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies @@ -31489,98 +31489,3 @@ ], "id": "libvirt-38" } - -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-39" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - } - ], - "id": "libvirt-39" -} diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies b/tes= ts/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies index e0a72f7ad9..0b6bf1e80d 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies @@ -34148,108 +34148,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34258,11 +34163,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34277,7 +34182,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34615,7 +34520,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34629,7 +34534,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34967,7 +34872,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34982,7 +34887,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -35320,7 +35225,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64.replies index fd6578b1c5..ddc580f591 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies @@ -34148,108 +34148,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34258,11 +34163,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34277,7 +34182,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34615,7 +34520,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -34629,7 +34534,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34967,7 +34872,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -34982,7 +34887,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -35320,7 +35225,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.0.0_x86_64.replies index b070a5e569..cd624f5095 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies @@ -35824,108 +35824,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -35934,11 +35839,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -35953,7 +35858,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -36296,7 +36201,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -36310,7 +36215,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -36653,7 +36558,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -36668,7 +36573,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -37117,7 +37022,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_8.1.0_s390x.replies index 032c102d4b..aa2fd62bc4 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies @@ -30403,109 +30403,6 @@ "id": "libvirt-37" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-38" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - } - ], - "id": "libvirt-38" -} - { "execute": "query-cpu-model-expansion", "arguments": { @@ -30514,7 +30411,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -30563,7 +30460,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.1.0_x86_64.replies index 6f5297b470..06be5c2264 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -37055,116 +37055,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37173,11 +37070,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37192,7 +37089,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37555,7 +37452,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -37569,7 +37466,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -37932,7 +37829,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -37947,7 +37844,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -38416,7 +38313,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies b/tests/= qemucapabilitiesdata/caps_8.2.0_aarch64.replies index 203774ecff..db5cb5750c 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies @@ -34733,112 +34733,9 @@ "id": "libvirt-41" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-42" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - } - ], - "id": "libvirt-42" -} - { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -34854,7 +34751,7 @@ "kernel": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -34865,7 +34762,7 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -34898,7 +34795,7 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-43" } { @@ -34913,11 +34810,11 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { - "id": "libvirt-45", + "id": "libvirt-44", "error": { "class": "GenericError", "desc": "Parameter 'hv-passthrough' is unexpected" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies b/tests/q= emucapabilitiesdata/caps_8.2.0_armv7l.replies index b67bb23c1b..d3617dac30 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies @@ -34895,112 +34895,9 @@ "id": "libvirt-41" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-42" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - } - ], - "id": "libvirt-42" -} - { "execute": "query-gic-capabilities", - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -35016,7 +34913,7 @@ "kernel": false } ], - "id": "libvirt-43" + "id": "libvirt-42" } { @@ -35027,11 +34924,11 @@ "name": "host" } }, - "id": "libvirt-44" + "id": "libvirt-43" } { - "id": "libvirt-44", + "id": "libvirt-43", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" @@ -35050,11 +34947,11 @@ } } }, - "id": "libvirt-45" + "id": "libvirt-44" } { - "id": "libvirt-45", + "id": "libvirt-44", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies b/te= sts/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies index 346c327e84..f68e9fe3e1 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies @@ -29896,109 +29896,6 @@ "id": "libvirt-39" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-40" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - } - ], - "id": "libvirt-40" -} - { "execute": "query-cpu-model-expansion", "arguments": { @@ -30007,11 +29904,11 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { - "id": "libvirt-41", + "id": "libvirt-40", "error": { "class": "GenericError", "desc": "The CPU type 'host' is not a recognized LoongArch CPU type" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_8.2.0_s390x.replies index 222a9fdfdc..70745a1550 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies @@ -31119,109 +31119,6 @@ "id": "libvirt-37" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-38" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - } - ], - "id": "libvirt-38" -} - { "execute": "query-cpu-model-expansion", "arguments": { @@ -31230,7 +31127,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -31279,7 +31176,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.2.0_x86_64.replies index 8a3c54f915..cd16a62fdf 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies @@ -37760,116 +37760,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37878,11 +37775,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37897,7 +37794,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -38264,7 +38161,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -38278,7 +38175,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -38645,7 +38542,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -38660,7 +38557,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -39133,7 +39030,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies b/tests/qe= mucapabilitiesdata/caps_9.0.0_sparc.replies index 9ddfcfae21..aa7a1be2b0 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies @@ -26120,110 +26120,3 @@ ], "id": "libvirt-23" } - -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-24" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-24" -} diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_9.0.0_x86_64.replies index 638313f857..b9c5ccd8c0 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies @@ -37988,120 +37988,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "compress" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "block" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -38110,11 +38003,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -38129,7 +38022,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -38497,7 +38390,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -38511,7 +38404,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -38879,7 +38772,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -38894,7 +38787,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -39368,7 +39261,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies b/tests/= qemucapabilitiesdata/caps_9.1.0_riscv64.replies index 35b905e5b2..282edd6283 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies @@ -31467,105 +31467,6 @@ "id": "libvirt-38" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-39" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-39" -} - { "execute": "query-cpu-model-expansion", "arguments": { @@ -31574,11 +31475,11 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { - "id": "libvirt-40", + "id": "libvirt-39", "error": { "class": "GenericError", "desc": "The requested expansion type is not supported" diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_9.1.0_s390x.replies index 0a523ba47e..8472bcf939 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies @@ -32070,105 +32070,6 @@ "id": "libvirt-38" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-39" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-39" -} - { "execute": "query-cpu-model-expansion", "arguments": { @@ -32177,7 +32078,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32249,7 +32150,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32260,7 +32161,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -32332,7 +32233,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_9.1.0_x86_64.replies index 47575075bd..12142fa24d 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies @@ -38686,112 +38686,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -38800,11 +38701,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38819,7 +38720,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39197,7 +39098,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39211,7 +39112,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39589,7 +39490,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39604,7 +39505,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -40092,7 +39993,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies b/te= sts/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies index 7801280291..104d1dae6c 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies @@ -33862,108 +33862,9 @@ "id": "libvirt-36" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-37" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-37" -} - { "execute": "query-gic-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -33979,7 +33880,7 @@ "kernel": false } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -33990,11 +33891,11 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } { - "id": "libvirt-39", + "id": "libvirt-38", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" @@ -34013,11 +33914,11 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { - "id": "libvirt-40", + "id": "libvirt-39", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_9.2.0_s390x.replies index d328e83a61..2ec542154c 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies @@ -32304,105 +32304,6 @@ "id": "libvirt-38" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-39" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-39" -} - { "execute": "query-cpu-model-expansion", "arguments": { @@ -32411,7 +32312,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32483,7 +32384,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -32494,7 +32395,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-40" } { @@ -32635,7 +32536,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies b/= tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies index be063de8aa..a2e33caacb 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies @@ -38368,108 +38368,9 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { @@ -38480,16 +38381,16 @@ "pdh": "AQAAAAE3AAADEAAAAwAAAAIAAAAZzB1NV5cz0ISI+tYZQHDF/dw77x1Zz+u2jw= 0cUf+KR3u958kjxZlN5IFNIo7sUgkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8eYMemS1wynFwg= VIgw9ZdHI+6qmsr91sCHKjJHGGBLRF3DHGYtdCLEsYQCVmJQywAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAC/3y8ro5Ah= FTmPkAnaWckGQXhPEnSKInCUEpNnGgufIttDMtWgsjaAX7Jve/Hjcg8AAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAADe6oGDni6/LfA/HHDe0vBW4xoma82CBGyydXkq/PJfhO6fra1H9symYAiEd6db4n= 8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAA=3D", "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD= +qQRCYS9joBYSHMD1g+rmjY+MmVw=3D=3D" }, - "id": "libvirt-48" + "id": "libvirt-47" } { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38504,7 +38405,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -38904,7 +38805,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -38918,7 +38819,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39318,7 +39219,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39333,7 +39234,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -39844,7 +39745,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_9.2.0_x86_64.replies index eaff01aba7..cea4cf7779 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies @@ -39048,112 +39048,13 @@ "id": "libvirt-46" } -{ - "execute": "query-migrate-capabilities", - "id": "libvirt-47" -} - -{ - "return": [ - { - "state": false, - "capability": "xbzrle" - }, - { - "state": false, - "capability": "rdma-pin-all" - }, - { - "state": false, - "capability": "auto-converge" - }, - { - "state": false, - "capability": "zero-blocks" - }, - { - "state": false, - "capability": "events" - }, - { - "state": false, - "capability": "postcopy-ram" - }, - { - "state": false, - "capability": "x-colo" - }, - { - "state": false, - "capability": "release-ram" - }, - { - "state": false, - "capability": "return-path" - }, - { - "state": false, - "capability": "pause-before-switchover" - }, - { - "state": false, - "capability": "multifd" - }, - { - "state": false, - "capability": "dirty-bitmaps" - }, - { - "state": false, - "capability": "postcopy-blocktime" - }, - { - "state": false, - "capability": "late-block-activate" - }, - { - "state": false, - "capability": "x-ignore-shared" - }, - { - "state": false, - "capability": "validate-uuid" - }, - { - "state": false, - "capability": "background-snapshot" - }, - { - "state": false, - "capability": "zero-copy-send" - }, - { - "state": false, - "capability": "postcopy-preempt" - }, - { - "state": false, - "capability": "switchover-ack" - }, - { - "state": false, - "capability": "dirty-limit" - }, - { - "state": false, - "capability": "mapped-ram" - } - ], - "id": "libvirt-47" -} - { "execute": "query-sev-capabilities", - "id": "libvirt-48" + "id": "libvirt-47" } { - "id": "libvirt-48", + "id": "libvirt-47", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -39162,11 +39063,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-49" + "id": "libvirt-48" } { - "id": "libvirt-49", + "id": "libvirt-48", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -39181,7 +39082,7 @@ "name": "host" } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39581,7 +39482,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-49" } { @@ -39595,7 +39496,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -39995,7 +39896,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-50" } { @@ -40010,7 +39911,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { @@ -40521,7 +40422,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-51" } { --=20 2.51.0 From nobody Sun Sep 7 23:35:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756306208; cv=none; d=zohomail.com; s=zohoarc; b=TVFKHAZfkgb9pTYudDz9btdiyML2PblM3ChW2leXimB4/Dn4N0ygHxLlfzC/xhE9xb0MY4poigz46fxcMs7z7zvjTgbU3otEJGijlVzifJjvixxCsjP50A8Bf2utD+PdbBxaIVINxGGTgMW3vmpO7pF0P+PaFAMquFMP0xXWAKI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756306208; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=6fsx1jnlZKWStsSj2y+nM0EHrRKPo+QQR2aZj4n5zhI=; b=dqjHUrNvdxN97CpMQeMGcSg19nkgM0XzD9Q05JXol2g/7K0HBRmf2BLe6Uj3jZAku6k66O9VbzLXDcR7QGJaYn/TASga0rdV5h4816Q6y0wAcAAjzDUNrI1RCou+rT/3b9lpCeSKEMljANb6oiX9kmVwmChiVY79gCnakeRki48= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756306208601741.7234604863745; Wed, 27 Aug 2025 07:50:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 1A9BF4410C; Wed, 27 Aug 2025 10:50:08 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C693C44117; Wed, 27 Aug 2025 10:47:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7932443E80; Wed, 27 Aug 2025 10:47:25 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 651BF4402F for ; Wed, 27 Aug 2025 10:47:04 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-107-B70M8GWAOsm5jgtu4kW15w-1; Wed, 27 Aug 2025 10:47:02 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A1E1318002AC for ; Wed, 27 Aug 2025 14:47:01 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DACA730001A5 for ; Wed, 27 Aug 2025 14:47:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6fsx1jnlZKWStsSj2y+nM0EHrRKPo+QQR2aZj4n5zhI=; b=fmaQHes37/Iq1R9V0Esbvb4v1d22EECe7i0UeNlbn+KqcPMzCqpKe999Q8m7BDVNM8UUh3 L3nHREaJgQKRM8zmd5HPQFXgDzEtx8QNrHDB430+Iq6Sr1Ze8yvj0Nd+W+xoTomWuwlZ7W hFuNmfYdnV7J1mupgZXqnFFCinlrT98= X-MC-Unique: B70M8GWAOsm5jgtu4kW15w-1 X-Mimecast-MFC-AGG-ID: B70M8GWAOsm5jgtu4kW15w_1756306021 To: devel@lists.libvirt.org Subject: [PATCH 04/10] qemu: capabilities: Detect TPM related capabilities from 'qom-list-types' Date: Wed, 27 Aug 2025 16:46:47 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LUz0JmN_hFOBFecQACPS3Y-2GVU7UDvUSLdFbr3u2fc_1756306021 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: T567X72R5F3BEQI7IW6IHFPXG37U7ENM X-Message-ID-Hash: T567X72R5F3BEQI7IW6IHFPXG37U7ENM X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756306211546124100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa All the information needed to detect supported TPM front and backends is present in the QOM types we already query, thus we don't need to invoke specific commands for querying TPM stuff. The only discrepancy is that there are 3 versions of 'tpm-tis' based on the backed they use. This patch reworks the probing but keeps the query commands in place. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 53 ++++++------------------------------ 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 75ce877b58..e7404ad27f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1427,6 +1427,13 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes= [] =3D { { "amd-iommu", QEMU_CAPS_AMD_IOMMU }, { "usb-bot", QEMU_CAPS_DEVICE_USB_BOT }, { "tdx-guest", QEMU_CAPS_TDX_GUEST}, + { "tpm-crb", QEMU_CAPS_DEVICE_TPM_CRB }, + { "tpm-tis", QEMU_CAPS_DEVICE_TPM_TIS }, + { "tpm-tis-device", QEMU_CAPS_DEVICE_TPM_TIS }, + { "tpm-tis-i2c", QEMU_CAPS_DEVICE_TPM_TIS }, + { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR }, + { "tpm-emulator", QEMU_CAPS_DEVICE_TPM_EMULATOR }, + { "tpm-passthrough", QEMU_CAPS_DEVICE_TPM_PASSTHROUGH }, }; @@ -3381,44 +3388,12 @@ virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps = *qemuCaps, } -struct tpmTypeToCaps { - int type; - virQEMUCapsFlags caps; -}; - -static const struct tpmTypeToCaps virQEMUCapsTPMTypesToCaps[] =3D { - { - .type =3D VIR_DOMAIN_TPM_TYPE_PASSTHROUGH, - .caps =3D QEMU_CAPS_DEVICE_TPM_PASSTHROUGH, - }, - { - .type =3D VIR_DOMAIN_TPM_TYPE_EMULATOR, - .caps =3D QEMU_CAPS_DEVICE_TPM_EMULATOR, - }, -}; - -const struct tpmTypeToCaps virQEMUCapsTPMModelsToCaps[] =3D { - { - .type =3D VIR_DOMAIN_TPM_MODEL_TIS, - .caps =3D QEMU_CAPS_DEVICE_TPM_TIS, - }, - { - .type =3D VIR_DOMAIN_TPM_MODEL_CRB, - .caps =3D QEMU_CAPS_DEVICE_TPM_CRB, - }, - { - .type =3D VIR_DOMAIN_TPM_MODEL_SPAPR, - .caps =3D QEMU_CAPS_DEVICE_TPM_SPAPR, - }, -}; - static int -virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps, +virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps G_GNUC_UNUSED, qemuMonitor *mon) { g_auto(GStrv) models =3D NULL; g_auto(GStrv) types =3D NULL; - size_t i; if (qemuMonitorGetTPMModels(mon, &models) < 0) return -1; @@ -3426,24 +3401,12 @@ virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps, if (!models) return 0; - for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsTPMModelsToCaps); i++) { - const char *needle =3D virDomainTPMModelTypeToString(virQEMUCapsTP= MModelsToCaps[i].type); - if (g_strv_contains((const char **)models, needle)) - virQEMUCapsSet(qemuCaps, virQEMUCapsTPMModelsToCaps[i].caps); - } - if (qemuMonitorGetTPMTypes(mon, &types) < 0) return -1; if (!types) return 0; - for (i =3D 0; i < G_N_ELEMENTS(virQEMUCapsTPMTypesToCaps); i++) { - const char *needle =3D virDomainTPMBackendTypeToString(virQEMUCaps= TPMTypesToCaps[i].type); - if (g_strv_contains((const char **)types, needle)) - virQEMUCapsSet(qemuCaps, virQEMUCapsTPMTypesToCaps[i].caps); - } - return 0; } --=20 2.51.0 From nobody Sun Sep 7 23:35:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756307198; cv=none; d=zohomail.com; s=zohoarc; b=YJOf0FnIGcI+JqiuAa8j1m5sXRy9QSXRSl9AY8+Pwx8XqLiEJzcQ6/7uBxsziAb682hhh8fIJtzZxQbSWy6s4EH+jIAJx8MvMuBbyOTymcHU+VrSZcqs9ai5bjvRKXkrgAnJHSn9De7uYnvyodltozF5b94IjssekkyyFWMUC1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756307198; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=7nfaJ3Bk5lCeiKKc7AhQxZ4WRy9kwK+T4SDJXtkRFr8=; b=DUDZhEMQatEvCejeBhS56L5nJhuNCOL4NelzLkGowF1L73p2c14zDnh98vMbWnUOnV22754tD1SPe2gnTsUzDi5fQA3VTkBT9GKMALwzJ1t8zxdkRqhr8Cwi5GVvjkCiDK2pEghWH2BdZyghdafRO2+Tplq7AM8q1bq8IGm+aX4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756307198946158.87676521858373; Wed, 27 Aug 2025 08:06:38 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id D3B6943F68; Wed, 27 Aug 2025 11:06:37 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id CBF1B44196; Wed, 27 Aug 2025 10:48:39 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 62F5E43FE4; Wed, 27 Aug 2025 10:47:29 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 15D9144061 for ; Wed, 27 Aug 2025 10:47:05 -0400 (EDT) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-Wc8kCEaoMN-a8b2FbsIy3w-1; Wed, 27 Aug 2025 10:47:03 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DC21B1800268 for ; Wed, 27 Aug 2025 14:47:02 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2251C30001A6 for ; Wed, 27 Aug 2025 14:47:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7nfaJ3Bk5lCeiKKc7AhQxZ4WRy9kwK+T4SDJXtkRFr8=; b=DfxzPKIm/2ATDpzIVJWIN1s6AJhpp6M0P80hZk1Gl+YzyYfZYnn1FIt04bl/pWSEXbojG7 iRgO2BVZLmx4iz5mkpbhc/NrlHbyRVKzKOeSGULxsNkXH2fm7hcinn0pAyDX273r2HGSNX Rl9U/WpAXjSYVuNUSVhGuUcp6Hemd6g= X-MC-Unique: Wc8kCEaoMN-a8b2FbsIy3w-1 X-Mimecast-MFC-AGG-ID: Wc8kCEaoMN-a8b2FbsIy3w_1756306023 To: devel@lists.libvirt.org Subject: [PATCH 05/10] qemu: capabilities: Don't use query-tpm-types/query-tpm-models for probe Date: Wed, 27 Aug 2025 16:46:48 +0200 Message-ID: <70372ca722a8e2a70080c0ce3c75f733c322bff7.1756305881.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NXZNKP5ktK1VL9mt8ugtyuP7oG4uXxcL-tcf44iMTTA_1756306023 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: E7OF7BYSNJPIRKWIXWC5UVWH6ROM3UAL X-Message-ID-Hash: E7OF7BYSNJPIRKWIXWC5UVWH6ROM3UAL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756307201572116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa In previous patches we've successfuly replaced it by looking at the qom types we already query so we don't need to invoke extra commands. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 25 --------- .../caps_10.0.0_aarch64.replies | 42 +++------------ .../caps_10.0.0_ppc64.replies | 29 +--------- .../caps_10.0.0_s390x.replies | 32 +++-------- .../caps_10.0.0_x86_64+amdsev.replies | 50 +++++------------ .../caps_10.0.0_x86_64.replies | 50 +++++------------ .../caps_10.1.0_x86_64+inteltdx.replies | 54 +++++-------------- .../caps_10.1.0_x86_64.replies | 54 +++++-------------- .../caps_6.2.0_ppc64.replies | 29 +--------- .../caps_6.2.0_x86_64.replies | 50 +++++------------ .../caps_7.0.0_ppc64.replies | 29 +--------- .../caps_7.0.0_x86_64.replies | 50 +++++------------ .../caps_7.1.0_ppc64.replies | 29 +--------- .../caps_7.1.0_x86_64.replies | 50 +++++------------ .../caps_7.2.0_ppc.replies | 24 +-------- .../caps_7.2.0_x86_64+hvf.replies | 50 +++++------------ .../caps_7.2.0_x86_64.replies | 50 +++++------------ .../caps_8.0.0_x86_64.replies | 50 +++++------------ .../caps_8.1.0_s390x.replies | 28 ++-------- .../caps_8.1.0_x86_64.replies | 50 +++++------------ .../caps_8.2.0_aarch64.replies | 42 +++------------ .../caps_8.2.0_armv7l.replies | 42 +++------------ .../caps_8.2.0_loongarch64.replies | 28 ++-------- .../caps_8.2.0_s390x.replies | 28 ++-------- .../caps_8.2.0_x86_64.replies | 50 +++++------------ .../caps_9.0.0_sparc.replies | 24 +-------- .../caps_9.0.0_x86_64.replies | 50 +++++------------ .../caps_9.1.0_riscv64.replies | 33 ++---------- .../caps_9.1.0_s390x.replies | 32 +++-------- .../caps_9.1.0_x86_64.replies | 50 +++++------------ .../caps_9.2.0_aarch64+hvf.replies | 41 +++----------- .../caps_9.2.0_s390x.replies | 32 +++-------- .../caps_9.2.0_x86_64+amdsev.replies | 50 +++++------------ .../caps_9.2.0_x86_64.replies | 50 +++++------------ 34 files changed, 274 insertions(+), 1103 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e7404ad27f..688d100b01 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3388,29 +3388,6 @@ virQEMUCapsUpdateCPUDeprecatedFeatures(virQEMUCaps *= qemuCaps, } -static int -virQEMUCapsProbeQMPTPM(virQEMUCaps *qemuCaps G_GNUC_UNUSED, - qemuMonitor *mon) -{ - g_auto(GStrv) models =3D NULL; - g_auto(GStrv) types =3D NULL; - - if (qemuMonitorGetTPMModels(mon, &models) < 0) - return -1; - - if (!models) - return 0; - - if (qemuMonitorGetTPMTypes(mon, &types) < 0) - return -1; - - if (!types) - return 0; - - return 0; -} - - static int virQEMUCapsProbeQMPKVMState(virQEMUCaps *qemuCaps, qemuMonitor *mon) @@ -5724,8 +5701,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps, return -1; if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, accel, mon) < 0) return -1; - if (virQEMUCapsProbeQMPTPM(qemuCaps, mon) < 0) - return -1; if (virQEMUCapsProbeQMPCommandLine(qemuCaps, mon) < 0) return -1; if (virQEMUCapsProbeQMPGICCapabilities(qemuCaps, mon) < 0) diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies b/tests= /qemucapabilitiesdata/caps_10.0.0_aarch64.replies index 7bee1a2933..f3d7ee69c1 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.replies @@ -34286,35 +34286,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -35781,12 +35755,12 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { "execute": "query-gic-capabilities", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -35802,7 +35776,7 @@ "kernel": false } ], - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -35813,7 +35787,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -35846,7 +35820,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -35861,11 +35835,11 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-41" } { - "id": "libvirt-43", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "Parameter 'model.props.hv-passthrough' is unexpected" diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies b/tests/q= emucapabilitiesdata/caps_10.0.0_ppc64.replies index e57c577b8b..76d0b6fb6f 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.replies @@ -35136,34 +35136,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -36525,7 +36500,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies b/tests/q= emucapabilitiesdata/caps_10.0.0_s390x.replies index 1188b5945a..52068141f9 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.replies @@ -31837,29 +31837,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -33137,7 +33117,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -33148,7 +33128,7 @@ "name": "host" } }, - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -33220,7 +33200,7 @@ } } }, - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -33231,7 +33211,7 @@ "name": "host" } }, - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -33387,7 +33367,7 @@ } } }, - "id": "libvirt-42" + "id": "libvirt-40" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies b= /tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies index cc32a73026..d49f1c3548 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.replies @@ -37353,35 +37353,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -38904,12 +38878,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38920,16 +38894,16 @@ "pdh": "AQAAAAE3AAADEAAAAwAAAAIAAAAZzB1NV5cz0ISI+tYZQHDF/dw77x1Zz+u2jw= 0cUf+KR3u958kjxZlN5IFNIo7sUgkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8eYMemS1wynFwg= VIgw9ZdHI+6qmsr91sCHKjJHGGBLRF3DHGYtdCLEsYQCVmJQywAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAC/3y8ro5Ah= FTmPkAnaWckGQXhPEnSKInCUEpNnGgufIttDMtWgsjaAX7Jve/Hjcg8AAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAADe6oGDni6/LfA/HHDe0vBW4xoma82CBGyydXkq/PJfhO6fra1H9symYAiEd6db4n= 8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAA=3D", "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD= +qQRCYS9joBYSHMD1g+rmjY+MmVw=3D=3D" }, - "id": "libvirt-47" + "id": "libvirt-45" } { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38944,7 +38918,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39345,7 +39319,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39359,7 +39333,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39760,7 +39734,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39775,7 +39749,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -40287,7 +40261,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies b/tests/= qemucapabilitiesdata/caps_10.0.0_x86_64.replies index fd1de1198e..73d9a1b313 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.replies @@ -38150,35 +38150,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -39701,16 +39675,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -39719,11 +39693,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -39738,7 +39712,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -40139,7 +40113,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -40153,7 +40127,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -40554,7 +40528,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -40569,7 +40543,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -41081,7 +41055,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies= b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies index 79525a0da7..2c4dcb149e 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.replies @@ -36345,35 +36345,9 @@ "id": "libvirt-41" } -{ - "execute": "query-tpm-models", - "id": "libvirt-42" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-42" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-43" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-43" -} - { "execute": "query-command-line-options", - "id": "libvirt-44" + "id": "libvirt-42" } { @@ -37707,16 +37681,16 @@ "option": "drive" } ], - "id": "libvirt-44" + "id": "libvirt-42" } { "execute": "query-sev-capabilities", - "id": "libvirt-45" + "id": "libvirt-43" } { - "id": "libvirt-45", + "id": "libvirt-43", "error": { "class": "GenericError", "desc": "SEV is not enabled in KVM" @@ -37725,7 +37699,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37753,7 +37727,7 @@ ], "flc": true }, - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37764,7 +37738,7 @@ "name": "host" } }, - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38169,7 +38143,7 @@ } } }, - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38183,7 +38157,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -38588,7 +38562,7 @@ } } }, - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -38599,7 +38573,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39115,7 +39089,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39130,7 +39104,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39646,7 +39620,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies b/tests/= qemucapabilitiesdata/caps_10.1.0_x86_64.replies index 27f56d62b8..8b8079617f 100644 --- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.replies @@ -39024,35 +39024,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -40583,16 +40557,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -40601,11 +40575,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -40620,7 +40594,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -41025,7 +40999,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -41039,7 +41013,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -41444,7 +41418,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -41455,7 +41429,7 @@ "name": "host" } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -41974,7 +41948,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -41989,7 +41963,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-50" } { @@ -42508,7 +42482,7 @@ } } }, - "id": "libvirt-52" + "id": "libvirt-50" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies b/tests/qe= mucapabilitiesdata/caps_6.2.0_ppc64.replies index ecbec17817..c248bced28 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.replies @@ -28966,34 +28966,9 @@ "id": "libvirt-37" } -{ - "execute": "query-tpm-models", - "id": "libvirt-38" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-38" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-39" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-39" -} - { "execute": "query-command-line-options", - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -30116,7 +30091,7 @@ "option": "drive" } ], - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_6.2.0_x86_64.replies index 8e889d7bbe..9b0d762799 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.replies @@ -30495,35 +30495,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -31843,16 +31817,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -31861,11 +31835,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -31880,7 +31854,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32213,7 +32187,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32227,7 +32201,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -32560,7 +32534,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -32575,7 +32549,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -32908,7 +32882,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies b/tests/qe= mucapabilitiesdata/caps_7.0.0_ppc64.replies index bc08815d62..58a624b006 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.replies @@ -29558,34 +29558,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -30772,7 +30747,7 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.0.0_x86_64.replies index cf18d9abb7..6f27d3a349 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.replies @@ -31092,35 +31092,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -32444,16 +32418,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -32462,7 +32436,7 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -32483,7 +32457,7 @@ } ] }, - "id": "libvirt-48" + "id": "libvirt-46" } { @@ -32494,7 +32468,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32831,7 +32805,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -32845,7 +32819,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33182,7 +33156,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33197,7 +33171,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -33534,7 +33508,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies b/tests/qe= mucapabilitiesdata/caps_7.1.0_ppc64.replies index 78f794fd96..546214a9ef 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.replies @@ -30265,34 +30265,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-spapr" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -31479,7 +31454,7 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.1.0_x86_64.replies index ef6d322490..fcee75b20a 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.replies @@ -31796,35 +31796,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -33148,16 +33122,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -33166,11 +33140,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -33185,7 +33159,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -33523,7 +33497,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -33537,7 +33511,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33875,7 +33849,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -33890,7 +33864,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -34228,7 +34202,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies b/tests/qemu= capabilitiesdata/caps_7.2.0_ppc.replies index 5e65d77589..a55685c8f0 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.replies @@ -30149,29 +30149,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31487,5 +31467,5 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies b/tes= ts/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies index 0b6bf1e80d..1095899c6e 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.replies @@ -32793,35 +32793,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -34145,16 +34119,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34163,11 +34137,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34182,7 +34156,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34520,7 +34494,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34534,7 +34508,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34872,7 +34846,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34887,7 +34861,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -35225,7 +35199,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64.replies index ddc580f591..f87ebf41ee 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.replies @@ -32793,35 +32793,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -34145,16 +34119,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -34163,11 +34137,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -34182,7 +34156,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34520,7 +34494,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -34534,7 +34508,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34872,7 +34846,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -34887,7 +34861,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -35225,7 +35199,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.0.0_x86_64.replies index cd624f5095..49faceec28 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.replies @@ -34352,35 +34352,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -35821,16 +35795,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -35839,11 +35813,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -35858,7 +35832,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -36201,7 +36175,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -36215,7 +36189,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -36558,7 +36532,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -36573,7 +36547,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -37022,7 +36996,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_8.1.0_s390x.replies index aa2fd62bc4..8a71843283 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.replies @@ -29155,29 +29155,9 @@ "id": "libvirt-34" } -{ - "execute": "query-tpm-models", - "id": "libvirt-35" -} - -{ - "return": [], - "id": "libvirt-35" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -30400,7 +30380,7 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -30411,7 +30391,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -30460,7 +30440,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.1.0_x86_64.replies index 06be5c2264..458d656220 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -35566,35 +35566,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37052,16 +37026,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37070,11 +37044,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37089,7 +37063,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -37452,7 +37426,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -37466,7 +37440,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -37829,7 +37803,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -37844,7 +37818,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -38313,7 +38287,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies b/tests/= qemucapabilitiesdata/caps_8.2.0_aarch64.replies index db5cb5750c..d1ca8b37f5 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.replies @@ -33337,35 +33337,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -34730,12 +34704,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34751,7 +34725,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34762,7 +34736,7 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-41" } { @@ -34795,7 +34769,7 @@ } } }, - "id": "libvirt-43" + "id": "libvirt-41" } { @@ -34810,11 +34784,11 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-42" } { - "id": "libvirt-44", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "Parameter 'hv-passthrough' is unexpected" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies b/tests/q= emucapabilitiesdata/caps_8.2.0_armv7l.replies index d3617dac30..d28046578d 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.replies @@ -33382,35 +33382,9 @@ "id": "libvirt-38" } -{ - "execute": "query-tpm-models", - "id": "libvirt-39" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-39" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-40" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-40" -} - { "execute": "query-command-line-options", - "id": "libvirt-41" + "id": "libvirt-39" } { @@ -34892,12 +34866,12 @@ "option": "drive" } ], - "id": "libvirt-41" + "id": "libvirt-39" } { "execute": "query-gic-capabilities", - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34913,7 +34887,7 @@ "kernel": false } ], - "id": "libvirt-42" + "id": "libvirt-40" } { @@ -34924,11 +34898,11 @@ "name": "host" } }, - "id": "libvirt-43" + "id": "libvirt-41" } { - "id": "libvirt-43", + "id": "libvirt-41", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" @@ -34947,11 +34921,11 @@ } } }, - "id": "libvirt-44" + "id": "libvirt-42" } { - "id": "libvirt-44", + "id": "libvirt-42", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies b/te= sts/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies index f68e9fe3e1..7f2bb97635 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.replies @@ -28556,29 +28556,9 @@ "id": "libvirt-36" } -{ - "execute": "query-tpm-models", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-38" -} - -{ - "return": [], - "id": "libvirt-38" -} - { "execute": "query-command-line-options", - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -29893,7 +29873,7 @@ "option": "drive" } ], - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -29904,11 +29884,11 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-38" } { - "id": "libvirt-40", + "id": "libvirt-38", "error": { "class": "GenericError", "desc": "The CPU type 'host' is not a recognized LoongArch CPU type" diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_8.2.0_s390x.replies index 70745a1550..492cef2065 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.replies @@ -29863,29 +29863,9 @@ "id": "libvirt-34" } -{ - "execute": "query-tpm-models", - "id": "libvirt-35" -} - -{ - "return": [], - "id": "libvirt-35" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -31116,7 +31096,7 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -31127,7 +31107,7 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31176,7 +31156,7 @@ } } }, - "id": "libvirt-38" + "id": "libvirt-36" } { diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_8.2.0_x86_64.replies index cd16a62fdf..4b34b01eea 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.replies @@ -36258,35 +36258,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37757,16 +37731,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -37775,11 +37749,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -37794,7 +37768,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38161,7 +38135,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38175,7 +38149,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38542,7 +38516,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38557,7 +38531,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39030,7 +39004,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies b/tests/qe= mucapabilitiesdata/caps_9.0.0_sparc.replies index aa7a1be2b0..2d492d7b06 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.replies @@ -24763,29 +24763,9 @@ "id": "libvirt-20" } -{ - "execute": "query-tpm-models", - "id": "libvirt-21" -} - -{ - "return": [], - "id": "libvirt-21" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-22" -} - -{ - "return": [], - "id": "libvirt-22" -} - { "execute": "query-command-line-options", - "id": "libvirt-23" + "id": "libvirt-21" } { @@ -26118,5 +26098,5 @@ "option": "drive" } ], - "id": "libvirt-23" + "id": "libvirt-21" } diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_9.0.0_x86_64.replies index b9c5ccd8c0..6099885857 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.replies @@ -36482,35 +36482,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -37985,16 +37959,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -38003,11 +37977,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "SGX is not enabled in KVM" @@ -38022,7 +37996,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38390,7 +38364,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38404,7 +38378,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38772,7 +38746,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -38787,7 +38761,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39261,7 +39235,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies b/tests/= qemucapabilitiesdata/caps_9.1.0_riscv64.replies index 282edd6283..51896936cc 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.replies @@ -30023,34 +30023,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [ - "tpm-tis" - ], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31464,7 +31439,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -31475,11 +31450,11 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-37" } { - "id": "libvirt-39", + "id": "libvirt-37", "error": { "class": "GenericError", "desc": "The requested expansion type is not supported" diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_9.1.0_s390x.replies index 8472bcf939..d8f0b032ba 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.replies @@ -30806,29 +30806,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32067,7 +32047,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32078,7 +32058,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32150,7 +32130,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32161,7 +32141,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -32233,7 +32213,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_9.1.0_x86_64.replies index 12142fa24d..7c6c525d12 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.replies @@ -37172,35 +37172,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -38683,16 +38657,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -38701,11 +38675,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38720,7 +38694,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39098,7 +39072,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39112,7 +39086,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39490,7 +39464,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39505,7 +39479,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39993,7 +39967,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies b/te= sts/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies index 104d1dae6c..66dcfe42d0 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.replies @@ -32516,34 +32516,9 @@ "id": "libvirt-33" } -{ - "execute": "query-tpm-models", - "id": "libvirt-34" -} - -{ - "return": [ - "tpm-tis", - "tpm-tis" - ], - "id": "libvirt-34" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-35" -} - -{ - "return": [ - "emulator" - ], - "id": "libvirt-35" -} - { "execute": "query-command-line-options", - "id": "libvirt-36" + "id": "libvirt-34" } { @@ -33859,12 +33834,12 @@ "option": "drive" } ], - "id": "libvirt-36" + "id": "libvirt-34" } { "execute": "query-gic-capabilities", - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -33880,7 +33855,7 @@ "kernel": false } ], - "id": "libvirt-37" + "id": "libvirt-35" } { @@ -33891,11 +33866,11 @@ "name": "host" } }, - "id": "libvirt-38" + "id": "libvirt-36" } { - "id": "libvirt-38", + "id": "libvirt-36", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" @@ -33914,11 +33889,11 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-37" } { - "id": "libvirt-39", + "id": "libvirt-37", "error": { "class": "GenericError", "desc": "The CPU type 'host' requires KVM" diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies b/tests/qe= mucapabilitiesdata/caps_9.2.0_s390x.replies index 2ec542154c..1a47f2b71b 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.replies @@ -31031,29 +31031,9 @@ "id": "libvirt-35" } -{ - "execute": "query-tpm-models", - "id": "libvirt-36" -} - -{ - "return": [], - "id": "libvirt-36" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-37" -} - -{ - "return": [], - "id": "libvirt-37" -} - { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32301,7 +32281,7 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-36" } { @@ -32312,7 +32292,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32384,7 +32364,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-37" } { @@ -32395,7 +32375,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-38" } { @@ -32536,7 +32516,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies b/= tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies index a2e33caacb..764b71bcdc 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.replies @@ -36824,35 +36824,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -38365,12 +38339,12 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { @@ -38381,16 +38355,16 @@ "pdh": "AQAAAAE3AAADEAAAAwAAAAIAAAAZzB1NV5cz0ISI+tYZQHDF/dw77x1Zz+u2jw= 0cUf+KR3u958kjxZlN5IFNIo7sUgkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8eYMemS1wynFwg= VIgw9ZdHI+6qmsr91sCHKjJHGGBLRF3DHGYtdCLEsYQCVmJQywAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAC/3y8ro5Ah= FTmPkAnaWckGQXhPEnSKInCUEpNnGgufIttDMtWgsjaAX7Jve/Hjcg8AAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAADe6oGDni6/LfA/HHDe0vBW4xoma82CBGyydXkq/PJfhO6fra1H9symYAiEd6db4n= 8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= AAAAAAAAAAAAAAAAA=3D", "cpu0-id": "BlAwmcr4Ruya3YvEGe2EBxuWjMAfIYolslNNM92RsIKxLkWDDRqivqSBOD= +qQRCYS9joBYSHMD1g+rmjY+MmVw=3D=3D" }, - "id": "libvirt-47" + "id": "libvirt-45" } { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -38405,7 +38379,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38805,7 +38779,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -38819,7 +38793,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39219,7 +39193,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39234,7 +39208,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -39745,7 +39719,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies b/tests/q= emucapabilitiesdata/caps_9.2.0_x86_64.replies index cea4cf7779..1b68825df6 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.replies @@ -37524,35 +37524,9 @@ "id": "libvirt-43" } -{ - "execute": "query-tpm-models", - "id": "libvirt-44" -} - -{ - "return": [ - "tpm-crb", - "tpm-tis" - ], - "id": "libvirt-44" -} - -{ - "execute": "query-tpm-types", - "id": "libvirt-45" -} - -{ - "return": [ - "passthrough", - "emulator" - ], - "id": "libvirt-45" -} - { "execute": "query-command-line-options", - "id": "libvirt-46" + "id": "libvirt-44" } { @@ -39045,16 +39019,16 @@ "option": "drive" } ], - "id": "libvirt-46" + "id": "libvirt-44" } { "execute": "query-sev-capabilities", - "id": "libvirt-47" + "id": "libvirt-45" } { - "id": "libvirt-47", + "id": "libvirt-45", "error": { "class": "GenericError", "desc": "SEV: Failed to open /dev/sev: No such file or directory" @@ -39063,11 +39037,11 @@ { "execute": "query-sgx-capabilities", - "id": "libvirt-48" + "id": "libvirt-46" } { - "id": "libvirt-48", + "id": "libvirt-46", "error": { "class": "GenericError", "desc": "Could not open '/dev/sgx_vepc': No such file or directory" @@ -39082,7 +39056,7 @@ "name": "host" } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39482,7 +39456,7 @@ } } }, - "id": "libvirt-49" + "id": "libvirt-47" } { @@ -39496,7 +39470,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39896,7 +39870,7 @@ } } }, - "id": "libvirt-50" + "id": "libvirt-48" } { @@ -39911,7 +39885,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { @@ -40422,7 +40396,7 @@ } } }, - "id": "libvirt-51" + "id": "libvirt-49" } { --=20 2.51.0 From nobody Sun Sep 7 23:35:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756307311; cv=none; d=zohomail.com; s=zohoarc; b=VFTEr0PiyOV0fKua1U67MFAp68Vdf8BcesxSrbwu3ROx2cKR/56DPGOfcG1yC0tiYkGRSQV5aQyHivQElcFT7Apa9LNK2trDcN5otfrKXgka4BTu2XL960FmO+CxZ+C3YNhIwBz6p+VfKuy2sFzdh5hZFmN4/bfImQXTZrt/Oks= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756307311; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=bcgbs18lNFHy4E91YYvY/qjJS0vwLSgznS9mjkbgZfs=; b=Z/TemByMfScIXea0cjq3/0n0+TxS36Ku1a9CNXWrW0A5985vs1ywAf7TjqPw1EVNsJkg/ih2786XXyeAGJxLiKRMlpeyuj99oKIMnRz38nqJ/CaPN3fKHvF7BcHTrUBnNbIITTCE7bVOP6RM1Rs2Y2iQj+Ae8/QYCX9KVskly9w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756307311019354.9200386206186; Wed, 27 Aug 2025 08:08:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0B11D4401B; Wed, 27 Aug 2025 11:08:18 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id CE6E9442AB; Wed, 27 Aug 2025 10:48:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 728634402E; Wed, 27 Aug 2025 10:47:30 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B42EC44013 for ; Wed, 27 Aug 2025 10:47:12 -0400 (EDT) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-199-mCBK0BdzOcqXgHR4AJvlMA-1; Wed, 27 Aug 2025 10:47:06 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 23D2F195609F for ; Wed, 27 Aug 2025 14:47:04 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5D48030001A5 for ; Wed, 27 Aug 2025 14:47:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bcgbs18lNFHy4E91YYvY/qjJS0vwLSgznS9mjkbgZfs=; b=P/o26BjMqrd6ofa3l2Bmekn80lWmDj4l8tjR8GgtAtaEaQiLys6S+crmm4km1czN6Dmpaz lH7S+g31yHJikxqtLPtpqridPUCeoRSEEiD5LUc6+Jkt7Ttv3r2Z35zx1G1nLF65eR71jJ 9Gef6bhOvAOwou1EYejBw5mZX/jUZ54= X-MC-Unique: mCBK0BdzOcqXgHR4AJvlMA-1 X-Mimecast-MFC-AGG-ID: mCBK0BdzOcqXgHR4AJvlMA_1756306025 To: devel@lists.libvirt.org Subject: [PATCH 06/10] qemu: monitor: Remove query-tpm-modes/query-tpm-types infrastructure Date: Wed, 27 Aug 2025 16:46:49 +0200 Message-ID: <46aa8e5037c7605eeec31ca0fe0e052a43eda9b3.1756305881.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: v_biCV81nG6CbNDTRraJBY4UbFAqWqStHn4iCcsKbkE_1756306025 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: RV7ANPWMBA2IMSH5GR4LYMQQK3QWEENC X-Message-ID-Hash: RV7ANPWMBA2IMSH5GR4LYMQQK3QWEENC X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756307313997124100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The query commands are not used since we can probe the supported types and models via qom types. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_monitor.c | 24 ------------------ src/qemu/qemu_monitor.h | 6 ----- src/qemu/qemu_monitor_json.c | 43 --------------------------------- src/qemu/qemu_monitor_json.h | 10 -------- tests/qemumonitorjsontest.c | 47 ------------------------------------ 5 files changed, 130 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index c1fef8d5de..3adce735e1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3585,30 +3585,6 @@ qemuMonitorBlockExportAdd(qemuMonitor *mon, } -int -qemuMonitorGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) -{ - VIR_DEBUG("tpmmodels=3D%p", tpmmodels); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONGetTPMModels(mon, tpmmodels); -} - - -int -qemuMonitorGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes) -{ - VIR_DEBUG("tpmtypes=3D%p", tpmtypes); - - QEMU_CHECK_MONITOR(mon); - - return qemuMonitorJSONGetTPMTypes(mon, tpmtypes); -} - - int qemuMonitorAttachCharDev(qemuMonitor *mon, virJSONValue **props, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 755f347e17..8061b95bf2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1242,12 +1242,6 @@ int qemuMonitorNBDServerStop(qemuMonitor *mon); int qemuMonitorBlockExportAdd(qemuMonitor *mon, virJSONValue **props); -int qemuMonitorGetTPMModels(qemuMonitor *mon, - char ***tpmmodels); - -int qemuMonitorGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes); - int qemuMonitorAttachCharDev(qemuMonitor *mon, virJSONValue **props, char **ptypath); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9f51421478..54c4e80578 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6496,49 +6496,6 @@ qemuMonitorJSONBlockExportAdd(qemuMonitor *mon, } -static int -qemuMonitorJSONGetStringArray(qemuMonitor *mon, - const char *qmpCmd, - char ***array) -{ - g_autoptr(virJSONValue) cmd =3D NULL; - g_autoptr(virJSONValue) reply =3D NULL; - virJSONValue *data; - - *array =3D NULL; - - if (!(cmd =3D qemuMonitorJSONMakeCommand(qmpCmd, NULL))) - return -1; - - if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) - return -1; - - if (qemuMonitorJSONHasError(reply, "CommandNotFound")) - return 0; - - if (!(data =3D qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_ARRAY= ))) - return -1; - - if (!(*array =3D virJSONValueArrayToStringList(data))) - return -1; - - return 0; -} - -int qemuMonitorJSONGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) -{ - return qemuMonitorJSONGetStringArray(mon, "query-tpm-models", tpmmodel= s); -} - - -int qemuMonitorJSONGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes) -{ - return qemuMonitorJSONGetStringArray(mon, "query-tpm-types", tpmtypes); -} - - int qemuMonitorJSONAttachCharDev(qemuMonitor *mon, virJSONValue **props, diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index bd437f7938..f076e637ba 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -546,16 +546,6 @@ int qemuMonitorJSONBlockExportAdd(qemuMonitor *mon, virJSONValue **props); -int -qemuMonitorJSONGetTPMModels(qemuMonitor *mon, - char ***tpmmodels) - ATTRIBUTE_NONNULL(2); - -int -qemuMonitorJSONGetTPMTypes(qemuMonitor *mon, - char ***tpmtypes) - ATTRIBUTE_NONNULL(2); - int qemuMonitorJSONAttachCharDev(qemuMonitor *mon, virJSONValue **props, diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index a18872db60..df64b1f115 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -492,52 +492,6 @@ testQemuMonitorJSONGetCPUDefinitions(const void *opaqu= e) } -static int -testQemuMonitorJSONGetTPMModels(const void *opaque) -{ - const testGenericData *data =3D opaque; - virDomainXMLOption *xmlopt =3D data->xmlopt; - g_auto(GStrv) tpmmodels =3D NULL; - g_autoptr(qemuMonitorTest) test =3D NULL; - - if (!(test =3D qemuMonitorTestNewSchema(xmlopt, data->schema))) - return -1; - - if (qemuMonitorTestAddItem(test, "query-tpm-models", - "{ " - " \"return\": [ " - " \"passthrough\"" - " ]" - "}") < 0) - return -1; - - if (qemuMonitorGetTPMModels(qemuMonitorTestGetMonitor(test), &tpmmodel= s) < 0) - return -1; - - if (g_strv_length(tpmmodels) !=3D 1) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - "expected 1 tpm model"); - return -1; - } - -#define CHECK(i, wantname) \ - do { \ - if (STRNEQ(tpmmodels[i], (wantname))) { \ - virReportError(VIR_ERR_INTERNAL_ERROR, \ - "name %s is not %s", \ - tpmmodels[i], (wantname)); \ - return -1; \ - } \ - } while (0) - - CHECK(0, "passthrough"); - -#undef CHECK - - return 0; -} - - struct qemuMonitorJSONTestAttachChardevData { virDomainChrSourceDef *chr; const char *expectPty; @@ -2998,7 +2952,6 @@ mymain(void) DO_TEST(GetVersion); DO_TEST(GetMachines); DO_TEST(GetCPUDefinitions); - DO_TEST(GetTPMModels); if (qemuMonitorJSONTestAttachChardev(driver.xmlopt, qapiData.schema) <= 0) ret =3D -1; DO_TEST(DetachChardev); --=20 2.51.0 From nobody Sun Sep 7 23:35:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1756307755; cv=none; d=zohomail.com; s=zohoarc; b=NXekkma3eCtuTrqywmZj9iUH6i6YAV1rauHKZm7eqsJHSk5HXlG65v+QYzxEtzHxOsG8OkMBfLDnqDkJPwG/R8KLr4QeUmE7S8DjupcZu5ZJFwcpdE2KS4Dc9EbbKILtoeYLJAUcFYWk4GdkY62X+9cirfJ3+h6ICRNHPscE4rw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756307755; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=RnP+kF4MjsCh/m3xYF+D8g+7cTq6tuCSMEZ0xF6CM7s=; b=OZZylcyQoJ6etdv8TRXxzNligfI+a8YRu9bTOMiQ2bOuko4W4jz/d6shY1ifvV0+Ho+1IlPG+SEZdvuZP16/rrSlavgfMcwhCOkrKjzqpUcAnbm94DEDXWXE9Xw+2WirxOEvT6BrRQaD5FBi8nvDhe4SEdEGyAY5fX8OoJEZrN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1756307755272611.268411161301; Wed, 27 Aug 2025 08:15:55 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 31E814400D; Wed, 27 Aug 2025 11:15:54 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 2170344067; Wed, 27 Aug 2025 10:49:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3299844062; Wed, 27 Aug 2025 10:47:33 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B119444094 for ; Wed, 27 Aug 2025 10:47:09 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517--Ngh3O2ZOW2952YN16xqAA-1; Wed, 27 Aug 2025 10:47:06 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 986DC195609E for ; Wed, 27 Aug 2025 14:47:05 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.3]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9711A30001A8 for ; Wed, 27 Aug 2025 14:47:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756306029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RnP+kF4MjsCh/m3xYF+D8g+7cTq6tuCSMEZ0xF6CM7s=; b=gz3cN6CtLm5YjCtGQxc37uqyK8rhfINFMb9M9W6U9w+zcEZ0VxkxghtPB69CTBePoJVLRy tAnK/OtiC15REXXeSBT8aSRuEgULrKYkxlWII+QrO7buGdx8yPdtZIEOa8STkJ+rqCtIBr dFYaPs62IVY+NO1JnOWo9brHUT5w76Y= X-MC-Unique: -Ngh3O2ZOW2952YN16xqAA-1 X-Mimecast-MFC-AGG-ID: -Ngh3O2ZOW2952YN16xqAA_1756306025 To: devel@lists.libvirt.org Subject: [PATCH 07/10] qemuxmlconftest: Add missing version specific invocations for 'cpu-host' tests Date: Wed, 27 Aug 2025 16:46:50 +0200 Message-ID: <78684573195765b2d35ddedfd9804843cd886c55.1756305881.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: sqqqKQb69DhgX7ouEM6UfeU2qQIYZW-2M-ea7brguVo_1756306025 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6OXRUTIMA33IFF7X3VYOARX3SGDRQ2AV X-Message-ID-Hash: 6OXRUTIMA33IFF7X3VYOARX3SGDRQ2AV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1756307756848116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa These were forgotten when new dumps were added. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- ...host-model-fallback-kvm.x86_64-10.0.0.args | 33 +++++++++++++ ...-host-model-fallback-kvm.x86_64-10.0.0.xml | 29 +++++++++++ ...-host-model-fallback-kvm.x86_64-8.2.0.args | 33 +++++++++++++ ...u-host-model-fallback-kvm.x86_64-8.2.0.xml | 29 +++++++++++ ...-host-model-fallback-kvm.x86_64-9.0.0.args | 33 +++++++++++++ ...u-host-model-fallback-kvm.x86_64-9.0.0.xml | 29 +++++++++++ ...-host-model-fallback-kvm.x86_64-9.1.0.args | 33 +++++++++++++ ...u-host-model-fallback-kvm.x86_64-9.1.0.xml | 29 +++++++++++ ...-host-model-fallback-kvm.x86_64-9.2.0.args | 33 +++++++++++++ ...u-host-model-fallback-kvm.x86_64-9.2.0.xml | 29 +++++++++++ ...host-model-fallback-tcg.x86_64-10.0.0.args | 33 +++++++++++++ ...-host-model-fallback-tcg.x86_64-10.0.0.xml | 29 +++++++++++ ...-host-model-fallback-tcg.x86_64-8.2.0.args | 33 +++++++++++++ ...u-host-model-fallback-tcg.x86_64-8.2.0.xml | 29 +++++++++++ ...-host-model-fallback-tcg.x86_64-9.0.0.args | 33 +++++++++++++ ...u-host-model-fallback-tcg.x86_64-9.0.0.xml | 29 +++++++++++ ...-host-model-fallback-tcg.x86_64-9.1.0.args | 33 +++++++++++++ ...u-host-model-fallback-tcg.x86_64-9.1.0.xml | 29 +++++++++++ ...-host-model-fallback-tcg.x86_64-9.2.0.args | 33 +++++++++++++ ...u-host-model-fallback-tcg.x86_64-9.2.0.xml | 29 +++++++++++ .../cpu-host-model-kvm.x86_64-10.0.0.args | 38 +++++++++++++++ .../cpu-host-model-kvm.x86_64-10.0.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-kvm.x86_64-8.2.0.args | 38 +++++++++++++++ .../cpu-host-model-kvm.x86_64-8.2.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-kvm.x86_64-9.0.0.args | 38 +++++++++++++++ .../cpu-host-model-kvm.x86_64-9.0.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-kvm.x86_64-9.1.0.args | 38 +++++++++++++++ .../cpu-host-model-kvm.x86_64-9.1.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-kvm.x86_64-9.2.0.args | 38 +++++++++++++++ .../cpu-host-model-kvm.x86_64-9.2.0.xml | 48 +++++++++++++++++++ ...st-model-nofallback-kvm.x86_64-10.0.0.args | 33 +++++++++++++ ...ost-model-nofallback-kvm.x86_64-10.0.0.xml | 29 +++++++++++ ...ost-model-nofallback-kvm.x86_64-8.2.0.args | 33 +++++++++++++ ...host-model-nofallback-kvm.x86_64-8.2.0.xml | 29 +++++++++++ ...ost-model-nofallback-kvm.x86_64-9.0.0.args | 33 +++++++++++++ ...host-model-nofallback-kvm.x86_64-9.0.0.xml | 29 +++++++++++ ...ost-model-nofallback-kvm.x86_64-9.1.0.args | 33 +++++++++++++ ...host-model-nofallback-kvm.x86_64-9.1.0.xml | 29 +++++++++++ ...ost-model-nofallback-kvm.x86_64-9.2.0.args | 33 +++++++++++++ ...host-model-nofallback-kvm.x86_64-9.2.0.xml | 29 +++++++++++ ...st-model-nofallback-tcg.x86_64-10.0.0.args | 33 +++++++++++++ ...ost-model-nofallback-tcg.x86_64-10.0.0.xml | 29 +++++++++++ ...ost-model-nofallback-tcg.x86_64-8.2.0.args | 33 +++++++++++++ ...host-model-nofallback-tcg.x86_64-8.2.0.xml | 29 +++++++++++ ...ost-model-nofallback-tcg.x86_64-9.0.0.args | 33 +++++++++++++ ...host-model-nofallback-tcg.x86_64-9.0.0.xml | 29 +++++++++++ ...ost-model-nofallback-tcg.x86_64-9.1.0.args | 33 +++++++++++++ ...host-model-nofallback-tcg.x86_64-9.1.0.xml | 29 +++++++++++ ...ost-model-nofallback-tcg.x86_64-9.2.0.args | 33 +++++++++++++ ...host-model-nofallback-tcg.x86_64-9.2.0.xml | 29 +++++++++++ .../cpu-host-model-tcg.x86_64-10.0.0.args | 38 +++++++++++++++ .../cpu-host-model-tcg.x86_64-10.0.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-tcg.x86_64-8.2.0.args | 38 +++++++++++++++ .../cpu-host-model-tcg.x86_64-8.2.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-tcg.x86_64-9.0.0.args | 38 +++++++++++++++ .../cpu-host-model-tcg.x86_64-9.0.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-tcg.x86_64-9.1.0.args | 38 +++++++++++++++ .../cpu-host-model-tcg.x86_64-9.1.0.xml | 48 +++++++++++++++++++ .../cpu-host-model-tcg.x86_64-9.2.0.args | 38 +++++++++++++++ .../cpu-host-model-tcg.x86_64-9.2.0.xml | 48 +++++++++++++++++++ tests/qemuxmlconftest.c | 30 ++++++++++++ 61 files changed, 2130 insertions(+) create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-10.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-10.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-8.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-8.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-9.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-9.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-9.1.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-9.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_6= 4-9.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-10.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-10.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-8.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-8.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-9.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-9.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-9.1.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-9.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-fallback-tcg.x86_6= 4-9.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.= args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-10.0.0.= xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-8.2.0.x= ml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.0.0.x= ml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.1.0.x= ml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-kvm.x86_64-9.2.0.x= ml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-10.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-10.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-8.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-8.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-9.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-9.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-9.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-kvm.x86= _64-9.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-10.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-10.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-8.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-8.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-9.0.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-9.0.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-9.1.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-9.1.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-9.2.0.args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-nofallback-tcg.x86= _64-9.2.0.xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.= args create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-10.0.0.= xml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-8.2.0.x= ml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.0.0.x= ml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.1.0.x= ml create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.a= rgs create mode 100644 tests/qemuxmlconfdata/cpu-host-model-tcg.x86_64-9.2.0.x= ml diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.= 0.args b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.ar= gs new file mode 100644 index 0000000000..edd334dd8b --- /dev/null +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.args @@ -0,0 +1,33 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pc-i440fx-10.0,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram,acpi=3Doff \ +-accel kvm \ +-cpu EPYC-Rome,x2apic=3Don,tsc-deadline=3Don,hypervisor=3Don,tsc-adjust=3D= on,stibp=3Don,arch-capabilities=3Don,ssbd=3Don,cmp-legacy=3Don,overflow-rec= ov=3Don,succor=3Don,amd-ssbd=3Don,virt-ssbd=3Don,lbrv=3Don,tsc-scale=3Don,v= mcb-clean=3Don,flushbyasid=3Don,pause-filter=3Don,pfthreshold=3Don,v-vmsave= -vmload=3Don,vgif=3Don,svme-addr-chk=3Don,lfence-always-serializing=3Don,nu= ll-sel-clr-base=3Don,ibpb-brtype=3Don,rdctl-no=3Don,skip-l1dfl-vmentry=3Don= ,mds-no=3Don,pschange-mc-no=3Don,gds-no=3Don,rfds-no=3Don,xsaves=3Doff \ +-m size=3D219136k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'= \ +-overcommit mem-lock=3Doff \ +-smp 6,sockets=3D6,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.= 0.xml b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.xml new file mode 100644 index 0000000000..e84798e344 --- /dev/null +++ b/tests/qemuxmlconfdata/cpu-host-model-fallback-kvm.x86_64-10.0.0.xml @@ -0,0 +1,29 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 6 + + hvm + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + +