From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV43-0005Y8-3b for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:27:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwV3y-00029m-5E for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:27:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65505) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwV3x-00029c-SD for qemu-devel@nongnu.org; Mon, 16 Jun 2014 07:26:58 -0400 From: Stefan Hajnoczi Date: Mon, 16 Jun 2014 19:23:47 +0800 Message-Id: <1402917843-6459-24-git-send-email-stefanha@redhat.com> In-Reply-To: <1402917843-6459-1-git-send-email-stefanha@redhat.com> References: <1402917843-6459-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 23/39] nfs.c: replace QEMUOptionParameter with QemuOpts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Chunyan Liu , Stefan Hajnoczi From: Chunyan Liu Reviewed-by: Stefan Hajnoczi Reviewed-by: Eric Blake Signed-off-by: Chunyan Liu Signed-off-by: Stefan Hajnoczi --- block/nfs.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/block/nfs.c b/block/nfs.c index e282f8d..35e5008 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -391,8 +391,7 @@ 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; @@ -401,12 +400,7 @@ static int nfs_file_create(const char *url, QEMUOptionParameter *options, client->aio_context = qemu_get_aio_context(); /* 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) { @@ -463,7 +457,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.9.3