migration: Make save/load_snapshot() return boolean
cover migration: Make save/load_snapshot() return boolean
I had a pair of patches making save_snapshot/load_snapshot() return a boolean (like Markus recent qdev/QOM cleanup), then realized Daniel already has series changing migration/, so I rebased my patches in the first part of his v6 series:
"migration: bring improved savevm/loadvm/delvm to QMP"
https://lists.gnu.org/archive/html/qemu-devel/2020-10/msg02158.html
I included patch #1/#3 from Daniel, #2 is my first patch, and my second patch is squashed with Daniel's #3.
Daniel if you find these patches worthwhile, please consider them while merging your series (or respining).
Regards,
Phil.
Daniel P. Berrangé (2):
block: push error reporting into bdrv_all_*_snapshot functions
migration: stop returning errno from load_snapshot()
Philippe Mathieu-Daudé (1):
migration: Make save_snapshot() return bool, not 0/-1
include/block/snapshot.h | 14 +++---- include/migration/snapshot.h | 18 +++++++- block/monitor/block-hmp-cmds.c | 7 ++-- block/snapshot.c | 77 +++++++++++++++++----------------- migration/savevm.c | 72 ++++++++++++------------------- monitor/hmp-cmds.c | 9 +--- replay/replay-debugging.c | 6 +-- replay/replay-snapshot.c | 4 +- softmmu/vl.c | 2 +- tests/qemu-iotests/267.out | 10 ++--- 10 files changed, 105 insertions(+), 114 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/3 block: push error reporting into bdrv_all_*_snapshot functions
From: Daniel P. Berrangé <[email protected]>
The bdrv_all_*_snapshot functions return a BlockDriverState pointer for the invalid backend, which the callers then use to report an error message. In some cases multiple callers are reporting the same error message, but with slightly different text. In the future there will be more error scenarios for some of these methods, which will benefit from fine grained error message reporting. So it is helpful to push error reporting down a level.
--- include/block/snapshot.h | 14 +++---- block/monitor/block-hmp-cmds.c | 7 ++-- block/snapshot.c | 77 +++++++++++++++++----------------- migration/savevm.c | 37 +++++----------- monitor/hmp-cmds.c | 7 +--- replay/replay-debugging.c | 4 +- tests/qemu-iotests/267.out | 10 ++--- 7 files changed, 67 insertions(+), 89 deletions(-)
include/block/snapshot.h +6 -8
@@ -77,17 +77,15 @@ int bdrv_snapshot_load_tmp_by_id_or_name(BlockDriverState *bs,* These functions will properly handle dataplane (take aio_context_acquire * when appropriate for appropriate block drivers */ -bool bdrv_all_can_snapshot (BlockDriverState **first_bad_bs); -int bdrv_all_delete_snapshot (const char *name,BlockDriverState **first_bsd_bs, -Error **errp); -int bdrv_all_goto_snapshot (const char *name,BlockDriverState **first_bad_bs, -Error **errp); -int bdrv_all_find_snapshot (const char *name,BlockDriverState **first_bad_bs); +bool bdrv_all_can_snapshot (Error **errp); +int bdrv_all_delete_snapshot (const char *name,Error **errp); +int bdrv_all_goto_snapshot (const char *name,Error **errp); +int bdrv_all_find_snapshot (const char *name,Error **errp);int bdrv_all_create_snapshot (QEMUSnapshotInfo *sn,BlockDriverState *vm_state_bs,uint64_t vm_state_size, -BlockDriverState **first_bad_bs); +Error **errp); -BlockDriverState *bdrv_all_find_vmstate_bs (void ); +BlockDriverState *bdrv_all_find_vmstate_bs (Error **errp);#endif
block/monitor/block-hmp-cmds.c +4 -3
@@ -899,10 +899,11 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)ImageEntry *image_entry, *next_ie;SnapshotEntry *snapshot_entry; +Error *err =NULL ; - bs =bdrv_all_find_vmstate_bs (); + bs =bdrv_all_find_vmstate_bs (&err);if (!bs) { -monitor_printf (mon,"No available block device supports snapshots\n" ); +error_report_err (err);return ; } aio_context =bdrv_get_aio_context (bs);
@@ -952,7 +953,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict) total =0 ;for (i =0 ; i < nb_sns; i++) {SnapshotEntry *next_sn; -if (bdrv_all_find_snapshot (sn_tab[i].name, &bs1) ==0 ) { +if (bdrv_all_find_snapshot (sn_tab[i].name,NULL ) ==0 ) { global_snapshots[total] = i; total++; QTAILQ_FOREACH(image_entry, &image_list, next) {
block/snapshot.c +39 -38
185 lines not on this page · raw message
migration/savevm.c +10 -27
@@ -2660,7 +2660,7 @@ int qemu_load_device_state(QEMUFile *f)int save_snapshot (const char *name,Error **errp) { -BlockDriverState *bs, *bs1; +BlockDriverState *bs;QEMUSnapshotInfo sn1, *sn = &sn1, old_sn1, *old_sn = &old_sn1;int ret =-1 , ret2;QEMUFile *f;
@@ -2680,25 +2680,19 @@ int save_snapshot(const char *name, Error **errp)return ret; } -if (!bdrv_all_can_snapshot (&bs)) { -error_setg (errp,"Device '%s' is writable but does not support " -"snapshots" ,bdrv_get_device_or_node_name (bs)); +if (!bdrv_all_can_snapshot (errp)) {return ret; }/* Delete old snapshots of the same name */ if (name) { - ret =bdrv_all_delete_snapshot (name, &bs1, errp); -if (ret <0 ) { -error_prepend (errp,"Error while deleting snapshot on device " -"'%s': " ,bdrv_get_device_or_node_name (bs1)); +if (bdrv_all_delete_snapshot (name, errp) <0 ) {return ret; } } - bs =bdrv_all_find_vmstate_bs (); + bs =bdrv_all_find_vmstate_bs (errp);if (bs ==NULL ) { -error_setg (errp,"No block device can accept snapshots" );return ret; } aio_context =bdrv_get_aio_context (bs);
@@ -2768,10 +2762,8 @@ int save_snapshot(const char *name, Error **errp)aio_context_release (aio_context); aio_context =NULL ; - ret =bdrv_all_create_snapshot (sn, bs, vm_state_size, &bs); + ret =bdrv_all_create_snapshot (sn, bs, vm_state_size, errp);if (ret <0 ) { -error_setg (errp,"Error while creating snapshot on '%s'" , -bdrv_get_device_or_node_name (bs)); goto the_end; }
@@ -2874,30 +2866,23 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp)int load_snapshot (const char *name,Error **errp) { -BlockDriverState *bs, *bs_vm_state; +BlockDriverState *bs_vm_state;QEMUSnapshotInfo sn;QEMUFile *f;int ret;AioContext *aio_context;MigrationIncomingState *mis =migration_incoming_get_current (); -if (!bdrv_all_can_snapshot (&bs)) { -error_setg (errp, -"Device '%s' is writable but does not support snapshots" , -bdrv_get_device_or_node_name (bs)); +if (!bdrv_all_can_snapshot (errp)) {return -ENOTSUP ; } - ret =bdrv_all_find_snapshot (name, &bs); + ret =bdrv_all_find_snapshot (name, errp);if (ret <0 ) { -error_setg (errp, -"Device '%s' does not have the requested snapshot '%s'" , -bdrv_get_device_or_node_name (bs), name);return ret; } - bs_vm_state =bdrv_all_find_vmstate_bs (); + bs_vm_state =bdrv_all_find_vmstate_bs (errp);if (!bs_vm_state) { -error_setg (errp,"No block device supports snapshots" );return -ENOTSUP ; } aio_context =bdrv_get_aio_context (bs_vm_state);
@@ -2923,10 +2908,8 @@ int load_snapshot(const char *name, Error **errp)/* Flush all IO requests so they don't interfere with the new state. */ bdrv_drain_all_begin (); - ret =bdrv_all_goto_snapshot (name, &bs, errp); + ret =bdrv_all_goto_snapshot (name, errp);if (ret <0 ) { -error_prepend (errp,"Could not load snapshot '%s' on '%s': " , - name,bdrv_get_device_or_node_name (bs)); goto err_drain; }
monitor/hmp-cmds.c +1 -6
@@ -1139,15 +1139,10 @@ void hmp_savevm(Monitor *mon, const QDict *qdict)void hmp_delvm (Monitor *mon,const QDict *qdict) { -BlockDriverState *bs;Error *err =NULL ;const char *name =qdict_get_str (qdict,"name" ); -if (bdrv_all_delete_snapshot (name, &bs, &err) <0 ) { -error_prepend (&err, -"deleting snapshot on device '%s': " , -bdrv_get_device_name (bs)); - } +bdrv_all_delete_snapshot (name, &err);hmp_handle_error (mon, err); }
replay/replay-debugging.c +2 -2
@@ -149,7 +149,7 @@ static char *replay_find_nearest_snapshot(int64_t icount, *snapshot_icount =-1 ; - bs =bdrv_all_find_vmstate_bs (); + bs =bdrv_all_find_vmstate_bs (NULL );if (!bs) { goto fail; }
@@ -160,7 +160,7 @@ static char *replay_find_nearest_snapshot(int64_t icount,aio_context_release (aio_context);for (i =0 ; i < nb_sns; i++) { -if (bdrv_all_find_snapshot (sn_tab[i].name, &bs) ==0 ) { +if (bdrv_all_find_snapshot (sn_tab[i].name,NULL ) ==0 ) {if (sn_tab[i].icount !=-1ULL && sn_tab[i].icount <= icount && (!nearest || nearest->icount < sn_tab[i].icount)) {
tests/qemu-iotests/267.out +5 -5
@@ -6,9 +6,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 Testing: QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 -Error: No block device can accept snapshots +Error: No block device supports snapshots (qemu) info snapshots -No available block device supports snapshots +No block device supports snapshots (qemu) loadvm snap0 Error: No block device supports snapshots (qemu) quit
@@ -22,7 +22,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 Error: Device 'none0' is writable but does not support snapshots (qemu) info snapshots -No available block device supports snapshots +No block device supports snapshots (qemu) loadvm snap0 Error: Device 'none0' is writable but does not support snapshots (qemu) quit
@@ -58,7 +58,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 Error: Device 'virtio0' is writable but does not support snapshots (qemu) info snapshots -No available block device supports snapshots +No block device supports snapshots (qemu) loadvm snap0 Error: Device 'virtio0' is writable but does not support snapshots (qemu) quit
@@ -83,7 +83,7 @@ QEMU X.Y.Z monitor - type 'help' for more information (qemu) savevm snap0 Error: Device 'file' is writable but does not support snapshots (qemu) info snapshots -No available block device supports snapshots +No block device supports snapshots (qemu) loadvm snap0 Error: Device 'file' is writable but does not support snapshots (qemu) quit
Signature · 1 line
2.26.2
Re: [PATCH 1/3] block: push error reporting into bdrv_all_*_snapshot functions
Quoted 11 lines · Philippe Mathieu-Daudé
From: Daniel P. Berrangé <[email protected]>
The bdrv_all_*_snapshot functions return a BlockDriverState pointer for the invalid backend, which the callers then use to report an error message. In some cases multiple callers are reporting the same error message, but with slightly different text. In the future there will be more error scenarios for some of these methods, which will benefit from fine grained error message reporting. So it is helpful to push error reporting down a level.
Signed-off-by Daniel P. Berrangé <[email protected]>
Quoted 9 lines
--- include/block/snapshot.h | 14 +++---- block/monitor/block-hmp-cmds.c | 7 ++-- block/snapshot.c | 77 +++++++++++++++++----------------- migration/savevm.c | 37 +++++----------- monitor/hmp-cmds.c | 7 +--- replay/replay-debugging.c | 4 +- tests/qemu-iotests/267.out | 10 ++--- 7 files changed, 67 insertions(+), 89 deletions(-)
Looks good overall to me, but for some reason this patch pulls in the @ok and @ret variables from the top scope of all concerned functions into the inner scopes of the BDS loops, and drops their initialization.
That’s wrong, because we only call the respective snapshotting
functions on some BDSs, so the return value stays uninitialized for all other BDSs:
Quoted 8 lines
block/snapshot.c +0
-0@@ -462,14 +462,14 @@ static bool bdrv_all_snapshots_includes_bs(BlockDriverState *bs)* These functions will properly handle dataplane (take aio_context_acquire * when appropriate for appropriate block drivers) */
block/snapshot.c static bool bdrv_all_snapshots_includes_bs(BlockDriverState *bs) · line 472
Quoted 10 lines
block/snapshot.c +2
-2-bool bdrv_all_can_snapshot (BlockDriverState **first_bad_bs) +bool bdrv_all_can_snapshot (Error **errp) { -bool ok = true;BlockDriverState *bs;BdrvNextIterator it;for (bs =bdrv_first (&it); bs; bs =bdrv_next (&it)) {AioContext *ctx =bdrv_get_aio_context (bs); +bool ok;
So I think @ok must be initialized.
Quoted 23 lines
block/snapshot.c +4
-6aio_context_acquire (ctx);if (bdrv_all_snapshots_includes_bs (bs)) {@@ -477,26 +477,25 @@ bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs) }aio_context_release (ctx);if (!ok) { +error_setg (errp,"Device '%s' is writable but does not support " +"snapshots" ,bdrv_get_device_or_node_name (bs));bdrv_next_cleanup (&it); - goto fail; +return false; } } -fail: - *first_bad_bs = bs; -return ok; +return true; } -int bdrv_all_delete_snapshot (const char *name,BlockDriverState **first_bad_bs, -Error **errp)
block/snapshot.c bool bdrv_all_can_snapshot(BlockDriverState **first_bad_bs) · line 498
Quoted 10 lines
block/snapshot.c +2
-1+int bdrv_all_delete_snapshot (const char *name,Error **errp) { -int ret =0 ;BlockDriverState *bs;BdrvNextIterator it;QEMUSnapshotInfo sn1, *snapshot = &sn1;for (bs =bdrv_first (&it); bs; bs =bdrv_next (&it)) {AioContext *ctx =bdrv_get_aio_context (bs); +int ret;
Same here, @ret must be initialized.
Quoted 23 lines
block/snapshot.c +4
-5aio_context_acquire (ctx); if (bdrv_all_snapshots_includes_bs(bs) &&@@ -507,26 +506,25 @@ int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs, }aio_context_release (ctx);if (ret <0 ) { +error_prepend (errp,"Could not delete snapshot '%s' on '%s': " , + name,bdrv_get_device_or_node_name (bs));bdrv_next_cleanup (&it); - goto fail; +return -1 ; } } -fail: - *first_bad_bs = bs; -return ret; +return 0 ; } -int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs,
block/snapshot.c int bdrv_all_delete_snapshot(const char *name, BlockDriverState **first_bad_bs, · line 527
Quoted 10 lines
block/snapshot.c +2
-2- Error **errp) +int bdrv_all_goto_snapshot (const char *name,Error **errp) { -int ret =0 ;BlockDriverState *bs;BdrvNextIterator it;for (bs =bdrv_first (&it); bs; bs =bdrv_next (&it)) {AioContext *ctx =bdrv_get_aio_context (bs); +int ret;
And again.
Quoted 22 lines
block/snapshot.c +4
-5aio_context_acquire (ctx);if (bdrv_all_snapshots_includes_bs (bs)) {@@ -534,75 +532,75 @@ int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs, }aio_context_release (ctx);if (ret <0 ) { +error_prepend (errp,"Could not load snapshot '%s' on '%s': " , + name,bdrv_get_device_or_node_name (bs));bdrv_next_cleanup (&it); - goto fail; +return -1 ; } } -fail: - *first_bad_bs = bs; -return ret; +return 0 ; } -int bdrv_all_find_snapshot (const char *name,BlockDriverState **first_bad_bs)
block/snapshot.c int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs, · line 553
Quoted 10 lines
block/snapshot.c +2
-1+int bdrv_all_find_snapshot (const char *name,Error **errp) {QEMUSnapshotInfo sn; -int err =0 ;BlockDriverState *bs;BdrvNextIterator it;for (bs =bdrv_first (&it); bs; bs =bdrv_next (&it)) {AioContext *ctx =bdrv_get_aio_context (bs); +int ret;
Again.
Quoted 26 lines
block/snapshot.c +6
-6aio_context_acquire (ctx);if (bdrv_all_snapshots_includes_bs (bs)) { - err =bdrv_snapshot_find (bs, &sn, name); + ret =bdrv_snapshot_find (bs, &sn, name); }aio_context_release (ctx); -if (err <0 ) { +if (ret <0 ) { +error_setg (errp,"Could not find snapshot '%s' on '%s'" , + name,bdrv_get_device_or_node_name (bs));bdrv_next_cleanup (&it); - goto fail; +return -1 ; } } -fail: - *first_bad_bs = bs; -return err; +return 0 ; } int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, BlockDriverState *vm_state_bs, uint64_t vm_state_size,
block/snapshot.c int bdrv_all_goto_snapshot(const char *name, BlockDriverState **first_bad_bs, · line 581
Quoted 10 lines
block/snapshot.c +2
-2- BlockDriverState **first_bad_bs) + Error **errp) { -int err =0 ;BlockDriverState *bs;BdrvNextIterator it;for (bs =bdrv_first (&it); bs; bs =bdrv_next (&it)) {AioContext *ctx =bdrv_get_aio_context (bs); +int ret;
And one final time.
Max
Quoted 20 lines
block/snapshot.c +6
-4aio_context_acquire (ctx);if (bs == vm_state_bs) { sn->vm_state_size = vm_state_size; - err =bdrv_snapshot_create (bs, sn); + ret =bdrv_snapshot_create (bs, sn); }else if (bdrv_all_snapshots_includes_bs (bs)) { sn->vm_state_size =0 ; - err =bdrv_snapshot_create (bs, sn); + ret =bdrv_snapshot_create (bs, sn); }aio_context_release (ctx); -if (err <0 ) { +if (ret <0 ) { +error_setg (errp,"Could not create snapshot '%s' on '%s'" , + sn->name,bdrv_get_device_or_node_name (bs));bdrv_next_cleanup (&it); - goto fail; +return -1 ; } }
Re: [PATCH 1/3] block: push error reporting into bdrv_all_*_snapshot functions
Quoted 22 lines · Max Reitz
Quoted 11 lines · Philippe Mathieu-Daudé
From: Daniel P. Berrangé <[email protected]>
The bdrv_all_*_snapshot functions return a BlockDriverState pointer for the invalid backend, which the callers then use to report an error message. In some cases multiple callers are reporting the same error message, but with slightly different text. In the future there will be more error scenarios for some of these methods, which will benefit from fine grained error message reporting. So it is helpful to push error reporting down a level.
Signed-off-by Daniel P. Berrangé <[email protected]>Quoted 9 lines
--- include/block/snapshot.h | 14 +++---- block/monitor/block-hmp-cmds.c | 7 ++-- block/snapshot.c | 77 +++++++++++++++++----------------- migration/savevm.c | 37 +++++----------- monitor/hmp-cmds.c | 7 +--- replay/replay-debugging.c | 4 +- tests/qemu-iotests/267.out | 10 ++--- 7 files changed, 67 insertions(+), 89 deletions(-)
Quoted 6 lines
Looks good overall to me, but for some reason this patch pulls in the @ok and @ret variables from the top scope of all concerned functions into the inner scopes of the BDS loops, and drops their initialization.
That’s wrong, because we only call the respective snapshotting
functions on some BDSs, so the return value stays uninitialized for all other BDSs:
Indeed, thanks for catching that.
[...]
Quoted 10 lines
Quoted 10 lines
int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn,
BlockDriverState *vm_state_bs, uint64_t vm_state_size,block/snapshot.c +1
-2- BlockDriverState **first_bad_bs) + Error **errp) { -int err =0 ;BlockDriverState *bs;BdrvNextIterator it;
Quoted 17 lines
Quoted 3 lines
for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) { AioContext *ctx = bdrv_get_aio_context(bs);+ int ret;
And one final time.
Max
Quoted 9 lines
aio_context_acquire(ctx); if (bs == vm_state_bs) { sn->vm_state_size = vm_state_size;block/snapshot.c +2
-2- err =bdrv_snapshot_create (bs, sn); + ret =bdrv_snapshot_create (bs, sn); }else if (bdrv_all_snapshots_includes_bs (bs)) { sn->vm_state_size =0 ; - err =bdrv_snapshot_create (bs, sn); + ret =bdrv_snapshot_create (bs, sn);
This one is not needed.
Quoted 12 lines
Quoted 11 lines
} aio_context_release(ctx);block/snapshot.c +4
-2-if (err <0 ) { +if (ret <0 ) { +error_setg (errp,"Could not create snapshot '%s' on '%s'" , + sn->name,bdrv_get_device_or_node_name (bs));bdrv_next_cleanup (&it); - goto fail; +return -1 ; } }
Re: [PATCH 1/3] block: push error reporting into bdrv_all_*_snapshot functions
Quoted 60 lines · Philippe Mathieu-Daudé
Quoted 22 lines · Max Reitz
Quoted 19 lines · Philippe Mathieu-Daudé
From: Daniel P. Berrangé <[email protected]>
The bdrv_all_*_snapshot functions return a BlockDriverState pointer for the invalid backend, which the callers then use to report an error message. In some cases multiple callers are reporting the same error message, but with slightly different text. In the future there will be more error scenarios for some of these methods, which will benefit from fine grained error message reporting. So it is helpful to push error reporting down a level.
Signed-off-by Daniel P. Berrangé <[email protected]>---
include/block/snapshot.h | 14 +++----block/monitor/block-hmp-cmds.c| 7 ++--
block/snapshot.c | 77 +++++++++++++++++----------------- migration/savevm.c | 37 +++++----------- monitor/hmp-cmds.c | 7 +--- replay/replay-debugging.c | 4 +- tests/qemu-iotests/267.out | 10 ++---Quoted 1 line
7 files changed, 67 insertions(+), 89 deletions(-)Quoted 6 lines
Looks good overall to me, but for some reason this patch pulls in the @ok and @ret variables from the top scope of all concerned functions into the inner scopes of the BDS loops, and drops their initialization. That’s wrong, because we only call the respective snapshotting functions on some BDSs, so the return value stays uninitialized for all other BDSs:
Indeed, thanks for catching that.
[...]
Quoted 13 lines
Quoted 4 lines
int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, BlockDriverState
*vm_state_bs,uint64_tvm_state_size, - BlockDriverState **first_bad_bs)Quoted 8 lines
+ Error **errp)
{
- int err = 0;
BlockDriverState *bs;
BdrvNextIterator it;
for (bs =bdrv_first(&it); bs; bs =bdrv_next(&it)) { AioContext *ctx =bdrv_get_aio_context(bs); + int ret;Quoted 13 lines
And one final time.
Max
Quoted 9 lines
aio_context_acquire(ctx);
if (bs ==vm_state_bs) {sn->vm_state_size=vm_state_size; - err =bdrv_snapshot_create(bs, sn); + ret =bdrv_snapshot_create(bs, sn); } else if (bdrv_all_snapshots_includes_bs(bs)) {sn->vm_state_size= 0;
- err =bdrv_snapshot_create(bs, sn); + ret =bdrv_snapshot_create(bs, sn);
Quoted 1 line
This one is not needed.
Why not? Is bdrv_all_snapshots_includes_bs(bs) guaranteed to be true? (I don’t see any a plain “else” branch, or where ret would be set outside of these two “if” blocks.)
Max
Quoted 13 lines
Quoted 12 lines
Quoted 11 lines
}
aio_context_release(ctx);
- if (err < 0) {
+ if (ret < 0) {
+ error_setg(errp, "Could not create snapshot '%s' on '%s'", +sn->name,bdrv_get_device_or_node_name(bs));bdrv_next_cleanup(&it);
- goto fail;
+ return -1;
}
}
Re: [PATCH 1/3] block: push error reporting into bdrv_all_*_snapshot functions
Quoted 61 lines · Max Reitz
Quoted 60 lines · Philippe Mathieu-Daudé
Quoted 22 lines · Max Reitz
Quoted 11 lines · Philippe Mathieu-Daudé
From: Daniel P. Berrangé <[email protected]>
The bdrv_all_*_snapshot functions return a BlockDriverState pointer for the invalid backend, which the callers then use to report an error message. In some cases multiple callers are reporting the same error message, but with slightly different text. In the future there will be more error scenarios for some of these methods, which will benefit from fine grained error message reporting. So it is helpful to push error reporting down a level.
Signed-off-by Daniel P. Berrangé <[email protected]>Quoted 9 lines
--- include/block/snapshot.h | 14 +++---- block/monitor/block-hmp-cmds.c | 7 ++-- block/snapshot.c | 77 +++++++++++++++++----------------- migration/savevm.c | 37 +++++----------- monitor/hmp-cmds.c | 7 +--- replay/replay-debugging.c | 4 +- tests/qemu-iotests/267.out | 10 ++--- 7 files changed, 67 insertions(+), 89 deletions(-)Quoted 6 lines
Looks good overall to me, but for some reason this patch pulls in the @ok and @ret variables from the top scope of all concerned functions into the inner scopes of the BDS loops, and drops their initialization.
That’s wrong, because we only call the respective snapshotting
functions on some BDSs, so the return value stays uninitialized for all other BDSs:Indeed, thanks for catching that.
[...]
Quoted 26 lines
Quoted 4 lines
int bdrv_all_create_snapshot(QEMUSnapshotInfo *sn, BlockDriverState
*vm_state_bs,uint64_tvm_state_size,
- BlockDriverState **first_bad_bs)Quoted 8 lines
+ Error **errp)
{
- int err = 0;
BlockDriverState *bs;
BdrvNextIterator it;
for (bs =bdrv_first(&it); bs; bs =bdrv_next(&it)) { AioContext *ctx =bdrv_get_aio_context(bs);
+ int ret;And one final time.
Max
Quoted 9 lines
aio_context_acquire(ctx);
if (bs ==vm_state_bs) {sn->vm_state_size=vm_state_size;
- err =bdrv_snapshot_create(bs, sn);
+ ret =bdrv_snapshot_create(bs, sn);
} else if (bdrv_all_snapshots_includes_bs(bs)) {sn->vm_state_size= 0;
- err =bdrv_snapshot_create(bs, sn);
+ ret =bdrv_snapshot_create(bs, sn);
Quoted 5 lines
Quoted 1 line
This one is not needed.
Why not? Is
bdrv_all_snapshots_includes_bs(bs)guaranteed to be true? (I don’t see any a plain “else” branch, or where ret would be set outside of these two “if” blocks.)
Oops, I misread the 'else' branch, you are right again :)
Quoted 17 lines
Max
Quoted 13 lines
Quoted 12 lines
Quoted 11 lines
}
aio_context_release(ctx);
- if (err < 0) {
+ if (ret < 0) {
+ error_setg(errp, "Could not create snapshot '%s' on '%s'", +sn->name,bdrv_get_device_or_node_name(bs));
bdrv_next_cleanup(&it);
- goto fail;
+ return -1;
}
}
PATCH 2/3 migration: Make save_snapshot() return bool, not 0/-1
In reply to Philippe Mathieu-DaudéJust for consistency, following the example documented since commit e3fe3988d7 ("error: Document Error API usage rules"). Document the function.
--- 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(-)
include/migration/snapshot.h +8 -1
@@ -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
migration/savevm.c +8 -8
@@ -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,
replay/replay-debugging.c +1 -1
@@ -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. */ } }
replay/replay-snapshot.c +1 -1
@@ -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 );
Signature · 1 line
2.26.2
Re: [PATCH 2/3] migration: Make save_snapshot() return bool, not 0/-1
Quoted 5 lines · Philippe Mathieu-Daudé
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é <[email protected]>
Quoted 120 lines
--- 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(-)include/migration/snapshot.h +8
-1@@ -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 migration/savevm.c +8
-8@@ -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,replay/replay-debugging.c +1
-1@@ -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. */ } }replay/replay-snapshot.c +1
-1@@ -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 );
Re: [PATCH 2/3] migration: Make save_snapshot() return bool, not 0/-1
In reply to Philippe Mathieu-DaudéQuoted 2 lines · Philippe Mathieu-Daudé
Just for consistency, following the example documented since commit
e3fe3988d7("error: Document Error API usage rules").
I meant to use this description:
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.
Quoted 123 lines
Document the function.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- 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(-)include/migration/snapshot.h +8
-1@@ -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 migration/savevm.c +8
-8@@ -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,replay/replay-debugging.c +1
-1@@ -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. */ } }replay/replay-snapshot.c +1
-1@@ -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 );
PATCH 3/3 migration: stop returning errno from load_snapshot()
In reply to Philippe Mathieu-DaudéFrom: Daniel P. Berrangé <[email protected]>
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.
--- 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(-)
include/migration/snapshot.h +8 -1
@@ -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);#endif
migration/savevm.c +9 -10
@@ -2864,7 +2864,7 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp)migration_incoming_state_destroy (); } -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 =migration_incoming_get_current ();if (!bdrv_all_can_snapshot (errp)) { -return -ENOTSUP ; +return false; } ret =bdrv_all_find_snapshot (name, errp);if (ret <0 ) { -return ret; +return false; } bs_vm_state =bdrv_all_find_vmstate_bs (errp);if (!bs_vm_state) { -return -ENOTSUP ; +return false; } aio_context =bdrv_get_aio_context (bs_vm_state);
@@ -2892,11 +2892,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 false; }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 false; }/*
@@ -2917,7 +2917,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; }
@@ -2933,14 +2932,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 false; } -return 0 ; +return true; err_drain:bdrv_drain_all_end (); -return ret; +return false; }void vmstate_register_ram (MemoryRegion *mr,DeviceState *dev)
monitor/hmp-cmds.c +1 -1
@@ -1123,7 +1123,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict)vm_stop (RUN_STATE_RESTORE_VM ); -if (load_snapshot (name, &err) ==0 && saved_vm_running) { +if (!load_snapshot (name, &err) && saved_vm_running) {vm_start (); }hmp_handle_error (mon, err);
replay/replay-snapshot.c +1 -1
@@ -83,7 +83,7 @@ void replay_vmstate_init(void)exit (1 ); } }else if (replay_mode ==REPLAY_MODE_PLAY ) { -if (load_snapshot (replay_snapshot, &err) !=0 ) { +if (!load_snapshot (replay_snapshot, &err)) {error_report_err (err);error_report ("Could not load snapshot for icount replay" );exit (1 );
softmmu/vl.c +1 -1
@@ -4478,7 +4478,7 @@ void qemu_init(int argc, char **argv, char **envp)register_global_state ();if (loadvm) {Error *local_err =NULL ; -if (load_snapshot (loadvm, &local_err) <0 ) { +if (!load_snapshot (loadvm, &local_err)) {error_report_err (local_err); autostart =0 ;exit (1 );
Signature · 1 line
2.26.2
Re: [PATCH 3/3] migration: stop returning errno from load_snapshot()
Quoted 10 lines · Philippe Mathieu-Daudé
From: Daniel P. Berrangé <[email protected]>
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 <[email protected]>Signed-off-by Daniel P. Berrangé <[email protected]>[PMD: Return false/true instead of -1/0, document function]Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Quoted 140 lines
--- 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(-)include/migration/snapshot.h +8
-1@@ -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);#endif migration/savevm.c +9
-10@@ -2864,7 +2864,7 @@ void qmp_xen_load_devices_state(const char *filename, Error **errp)migration_incoming_state_destroy (); } -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 =migration_incoming_get_current ();if (!bdrv_all_can_snapshot (errp)) { -return -ENOTSUP ; +return false; } ret =bdrv_all_find_snapshot (name, errp);if (ret <0 ) { -return ret; +return false; } bs_vm_state =bdrv_all_find_vmstate_bs (errp);if (!bs_vm_state) { -return -ENOTSUP ; +return false; } aio_context =bdrv_get_aio_context (bs_vm_state);@@ -2892,11 +2892,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 false; }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 false; }/* @@ -2917,7 +2917,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; }@@ -2933,14 +2932,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 false; } -return 0 ; +return true; err_drain:bdrv_drain_all_end (); -return ret; +return false; }void vmstate_register_ram (MemoryRegion *mr,DeviceState *dev)monitor/hmp-cmds.c +1
-1@@ -1123,7 +1123,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict)vm_stop (RUN_STATE_RESTORE_VM ); -if (load_snapshot (name, &err) ==0 && saved_vm_running) { +if (!load_snapshot (name, &err) && saved_vm_running) {vm_start (); }hmp_handle_error (mon, err);replay/replay-snapshot.c +1
-1@@ -83,7 +83,7 @@ void replay_vmstate_init(void)exit (1 ); } }else if (replay_mode ==REPLAY_MODE_PLAY ) { -if (load_snapshot (replay_snapshot, &err) !=0 ) { +if (!load_snapshot (replay_snapshot, &err)) {error_report_err (err);error_report ("Could not load snapshot for icount replay" );exit (1 );softmmu/vl.c +1
-1@@ -4478,7 +4478,7 @@ void qemu_init(int argc, char **argv, char **envp)register_global_state ();if (loadvm) {Error *local_err =NULL ; -if (load_snapshot (loadvm, &local_err) <0 ) { +if (!load_snapshot (loadvm, &local_err)) {error_report_err (local_err); autostart =0 ;exit (1 );