From patchwork Tue May 3 09:43:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Karhunen X-Patchwork-Id: 9001601 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 13762BF29F for ; Tue, 3 May 2016 09:45:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5A1B62024F for ; Tue, 3 May 2016 09:45:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AB4D920123 for ; Tue, 3 May 2016 09:45:03 +0000 (UTC) Received: from localhost ([::1]:40453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axWt1-0005qf-If for patchwork-qemu-devel@patchwork.kernel.org; Tue, 03 May 2016 05:44:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axWso-0005cQ-Ca for qemu-devel@nongnu.org; Tue, 03 May 2016 05:44:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1axWsc-0002Ye-De for qemu-devel@nongnu.org; Tue, 03 May 2016 05:44:40 -0400 Received: from sessmg23.ericsson.net ([193.180.251.45]:61831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1axWsc-0002Lt-3Q for qemu-devel@nongnu.org; Tue, 03 May 2016 05:44:34 -0400 X-AuditID: c1b4fb2d-f79936d0000030e4-67-572872ef9fec Received: from ESESSHC024.ericsson.se (Unknown_Domain [153.88.183.90]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 8A.8D.12516.FE278275; Tue, 3 May 2016 11:44:15 +0200 (CEST) Received: from E7440.lmf.ericsson.se (153.88.183.153) by smtp.internal.ericsson.com (153.88.183.92) with Microsoft SMTP Server id 14.3.248.2; Tue, 3 May 2016 11:44:01 +0200 From: Janne Karhunen To: , Fam Zheng Date: Tue, 3 May 2016 02:43:30 -0700 Message-ID: <1462268610-27775-1-git-send-email-Janne.Karhunen@gmail.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJLMWRmVeSWpSXmKPExsUyM2J7lO77Io1wg3sHZCwWf5rMaDFv6l52 i+O9O1gcmD12zrrL7vHk2mYmj/f7rrIFMEdx2aSk5mSWpRbp2yVwZSxZVVDwUKXi7be3LA2M TVJdjJwcEgImEosmbGKFsMUkLtxbz9bFyMUhJHCEUeL6zrdMEM4GRonL3w4yg1SxCehLNF5c xAJiiwhYSFz/38kIYjMLREksndUDNklYwEtiSstZoGYODhYBFYnT92pBwrwCHhKT/q9ih1gm J3Hy2GRWiLigxMmZT1ggxkhIHHzxAmyVkICqxNkFzxgnMPLNQlI2C0nZAkamVYyixanFxbnp RsZ6qUWZycXF+Xl6eaklmxiBAXZwy2/dHYyrXzseYhTgYFTi4VVg0wgXYk0sK67MPcQowcGs JMIbVwgU4k1JrKxKLcqPLyrNSS0+xCjNwaIkzuv/UjFcSCA9sSQ1OzW1ILUIJsvEwSnVwGgy w6n4W3r+zTqBg78XrTl3/WNkwpF1ZtaaqyVWVwjKPnyU2y/3vdXXqVfetNlP2E1WN3BjzvJ1 J/xWJavkBK4739i39+y0S5bnNI0dV/806rkaoddufe7trYqO3Mj41rbrnXNX5BsefrNURP9i 9Y5M4cxtvJLG7hc/8698Wj7N3JlbKLC4S4mlOCPRUIu5qDgRAE756kwsAgAA X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 193.180.251.45 Subject: [Qemu-devel] [PATCH] Allow users to specify the vmdk virtual hardware version. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Janne Karhunen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Janne Karhunen Vmdk images have metadata to indicate the vmware virtual hardware version image was created/tested to run with. Allow users to specify that version via new 'hwversion' option. Signed-off-by: Janne Karhunen Reviewed-by: Fam Zheng --- block/vmdk.c | 27 +++++++++++++++++++++++---- include/block/block_int.h | 2 +- qemu-doc.texi | 3 +++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 45f9d3c..955c6b3 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1829,8 +1829,8 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) int64_t total_size = 0, filesize; char *adapter_type = NULL; char *backing_file = NULL; + char *hw_version = NULL; char *fmt = NULL; - int flags = 0; int ret = 0; bool flat, split, compress; GString *ext_desc_lines; @@ -1861,7 +1861,7 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) "# The Disk Data Base\n" "#DDB\n" "\n" - "ddb.virtualHWVersion = \"%d\"\n" + "ddb.virtualHWVersion = \"%s\"\n" "ddb.geometry.cylinders = \"%" PRId64 "\"\n" "ddb.geometry.heads = \"%" PRIu32 "\"\n" "ddb.geometry.sectors = \"63\"\n" @@ -1878,8 +1878,20 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) BDRV_SECTOR_SIZE); adapter_type = qemu_opt_get_del(opts, BLOCK_OPT_ADAPTER_TYPE); backing_file = qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE); + hw_version = qemu_opt_get_del(opts, BLOCK_OPT_HWVERSION); if (qemu_opt_get_bool_del(opts, BLOCK_OPT_COMPAT6, false)) { - flags |= BLOCK_FLAG_COMPAT6; + if (strcmp(hw_version, "undefined")) { + error_setg(errp, + "compat6 cannot be enabled with hwversion set"); + ret = -EINVAL; + goto exit; + } + g_free(hw_version); + hw_version = g_strdup("6"); + } + if (strcmp(hw_version, "undefined") == 0) { + g_free(hw_version); + hw_version = g_strdup("4"); } fmt = qemu_opt_get_del(opts, BLOCK_OPT_SUBFMT); if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ZEROED_GRAIN, false)) { @@ -2001,7 +2013,7 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) fmt, parent_desc_line, ext_desc_lines->str, - (flags & BLOCK_FLAG_COMPAT6 ? 6 : 4), + hw_version, total_size / (int64_t)(63 * number_heads * BDRV_SECTOR_SIZE), number_heads, @@ -2047,6 +2059,7 @@ exit: } g_free(adapter_type); g_free(backing_file); + g_free(hw_version); g_free(fmt); g_free(desc); g_free(path); @@ -2298,6 +2311,12 @@ static QemuOptsList vmdk_create_opts = { .def_value_str = "off" }, { + .name = BLOCK_OPT_HWVERSION, + .type = QEMU_OPT_STRING, + .help = "VMDK hardware version", + .def_value_str = "undefined" + }, + { .name = BLOCK_OPT_SUBFMT, .type = QEMU_OPT_STRING, .help = diff --git a/include/block/block_int.h b/include/block/block_int.h index 10d8759..931a412 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -38,12 +38,12 @@ #include "qemu/throttle.h" #define BLOCK_FLAG_ENCRYPT 1 -#define BLOCK_FLAG_COMPAT6 4 #define BLOCK_FLAG_LAZY_REFCOUNTS 8 #define BLOCK_OPT_SIZE "size" #define BLOCK_OPT_ENCRYPT "encryption" #define BLOCK_OPT_COMPAT6 "compat6" +#define BLOCK_OPT_HWVERSION "hwversion" #define BLOCK_OPT_BACKING_FILE "backing_file" #define BLOCK_OPT_BACKING_FMT "backing_fmt" #define BLOCK_OPT_CLUSTER_SIZE "cluster_size" diff --git a/qemu-doc.texi b/qemu-doc.texi index 79141d3..f37fd31 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -693,6 +693,9 @@ Supported options: File name of a base image (see @option{create} subcommand). @item compat6 Create a VMDK version 6 image (instead of version 4) +@item hwversion +Specify vmdk virtual hardware version. Compat6 flag cannot be enabled +if hwversion is specified. @item subformat Specifies which VMDK subformat to use. Valid options are @code{monolithicSparse} (default),