From nobody Tue Dec 16 03:21: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=1743581365; cv=none; d=zohomail.com; s=zohoarc; b=YtWuWo/t/r69PDOekKbAUMPfJvTRAvlMxKZerEGQUXaArNOLmlyxNgxv8Xrm8YgZuDy/qIZ177dXYGHM8EdMIZRaPWmBIPpMzkTa2wKdOWgPfJ+y8RQjvdORFUvFwlB5s49UhHEMIHnXNM1KuinTHIVLtEfrVvg7ylLzv8p1Vng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743581365; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=J++Q4ADP6vLPf/VdewQ9v+9aruuXwrW0L5C4705h03k=; b=oA/FqJNfkayNaOrNHHkcQ73IKBgmNwm3AtNFUcvtpSU43R6KKGe3L8HxtDdsR+Oi+i9QiRecqKggQm4r0A0aHbqj6+G4IV/DFcnBj6rNfi4XUPrtmV/6jYONB4dGHlGRs+7SD2gs2cpCeYyVgZfcRMlzQh7FZ0CsqMM543T584c= 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 1743581365256259.25307238977393; Wed, 2 Apr 2025 01:09:25 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4D69412D6; Wed, 2 Apr 2025 04:09:24 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 9485A13F7; Wed, 2 Apr 2025 04:08:40 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F2BD4E8A; Wed, 2 Apr 2025 04:08:35 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 78F48E90 for ; Wed, 2 Apr 2025 04:08:35 -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-70-uWeG6Mj7PTyHaxGSkIZVvA-1; Wed, 02 Apr 2025 04:08:34 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 49934195608D for ; Wed, 2 Apr 2025 08:08:33 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 739E3180A803 for ; Wed, 2 Apr 2025 08:08:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743581315; 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=YfYbAm4DCffYFVyNFxwS7m2fEnnYanezXiJOZWwa1cw=; b=dxJR3IDf3tjzphs3Z9hL3y3R4i8i63Edax+A5ASDFOTKGfCe4bkYwlI+X4VXplbbjiN8PQ /fer5IfjDE99rq1Vu0qd+BuJZ+fmcJNFWpV2AfN7xS+fhz92bKeYgm7OS/KsDXyxjOTubw dCaOQmQ6mFrecl+UylICzRiM9VPNqn4= X-MC-Unique: uWeG6Mj7PTyHaxGSkIZVvA-1 X-Mimecast-MFC-AGG-ID: uWeG6Mj7PTyHaxGSkIZVvA_1743581313 To: devel@lists.libvirt.org Subject: [PATCH 1/6] qemu: domain: Don't check return value of 'virCPUDefCopy' Date: Wed, 2 Apr 2025 10:08:24 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1sooK9pqWhaXGjzUxNPskIhO4m3_OOcdpgjWnYaOEPQ_1743581313 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: B5IELMIJGFKHRVJSFZ35OEFUXATXUTOL X-Message-ID-Hash: B5IELMIJGFKHRVJSFZ35OEFUXATXUTOL X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1743581366205019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa As 'virCPUDefCopy' can't fail any more (without aborting) remove the last two return value checks. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/qemu/qemu_domain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e45eef4787..c3ca4b3040 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5321,8 +5321,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriver *driver, */ if (origCPU) { virCPUDefFree(def->cpu); - if (!(def->cpu =3D virCPUDefCopy(origCPU))) - return -1; + def->cpu =3D virCPUDefCopy(origCPU); } if (def->cpu && @@ -9354,8 +9353,8 @@ qemuDomainSaveCookieNew(virDomainObj *vm) if (!(cookie =3D virObjectNew(qemuDomainSaveCookieClass))) return NULL; - if (priv->origCPU && !(cookie->cpu =3D virCPUDefCopy(vm->def->cpu))) - return NULL; + if (priv->origCPU) + cookie->cpu =3D virCPUDefCopy(vm->def->cpu); cookie->slirpHelper =3D qemuDomainGetSlirpHelperOk(vm); --=20 2.49.0 From nobody Tue Dec 16 03:21: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=1743581386; cv=none; d=zohomail.com; s=zohoarc; b=kFzbYUYc4sOcrWxEEBsjPCI6FnvzLELgu4a6kz7uCdh55iq+SSVW40X2XWW7nDGcvH0f8urCOW2dkaAkd8pEhT+DPUrLawFhSZX0J99qwAhO4zlWJjsbKqCwYWXbfD/j4uid0qkpRuMC1Ih50wXzyHY1yS1v4/ylr7mj72GghDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743581386; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=/Z40udMRf0gcE2ipTOgEqWBNKzdF6Lg/WManq9l7n4c=; b=LWxcrSba07A0vI49obKKiJDi6oQGUpsI0Pgih2gwTQVWqdAMxTlpJQk4/e+RCZRo8Yd1bHkWif4MPAaU2GHLzmUPBvoh6NID69OgxdNSAAfXpDbj6hS2M2BQwyNU/SATpEkPAtY0Vc+qzWxSzPKINemKjkx8iUuP7VF3CHS8xmI= 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 174358138636340.72319507064128; Wed, 2 Apr 2025 01:09:46 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 61453132D; Wed, 2 Apr 2025 04:09:45 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 27F941401; Wed, 2 Apr 2025 04:08:43 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 45A8AE90; Wed, 2 Apr 2025 04:08:37 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C2CF3E88 for ; Wed, 2 Apr 2025 04:08:36 -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-637-xdxZXJJ0OlarADXioLRntA-1; Wed, 02 Apr 2025 04:08:35 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 A8EE11828AD1 for ; Wed, 2 Apr 2025 08:08:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D32FB180A803 for ; Wed, 2 Apr 2025 08:08:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743581316; 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=sPMfWIeJyg1H1PiOIEzACTwzZ7R4qf33xPzNdDJ54V4=; b=eiG7lWylC9k5m9/MfszV8z+Ljbe0Muux4jhSUUaORRK5uCZQ4jVXY7c0zCgT2R4ZDVGyD+ QfD7mtVhfvQZEVpkDawlzVkvxZlP1HZYCXE6+vuj0kqQ9mIxDad6f8P3SZuue/8e6fa6lK k8hmaKVUE1jQULHOoRmtLPVusK2fSbA= X-MC-Unique: xdxZXJJ0OlarADXioLRntA-1 X-Mimecast-MFC-AGG-ID: xdxZXJJ0OlarADXioLRntA_1743581314 To: devel@lists.libvirt.org Subject: [PATCH 2/6] qemuSnapshotCreateActiveInternal: Fix error logic Date: Wed, 2 Apr 2025 10:08:25 +0200 Message-ID: <3ec951634bbb36b09c6c1765a88fb8a2c9d3828a.1743580869.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: gkUh4uZhc9qTiM7glHE7JnMrCyXOTU81ofN-I3CM8EU_1743581314 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FVAUPKGJQN2BSTENA3FVRVWUPWQL4EC7 X-Message-ID-Hash: FVAUPKGJQN2BSTENA3FVRVWUPWQL4EC7 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1743581388305019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The 'ret' variable is set to 0 before a call which can theoretically fail. Not in practice really as the failure scenarion includes only object initialization. Since the code already has another variable for checking monitor returns use that one properly so that the code makes sense. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index ac05156e17..4f914b385c 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -592,16 +592,15 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *drive= r, goto cleanup; } - ret =3D 0; } else { if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_SNAPSHOT) < 0= ) { resume =3D false; goto cleanup; } - ret =3D qemuMonitorCreateSnapshot(priv->mon, snap->def->name); + rv =3D qemuMonitorCreateSnapshot(priv->mon, snap->def->name); qemuDomainObjExitMonitor(vm); - if (ret < 0) + if (rv < 0) goto cleanup; } @@ -617,6 +616,8 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver, resume =3D false; } + ret =3D 0; + cleanup: if (resume && virDomainObjIsActive(vm) && qemuProcessStartCPUs(driver, vm, --=20 2.49.0 From nobody Tue Dec 16 03:21: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=1743581409; cv=none; d=zohomail.com; s=zohoarc; b=mLTGC2h30W7Fk6hri66LstaWeQNhIbSAjEgD45VSrBBwAw9sSuTbhmK/YsMmCVL+G8I2eH/e42YdHTdNQTYmCd6pvmEyNrxIpnc3qJcFDmK39Mtxf85Yv8B/HTpbXuO1U+HYR9JW8JgyDpu8tSt5bBWYQ/SOLypQN10Z0V0F+Lc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743581408; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=r/au06kz5xnvrnQpFULd6Q98CBWXBW8Y5Ize2nV3Eb0=; b=U/hPqUmND7T54xmmNdcOPb0HRgwggqcsfJE6YtXDxMhtGXW1hJ6FSXACOC+f4TdowjlrPSqT4JXKZbUmqGG7qFe/WpEYgHAMgFGx++BUPUmq2s3R7ZzQqZ3mGJE3baaUP1xM25dRGnxgu/izaRnjRTWiIJs5l4ss+kgyPbJXsU0= 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 1743581408853198.3438332010711; Wed, 2 Apr 2025 01:10:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4625C11E7; Wed, 2 Apr 2025 04:10:08 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 75533121B; Wed, 2 Apr 2025 04:08:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 961EE12B3; Wed, 2 Apr 2025 04:08:48 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 60AF51353 for ; Wed, 2 Apr 2025 04:08:39 -0400 (EDT) Received: from mx-prod-mc-03.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-607-lz7bjiRBMla9I56s9StmtQ-1; Wed, 02 Apr 2025 04:08:37 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1ED311955BC9 for ; Wed, 2 Apr 2025 08:08:36 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3DA68180A803 for ; Wed, 2 Apr 2025 08:08:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743581319; 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=hfgrvU+zYV/JAJhZXiyfC3Upwg2c2Iv736jv02JQpTw=; b=NI+tFsnda7vf94NVR4k1dBprcgFsvsG+BqCUqzJgk1S6nWw4k7233qCqdC9vhRMMeha+iB hEg2CIb1inup+mYuJGCSkgXlKsf5RiTH+FFyB77EU++g16tSWZKndOXBqHKKE3thwpYWvT RyQCQ0Hy344L1cRI2njvb3RShcRC8Cg= X-MC-Unique: lz7bjiRBMla9I56s9StmtQ-1 X-Mimecast-MFC-AGG-ID: lz7bjiRBMla9I56s9StmtQ_1743581316 To: devel@lists.libvirt.org Subject: [PATCH 3/6] qemu: snapshot: Always assume support for QEMU_CAPS_SNAPSHOT_INTERNAL_QMP Date: Wed, 2 Apr 2025 10:08:26 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ltx-cA47a2SGg9R31E8V0uKthzJaBZPOCC9GTd-Ajx8_1743581316 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: H5IHDWMHCOCGWI4AS7MGQBF7ALRYFCMF X-Message-ID-Hash: H5IHDWMHCOCGWI4AS7MGQBF7ALRYFCMF X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1743581412221019000 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The 'snapshot-save' QMP command was introduced in 'qemu-6.0' and libvirt now requires at least 'qemu-6.2'. Thus we can assume that the QMP command can be used always. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/qemu/qemu_snapshot.c | 46 ++++++---------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 4f914b385c..f9b18f94b6 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -554,12 +554,12 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *drive= r, virDomainMomentObj *snap, unsigned int flags) { - qemuDomainObjPrivate *priv =3D vm->privateData; virObjectEvent *event =3D NULL; bool resume =3D false; virDomainSnapshotDef *snapdef =3D virDomainSnapshotObjGetDef(snap); int ret =3D -1; int rv =3D 0; + g_autoptr(qemuBlockJobData) job =3D NULL; if (!qemuMigrationSrcIsAllowed(vm, false, VIR_ASYNC_JOB_SNAPSHOT, 0)) goto cleanup; @@ -581,26 +581,11 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *drive= r, } } - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SNAPSHOT_INTERNAL_QMP)) { - g_autoptr(qemuBlockJobData) job =3D NULL; - - if (!(job =3D qemuSnapshotCreateActiveInternalStart(vm, snapdef))) - goto cleanup; - - while ((rv =3D qemuSnapshotCreateActiveInternalDone(vm, job)) !=3D= 1) { - if (rv < 0 || qemuDomainObjWait(vm) < 0) - goto cleanup; - } + if (!(job =3D qemuSnapshotCreateActiveInternalStart(vm, snapdef))) + goto cleanup; - } else { - if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_SNAPSHOT) < 0= ) { - resume =3D false; - goto cleanup; - } - - rv =3D qemuMonitorCreateSnapshot(priv->mon, snap->def->name); - qemuDomainObjExitMonitor(vm); - if (rv < 0) + while ((rv =3D qemuSnapshotCreateActiveInternalDone(vm, job)) !=3D 1) { + if (rv < 0 || qemuDomainObjWait(vm) < 0) goto cleanup; } @@ -944,7 +929,6 @@ qemuSnapshotPrepare(virDomainObj *vm, bool *has_manual, unsigned int *flags) { - qemuDomainObjPrivate *priv =3D vm->privateData; size_t i; bool active =3D virDomainObjIsActive(vm); bool reuse =3D (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) !=3D 0; @@ -1065,13 +1049,6 @@ qemuSnapshotPrepare(virDomainObj *vm, * varstore is in qcow2 format. */ if (active && found_internal) { - if (virDomainDefHasOldStyleUEFI(vm->def) && - !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SNAPSHOT_INTERNAL_QM= P)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("internal snapshots of a VM with pflash based= firmware are not supported with this qemu")); - return -1; - } - if (vm->def->os.loader && vm->def->os.loader->nvram && vm->def->os.loader->nvram->format !=3D VIR_STORAGE_FILE_QCOW2)= { @@ -4120,22 +4097,13 @@ qemuSnapshotDiscardImpl(virDomainObj *vm, return -1; } else { virDomainSnapshotDef *snapdef =3D virDomainSnapshotObjGetD= ef(snap); - qemuDomainObjPrivate *priv =3D vm->privateData; /* Similarly as internal snapshot creation we would use a = regular job * here so set a mask to forbid any other job. */ qemuDomainObjSetAsyncJobMask(vm, VIR_JOB_NONE); - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SNAPSHOT_INTE= RNAL_QMP)) { - if (qemuSnapshotDiscardActiveInternal(vm, snapdef) < 0) - return -1; - } else { - if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_S= NAPSHOT) < 0) - return -1; - /* we continue on even in the face of error */ - qemuMonitorDeleteSnapshot(qemuDomainGetMonitor(vm), sn= ap->def->name); - qemuDomainObjExitMonitor(vm); - } + if (qemuSnapshotDiscardActiveInternal(vm, snapdef) < 0) + return -1; qemuDomainObjSetAsyncJobMask(vm, VIR_JOB_DEFAULT_MASK); } --=20 2.49.0 From nobody Tue Dec 16 03:21: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=1743581429; cv=none; d=zohomail.com; s=zohoarc; b=Cb6LrHtskmhE2bzy05IzY/yp1v236wBpCOulW2STuWXq49gAWkDlJJkV0pdgCfD7AixzcqkkGFx1R3hKhY9eXAVBZonm/YT+CrJ4p99dN4dLklbyZu9CBjkIKoVbRXB6Shs6hn/m6duennApFJUuuJ8bMxlyBHv0mvzM+4lGUoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743581429; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=Zu8+4fWZ2NLxkhtpk9L6XtHJToRmU6cVC7w8bl5BB+I=; b=Gsxfrlu49J24W5fJdyt7JBkGrta6O2qaC0fpiBUVg7MfmMVTVOv0lnky/kc5uB1mFuY3d2Ctcpjsz3yv4+dee3sciolRv0vxZgnzSYrFpxpepsFR//GIfYZtE4CaPdDK2jcKXbI88IBgTnTia6vp7r4wZnFjYrxQ9iG6X+DEgSI= 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 17435814298651021.6501667606898; Wed, 2 Apr 2025 01:10:29 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3BC9C13E2; Wed, 2 Apr 2025 04:10:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 403D411C7; Wed, 2 Apr 2025 04:08:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E52111428; Wed, 2 Apr 2025 04:08:49 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B1B4A137F for ; Wed, 2 Apr 2025 04:08:39 -0400 (EDT) Received: from mx-prod-mc-04.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-681-vKka9DxENK-Wvu-jjpyEoA-1; Wed, 02 Apr 2025 04:08:38 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 62BB41955D61 for ; Wed, 2 Apr 2025 08:08:37 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 943D01828A80 for ; Wed, 2 Apr 2025 08:08:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743581319; 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=24xaEgGLBq1GGTBMBzz+oK2oeGsYND+1F58WOKPhS/k=; b=HKd52W5BC/BocytZLlRQUYlQxMcCbeWpojzTnTc8Zo4GrHDwLQ/YD2kPDmBkWG/C4CaAlI NwA0Aj9LjYsS+OiyLS4mXxEvtUy0pFRZOVRJa729r2F1eEQKzr6i9+qRsWYM5ZNG+SOM/p oQ+gJ5jV1CliOd4RWzTGPhZ1JpyuWEw= X-MC-Unique: vKka9DxENK-Wvu-jjpyEoA-1 X-Mimecast-MFC-AGG-ID: vKka9DxENK-Wvu-jjpyEoA_1743581317 To: devel@lists.libvirt.org Subject: [PATCH 4/6] qemu: Always revert internal snapshots via QMP rather than '-loadvm' Date: Wed, 2 Apr 2025 10:08:27 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: aPQkcOLuWf7naGEN5uljqCCw7pTv9S6ehdQ3Q82dpRo_1743581317 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OMP726MOAZ4GW7QE7GQXBEHQKU27ZGC5 X-Message-ID-Hash: OMP726MOAZ4GW7QE7GQXBEHQKU27ZGC5 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1743581431136019000 Content-Type: text/plain; charset="utf-8" From: Peter Krempa As all supported qemu versions now support the QMP internal snapshot commands (QEMU_CAPS_SNAPSHOT_INTERNAL_QMP is always present) we can remove the code for loading snapshots during startup via '-loadvm'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/qemu/qemu_command.c | 6 ------ src/qemu/qemu_process.c | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 86eb52f197..e6d308534f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10685,12 +10685,6 @@ qemuBuildCommandLine(virDomainObj *vm, if (qemuBuildSecCommandLine(vm, cmd, def->sec) < 0) return NULL; - /* Internal snapshot reversion happens via QMP command after startup if - * supported */ - if (snapshot && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SNAPSHOT_INTERNAL_QMP)) - virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); - if (def->namespaceData) { qemuDomainXmlNsDef *qemuxmlns; GStrv n; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 842f559439..015a98d035 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8239,8 +8239,7 @@ qemuProcessLaunch(virConnectPtr conn, qemuDomainVcpuPersistOrder(vm->def); - if (snapshot && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_SNAPSHOT_INTERNAL_QMP)) { + if (snapshot) { VIR_DEBUG("reverting internal snapshot via QMP"); if (qemuSnapshotInternalRevert(vm, snapshot, asyncJob) < 0) goto cleanup; --=20 2.49.0 From nobody Tue Dec 16 03:21: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=1743581469; cv=none; d=zohomail.com; s=zohoarc; b=OwSdVdEJThveRpueqPK2445WxgtS/G6ccxyiqJlZW9RiIdj+OzFoiqccmU83KiFjiuYtqr1PTSEM+bGoFgo6N+LFwx06YOY3+8qJGSgOMEn01C3Vod4R6AFZYAL8ThY8luo1MAYvK9Cn4iyX0N8ybnEvoAHpPwgI7Z1cDoSB0kM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743581469; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=qq0t04giLYKPoZRNQn93sZE5txNSWGQ3vCqwVV8xL1w=; b=aJCqHVVbJBMXrGCcgJOIDEm+phGsSR/Vn33eMHrsTeJB7bpQtl/xOvrl+tBnOI+9VDTiwA6Rip5caxqUfqRe52P5FdAtaXWPZiY+sNzkUfnsrKWPEyIMgynujUQIROLqQAESHkBtAwTVSjqm4jI0I0OGYTHJYP36kdKF6TReew8= 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 1743581469203981.9385739911577; Wed, 2 Apr 2025 01:11:09 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8FB3213F0; Wed, 2 Apr 2025 04:11:08 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 39558141C; Wed, 2 Apr 2025 04:09:00 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id A5ABE1410; Wed, 2 Apr 2025 04:08:57 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3B0D4EA1 for ; Wed, 2 Apr 2025 04:08:41 -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-691-e1G6ZJ-gOaupO8F1sm_sFA-1; Wed, 02 Apr 2025 04:08:39 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 A143018001E2 for ; Wed, 2 Apr 2025 08:08:38 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D7A9B180A803 for ; Wed, 2 Apr 2025 08:08:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743581320; 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=ri0OaQxbYdfSkUf05M4aajAPYdGoQ8gG1/6QxXi1Z6k=; b=bUBvpLFrdehEsTf5sUA3D6SXJR4WydBaV0K7s17Kfu/3FntnQyZBbDkskzrLtIdq3Jni8y cuuUyHU9zHdwWTLSJENQ+7xxx9FXmSfwedfLVeIkZGq/IW3GgAWt1W6rPLrN5ebHLnXjfb fZULhHf2EcMn+Vezp7QDeOgApaV6Fdg= X-MC-Unique: e1G6ZJ-gOaupO8F1sm_sFA-1 X-Mimecast-MFC-AGG-ID: e1G6ZJ-gOaupO8F1sm_sFA_1743581318 To: devel@lists.libvirt.org Subject: [PATCH 5/6] qemu: monitor: Remove HMP monitor code Date: Wed, 2 Apr 2025 10:08:28 +0200 Message-ID: <94a0008a1c7bb4bd5f57999f9f62b9891a1c4392.1743580869.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: i_zMFxAyiivhwXI_UPq_gbWfM5nV5jWwFQZa-CImVkg_1743581318 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HMD42IK57GDZ7MHG6GMNPBRD4MFV3BDD X-Message-ID-Hash: HMD42IK57GDZ7MHG6GMNPBRD4MFV3BDD X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1743581469591019000 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Now that we've replaced the final two HMP commands used by libvirt we can fully drop the 'text' monitor support. The only thing we keep is the HMP passtrhough with 'virsh qemu-monitor-command'. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- po/POTFILES | 1 - src/qemu/meson.build | 1 - src/qemu/qemu_monitor.c | 25 ---------- src/qemu/qemu_monitor.h | 3 -- src/qemu/qemu_monitor_text.c | 88 ------------------------------------ src/qemu/qemu_monitor_text.h | 29 ------------ 6 files changed, 147 deletions(-) delete mode 100644 src/qemu/qemu_monitor_text.c delete mode 100644 src/qemu/qemu_monitor_text.h diff --git a/po/POTFILES b/po/POTFILES index 0c83affb44..9747c38951 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -188,7 +188,6 @@ src/qemu/qemu_migration_cookie.c src/qemu/qemu_migration_params.c src/qemu/qemu_monitor.c src/qemu/qemu_monitor_json.c -src/qemu/qemu_monitor_text.c src/qemu/qemu_namespace.c src/qemu/qemu_nbdkit.c src/qemu/qemu_passt.c diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 7a07d4f2c4..5cf20f426f 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -27,7 +27,6 @@ qemu_driver_sources =3D [ 'qemu_migration_params.c', 'qemu_monitor.c', 'qemu_monitor_json.c', - 'qemu_monitor_text.c', 'qemu_namespace.c', 'qemu_nbdkit.c', 'qemu_passt.c', diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index fc215def13..6340f437dd 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -28,7 +28,6 @@ #include "qemu_alias.h" #include "qemu_monitor.h" -#include "qemu_monitor_text.h" #include "qemu_monitor_json.h" #include "qemu_domain.h" #include "qemu_capabilities.h" @@ -2745,30 +2744,6 @@ qemuMonitorDelObject(qemuMonitor *mon, } -int -qemuMonitorCreateSnapshot(qemuMonitor *mon, const char *name) -{ - VIR_DEBUG("name=3D%s", name); - - QEMU_CHECK_MONITOR(mon); - - /* there won't ever be a direct QMP replacement for this function */ - return qemuMonitorTextCreateSnapshot(mon, name); -} - - -int -qemuMonitorDeleteSnapshot(qemuMonitor *mon, const char *name) -{ - VIR_DEBUG("name=3D%s", name); - - QEMU_CHECK_MONITOR(mon); - - /* there won't ever be a direct QMP replacement for this function */ - return qemuMonitorTextDeleteSnapshot(mon, name); -} - - int qemuMonitorSnapshotSave(qemuMonitor *mon, const char *jobname, diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 9a55b49472..db451c448b 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -976,9 +976,6 @@ int qemuMonitorDelObject(qemuMonitor *mon, const char *objalias, bool report_error); -int qemuMonitorCreateSnapshot(qemuMonitor *mon, const char *name); -int qemuMonitorDeleteSnapshot(qemuMonitor *mon, const char *name); - int qemuMonitorTransaction(qemuMonitor *mon, virJSONValue **actions) ATTRIBUTE_NONNULL(2); int qemuMonitorBlockdevMirror(qemuMonitor *mon, diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c deleted file mode 100644 index 3482972600..0000000000 --- a/src/qemu/qemu_monitor_text.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * qemu_monitor_text.c: interaction with QEMU monitor console - * - * Copyright (C) 2006-2014 Red Hat, Inc. - * Copyright (C) 2006 Daniel P. Berrange - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * . - */ - -#include - - -#include "qemu_monitor_text.h" -#include "qemu_monitor_json.h" -#include "virlog.h" -#include "virerror.h" - -#define VIR_FROM_THIS VIR_FROM_QEMU - -VIR_LOG_INIT("qemu.qemu_monitor_text"); - -int -qemuMonitorTextCreateSnapshot(qemuMonitor *mon, - const char *name) -{ - g_autofree char *cmd =3D NULL; - g_autofree char *reply =3D NULL; - - cmd =3D g_strdup_printf("savevm \"%s\"", name); - - if (qemuMonitorJSONHumanCommand(mon, cmd, -1, &reply)) - return -1; - - if (strstr(reply, "Error while creating snapshot") || - strstr(reply, "Could not open VM state file") || - strstr(reply, "State blocked by non-migratable device") || - strstr(reply, "Error: ") || - (strstr(reply, "Error") && strstr(reply, "while writing VM"))) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to take snapshot: %1$s"), reply); - return -1; - } else if (strstr(reply, "No block device can accept snapshots")) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("this domain does not have a device to take snaps= hots")); - return -1; - } - - return 0; -} - -int qemuMonitorTextDeleteSnapshot(qemuMonitor *mon, const char *name) -{ - g_autofree char *cmd =3D NULL; - g_autofree char *reply =3D NULL; - - cmd =3D g_strdup_printf("delvm \"%s\"", name); - if (qemuMonitorJSONHumanCommand(mon, cmd, -1, &reply)) - return -1; - - if (strstr(reply, "No block device supports snapshots")) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("this domain does not have a device to delete sna= pshots")); - return -1; - } else if (strstr(reply, "Snapshots not supported on device")) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", reply); - return -1; - } else if (strstr(reply, "Error: ") || - (strstr(reply, "Error") && - strstr(reply, "while deleting snapshot"))) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Failed to delete snapshot: %1$s"), reply); - return -1; - } - - return 0; -} diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h deleted file mode 100644 index 27d0f061d3..0000000000 --- a/src/qemu/qemu_monitor_text.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * qemu_monitor_text.h: interaction with QEMU monitor console - * - * Copyright (C) 2006-2009, 2011-2012 Red Hat, Inc. - * Copyright (C) 2006 Daniel P. Berrange - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see - * . - */ - -#pragma once - -#include "internal.h" - -#include "qemu_monitor.h" - -int qemuMonitorTextCreateSnapshot(qemuMonitor *mon, const char *name); -int qemuMonitorTextDeleteSnapshot(qemuMonitor *mon, const char *name); --=20 2.49.0 From nobody Tue Dec 16 03:21: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=1743581521; cv=none; d=zohomail.com; s=zohoarc; b=TrJIhsEvH3ZZ4aG4CRLz1qNuUE/o49BSwV/GRLGzPzLnceDQBkHBYSPlnaMR9X4zgpNmYS5isl5DBvT8b3zQYcUHkZgc2+SPDxiq3m+GXM8trO+JqufyEwpTLa3oLRoVYFdtuk7/LlgBjc5mKBO3Q3V01VV2P1AWpm09iix6lco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743581521; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post: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=wMIaWw9Szg0GzF0hwQ97JJutDrhNpX4+wJAva4OKdTA=; b=Uu4e8v3VhEtilGQBy3EGVGJh1MuQCp06GtvdgnV2GEzJ7ka0ZD2gAipUMkyRQVwCsRnMtZnq4TUwkthTzVNG3gw6As65PDxRBrkbU5N66r4Esr/ap2IA2PqNvXGjL62o6tFVT0MHo10u6KJv1M1bDXbNQlyQuVYpZcrqvnERLQA= 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 1743581521226449.9743772572193; Wed, 2 Apr 2025 01:12:01 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3EFDD10F4; Wed, 2 Apr 2025 04:12:00 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 6FD041295; Wed, 2 Apr 2025 04:09:03 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 390441319; Wed, 2 Apr 2025 04:08:58 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 87140140A for ; Wed, 2 Apr 2025 04:08:42 -0400 (EDT) Received: from mx-prod-mc-01.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-621-IKI3cMeqOl2CRNPzSiicHA-1; Wed, 02 Apr 2025 04:08:41 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 35B0C1956055 for ; Wed, 2 Apr 2025 08:08:40 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 22E24180A803 for ; Wed, 2 Apr 2025 08:08:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1743581322; 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=Z92Bkd1tAEfkq1OJhHMJI8sZ1gmW6OE4JrlERuND76I=; b=i5Epz8VWvU+n7hel+D8ka52UvCIJoVfIu4r0xCmtqov08uFJqpfWAmI7PSQbypvJq8xKWT +wWNABsPK+wtoXxX/THK/Suq/EvGNLUULwTHxuLRIMWz0KTq7nllbToB0rPZdceizMmQ7g qMJz3kXvuSiHMI1Ow0KG+NjpkQ/WLw4= X-MC-Unique: IKI3cMeqOl2CRNPzSiicHA-1 X-Mimecast-MFC-AGG-ID: IKI3cMeqOl2CRNPzSiicHA_1743581320 To: devel@lists.libvirt.org Subject: [PATCH 6/6] qemu: capabilities: Retire QEMU_CAPS_SNAPSHOT_INTERNAL_QMP Date: Wed, 2 Apr 2025 10:08:29 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KFYIPa63fZeJDaoB93JLfXxWzySsrbVuZcT3icgsnpE_1743581320 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NFN7X7CY2JJFGR3LQIDPDBNQWDUDS6Z6 X-Message-ID-Hash: NFN7X7CY2JJFGR3LQIDPDBNQWDUDS6Z6 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1743581522789019100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The code now always assumes support for the QMP internal snapshot commands so the capability is no longer needed. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- 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_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 - 31 files changed, 2 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 67350f2300..665f5e225e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -717,7 +717,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine-i8042-opt", /* QEMU_CAPS_MACHINE_I8042_OPT */ /* 465 */ - "snapshot-internal-qmp", /* QEMU_CAPS_SNAPSHOT_INTERNAL_QMP = */ + "snapshot-internal-qmp", /* X_QEMU_CAPS_SNAPSHOT_INTERNAL_QM= P */ "chardev-reconnect-miliseconds", /* QEMU_CAPS_CHARDEV_RECONN= ECT_MILISECONDS */ "virtio-ccw.loadparm", /* QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPA= RM */ "netdev-stream-reconnect-miliseconds", /* QEMU_CAPS_NETDEV_S= TREAM_RECONNECT_MILISECONDS */ @@ -1251,7 +1251,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = =3D { { "query-stats", QEMU_CAPS_QUERY_STATS }, { "query-stats-schemas", QEMU_CAPS_QUERY_STATS_SCHEMAS }, { "display-reload", QEMU_CAPS_DISPLAY_RELOAD }, - { "snapshot-save", QEMU_CAPS_SNAPSHOT_INTERNAL_QMP }, { "blockdev-set-active", QEMU_CAPS_BLOCKDEV_SET_ACTIVE }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2c2433580c..685a938bbc 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -698,7 +698,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_MACHINE_I8042_OPT, /* -machine xxx,i8042=3Don/off; use virQE= MUCapsSupportsI8042Toggle() to query this capability */ /* 465 */ - QEMU_CAPS_SNAPSHOT_INTERNAL_QMP, /* internal snapshot support via QMP = commands 'snapshot-save'/'snapshot-delete' */ + X_QEMU_CAPS_SNAPSHOT_INTERNAL_QMP, /* internal snapshot support via QM= P commands 'snapshot-save'/'snapshot-delete' */ QEMU_CAPS_CHARDEV_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for = chardevs supported */ QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM, /* loadparm available on CCW dev= ice for multi device boot */ QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS, /* 'reconnect-ms' optio= n for netdev stream supported */ diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemuc= apabilitiesdata/caps_10.0.0_s390x.xml index 0600cbda62..4f3669ebb7 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml @@ -128,7 +128,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 ad7bb7ebc8..eaf35bb703 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml @@ -201,7 +201,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 529ec7fbe2..dea2e3fc89 100644 --- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml @@ -200,7 +200,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml index e080352a4c..cf5fc6b017 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -132,7 +132,6 @@ - 6002000 42900244 v6.2.0 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index 1c7def169c..ed43c4767f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -174,7 +174,6 @@ - 6002000 43100244 v6.2.0 diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml index a5dbf4fb13..9a273e531e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -151,7 +151,6 @@ - 7000000 42900243 v7.0.0 diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index 8e342bf4ad..3214f50be6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -182,7 +182,6 @@ - 7000000 43100243 v7.0.0 diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml index 610ca193d0..46a93cadbc 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -152,7 +152,6 @@ - 7001000 42900244 v7.1.0 diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 71e6c16e8f..eb5e35b904 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -187,7 +187,6 @@ - 7001000 43100244 v7.1.0 diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml index bba3376484..f8b79cc751 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -147,7 +147,6 @@ - 7002000 0 qemu-7.2.0-6.fc37 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 7bdeb00f9a..6ea91329bc 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -191,7 +191,6 @@ - 7002000 43100245 v7.2.0 diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index 54c72521b0..dfecf16eaf 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -191,7 +191,6 @@ - 7002000 43100245 v7.2.0 diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index 54db96d9c7..09c9fbe17e 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -195,7 +195,6 @@ - 8000000 43100244 v8.0.0 diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.1.0_s390x.xml index 0de066b2d9..4127437fcc 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml @@ -115,7 +115,6 @@ - 8001000 39100245 v8.1.0 diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index 7d508a1601..eb03dd891a 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -197,7 +197,6 @@ - 8001000 43100245 v8.1.0 diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_8.2.0_aarch64.xml index 047a08a20c..31757fcc4f 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml @@ -162,7 +162,6 @@ - 8002000 61700246 v8.2.0 diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_armv7l.xml index 3bf741931d..af50e1acd2 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml @@ -169,7 +169,6 @@ - 8002000 0 qemu-8.2.0-7.fc39 diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/= qemucapabilitiesdata/caps_8.2.0_loongarch64.xml index 73871a6880..067526a4f1 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml @@ -152,7 +152,6 @@ - 8002000 106300246 v8.2.0 diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_8.2.0_s390x.xml index d1f4bd300e..9b0b5bdd9d 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml @@ -116,7 +116,6 @@ - 8002000 39100246 v8.2.0 diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.2.0_x86_64.xml index 2da46d944d..e786f16ec1 100644 --- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml @@ -200,7 +200,6 @@ - 8002000 43100246 v8.2.0 diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemuca= pabilitiesdata/caps_9.0.0_sparc.xml index 698136134d..74d10dc744 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml @@ -72,7 +72,6 @@ - 9000000 0 qemu-9.0.0-1.fc40 diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.0.0_x86_64.xml index b273193d35..ec71682150 100644 --- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml @@ -202,7 +202,6 @@ - 9000000 43100245 v9.0.0 diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemu= capabilitiesdata/caps_9.1.0_riscv64.xml index 60eeb04fe7..2fa5d84c24 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml @@ -160,7 +160,6 @@ - 9001000 diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_9.1.0_s390x.xml index 91738c0204..f2fb085af3 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml @@ -125,7 +125,6 @@ - 9001000 diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_9.1.0_x86_64.xml index 6b995c2f26..08a4b24ae7 100644 --- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml @@ -200,7 +200,6 @@ - 9001000 43100246 diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/= qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml index a7bfc10168..7c9d245099 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml @@ -132,7 +132,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemuca= pabilitiesdata/caps_9.2.0_s390x.xml index 7427bab1e9..572e829208 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml @@ -125,7 +125,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 2181b9432a..be235051e2 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml @@ -202,7 +202,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 924f56d010..73b2897c22 100644 --- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml @@ -200,7 +200,6 @@ - --=20 2.49.0