Received: from eggs.gnu.org ([2001:4830:134:3::10]:58104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYW6p-0005dL-HE for qemu-devel@nongnu.org; Mon, 29 Sep 2014 04:15:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYW6k-0004Uc-SO for qemu-devel@nongnu.org; Mon, 29 Sep 2014 04:15:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6225) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYW6k-0004Ro-JP for qemu-devel@nongnu.org; Mon, 29 Sep 2014 04:14:58 -0400 From: Markus Armbruster References: <201409291512397046850@sangfor.com> Date: Mon, 29 Sep 2014 10:14:45 +0200 In-Reply-To: <201409291512397046850@sangfor.com> (Zhang Haoyu's message of "Mon, 29 Sep 2014 15:12:42 +0800") Message-ID: <8738bau9l6.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH bugfix] snapshot: fix referencing wrong variable in while loop in do_delvm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Zhang Haoyu Cc: Kevin Wolf , qemu-devel , Stefan Hajnoczi , Wenchao Xia "Zhang Haoyu" writes: > 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. > > Signed-off-by: Zhang Haoyu > --- > savevm.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/savevm.c b/savevm.c > index e19ae0a..2d8eb96 100644 > --- a/savevm.c > +++ b/savevm.c > @@ -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, Ouch! Broken in commit a89d89d, v1.7.0. If you add that to your commit message, you can also add Reviewed-by: Markus Armbruster