From patchwork Fri Mar 21 00:13:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leandro Dorileo X-Patchwork-Id: 332457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 57C172C00AD for ; Fri, 21 Mar 2014 11:27:41 +1100 (EST) Received: from localhost ([::1]:50224 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQnJD-0001RJ-9Y for incoming@patchwork.ozlabs.org; Thu, 20 Mar 2014 20:27:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn7M-0002JG-E1 for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:15:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQn7G-00085J-3D for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:15:24 -0400 Received: from mail-yh0-f51.google.com ([209.85.213.51]:33946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn7F-00085E-Uw for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:15:18 -0400 Received: by mail-yh0-f51.google.com with SMTP id f10so1697370yha.38 for ; Thu, 20 Mar 2014 17:15:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VL92T1M+s6/N/m4EMoIic/ggMW/2sgQODTN1bkT1pWo=; b=acGnwWxEowany7ZyhtG0mv5CzaUJ8cQmhO0KMCg18gp0WWYlB7cgJuPqeJt/5cNM7k 45kMP/IVOJIkb24vnmhVVuOM7sfSEj8D3CiWZ0FWvPG01ydNtlXL0X8sjOoaOB6ZgKA7 W/hJW8yIJkY7hrij1caPRDnYTMHqG6JDGSCu69XBpTV2Q3IsOwNbTPq73YQr4jvQh6DP KE8dgSjBvpYA+czayEow86eH8hnw6mHdQJm6UrcjvvPUc2290irfGDrQlnzUs+tLJnOC kA926Y2sVX2EZ+wm4pUpibv2MuU4UeE5Y7jYqavgTCHi3FpH5607YeLh9Fdu9ok0atOw xUyQ== X-Gm-Message-State: ALoCoQkK1/nSP+2GzFmaPqkRICCdpbQKHehZ1xyExPV9EGm102khRwExzRaQoWw5pGG/AEWIn0wg X-Received: by 10.236.116.131 with SMTP id g3mr21599409yhh.110.1395360917715; Thu, 20 Mar 2014 17:15:17 -0700 (PDT) Received: from dorilex-lnv.MultilaserAP ([177.194.92.107]) by mx.google.com with ESMTPSA id k63sm5501231yhg.37.2014.03.20.17.15.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Mar 2014 17:15:17 -0700 (PDT) From: Leandro Dorileo To: qemu-devel@nongnu.org Date: Thu, 20 Mar 2014 21:13:31 -0300 Message-Id: <1395360813-2833-25-git-send-email-l@dorileo.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395360813-2833-1-git-send-email-l@dorileo.org> References: <1395360813-2833-1-git-send-email-l@dorileo.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.213.51 Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Liu Yuan , Jeff Cody , Markus Armbruster , Peter Lieven , "Richard W.M. Jones" , Luiz Capitulino , Leandro Dorileo , Ronnie Sahlberg , Josh Durgin , Anthony Liguori , Paolo Bonzini , Stefan Weil , Max Reitz , MORITA Kazutaka , Benoit Canet Subject: [Qemu-devel] [PATCH 24/26] vvfat: migrate vvfat driver QemuOptionParameter usage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Do the directly migration from QemuOptionParameter to QemuOpts on vvfat block driver. Signed-off-by: Leandro Dorileo --- block/vvfat.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index f966ea5..7aefba3 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2907,7 +2907,7 @@ static BlockDriver vvfat_write_target = { static int enable_write_target(BDRVVVFATState *s) { BlockDriver *bdrv_qcow; - QEMUOptionParameter *options; + QemuOpts *options; Error *local_err = NULL; int ret; int size = sector2cluster(s, s->sector_count); @@ -2918,13 +2918,26 @@ static int enable_write_target(BDRVVVFATState *s) s->qcow_filename = g_malloc(1024); ret = get_tmp_filename(s->qcow_filename, 1024); if (ret < 0) { - goto err; + goto err_opt; } bdrv_qcow = bdrv_find_format("qcow"); - options = parse_option_parameters("", bdrv_qcow->create_options, NULL); - set_option_parameter_int(options, BLOCK_OPT_SIZE, s->sector_count * 512); - set_option_parameter(options, BLOCK_OPT_BACKING_FILE, "fat:"); + + options = qemu_opts_create(bdrv_qcow->create_options, NULL, 0, + &error_abort); + if (!options) { + goto err_opt; + } + + ret = qemu_opt_set_number(options, BLOCK_OPT_SIZE, s->sector_count * 512); + if (ret < 0) { + goto err; + } + + ret = qemu_opt_set(options, BLOCK_OPT_BACKING_FILE, "fat:"); + if (ret < 0) { + goto err; + } ret = bdrv_create(bdrv_qcow, s->qcow_filename, options, &local_err); if (ret < 0) { @@ -2951,10 +2964,13 @@ static int enable_write_target(BDRVVVFATState *s) s->bs->backing_hd->drv = &vvfat_write_target; s->bs->backing_hd->opaque = g_malloc(sizeof(void*)); *(void**)s->bs->backing_hd->opaque = s; + qemu_opts_del(options); return 0; err: + qemu_opts_del(options); +err_opt: g_free(s->qcow_filename); s->qcow_filename = NULL; return ret;