[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 02/10] migration: stop returning errno from load_snapshot()
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v5 02/10] migration: stop returning errno from load_snapshot() |
Date: |
Fri, 2 Oct 2020 17:27:39 +0100 |
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 -1.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/savevm.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 0e39df59e5..3d77277f0b 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2871,20 +2871,20 @@ int load_snapshot(const char *name, Error **errp)
if (!replay_can_snapshot()) {
error_setg(errp, "Record/replay does not allow loading snapshot "
"right now. Try once more later.");
- return -EINVAL;
+ return -1;
}
if (!bdrv_all_can_snapshot(errp)) {
- return -ENOTSUP;
+ return -1;
}
ret = bdrv_all_find_snapshot(name, errp);
if (ret < 0) {
- return ret;
+ return -1;
}
bs_vm_state = bdrv_all_find_vmstate_bs(errp);
if (!bs_vm_state) {
- return -ENOTSUP;
+ return -1;
}
aio_context = bdrv_get_aio_context(bs_vm_state);
@@ -2893,11 +2893,11 @@ int load_snapshot(const char *name, Error **errp)
ret = bdrv_snapshot_find(bs_vm_state, &sn, name);
aio_context_release(aio_context);
if (ret < 0) {
- return ret;
+ return -1;
} else if (sn.vm_state_size == 0) {
error_setg(errp, "This is a disk-only snapshot. Revert to it "
" offline using qemu-img");
- return -EINVAL;
+ return -1;
}
/* Flush all IO requests so they don't interfere with the new state. */
@@ -2912,7 +2912,6 @@ int load_snapshot(const char *name, Error **errp)
f = qemu_fopen_bdrv(bs_vm_state, 0);
if (!f) {
error_setg(errp, "Could not open VM state file");
- ret = -EINVAL;
goto err_drain;
}
@@ -2928,14 +2927,14 @@ int load_snapshot(const char *name, Error **errp)
if (ret < 0) {
error_setg(errp, "Error %d while loading VM state", ret);
- return ret;
+ return -1;
}
return 0;
err_drain:
bdrv_drain_all_end();
- return ret;
+ return -1;
}
void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev)
--
2.26.2
- [PATCH v5 00/10] migration: bring improved savevm/loadvm/delvm to QMP, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 01/10] block: push error reporting into bdrv_all_*_snapshot functions, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 02/10] migration: stop returning errno from load_snapshot(),
Daniel P . Berrangé <=
- [PATCH v5 03/10] block: add ability to specify list of blockdevs during snapshot, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 04/10] block: allow specifying name of block device for vmstate storage, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 05/10] block: rename and alter bdrv_all_find_snapshot semantics, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 06/10] migration: control whether snapshots are ovewritten, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 07/10] migration: wire up support for snapshot device selection, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 08/10] migration: introduce a delete_snapshot wrapper, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 09/10] iotests: add support for capturing and matching QMP events, Daniel P . Berrangé, 2020/10/02
- [PATCH v5 10/10] migration: introduce snapshot-{save, load, delete} QMP commands, Daniel P . Berrangé, 2020/10/02