From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyCuW-0002Qg-AR for qemu-devel@nongnu.org; Sun, 05 Aug 2012 22:19:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SyCuV-0001li-Bh for qemu-devel@nongnu.org; Sun, 05 Aug 2012 22:19:12 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:55339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SyCuV-0001le-5Z for qemu-devel@nongnu.org; Sun, 05 Aug 2012 22:19:11 -0400 Received: by pbbro12 with SMTP id ro12so4516331pbb.4 for ; Sun, 05 Aug 2012 19:19:10 -0700 (PDT) Sender: Dong Xu Wang From: Dong Xu Wang Date: Mon, 6 Aug 2012 10:18:42 +0800 Message-Id: <1344219522-11873-1-git-send-email-wdongxu@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V2] qemu-img: use QemuOpts instead of QEMUOptionParameter in resize function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, Dong Xu Wang Signed-off-by: Dong Xu Wang --- v1->v2: fix param leak. qemu-img.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 80cfb9b..36e1c77 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1567,14 +1567,19 @@ static int img_resize(int argc, char **argv) const char *filename, *fmt, *size; int64_t n, total_size; BlockDriverState *bs = NULL; - QEMUOptionParameter *param; - QEMUOptionParameter resize_options[] = { - { - .name = BLOCK_OPT_SIZE, - .type = OPT_SIZE, - .help = "Virtual disk size" + QemuOpts *param; + static QemuOptsList resize_options = { + .name = "resize_options", + .head = QTAILQ_HEAD_INITIALIZER(resize_options.head), + .desc = { + { + .name = BLOCK_OPT_SIZE, + .type = QEMU_OPT_SIZE, + .help = "Virtual disk size" + }, { + /* end of list */ + } }, - { NULL } }; /* Remove size from argv manually so that negative numbers are not treated @@ -1624,14 +1629,15 @@ static int img_resize(int argc, char **argv) } /* Parse size */ - param = parse_option_parameters("", resize_options, NULL); - if (set_option_parameter(param, BLOCK_OPT_SIZE, size)) { + param = qemu_opts_create(&resize_options, NULL, 0, NULL); + if (qemu_opt_set(param, BLOCK_OPT_SIZE, size)) { /* Error message already printed when size parsing fails */ ret = -1; + qemu_opts_del(param); goto out; } - n = get_option_parameter(param, BLOCK_OPT_SIZE)->value.n; - free_option_parameters(param); + n = qemu_opt_get_size(param, BLOCK_OPT_SIZE, 0); + qemu_opts_del(param); bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR); if (!bs) { -- 1.7.1