From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn6U-0001JC-Oe for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:14:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQn6O-0007dr-OQ for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:14:30 -0400 Received: from mail-yk0-f175.google.com ([209.85.160.175]:60913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn6O-0007dk-Jr for qemu-devel@nongnu.org; Thu, 20 Mar 2014 20:14:24 -0400 Received: by mail-yk0-f175.google.com with SMTP id 131so4390460ykp.6 for ; Thu, 20 Mar 2014 17:14:24 -0700 (PDT) From: Leandro Dorileo Date: Thu, 20 Mar 2014 21:13:18 -0300 Message-Id: <1395360813-2833-12-git-send-email-l@dorileo.org> In-Reply-To: <1395360813-2833-1-git-send-email-l@dorileo.org> References: <1395360813-2833-1-git-send-email-l@dorileo.org> Subject: [Qemu-devel] [PATCH 11/26] qcow: migrate qcow driver QemuOptionParameter usage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Do the directly migration from QemuOptionParameter to QemuOpts on qcow block driver. Signed-off-by: Leandro Dorileo --- block/qcow.c | 59 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/block/qcow.c b/block/qcow.c index 1e128be..65c7486 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -662,31 +662,26 @@ static void qcow_close(BlockDriverState *bs) error_free(s->migration_blocker); } -static int qcow_create(const char *filename, QEMUOptionParameter *options, - Error **errp) +static int qcow_create(const char *filename, QemuOpts *options, Error **errp) { int header_size, backing_filename_len, l1_size, shift, i; QCowHeader header; uint8_t *tmp; int64_t total_size = 0; const char *backing_file = NULL; - int flags = 0; + uint64_t flags = 0; Error *local_err = NULL; int ret; BlockDriverState *qcow_bs; - /* Read out options */ - while (options && options->name) { - if (!strcmp(options->name, BLOCK_OPT_SIZE)) { - total_size = options->value.n / 512; - } else if (!strcmp(options->name, BLOCK_OPT_BACKING_FILE)) { - backing_file = options->value.s; - } else if (!strcmp(options->name, BLOCK_OPT_ENCRYPT)) { - flags |= options->value.n ? BLOCK_FLAG_ENCRYPT : 0; - } - options++; + total_size = qemu_opt_get_size(options, BLOCK_OPT_SIZE, 0); + if (total_size) { + total_size = total_size / 512; } + backing_file = qemu_opt_get(options, BLOCK_OPT_BACKING_FILE); + flags |= qemu_opt_get_number(options, BLOCK_OPT_ENCRYPT, 0); + ret = bdrv_create_file(filename, options, &local_err); if (ret < 0) { error_propagate(errp, local_err); @@ -882,23 +877,27 @@ static int qcow_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) } -static QEMUOptionParameter qcow_create_options[] = { - { - .name = BLOCK_OPT_SIZE, - .type = OPT_SIZE, - .help = "Virtual disk size" - }, - { - .name = BLOCK_OPT_BACKING_FILE, - .type = OPT_STRING, - .help = "File name of a base image" - }, - { - .name = BLOCK_OPT_ENCRYPT, - .type = OPT_FLAG, - .help = "Encrypt the image" +static QemuOptsList qcow_create_options = { + .name = "qcow_create_options", + .head = QTAILQ_HEAD_INITIALIZER(qcow_create_options.head), + .desc = { + { + .name = BLOCK_OPT_SIZE, + .type = QEMU_OPT_SIZE, + .help = "Virtual disk size" + }, + { + .name = BLOCK_OPT_BACKING_FILE, + .type = QEMU_OPT_STRING, + .help = "File name of a base image" + }, + { + .name = BLOCK_OPT_ENCRYPT, + .type = QEMU_OPT_NUMBER, + .help = "Encrypt the image" + }, + { NULL } }, - { NULL } }; static BlockDriver bdrv_qcow = { @@ -920,7 +919,7 @@ static BlockDriver bdrv_qcow = { .bdrv_write_compressed = qcow_write_compressed, .bdrv_get_info = qcow_get_info, - .create_options = qcow_create_options, + .create_options = &qcow_create_options, }; static void bdrv_qcow_init(void) -- 1.9.0