From nobody Mon Feb 9 00:42:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612463043; cv=none; d=zohomail.com; s=zohoarc; b=Tp7L+NEUG/DEF8P5FyeLkx1eTqpTfz7lVzJMHEBANXYHHt3peqGQCKAqkkXW4yHIFBx4dojc0fgC/1kWZYaA91OCm54a07FiSP9fdruso38l1F7jXID1OipvrMjpyYngzU3UyXbnLvycPrtVXP9JGKO0vRQ3t5dS4nVMevopm74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612463043; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9PAMIFGXEZffGzCZZ4pKKkrTnrT0sfVqxuCXEAkrhyw=; b=RS1zTPEXRr22gMiZUXrSA++vf/bQvLTgRN9mFcz02Y7KXDS5VDQDxLfUU0RsvxxMuJeKsQsQ530D+YwUMfiPXx8zeKfQyk2t68J/3IPlQ/VHKRRzszpFeRp1z9zzgI/To1Ga7SZmTaSGA8ZsxtB6fFXZ9s4Ayk45Kvrax1qIDms= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612463043183106.99949888833225; Thu, 4 Feb 2021 10:24:03 -0800 (PST) Received: from localhost ([::1]:43082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7jIP-00061N-Ha for importer@patchew.org; Thu, 04 Feb 2021 13:24:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7iIY-0007zw-No for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:20:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7iIP-0005gW-RU for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:20:06 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-87-Om1uMpSCOsmYpvsWzN0oQg-1; Thu, 04 Feb 2021 12:19:55 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D2B8107ACE3; Thu, 4 Feb 2021 17:19:54 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-221.ams2.redhat.com [10.36.112.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 074E650E2F; Thu, 4 Feb 2021 17:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612459196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9PAMIFGXEZffGzCZZ4pKKkrTnrT0sfVqxuCXEAkrhyw=; b=Ir9oBIhcOkKf1fF5sVDmIBY9Be5/IuDe3FX52o0omJwp66P2hIMm6gmuGfE64hHlrwZoFS 8YvsMKRxJx9fUKxf1YproUtUJF9hEujuYWpTVmKBa/Dl+i7p5GsDSBJ6zsn7+iIk1fLRCb vdwjpMvJmcrZsgDZhu4t28X4ERoMo2M= X-MC-Unique: Om1uMpSCOsmYpvsWzN0oQg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 23/33] migration: simplify some error reporting in save_snapshot() Date: Thu, 4 Feb 2021 17:18:57 +0000 Message-Id: <20210204171907.901471-24-berrange@redhat.com> In-Reply-To: <20210204171907.901471-1-berrange@redhat.com> References: <20210204171907.901471-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Dr. David Alan Gilbert" , Hailiang Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Re-arrange code to remove need for a separate 'ret2' variable, accepting the duplicated qemu_fclose() call as resulting in clearer code to follow the flow of. Signed-off-by: Daniel P. Berrang=C3=A9 --- migration/savevm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 23e4d5a1a2..fdf8b6edfb 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2788,7 +2788,7 @@ bool save_snapshot(const char *name, bool overwrite, = const char *vmstate, { BlockDriverState *bs; QEMUSnapshotInfo sn1, *sn =3D &sn1; - int ret =3D -1, ret2; + int ret =3D -1; QEMUFile *f; int saved_vm_running; uint64_t vm_state_size; @@ -2818,11 +2818,11 @@ bool save_snapshot(const char *name, bool overwrite= , const char *vmstate, return false; } } else { - ret2 =3D bdrv_all_has_snapshot(name, has_devices, devices, err= p); - if (ret2 < 0) { + ret =3D bdrv_all_has_snapshot(name, has_devices, devices, errp= ); + if (ret < 0) { return false; } - if (ret2 =3D=3D 1) { + if (ret =3D=3D 1) { error_setg(errp, "Snapshot '%s' already exists in one or more de= vices", name); @@ -2874,13 +2874,14 @@ bool save_snapshot(const char *name, bool overwrite= , const char *vmstate, f =3D qemu_fopen_bdrv(bs, 1); =20 ret =3D qemu_savevm_state(f, errp); - vm_state_size =3D qemu_ftell(f); - ret2 =3D qemu_fclose(f); if (ret < 0) { + qemu_fclose(f); goto the_end; } - if (ret2 < 0) { - ret =3D ret2; + vm_state_size =3D qemu_ftell(f); + ret =3D qemu_fclose(f); + if (ret < 0) { + error_setg_errno(errp, -ret, "failed to close vmstate file"); goto the_end; } =20 --=20 2.29.2