From patchwork Fri Mar 21 00:13:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leandro Dorileo X-Patchwork-Id: 332468 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 7A0AF2C00AD for ; Fri, 21 Mar 2014 12:04:50 +1100 (EST) Received: from localhost ([::1]:50112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQn8A-0002Ua-9A for incoming@patchwork.ozlabs.org; Thu, 20 Mar 2014 20:16:14 -0400 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) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZlgSMtvPUyxs8+S2OFMLseGJUKf6h85VlF8zWCc9DwE=; b=jSq2wXbiYsTznJsNPUFEUaKoBrlvsfRLFtYSDpqAZFTQhvZEz4dbjEOVhX1qrxYkKY jG8lS/qEM2gDkTi+JTfp5FiR8sHH1PwF3LuujS1XqRhLv5UsvSeY6R/tHihBQ3z+5Rvt neV5f6aGYVabC4ItVfkjzVRP5Iq1yaqUlieQRJt7yaZUW6srxUSPq+P7rU767hEZWe+t UuEIy31PkNVVDFpIWuBKxnY6+q7KW0Gbk1BWKHf/ijGWsM+Ae+ymdX5D83oJrXmE3f+e FEtLhu6oqw0QxaHvODNTyxR4BYAb8TUu04M3xnXFbsGVmHOTESUJzr3HhUp5+wAgN/oP cjdQ== X-Gm-Message-State: ALoCoQklJGwsrqkmRj1nKnFuTTNub7qIlPOZHQVDLcVmQabUynC6xDWrwPAqbS3+3DGVgrc1J6W5 X-Received: by 10.236.19.11 with SMTP id m11mr138102yhm.154.1395360864312; Thu, 20 Mar 2014 17:14:24 -0700 (PDT) Received: from dorilex-lnv.MultilaserAP ([177.194.92.107]) by mx.google.com with ESMTPSA id k63sm5501231yhg.37.2014.03.20.17.14.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Mar 2014 17:14:23 -0700 (PDT) From: Leandro Dorileo To: qemu-devel@nongnu.org Date: Thu, 20 Mar 2014 21:13:18 -0300 Message-Id: <1395360813-2833-12-git-send-email-l@dorileo.org> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395360813-2833-1-git-send-email-l@dorileo.org> References: <1395360813-2833-1-git-send-email-l@dorileo.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.175 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 Subject: [Qemu-devel] [PATCH 11/26] qcow: migrate qcow driver QemuOptionParameter usage 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 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)