From patchwork Thu Apr 21 19:29:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Karhunen X-Patchwork-Id: 8903591 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BE18E9F457 for ; Thu, 21 Apr 2016 19:30:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 111ED201C0 for ; Thu, 21 Apr 2016 19:30: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 1883720172 for ; Thu, 21 Apr 2016 19:30:07 +0000 (UTC) Received: from localhost ([::1]:46791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atKIg-0007yO-7C for patchwork-qemu-devel@patchwork.kernel.org; Thu, 21 Apr 2016 15:30:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53060) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atKIY-0007uA-Ip for qemu-devel@nongnu.org; Thu, 21 Apr 2016 15:29:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1atKIS-0001wb-76 for qemu-devel@nongnu.org; Thu, 21 Apr 2016 15:29:58 -0400 Received: from sesbmg23.ericsson.net ([193.180.251.37]:57775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1atKIR-0001vC-QM for qemu-devel@nongnu.org; Thu, 21 Apr 2016 15:29:52 -0400 X-AuditID: c1b4fb25-f79f26d00000327e-1d-57192a2de3a1 Received: from ESESSHC011.ericsson.se (Unknown_Domain [153.88.183.51]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id B0.F6.12926.D2A29175; Thu, 21 Apr 2016 21:29:49 +0200 (CEST) Received: from E7440.dyn.sj.us.am.ericsson.se (153.88.183.153) by smtp.internal.ericsson.com (153.88.183.53) with Microsoft SMTP Server id 14.3.248.2; Thu, 21 Apr 2016 21:29:49 +0200 From: Janne Karhunen To: Date: Thu, 21 Apr 2016 12:29:37 -0700 Message-ID: <1461266977-6045-1-git-send-email-Janne.Karhunen@gmail.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprILMWRmVeSWpSXmKPExsUyM2K7sa6ulmS4wYp76hbzpu5ltzjeu4PF gclj56y77B5Prm1mCmCK4rJJSc3JLEst0rdL4Mpoff2GpeCkcsXiWUtYGhgnS3YxcnJICJhI fH+6kgnCFpO4cG89WxcjF4eQwBFGiTNb29khnF2MEo9OrQKrYhPQl2i8uIgFxBYRkJbonwNS xMnBLBAlsXRWDyuILSzgJTGl5SxYPYuAqsTUbyfZQGxeAXeJD7s62CG2yUmcPDaZFSIuKHFy 5hMWiDkSEgdfvGAGsYWAes8ueMY4gZFvFpKyWUjKFjAyrWIULU4tTspNNzLWSy3KTC4uzs/T y0st2cQIDKiDW36r7mC8/MbxEKMAB6MSD6+CiUS4EGtiWXFl7iFGCQ5mJRHeUjXJcCHelMTK qtSi/Pii0pzU4kOM0hwsSuK82ZH/woQE0hNLUrNTUwtSi2CyTBycUg2MOZ+ad9WaOupMn3aP T1xJfm6X35bKHtfOtT0rjOw2ZXHcc0u3jS8ud9C2Mo19EbE/8nNAWqPWgfcXdwVlsbsVbd+1 8/GTaxvjw6ap6rze6Catx2qmM4HpCs/Pe1pqE38eWSanHb3leqLHmY7JT9lFJr0w3rE9O+Lw r/m9e24azpGUcHe+9oFBiaU4I9FQi7moOBEAjPqxjCQCAAA= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 193.180.251.37 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 --- block/vmdk.c | 23 +++++++++++++++++++---- include/block/block_int.h | 2 +- qemu-doc.texi | 3 +++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 45f9d3c..4b5cac8 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,16 @@ 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, "4")) { + error_setg(errp, + "compat6 and hwversion are mutually exclusive"); + ret = -EINVAL; + goto exit; + } + g_free(hw_version); + hw_version = g_strdup("6"); } fmt = qemu_opt_get_del(opts, BLOCK_OPT_SUBFMT); if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ZEROED_GRAIN, false)) { @@ -2001,7 +2009,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 +2055,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 +2307,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 = "4" + }, + { .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..d3a5f94 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. Option is mutually exclusive +with the compat6 flag. @item subformat Specifies which VMDK subformat to use. Valid options are @code{monolithicSparse} (default),