From patchwork Mon Jul 13 17:52:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 277943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CA05C433E0 for ; Mon, 13 Jul 2020 17:55:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 31C3E206F5 for ; Mon, 13 Jul 2020 17:55:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YfJ5z18a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 31C3E206F5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jv2fi-0000cH-Fn for qemu-devel@archiver.kernel.org; Mon, 13 Jul 2020 13:55:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jv2ci-0005X6-Fd for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:16 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:60964 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jv2cg-0007RH-Ku for qemu-devel@nongnu.org; Mon, 13 Jul 2020 13:52:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594662733; 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=yfIb0WoSohr36CI5PC7CR58EVtgqFNPY3VFIqPoN2Bk=; b=YfJ5z18aVeJMuzoV4UnSh76FjT5HrU2gqf3h1KyBcV6gP180c1cI4Vz42KikZcM78Qnbn6 bQKq3NAaSMMpY5R/Y7cVFE6k67dRMk/M65QEJim5iP+I6MVa50Xg63urLtp+rrim4XyyRc 6IQi0PIaYZN4LZHjzWzjEfjUs6Yq/lk= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-Ia-HrFD1Nfm1t5ogk9_9Yg-1; Mon, 13 Jul 2020 13:52:12 -0400 X-MC-Unique: Ia-HrFD1Nfm1t5ogk9_9Yg-1 Received: by mail-wm1-f69.google.com with SMTP id f68so378990wmf.1 for ; Mon, 13 Jul 2020 10:52:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yfIb0WoSohr36CI5PC7CR58EVtgqFNPY3VFIqPoN2Bk=; b=P90DZpZ4zZ/Afak/kEt000Glyvt5n0J3YcKKeb6Ac6LXrgV9UQzIb7O6pSJD+rWd6w LuLpjCc8wH8KFVkY12LRtcoGjdMfKUvvbYaHkz7DcNWaTiHF2gT6qi8elCZ8EqVQps7d hsUNNVo880I+twFVvr/Kb2F7BglCpaLV8cZwYWp2AsSOjfJtXOuqY/U6h0lx2LnkKr6N YAF/QjylC1mrZFCILjE6MoKEv80d/EmWHHpEQkJgq04No2F7qI+goZJ8ljnv8SiWcu5U gtRquSaVviXo5YlTnmBoK7MdBpOaWI8MQ2WIR2t8k9Y7GiBSqsmlKwjFJom1NY2Zaik3 aVDw== X-Gm-Message-State: AOAM530fMLBMCflLc9ziJ7bm8sW0p4epsG8fz9gL7IiqsWmw6X1TF8ko buF3kR2yzQQnlKTMjlgPbC8gLi0e8juxRcnXN9Jh05ee462xArbQ3OGCqme+uOY+RjfLJkuvLOY M0w7DwFOU1OoqpjA= X-Received: by 2002:a1c:7d85:: with SMTP id y127mr534972wmc.181.1594662731086; Mon, 13 Jul 2020 10:52:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8ZHSSxvUnW14VOVhay51BUI2J9kmtKvDzwiwHAWmvd3Kl5O/n3T8iGVZTiuIufJoh3yKtYQ== X-Received: by 2002:a1c:7d85:: with SMTP id y127mr534951wmc.181.1594662730918; Mon, 13 Jul 2020 10:52:10 -0700 (PDT) Received: from localhost (trasno.trasno.org. [83.165.45.250]) by smtp.gmail.com with ESMTPSA id o9sm24308346wrs.1.2020.07.13.10.52.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 10:52:10 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 2/3] migration/savevm: respect qemu_fclose() error code in save_snapshot() Date: Mon, 13 Jul 2020 19:52:05 +0200 Message-Id: <20200713175206.13659-3-quintela@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: <20200713175206.13659-1-quintela@redhat.com> References: <20200713175206.13659-1-quintela@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=207.211.31.81; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/13 02:19:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Kevin Wolf , Fam Zheng , Vladimir Sementsov-Ogievskiy , Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Denis Plotnikov , quintela@trasno.org, Stefan Hajnoczi , "Denis V. Lunev" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: "Denis V. Lunev" qemu_fclose() could return error, f.e. if bdrv_co_flush() will return the error. This validation will become more important once we will start waiting of asynchronous IO operations, started from bdrv_write_vmstate(), which are coming soon. Signed-off-by: Denis V. Lunev Reviewed-by: "Dr. David Alan Gilbert" Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Juan Quintela CC: Kevin Wolf CC: Max Reitz CC: Stefan Hajnoczi CC: Fam Zheng CC: Juan Quintela CC: Denis Plotnikov Signed-off-by: Juan Quintela --- migration/savevm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 6e01724605..45c9dd9d8a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2635,7 +2635,7 @@ int save_snapshot(const char *name, Error **errp) { BlockDriverState *bs, *bs1; QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1; - int ret = -1; + int ret = -1, ret2; QEMUFile *f; int saved_vm_running; uint64_t vm_state_size; @@ -2719,10 +2719,14 @@ int save_snapshot(const char *name, Error **errp) } ret = qemu_savevm_state(f, errp); vm_state_size = qemu_ftell(f); - qemu_fclose(f); + ret2 = qemu_fclose(f); if (ret < 0) { goto the_end; } + if (ret2 < 0) { + ret = ret2; + goto the_end; + } /* The bdrv_all_create_snapshot() call that follows acquires the AioContext * for itself. BDRV_POLL_WHILE() does not support nested locking because