From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48895) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYUQz-0006C2-Rb for qemu-devel@nongnu.org; Fri, 11 Apr 2014 01:55:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYUQs-00050P-IE for qemu-devel@nongnu.org; Fri, 11 Apr 2014 01:55:29 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:57791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYUQs-0004zt-Ay for qemu-devel@nongnu.org; Fri, 11 Apr 2014 01:55:22 -0400 From: Chunyan Liu Date: Fri, 11 Apr 2014 01:54:12 +0800 Message-Id: <1397152467-17186-17-git-send-email-cyliu@suse.com> In-Reply-To: <1397152467-17186-1-git-send-email-cyliu@suse.com> References: <1397152467-17186-1-git-send-email-cyliu@suse.com> Subject: [Qemu-devel] [PATCH v25 16/31] nfs.c: replace QEMUOptionParameter with QemuOpts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: l@dorileo.org, stefanha@redhat.com Signed-off-by: Chunyan Liu --- block/nfs.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index 98aa363..664ceeb 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -357,20 +357,14 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags, return 0; } -static int nfs_file_create(const char *url, QEMUOptionParameter *options, - Error **errp) +static int nfs_file_create(const char *url, QemuOpts *opts, Error **errp) { int ret = 0; int64_t total_size = 0; NFSClient *client = g_malloc0(sizeof(NFSClient)); /* Read out options */ - while (options && options->name) { - if (!strcmp(options->name, "size")) { - total_size = options->value.n; - } - options++; - } + total_size = qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0); ret = nfs_client_open(client, url, O_CREAT, errp); if (ret < 0) { @@ -427,7 +421,7 @@ static BlockDriver bdrv_nfs = { .bdrv_file_open = nfs_file_open, .bdrv_close = nfs_file_close, - .bdrv_create = nfs_file_create, + .bdrv_create2 = nfs_file_create, .bdrv_co_readv = nfs_co_readv, .bdrv_co_writev = nfs_co_writev, -- 1.7.12.4