From patchwork Thu Oct 8 17:48:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 303412 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.6 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,USER_AGENT_GIT autolearn=ham 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 37D65C433E7 for ; Thu, 8 Oct 2020 17:52:26 +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 7AD222076E for ; Thu, 8 Oct 2020 17:52:25 +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="MaevFSAi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AD222076E 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]:32866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQa5Y-0002Wy-G0 for qemu-devel@archiver.kernel.org; Thu, 08 Oct 2020 13:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQa1k-0005vN-Q7 for qemu-devel@nongnu.org; Thu, 08 Oct 2020 13:48:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33325) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQa1i-0003Lu-QO for qemu-devel@nongnu.org; Thu, 08 Oct 2020 13:48:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602179305; 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=2xL7VzS347TMQY4jeRkZ39UPhoJfDnOTBkcZwp2rt3Q=; b=MaevFSAiUllrA/C7KelP8fmPP2sgaal9jTyap7dSJN/t+9uVvSHh7DrjsoskpQeK2B7gq8 R9UD8TQZPcNUz0QMabaMjVPBUxu0+ho2a92yNutTCtCPb33l9TDpUoYTdKOdv93iCh6s37 rs5xx2m/zRrLOnxIOexsgz35KVU4zGA= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-FV-k1kfPMGyPKQ9cthu3UQ-1; Thu, 08 Oct 2020 13:48:17 -0400 X-MC-Unique: FV-k1kfPMGyPKQ9cthu3UQ-1 Received: by mail-wr1-f72.google.com with SMTP id r16so4153449wrm.18 for ; Thu, 08 Oct 2020 10:48:17 -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=2xL7VzS347TMQY4jeRkZ39UPhoJfDnOTBkcZwp2rt3Q=; b=JmN6uv7268/NITqIQsSMgGrSrfWZTSXDSCHEWF2Xf/J0OuCy0agmjb4oPJy4NwtFyS 4vXODgpOKIdcVDaHAjd0JBiEghpluDPHSH+FaR/HsO0K3N4i0qjbrVzzC2fJMrildS1w 7n8Nx7dCzIfDyAbet/+cL6D3zsxgQbuo08mVWGTLT2VZLAcB3W5UdJMxFgYfup7WT+PX UCAoRLn/WUX19dKS6lH+9xse2pwVFuZXKaz51SfG8fvyl9xsQIfxWq//Fh4WrYYqEQqK MnqW4k5Rrc9MZInfehAaSaWRyhHZvHWGVzVCriWzvZgOKMX86cpWD9W1SOLJWDu1UOBO uHTg== X-Gm-Message-State: AOAM531NdT8h4sWsDV3VAt72Of7CDT6FWk0H2DkSw1BIuePo6BKPS1qq 6Ad7HbecLDIRzJLpPwksSuTHBM8m8JQiuwx63QtTMHPzJQU4LJ5GASyq6IbBuQyG3F1MeYZKZs8 mN3tu8Gz0bfrOs8w= X-Received: by 2002:a5d:5281:: with SMTP id c1mr10525425wrv.184.1602179295722; Thu, 08 Oct 2020 10:48:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBwWx1y9LgP7s9uVXzfUPTD3W6hNujXZgHx0qpl9PTSJv1Cb/q28tUJF7ool0f/gUA72QXgg== X-Received: by 2002:a5d:5281:: with SMTP id c1mr10525399wrv.184.1602179295401; Thu, 08 Oct 2020 10:48:15 -0700 (PDT) Received: from x1w.redhat.com (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id f189sm8018676wmf.16.2020.10.08.10.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 10:48:14 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/3] migration: Make save_snapshot() return bool, not 0/-1 Date: Thu, 8 Oct 2020 19:48:02 +0200 Message-Id: <20201008174803.2696619-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201008174803.2696619-1-philmd@redhat.com> References: <20201008174803.2696619-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 01:56:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-block@nongnu.org, Juan Quintela , "Dr. David Alan Gilbert" , Max Reitz , Pavel Dovgalyuk , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Just for consistency, following the example documented since commit e3fe3988d7 ("error: Document Error API usage rules"). Document the function. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Pavel Dovgalyuk --- include/migration/snapshot.h | 9 ++++++++- migration/savevm.c | 16 ++++++++-------- replay/replay-debugging.c | 2 +- replay/replay-snapshot.c | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h index c85b6ec75b..a40c34307b 100644 --- a/include/migration/snapshot.h +++ b/include/migration/snapshot.h @@ -15,7 +15,14 @@ #ifndef QEMU_MIGRATION_SNAPSHOT_H #define QEMU_MIGRATION_SNAPSHOT_H -int save_snapshot(const char *name, Error **errp); +/** + * save_snapshot: Save a snapshot. + * @name: path to snapshot + * @errp: pointer to error object + * On success, return %true. + * On failure, store an error through @errp and return %false. + */ +bool save_snapshot(const char *name, Error **errp); int load_snapshot(const char *name, Error **errp); #endif diff --git a/migration/savevm.c b/migration/savevm.c index a52da440f4..fd2e5e8b66 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2658,7 +2658,7 @@ int qemu_load_device_state(QEMUFile *f) return 0; } -int save_snapshot(const char *name, Error **errp) +bool save_snapshot(const char *name, Error **errp) { BlockDriverState *bs; QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1; @@ -2671,29 +2671,29 @@ int save_snapshot(const char *name, Error **errp) AioContext *aio_context; if (migration_is_blocked(errp)) { - return ret; + return false; } if (!replay_can_snapshot()) { error_setg(errp, "Record/replay does not allow making snapshot " "right now. Try once more later."); - return ret; + return false; } if (!bdrv_all_can_snapshot(errp)) { - return ret; + return false; } /* Delete old snapshots of the same name */ if (name) { if (bdrv_all_delete_snapshot(name, errp) < 0) { - return ret; + return false; } } bs = bdrv_all_find_vmstate_bs(errp); if (bs == NULL) { - return ret; + return false; } aio_context = bdrv_get_aio_context(bs); @@ -2702,7 +2702,7 @@ int save_snapshot(const char *name, Error **errp) ret = global_state_store(); if (ret) { error_setg(errp, "Error saving global state"); - return ret; + return false; } vm_stop(RUN_STATE_SAVE_VM); @@ -2779,7 +2779,7 @@ int save_snapshot(const char *name, Error **errp) if (saved_vm_running) { vm_start(); } - return ret; + return ret == 0; } void qmp_xen_save_devices_state(const char *filename, bool has_live, bool live, diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c index 8785489c02..5458a73fce 100644 --- a/replay/replay-debugging.c +++ b/replay/replay-debugging.c @@ -327,7 +327,7 @@ void replay_gdb_attached(void) */ if (replay_mode == REPLAY_MODE_PLAY && !replay_snapshot) { - if (save_snapshot("start_debugging", NULL) != 0) { + if (!save_snapshot("start_debugging", NULL)) { /* Can't create the snapshot. Continue conventional debugging. */ } } diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index e26fa4c892..4f2560d156 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -77,7 +77,7 @@ void replay_vmstate_init(void) if (replay_snapshot) { if (replay_mode == REPLAY_MODE_RECORD) { - if (save_snapshot(replay_snapshot, &err) != 0) { + if (!save_snapshot(replay_snapshot, &err)) { error_report_err(err); error_report("Could not create snapshot for icount record"); exit(1);