haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

snapshot: fix referencing wrong variable in while loop in do_delvm

Browse source 
The while loop variabal is "bs1",
but "bs" is always passed to bdrv_snapshot_delete_by_id_or_name.
Broken in commit a89d89d, v1.7.0.

Signed-off-by: Zhang Haoyu <zhanghy@sangfor.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Zhang Haoyu 2014-09-29 16:38:02 +08:00 committed by Stefan Hajnoczi
parent b00a0ddb31
commit af95738754
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
savevm.c
View file

@ -1245,19 +1245,18 @@ int load_vmstate(const char *name)
void do_delvm(Monitor *mon, const QDict *qdict) void do_delvm(Monitor *mon, const QDict *qdict)
{ {
BlockDriverState *bs, *bs1; BlockDriverState *bs;
Error *err = NULL; Error *err = NULL;
const char *name = qdict_get_str(qdict, "name"); const char *name = qdict_get_str(qdict, "name");
bs = find_vmstate_bs(); if (!find_vmstate_bs()) {
if (!bs) {
monitor_printf(mon, "No block device supports snapshots\n"); monitor_printf(mon, "No block device supports snapshots\n");
return; return;
} }
bs1 = NULL; bs = NULL;
while ((bs1 = bdrv_next(bs1))) { while ((bs = bdrv_next(bs))) {
if (bdrv_can_snapshot(bs1)) { if (bdrv_can_snapshot(bs)) {
bdrv_snapshot_delete_by_id_or_name(bs, name, &err); bdrv_snapshot_delete_by_id_or_name(bs, name, &err);
if (err) { if (err) {
monitor_printf(mon, monitor_printf(mon,