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=1602179306; cv=none; d=zohomail.com; s=zohoarc; b=iNLOVULwkfIqI0XHyQXPd0CBAHly0IMRSPh9A/BLWBYaPzRx67OrHPbMSnbEcyhPgmWFafBOF5MIqmFhRwGgMw029TX3h8O1xQY0JZwH6BZ3SuVl44oy/7CsY02XW5BcR1tAHacU8Ly249nwfrlWv6yA7NJt3XjJclS+eHf66is= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602179306; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=lKl/VVHXc4ERkMK0MKUUbJBmIyHe52WPOzLGwwT5H0E=; b=nWqqC2pKyw/RtdMlQPMZ8YvkUNMIjZLWS0psooBIatq5IteRJ+e7RsKp4md8pgCyRXE3NHUCgEm02u7tsyAPYnhotoB9dPfv6zOmZ0xWYKIbI4Ao0sQuCsapDT0HcQKY6L5I//wxWQqxxNGtvYxvF+N6UhXzAM/gx6f/7Xsio4A= 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 1602179306654694.5805283129155; Thu, 8 Oct 2020 10:48:26 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-588-voBSQfKQOQS_xW-U6g7aag-1; Thu, 08 Oct 2020 13:48:21 -0400 Received: by mail-wm1-f71.google.com with SMTP id a25so3416579wmb.2 for ; Thu, 08 Oct 2020 10:48:21 -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 m11sm8119229wmf.10.2020.10.08.10.48.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Oct 2020 10:48:19 -0700 (PDT) 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=lKl/VVHXc4ERkMK0MKUUbJBmIyHe52WPOzLGwwT5H0E=; b=iYzJ6c048P5bwMdz2GAIFIJhoZIYXKkfi6feFCPBPcVSGiTV5+en8CFqd/1BzCVcsgqK4J 1VKeVfqewVNNO2I8SS0+2DllMRI+5oiMPiX97rbnVWKnhDqHUgUQjefhtA9OdTcDA5oE0l rJG0cRfaXT9G2eOOK1cnzjw8FXG/Wu4= X-MC-Unique: voBSQfKQOQS_xW-U6g7aag-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=lKl/VVHXc4ERkMK0MKUUbJBmIyHe52WPOzLGwwT5H0E=; b=OqsL6DyPP88XTHDaMoJzH9zIcBr+plvg8Ej18TEL2XJE6lYiTXaxihK5AzLAQZ8Fwb NJS+QMuGJQ6xEgMbMGMr0Fqm2398FGYKzsCDxAIRM78Aet7lhsFCPJJO4RwOwf0YqxQy J1jTAHW+mKkrbqVzTfnypoUUNvmhRplALb3eQFy6dUNFGmP7XMhT2KiM937DUcC1lsts pU7+SnXN26gsN//ZhM+Mm/fG08rlvo20XxhLbbi01R8K2T77IIOO87GP46aAb9aQjcoY TKCpvU7i5n7ZgfV2Y5A7LZnKY4kBPX5KoaU6kDGbDeAeBUfgFnET2Uo2rmr5ZxHSZeQ0 2bZw== X-Gm-Message-State: AOAM533VwXJMp2zWbbSx586AGSvp0HR3XHjAF4RHPKk8IqVCk6S4kLwX 8JSLl8GaiY5kQL8rtpxcOdON9jKR5D20/U21POfa4eVZaWOuLT8NmIJLs5FNwY1nXvTFY4lA6W7 QiGO95T0FU5rzaw== X-Received: by 2002:a1c:2808:: with SMTP id o8mr10153452wmo.150.1602179300561; Thu, 08 Oct 2020 10:48:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4joHFgeXMcy2LyT6WF9mCH9bqVKJeLVtNMhyKie6pjpcB1RUjJhiZZnkwQjsaxNMe5pm+6A== X-Received: by 2002:a1c:2808:: with SMTP id o8mr10153429wmo.150.1602179300352; Thu, 08 Oct 2020 10:48:20 -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 3/3] migration: stop returning errno from load_snapshot() Date: Thu, 8 Oct 2020 19:48:03 +0200 Message-Id: <20201008174803.2696619-4-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) From: Daniel P. Berrang=C3=A9 None of the callers care about the errno value since there is a full Error object populated. This gives consistency with save_snapshot() which already just returns a boolean value. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrang=C3=A9 [PMD: Return false/true instead of -1/0, document function] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Pavel Dovgalyuk --- include/migration/snapshot.h | 9 ++++++++- migration/savevm.c | 19 +++++++++---------- monitor/hmp-cmds.c | 2 +- replay/replay-snapshot.c | 2 +- softmmu/vl.c | 2 +- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h index a40c34307b..9bc989a6b4 100644 --- a/include/migration/snapshot.h +++ b/include/migration/snapshot.h @@ -23,6 +23,13 @@ * 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); +/** + * save_snapshot: Load 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 load_snapshot(const char *name, Error **errp); =20 #endif diff --git a/migration/savevm.c b/migration/savevm.c index fd2e5e8b66..531bb2eca1 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2864,7 +2864,7 @@ void qmp_xen_load_devices_state(const char *filename,= Error **errp) migration_incoming_state_destroy(); } =20 -int load_snapshot(const char *name, Error **errp) +bool load_snapshot(const char *name, Error **errp) { BlockDriverState *bs_vm_state; QEMUSnapshotInfo sn; @@ -2874,16 +2874,16 @@ int load_snapshot(const char *name, Error **errp) MigrationIncomingState *mis =3D migration_incoming_get_current(); =20 if (!bdrv_all_can_snapshot(errp)) { - return -ENOTSUP; + return false; } ret =3D bdrv_all_find_snapshot(name, errp); if (ret < 0) { - return ret; + return false; } =20 bs_vm_state =3D bdrv_all_find_vmstate_bs(errp); if (!bs_vm_state) { - return -ENOTSUP; + return false; } aio_context =3D bdrv_get_aio_context(bs_vm_state); =20 @@ -2892,11 +2892,11 @@ int load_snapshot(const char *name, Error **errp) ret =3D bdrv_snapshot_find(bs_vm_state, &sn, name); aio_context_release(aio_context); if (ret < 0) { - return ret; + return false; } else if (sn.vm_state_size =3D=3D 0) { error_setg(errp, "This is a disk-only snapshot. Revert to it " " offline using qemu-img"); - return -EINVAL; + return false; } =20 /* @@ -2917,7 +2917,6 @@ int load_snapshot(const char *name, Error **errp) f =3D qemu_fopen_bdrv(bs_vm_state, 0); if (!f) { error_setg(errp, "Could not open VM state file"); - ret =3D -EINVAL; goto err_drain; } =20 @@ -2933,14 +2932,14 @@ int load_snapshot(const char *name, Error **errp) =20 if (ret < 0) { error_setg(errp, "Error %d while loading VM state", ret); - return ret; + return false; } =20 - return 0; + return true; =20 err_drain: bdrv_drain_all_end(); - return ret; + return false; } =20 void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 14848a3381..ff0e3df8a3 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1123,7 +1123,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict) =20 vm_stop(RUN_STATE_RESTORE_VM); =20 - if (load_snapshot(name, &err) =3D=3D 0 && saved_vm_running) { + if (!load_snapshot(name, &err) && saved_vm_running) { vm_start(); } hmp_handle_error(mon, err); diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 4f2560d156..b289365937 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -83,7 +83,7 @@ void replay_vmstate_init(void) exit(1); } } else if (replay_mode =3D=3D REPLAY_MODE_PLAY) { - if (load_snapshot(replay_snapshot, &err) !=3D 0) { + if (!load_snapshot(replay_snapshot, &err)) { error_report_err(err); error_report("Could not load snapshot for icount replay"); exit(1); diff --git a/softmmu/vl.c b/softmmu/vl.c index 5a11a62f78..6eaa6b3a09 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -4478,7 +4478,7 @@ void qemu_init(int argc, char **argv, char **envp) register_global_state(); if (loadvm) { Error *local_err =3D NULL; - if (load_snapshot(loadvm, &local_err) < 0) { + if (!load_snapshot(loadvm, &local_err)) { error_report_err(local_err); autostart =3D 0; exit(1); --=20 2.26.2