From nobody Fri Dec 12 14:07:31 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=1765363069; cv=none; d=zohomail.com; s=zohoarc; b=L32NOuu/pPrQxbQIAgRrxToNpGfhIbLrP3TZE8rKQLYZM+ah3KO0cMxCiuQHBRR6vKyYdWrLJZPkjRBtbBURWY69E0E36slCmqzwK1tQq2zmj828jbJ+kzIuCOIT3TyL/PxB1tYpYUD13WdArWPBDo92kJeaqOJpk8kIT3ilacY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363069; 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=ySaBJyGMlwmjGY8KFNomLmGvnviRRlVu22hEy9rbvnw=; b=oJrBqRxjQbripxV1Gh/Oek3Xm8mDfl4CVdqp7Xs/eWQM6SyWsu67YoBCsyRYtih4TBHWDIgpFDWddbuC2/HExd4W6pabhJnwUXvEy4OkobTCwQzeoifvFVBweQHarWLUsknMLEjymRk90SetTntEpGqAbpSZZufPhj5Y6wmcdoE= 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 1765363069774200.83125464112197; Wed, 10 Dec 2025 02:37:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id A308E41B60; Wed, 10 Dec 2025 05:37:48 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 094FB43DD2; Wed, 10 Dec 2025 05:36:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2043F41B43; Wed, 10 Dec 2025 05:32:39 -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 76A9041B42 for ; Wed, 10 Dec 2025 05:32:37 -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-596-BAkEfKM-OjOfbWRSwH8TMw-1; Wed, 10 Dec 2025 05:32:35 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 D7F0818002DE for ; Wed, 10 Dec 2025 10:32:34 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2A42330001A5 for ; Wed, 10 Dec 2025 10:32:33 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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=1765362757; 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=ySaBJyGMlwmjGY8KFNomLmGvnviRRlVu22hEy9rbvnw=; b=Hhddv39BTzf3njv7jHy4/Ps42i/PIWp2Y0PSFU7LQTSESA9pu1jIHHmU66cArKGI1Ekglg lgZILp1HnzGJeu52C+rUlyF5WP/ko6ANuNSN4oRbCtfB56jkUsRkMnYw/ssh6JExCt5bMx oOeN45tMakz2pUtsjja51Y9e6nG2L7k= X-MC-Unique: BAkEfKM-OjOfbWRSwH8TMw-1 X-Mimecast-MFC-AGG-ID: BAkEfKM-OjOfbWRSwH8TMw_1765362755 To: devel@lists.libvirt.org Subject: [PATCH 01/10] qemu: snapshot: Don't overwrite 'ret' in qemuSnapshotCreateActiveExternal Date: Wed, 10 Dec 2025 11:32:22 +0100 Message-ID: <84efdfe05e52f7398603fe1ef2ea6e2ed74deee6.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: b2Xe8IJVynuQt7ZrvM5RMsMjhDPR6pN3UGQZoWwv5Ok_1765362755 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ADZVDVPXXEN2RXSHRXKJG4J5YDJESME7 X-Message-ID-Hash: ADZVDVPXXEN2RXSHRXKJG4J5YDJESME7 X-MailFrom: pkrempa@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: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1765363072785158500 Content-Type: text/plain; charset="utf-8" From: Nikolay Shirokovskiy Both qemuSaveImageCreate and qemuSnapshotCreateActiveExternalDisks follow the usual convention of returning 0 on success and -1 on error so there's no need store the values in 'ret'. Signed-off-by: Nikolay Shirokovskiy Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5b0b52e2ba..5ceaff3554 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1756,9 +1756,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, if (!(snap_params =3D qemuMigrationParamsNew())) goto cleanup; - if ((ret =3D qemuSaveImageCreate(driver, vm, snapdef->memorysnapsh= otfile, - data, compressor, snap_params, 0, - VIR_ASYNC_JOB_SNAPSHOT)) < 0) + if (qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile, + data, compressor, snap_params, 0, + VIR_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; /* the memory image was created, remove it on errors */ @@ -1775,9 +1775,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, qemuSnapshotCreateActiveExternalDisksManual(vm, snap, VIR_ASYNC_JO= B_SNAPSHOT) < 0) goto cleanup; - if ((ret =3D qemuSnapshotCreateActiveExternalDisks(vm, snap, - blockNamedNodeData, f= lags, - VIR_ASYNC_JOB_SNAPSHO= T)) < 0) + if (qemuSnapshotCreateActiveExternalDisks(vm, snap, + blockNamedNodeData, flags, + VIR_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; /* the snapshot is complete now */ --=20 2.52.0