From nobody Tue Mar 3 04:54:09 2026 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=1771873379; cv=none; d=zohomail.com; s=zohoarc; b=U802HhvUZ0CkGWGoesR4dbf0jviCLFyOMXN7I4bybrv2r/RrkFz+mq4eWq3b6uKn1jA5o0GwgkRErsSQDNUP/V8Jg24aLmF1nvKTn60RPkZG3EhnZZe4meYvnufDhgot8tfmJ6UkGRnAC5zzgU5lwlZzaM6ac8QUV3gLR7zH8+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771873379; 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=fsgCBp9J69BBzTat90ZPWTXk1UHOss3VRS8CzSC4FZw=; b=hDpBuGNgKVKVBR1HKZCuJCidYYIdwCfo9/6Zk6zyGGQknJ14GgLRoLkkgDYpOqZlXSBsjFlafO8cpORRvD3X8ARfZpL5RfpnVs1f+maI73lRM/HEUU6pMlCPjXgY5hOHkaRO7tRE9THkMOj897WTs6gydXYn72HruiY/XqAmli8= 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 1771873379315386.4615561154003; Mon, 23 Feb 2026 11:02:59 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 567CA418F3; Mon, 23 Feb 2026 14:02:58 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 54EBC41B74; Mon, 23 Feb 2026 13:37:02 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 365DD41C86; Mon, 23 Feb 2026 13:36:48 -0500 (EST) 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 A8E0441B28 for ; Mon, 23 Feb 2026 13:32:31 -0500 (EST) 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-68-OaB1rj6wNI6uSwFFccdIDw-1; Mon, 23 Feb 2026 13:32:29 -0500 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 2B72F180034A for ; Mon, 23 Feb 2026 18:32:29 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.44.32.20]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1F58C1955D71 for ; Mon, 23 Feb 2026 18:32:27 +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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, 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=1771871551; 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=fsgCBp9J69BBzTat90ZPWTXk1UHOss3VRS8CzSC4FZw=; b=Eu1cYlyc/nKwrUTJBMvZ/cbVsVJsmO/22BjKOyQjH8oD/D7qbc3R7MHqEmyCvATxcXx1He vriGBytVjmuXiV7TT6cw12y5QZ6zg996/oZInaiO2Pu62qDoW3CIwNmL6N+yIbtEDqnV6F IyT71eFkWUflZTmlOp52/ENLqYtvDQM= X-MC-Unique: OaB1rj6wNI6uSwFFccdIDw-1 X-Mimecast-MFC-AGG-ID: OaB1rj6wNI6uSwFFccdIDw_1771871549 To: devel@lists.libvirt.org Subject: [PATCH v4 35/36] virsh: Update for varstore handling Date: Mon, 23 Feb 2026 19:31:18 +0100 Message-ID: <20260223183119.501349-36-abologna@redhat.com> In-Reply-To: <20260223183119.501349-1-abologna@redhat.com> References: <20260223183119.501349-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: N_YcQeNkxVa9WYwVsBYwnRYuBj22DM6fxwu-dPeaqvs_1771871549 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 77R4IOQE4SZVDJHVHML6VUYF42H2QTUU X-Message-ID-Hash: 77R4IOQE4SZVDJHVHML6VUYF42H2QTUU X-MailFrom: abologna@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: Andrea Bolognani via Devel Reply-To: Andrea Bolognani X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1771873381178158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Document the fact that the existing flags which apply to NVRAM files also do the right thing when varstore files are used instead. Signed-off-by: Andrea Bolognani Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/manpages/virsh.rst | 23 ++++++++++++----------- tools/virsh-domain.c | 10 +++++----- tools/virsh-snapshot.c | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index ff0cf1a715..b3e9289894 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -1722,8 +1722,8 @@ of open file descriptors which should be pass on into= the guest. The file descriptors will be re-numbered in the guest, starting from 3. This is only supported with container based virtualization. =20 -If *--reset-nvram* is specified, any existing NVRAM file will be deleted -and re-initialized from its pristine template. +If *--reset-nvram* is specified, any existing NVRAM/varstore file will be +deleted and re-initialized from its pristine template. =20 **Example:** =20 @@ -4281,8 +4281,8 @@ save image to decide between running or paused; passi= ng either the *--running* or *--paused* flag will allow overriding which state the domain should be started in. =20 -If *--reset-nvram* is specified, any existing NVRAM file will be deleted -and re-initialized from its pristine template. +If *--reset-nvram* is specified, any existing NVRAM/varstore file will be +deleted and re-initialized from its pristine template. =20 *--parallel-channels* option can specify number of parallel IO channels to be used when loading memory from file. Parallel save may significantly @@ -4925,8 +4925,8 @@ of open file descriptors which should be pass on into= the guest. The file descriptors will be re-numbered in the guest, starting from 3. This is only supported with container based virtualization. =20 -If *--reset-nvram* is specified, any existing NVRAM file will be deleted -and re-initialized from its pristine template. +If *--reset-nvram* is specified, any existing NVRAM/varstore file will be +deleted and re-initialized from its pristine template. =20 =20 suspend @@ -4988,9 +4988,10 @@ domain. Without the flag, attempts to undefine an i= nactive domain with checkpoint metadata will fail. If the domain is active, this flag is ignored. =20 -*--nvram* and *--keep-nvram* specify accordingly to delete or keep nvram -(/domain/os/nvram/) file. If the domain has an nvram file and the flags are -omitted, the undefine will fail. +The *--nvram* and *--keep-nvram* flags specify whether to delete or keep t= he +NVRAM (/domain/os/nvram/) or varstore (/domain/os/varstore) file respectiv= ely. +If the domain has an NVRAM/varstore file and the flags are omitted, the +undefine operation will fail. =20 The *--storage* flag takes a parameter ``volumes``, which is a comma separ= ated list of volume target names or source paths of storage volumes to be remov= ed @@ -8174,8 +8175,8 @@ requires the use of *--force* to proceed: likely cause extensive filesystem corruption or crashes due to swap co= ntent mismatches when run. =20 -If *--reset-nvram* is specified, any existing NVRAM file will be deleted -and re-initialized from its pristine template. +If *--reset-nvram* is specified, any existing NVRAM/varstore file will be +deleted and re-initialized from its pristine template. =20 =20 snapshot-delete diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a7f6a97dd7..5a2ae75379 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3981,11 +3981,11 @@ static const vshCmdOptDef opts_undefine[] =3D { }, {.name =3D "nvram", .type =3D VSH_OT_BOOL, - .help =3D N_("remove nvram file") + .help =3D N_("remove NVRAM/varstore file") }, {.name =3D "keep-nvram", .type =3D VSH_OT_BOOL, - .help =3D N_("keep nvram file") + .help =3D N_("keep NVRAM/varstore file") }, {.name =3D "tpm", .type =3D VSH_OT_BOOL, @@ -4401,7 +4401,7 @@ static const vshCmdOptDef opts_start[] =3D { }, {.name =3D "reset-nvram", .type =3D VSH_OT_BOOL, - .help =3D N_("re-initialize NVRAM from its pristine template") + .help =3D N_("re-initialize NVRAM/varstore from its pristine template= ") }, {.name =3D NULL} }; @@ -5728,7 +5728,7 @@ static const vshCmdOptDef opts_restore[] =3D { }, {.name =3D "reset-nvram", .type =3D VSH_OT_BOOL, - .help =3D N_("re-initialize NVRAM from its pristine template") + .help =3D N_("re-initialize NVRAM/varstore from its pristine template= ") }, {.name =3D NULL} }; @@ -8520,7 +8520,7 @@ static const vshCmdOptDef opts_create[] =3D { }, {.name =3D "reset-nvram", .type =3D VSH_OT_BOOL, - .help =3D N_("re-initialize NVRAM from its pristine template") + .help =3D N_("re-initialize NVRAM/varstore from its pristine template= ") }, {.name =3D NULL} }; diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 8e5b9d635c..08184576a7 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1714,7 +1714,7 @@ static const vshCmdOptDef opts_snapshot_revert[] =3D { }, {.name =3D "reset-nvram", .type =3D VSH_OT_BOOL, - .help =3D N_("re-initialize NVRAM from its pristine template") + .help =3D N_("re-initialize NVRAM/varstore from its pristine template= ") }, {.name =3D NULL} }; --=20 2.53.0