From nobody Mon Nov 17 01:31:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602179300; cv=none; d=zohomail.com; s=zohoarc; b=js+Y+ZRy8Sih9RyFFx1rq+vwfqZISSFeR6iqJ+h58x5eymWFtp1d0aHpWeCjgE1U4xMFDLEs4zV+n/fN3fR1HaTnPccJBbyQWXb9wBpclrY5uqPK5LFeGTL/t/mm4i3utMau14MWqtYAP4I53BaLqzST6skI+FeX8EUpyW/oRmk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602179300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=2xL7VzS347TMQY4jeRkZ39UPhoJfDnOTBkcZwp2rt3Q=; b=mjOcR29QZpSB9BZ+sasD5SPo0YLs5aunCTcOZCjuV5C3uhARX5GB21d/ptiG9FIhTBI3eNSiEtYJ4b+ocn727M98pmOWyy66sKHt24Y1FhBxqNPJ9+pITEIwmv057e2XAldHOS6CzcfE65BFNrG9TQKyFiOs1EKRyl/XBGztt0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602179300663683.2526898145047; Thu, 8 Oct 2020 10:48:20 -0700 (PDT) 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-32-lZ_mj14BPAqIXJnfjPNF6g-1; Thu, 08 Oct 2020 13:48:17 -0400 Received: by mail-wm1-f69.google.com with SMTP id g125so3406883wme.1 for ; Thu, 08 Oct 2020 10:48:16 -0700 (PDT) Return-Path: Return-Path: 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602179299; 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=gHHGKpc2669dceWZxF/voWZY/nVhLbbxchZ9J3u150cGQee15qw4bKD+Bphh2PCwj/5FZe vc61qoQf76+QoWs+hGkBCqTpF2ct6YlQsna4Hzivlpt8ohZzjz1PzAaILFud+gl0sd8K54 4n2aa2nSw6Ftx4GVkFJH2LqOhHe0wX0= X-MC-Unique: lZ_mj14BPAqIXJnfjPNF6g-1 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=OQtoyLkn7hu8/yf8dUBqApVCRjoiJQYf48a6TK6N8/UET8ZlHKSv3cgjNeVd56MZI/ SGCGJRUPQEVFHC31coetf1y6C8XgE3Sq4XIGxHiZ2SHMD4Mv5rBaSwtBVTFM3IdDFEAc VL/lNjnP4JG9wnkwyzxBRdfX/DYvobbx2e0tjOZgz0WOuf2otT+vkjw/1VlWvy/Mh7H2 bSVRHNeQEWDXEfqgFb20nvO10liGlDKuYl7xAZwUbVDS3hDLPhvYKJQnw9lPzjTP2KqW IumenJhZbjYGk4ramRgGewAwSJ2gbN4VAPHaa/UfLQbEaDpjCt50k8bed27lKDf3PwPY 1Byw== X-Gm-Message-State: AOAM533jXPrKVES8prkIQ3eMUluHnNUCVRY4r9I3HCfmqfsnihwqEp1m n0yRtzI9R/GtdtfzfZtWjQH0OPd+LHCCSnm66CJBVi47ozSANMDzr4sXER9U7Noh7I1QV6CJfij MJUzQgZda8DK/Ow== X-Received: by 2002:a5d:5281:: with SMTP id c1mr10525421wrv.184.1602179295721; 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) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Max Reitz , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Pavel Dovgalyuk , Paolo Bonzini , "Dr. David Alan Gilbert" , Juan Quintela , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) 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=C3=A9 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 =20 -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); =20 #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; } =20 -int save_snapshot(const char *name, Error **errp) +bool save_snapshot(const char *name, Error **errp) { BlockDriverState *bs; QEMUSnapshotInfo sn1, *sn =3D &sn1, old_sn1, *old_sn =3D &old_sn1; @@ -2671,29 +2671,29 @@ int save_snapshot(const char *name, Error **errp) AioContext *aio_context; =20 if (migration_is_blocked(errp)) { - return ret; + return false; } =20 if (!replay_can_snapshot()) { error_setg(errp, "Record/replay does not allow making snapshot " "right now. Try once more later."); - return ret; + return false; } =20 if (!bdrv_all_can_snapshot(errp)) { - return ret; + return false; } =20 /* Delete old snapshots of the same name */ if (name) { if (bdrv_all_delete_snapshot(name, errp) < 0) { - return ret; + return false; } } =20 bs =3D bdrv_all_find_vmstate_bs(errp); if (bs =3D=3D NULL) { - return ret; + return false; } aio_context =3D bdrv_get_aio_context(bs); =20 @@ -2702,7 +2702,7 @@ int save_snapshot(const char *name, Error **errp) ret =3D global_state_store(); if (ret) { error_setg(errp, "Error saving global state"); - return ret; + return false; } vm_stop(RUN_STATE_SAVE_VM); =20 @@ -2779,7 +2779,7 @@ int save_snapshot(const char *name, Error **errp) if (saved_vm_running) { vm_start(); } - return ret; + return ret =3D=3D 0; } =20 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 =3D=3D REPLAY_MODE_PLAY && !replay_snapshot) { - if (save_snapshot("start_debugging", NULL) !=3D 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) =20 if (replay_snapshot) { if (replay_mode =3D=3D REPLAY_MODE_RECORD) { - if (save_snapshot(replay_snapshot, &err) !=3D 0) { + if (!save_snapshot(replay_snapshot, &err)) { error_report_err(err); error_report("Could not create snapshot for icount record"= ); exit(1); --=20 2.26.2