snapshot: fix referencing wrong variable in while loop in do_delvm
PATCH 1/1 snapshot: fix referencing wrong variable in while loop in do_delvm
The while loop variabal is "bs1", but "bs" is always passed to bdrv_snapshot_delete_by_id_or_name.
Signed-off-by Zhang Haoyu <[email protected]>
--- savevm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
savevm.c +5 -6
@@ -1245,19 +1245,18 @@ int load_vmstate(const char *name)void do_delvm (Monitor *mon,const QDict *qdict) { -BlockDriverState *bs, *bs1; +BlockDriverState *bs;Error *err =NULL ;const char *name =qdict_get_str (qdict,"name" ); - bs =find_vmstate_bs (); -if (!bs) { +if (!find_vmstate_bs ()) {monitor_printf (mon,"No block device supports snapshots\n" );return ; } - bs1 =NULL ; -while ((bs1 =bdrv_next (bs1))) { -if (bdrv_can_snapshot (bs1)) { + bs =NULL ; +while ((bs =bdrv_next (bs))) { +if (bdrv_can_snapshot (bs)) {bdrv_snapshot_delete_by_id_or_name (bs, name, &err);if (err) { monitor_printf(mon,
Signature · 1 line
1.7.12.4
Quoted 1 line · Zhang Haoyu
The while loop variabal is "bs1", but "bs" is always passed to
bdrv_snapshot_delete_by_id_or_name.
Please limit commit message line length to around 70 characters.
Quoted 25 lines
Signed-off-by Zhang Haoyu <[email protected]>--- savevm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)savevm.c +2
-3@@ -1245,19 +1245,18 @@ int load_vmstate(const char *name)void do_delvm (Monitor *mon,const QDict *qdict) { -BlockDriverState *bs, *bs1; +BlockDriverState *bs;Error *err =NULL ;const char *name =qdict_get_str (qdict,"name" ); - bs =find_vmstate_bs (); -if (!bs) { +if (!find_vmstate_bs ()) {monitor_printf (mon,"No block device supports snapshots\n" );return ; }
savevm.c int load_vmstate(const char *name) · line 1262
Quoted 10 lines
savevm.c +3
-3- bs1 =NULL ; -while ((bs1 =bdrv_next (bs1))) { -if (bdrv_can_snapshot (bs1)) { + bs =NULL ; +while ((bs =bdrv_next (bs))) { +if (bdrv_can_snapshot (bs)) {bdrv_snapshot_delete_by_id_or_name (bs, name, &err);if (err) { monitor_printf(mon,
Ouch!
Broken in commit a89d89d, v1.7.0. If you add that to your commit message, you can also add
Reviewed-by Markus Armbruster <[email protected]>