From nobody Tue Dec 16 16:31:11 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 --- 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