migration: Make save_snapshot() return bool, not 0/-1
Just for consistency, following the example documented since
commit e3fe3988d7
("error: Document Error API usage rules"),
return a boolean value indicating an error is set or not.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210204124834.774401-3-berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
parent
e26f98e209
commit
7ea14df230
@ -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 an internal snapshot.
|
||||
* @name: name of internal 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
|
||||
|
@ -2764,7 +2764,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;
|
||||
@ -2777,29 +2777,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);
|
||||
|
||||
@ -2808,7 +2808,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);
|
||||
|
||||
@ -2880,7 +2880,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,
|
||||
|
@ -323,7 +323,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. */
|
||||
}
|
||||
}
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user