From 9281dbe6535d79ecae121f6c3e620c25d55230e9 Mon Sep 17 00:00:00 2001 From: Gonglei Date: Thu, 4 Dec 2014 14:34:11 +0800 Subject: block/rbd: fix memory leak Variable local_err going out of scope leaks the storage it points to. Cc: Markus Armbruster Signed-off-by: Gonglei Reviewed-by: Amos Kong Message-id: 1417674851-6248-1-git-send-email-arei.gonglei@huawei.com Signed-off-by: Stefan Hajnoczi --- block/rbd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'block/rbd.c') diff --git a/block/rbd.c b/block/rbd.c index 5b5a64a..f3ab2dd 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -459,7 +459,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, clientname = qemu_rbd_parse_clientname(conf, clientname_buf); r = rados_create(&s->cluster, clientname); if (r < 0) { - error_setg(&local_err, "error initializing"); + error_setg(errp, "error initializing"); goto failed_opts; } @@ -495,19 +495,19 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, r = rados_connect(s->cluster); if (r < 0) { - error_setg(&local_err, "error connecting"); + error_setg(errp, "error connecting"); goto failed_shutdown; } r = rados_ioctx_create(s->cluster, pool, &s->io_ctx); if (r < 0) { - error_setg(&local_err, "error opening pool %s", pool); + error_setg(errp, "error opening pool %s", pool); goto failed_shutdown; } r = rbd_open(s->io_ctx, s->name, &s->image, s->snap); if (r < 0) { - error_setg(&local_err, "error reading header from %s", s->name); + error_setg(errp, "error reading header from %s", s->name); goto failed_open; } -- cgit v1.1