From nobody Sat Apr 27 03:58:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552574246321774.9311387458315; Thu, 14 Mar 2019 07:37:26 -0700 (PDT) Received: from localhost ([127.0.0.1]:38768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4RTu-0003kv-M6 for importer@patchew.org; Thu, 14 Mar 2019 10:37:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4RCD-0002vU-GC for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:18:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4R9B-0006ya-Ne for qemu-devel@nongnu.org; Thu, 14 Mar 2019 10:15:50 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:42190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h4R98-0006hE-R8; Thu, 14 Mar 2019 10:15:47 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x2EEEJeO128224; Thu, 14 Mar 2019 14:15:18 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2r44wuh8s9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2019 14:15:18 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x2EEFHAJ026160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 14 Mar 2019 14:15:18 GMT Received: from abhmp0011.oracle.com (abhmp0011.oracle.com [141.146.116.17]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x2EEFGAf005395; Thu, 14 Mar 2019 14:15:17 GMT Received: from nexus.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 14 Mar 2019 14:15:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id; s=corp-2018-07-02; bh=lpRROv9cXvWwZLj45hYLQD8F4tcMbIzrqii0hw1lh2k=; b=Odtcs3Ytjy+DeAfQRxoUHzmxYnCBLGroFJzMycjjQ6QF79Z0sQmy/ouQ8EekmbB4WyIp /s314F1v2RRwxx/KVjrhpYKQKCmEL78jmR924DP05p2yLVIpf80wzSzlVUXZ6VareiXH wfyTm98F+rO30Sfjc+lPgxtrKJ1nw6UhyC8dKlfMpCYRT94BrbVatfIXiA5sQ3yi6fuL 616crfOHn0ONpKvA2D9KuuYbnKnXD0sh0gq3/jShYSw+AAJv9n2vK2t36A2R6WAfAesC ahamtczIbq7YTfBbhPpjeKrscb6wFcPOjuGtE7+sTFTVUfy/swHJW8N2Lq2+njzmbWXi jg== From: Sam Eiderman To: fam@euphon.net, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org Date: Thu, 14 Mar 2019 16:14:37 +0200 Message-Id: <20190314141437.35517-1-shmuel.eiderman@oracle.com> X-Mailer: git-send-email 2.13.3 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9194 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1903140100 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 X-Mailman-Approved-At: Thu, 14 Mar 2019 10:36:16 -0400 Subject: [Qemu-devel] [PATCH] vmdk: Support version=3 in VMDK descriptor files 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: qemu-devel@nongnu.org, shmuel.eiderman@oracle.com, yoav.elnekave@oracle.com, arbel.moshe@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Commit 509d39aa22909c0ed1aabf896865f19c81fb38a1 added support for read only VMDKs of version 3. This commit fixes the probe function to correctly handle descriptors of version 3. This commit has two effects: 1. We no longer need to supply '-f vmdk' when pointing to descriptor files of version 3 in qemu/qemu-img command line arguments. 2. This fixes the scenario where a VMDK points to a parent version 3 descriptor file which is being probed as "raw" instead of "vmdk". Reviewed-by: Arbel Moshe Reviewed-by: Mark Kanda Signed-off-by: Shmuel Eiderman --- block/vmdk.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index d8c0c50390..8dec6ef767 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -195,13 +195,15 @@ static int vmdk_probe(const uint8_t *buf, int buf_siz= e, const char *filename) } if (end - p >=3D strlen("version=3DX\n")) { if (strncmp("version=3D1\n", p, strlen("version=3D1\n")) = =3D=3D 0 || - strncmp("version=3D2\n", p, strlen("version=3D2\n")) = =3D=3D 0) { + strncmp("version=3D2\n", p, strlen("version=3D2\n")) = =3D=3D 0 || + strncmp("version=3D3\n", p, strlen("version=3D3\n")) = =3D=3D 0) { return 100; } } if (end - p >=3D strlen("version=3DX\r\n")) { if (strncmp("version=3D1\r\n", p, strlen("version=3D1\r\n"= )) =3D=3D 0 || - strncmp("version=3D2\r\n", p, strlen("version=3D2\r\n"= )) =3D=3D 0) { + strncmp("version=3D2\r\n", p, strlen("version=3D2\r\n"= )) =3D=3D 0 || + strncmp("version=3D3\r\n", p, strlen("version=3D3\r\n"= )) =3D=3D 0) { return 100; } } --=20 2.13.3