From nobody Tue Dec 16 16:43:55 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=1742512173; cv=none; d=zohomail.com; s=zohoarc; b=CLbVA5iR7MwpJ3fuaR5JhrCIrEEivqjEwARl9MnFOPWmC35/86ckNYPHx4+dssJjFEr1zHy8oWI2Zl8+pr9zmYoC9+/wsPd/Y0qRfGDarVug4I1ZzSwFpJikzwAp2/86NX8jirACRNhGkqwwmQCZeVFumJ6EDuQIpke8RxOAV2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1742512173; 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=z5vjQMUOLK0xGK3bBBFNjCnvr48SDrajBs6GTYCRycA=; b=N6NvfEciQ8+2HaNwhPb17w6Nu4wjQTgMo4zPmNzJloniD5U1VlIeAIUeASrHkOcw9578KZ59XpxCo31LrlJKjIDhm+GyeqZv1DlESIg6kfWZVewoG3reWleAn8h/XnGthHY1VDgmNUukEtWqKkU1KcJ81syOvlv9YD2m5KLFv2c= 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 1742512173398587.8188689893765; Thu, 20 Mar 2025 16:09:33 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6DFDB1823; Thu, 20 Mar 2025 19:09:32 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EEA091805; Thu, 20 Mar 2025 19:07:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E0458159A; Thu, 20 Mar 2025 19:07:36 -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 371251738 for ; Thu, 20 Mar 2025 19:07:26 -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-26-P1d0GSgCNguBGlfrdAfOIw-1; Thu, 20 Mar 2025 19:07:23 -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 3A0A7180AF4D for ; Thu, 20 Mar 2025 23:07:22 +0000 (UTC) Received: from antique-work.lan (unknown [10.45.226.90]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 73E8D1800370 for ; Thu, 20 Mar 2025 23:07:21 +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_H2, 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=1742512045; 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=KnXh7E2SAwinkjYjoU3AoYsyonjMg6q0yA0t9G7iFyI=; b=K+BZjjQJ79UiLkVUKi/JnE4e7LMDevzukGuLGuiQdIN6/nKDXtKF8b7mHvQGcw/tsIrRsv a/QBaF8xVh7QcpH1/yEk/11TDhmrXYPd58kVdHCSuVkw/NXZT+JQFGn12dMPSjwV5vtMG9 rfF5u0X4VNdt6tbpDMDi0ajPl48Lv9g= X-MC-Unique: P1d0GSgCNguBGlfrdAfOIw-1 X-Mimecast-MFC-AGG-ID: P1d0GSgCNguBGlfrdAfOIw_1742512042 To: devel@lists.libvirt.org Subject: [libvirt PATCH 4/6] tools: use virDomainRestoreParams only when necessary Date: Fri, 21 Mar 2025 00:07:12 +0100 Message-ID: <30be1381a252d9fad88915357af2c0975e993c2f.1742511952.git.phrdina@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: czp4WnskCd-hjDlanbv-PtECSlbPChSKFhK8OXpN2Yo_1742512042 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FHNNFUAF5BAPMNYJW3AZUAMRVRBDP2TX X-Message-ID-Hash: FHNNFUAF5BAPMNYJW3AZUAMRVRBDP2TX X-MailFrom: phrdina@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: Pavel Hrdina via Devel Reply-To: Pavel Hrdina X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1742512176145019100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Pavel Hrdina We should use the newest API only when user sets parallel-channels. Signed-off-by: Pavel Hrdina --- tools/virsh-domain.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 56ddf4d701..c21cf847c8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5707,10 +5707,6 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) =20 if (vshCommandOptString(ctl, cmd, "file", &from) < 0) return false; - if (from && - virTypedParamsAddString(¶ms, &nparams, &maxparams, - VIR_DOMAIN_SAVE_PARAM_FILE, from) < 0) - return false; =20 if (vshCommandOptString(ctl, cmd, "xml", &xmlfile) < 0) return false; @@ -5718,10 +5714,6 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) if (xmlfile && virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0) return false; - if (xml && - virTypedParamsAddString(¶ms, &nparams, &maxparams, - VIR_DOMAIN_SAVE_PARAM_DXML, xml) < 0) - return false; =20 if ((rc =3D vshCommandOptInt(ctl, cmd, "parallel-channels", &nchannels= )) < 0) return false; @@ -5730,8 +5722,20 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) VIR_DOMAIN_SAVE_PARAM_PARALLEL_CHANNELS, ncha= nnels) < 0) return false; =20 - if (flags || xml) { + if (nparams > 0) { + if (from && + virTypedParamsAddString(¶ms, &nparams, &maxparams, + VIR_DOMAIN_SAVE_PARAM_FILE, from) < 0) + return false; + + if (xml && + virTypedParamsAddString(¶ms, &nparams, &maxparams, + VIR_DOMAIN_SAVE_PARAM_DXML, xml) < 0) + return false; + rc =3D virDomainRestoreParams(priv->conn, params, nparams, flags); + } else if (flags || xml) { + rc =3D virDomainRestoreFlags(priv->conn, from, xml, flags); } else { rc =3D virDomainRestore(priv->conn, from); } --=20 2.48.1