From nobody Tue Dec 16 13:49:46 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 --- 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