From patchwork Thu Jun 5 09:20:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chunyan Liu X-Patchwork-Id: 356259 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 6C61B14009F for ; Thu, 5 Jun 2014 19:31:26 +1000 (EST) Received: from localhost ([::1]:39470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsU16-0001JH-B4 for incoming@patchwork.ozlabs.org; Thu, 05 Jun 2014 05:31:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsTrz-0003V6-8G for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:22:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsTrr-0008CJ-4q for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:21:59 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:34691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsTrq-0008Bc-SS for qemu-devel@nongnu.org; Thu, 05 Jun 2014 05:21:51 -0400 Received: from linux-cyliu.lab.bej.apac.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by victor.provo.novell.com with ESMTP (NOT encrypted); Thu, 05 Jun 2014 03:21:41 -0600 From: Chunyan Liu To: qemu-devel@nongnu.org Date: Thu, 5 Jun 2014 17:20:52 +0800 Message-Id: <1401960072-2363-14-git-send-email-cyliu@suse.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1401960072-2363-1-git-send-email-cyliu@suse.com> References: <1401960072-2363-1-git-send-email-cyliu@suse.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 137.65.250.26 Cc: stefanha@redhat.com Subject: [Qemu-devel] [PATCH v28 13/33] vvfat.c: handle cross_driver's create_options and create_opts 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 vvfat shares create options of qcow driver. To avoid vvfat breaking when qcow driver changes from QEMUOptionParameter to QemuOpts, let it able to handle both cases. Signed-off-by: Chunyan Liu Reviewed-by: Eric Blake --- block/vvfat.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index d895582..b1ab195 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -2910,8 +2910,9 @@ static BlockDriver vvfat_write_target = { static int enable_write_target(BDRVVVFATState *s, Error **errp) { - BlockDriver *bdrv_qcow; - QEMUOptionParameter *options; + BlockDriver *bdrv_qcow = NULL; + QemuOptsList *create_opts = NULL; + QemuOpts *opts = NULL; int ret; int size = sector2cluster(s, s->sector_count); s->used_clusters = calloc(size, 1); @@ -2926,12 +2927,21 @@ static int enable_write_target(BDRVVVFATState *s, Error **errp) } 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:"); + assert(!(bdrv_qcow->create_opts && bdrv_qcow->create_options)); + if (bdrv_qcow->create_options) { + create_opts = params_to_opts(bdrv_qcow->create_options); + } else { + create_opts = bdrv_qcow->create_opts; + } + opts = qemu_opts_create(create_opts, NULL, 0, &error_abort); + qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s->sector_count * 512); + qemu_opt_set(opts, BLOCK_OPT_BACKING_FILE, "fat:"); - ret = bdrv_create(bdrv_qcow, s->qcow_filename, options, NULL, errp); - free_option_parameters(options); + ret = bdrv_create(bdrv_qcow, s->qcow_filename, NULL, opts, errp); + qemu_opts_del(opts); + if (bdrv_qcow->create_options) { + qemu_opts_free(create_opts); + } if (ret < 0) { goto err; }