qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Chunyan Liu <cyliu@suse.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, Dong Xu Wang <wdongxu@linux.vnet.ibm.com>,
	Chunyan Liu <cyliu@suse.com>,
	stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v21 24/25] vvfat.c: replace QEMUOptionParameter with QemuOpts
Date: Fri, 21 Feb 2014 18:35:47 +0800	[thread overview]
Message-ID: <1392978948-27416-25-git-send-email-cyliu@suse.com> (raw)
In-Reply-To: <1392978948-27416-1-git-send-email-cyliu@suse.com>

vvfat.c: replace QEMUOptionParameter with QemuOpts

Signed-off-by: Dong Xu Wang <wdongxu@linux.vnet.ibm.com>
Signed-off-by: Chunyan Liu <cyliu@suse.com>
---
 block/vvfat.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/block/vvfat.c b/block/vvfat.c
index c8c8a1c..d901250 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -2910,7 +2910,7 @@ static BlockDriver vvfat_write_target = {
 static int enable_write_target(BDRVVVFATState *s)
 {
     BlockDriver *bdrv_qcow;
-    QEMUOptionParameter *options;
+    QemuOpts *opts;
     Error *local_err = NULL;
     int ret;
     int size = sector2cluster(s, s->sector_count);
@@ -2925,11 +2925,11 @@ static int enable_write_target(BDRVVVFATState *s)
     }
 
     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:");
+    opts = qemu_opts_create(bdrv_qcow->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, &local_err);
+    ret = bdrv_create(bdrv_qcow, s->qcow_filename, NULL, opts, &local_err);
     if (ret < 0) {
         qerror_report_err(local_err);
         error_free(local_err);
-- 
1.6.0.2

  parent reply	other threads:[~2014-02-21 10:37 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-21 10:35 [Qemu-devel] [PATCH v21 00/25] replace QEMUOptionParameter with QemuOpts Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 01/25] add def_value_str to QemuOptDesc Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 02/25] qapi: output def_value_str when query command line options Chunyan Liu
2014-03-04  0:02   ` Eric Blake
2014-03-04  2:01     ` Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 03/25] improve some functions in qemu-option.c Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 04/25] improve assertion in qemu_opt_get functions Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 05/25] add some QemuOpts functions for replace work Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 06/25] add convert functions between QEMUOptionParameter to QemuOpts Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 07/25] change block layer to support both QemuOpts and QEMUOptionParamter Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 08/25] cow.c: replace QEMUOptionParameter with QemuOpts Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 09/25] gluster.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 10/25] iscsi.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 11/25] qcow.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 12/25] qcow2.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 13/25] qed.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 14/25] raw-posix.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 15/25] raw-win32.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 16/25] raw_bsd.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 17/25] rbd.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 18/25] sheepdog.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 19/25] ssh.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 20/25] vdi.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 21/25] vmdk.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 22/25] vpc.c: " Chunyan Liu
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 23/25] vhdx.c: " Chunyan Liu
2014-02-21 10:35 ` Chunyan Liu [this message]
2014-02-21 10:35 ` [Qemu-devel] [PATCH v21 25/25] cleanup QEMUOptionParameter Chunyan Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392978948-27416-25-git-send-email-cyliu@suse.com \
    --to=cyliu@suse.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=wdongxu@linux.vnet.ibm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).