From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8YI4-0004Wk-7U for qemu-devel@nongnu.org; Sun, 11 Aug 2013 12:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8YHx-0006PP-Kb for qemu-devel@nongnu.org; Sun, 11 Aug 2013 12:14:48 -0400 Received: from mail-ee0-x229.google.com ([2a00:1450:4013:c00::229]:45755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8YHx-0006PD-7I for qemu-devel@nongnu.org; Sun, 11 Aug 2013 12:14:41 -0400 Received: by mail-ee0-f41.google.com with SMTP id d17so3092460eek.28 for ; Sun, 11 Aug 2013 09:14:40 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sun, 11 Aug 2013 18:13:58 +0200 Message-Id: <1376237638-6968-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1376237638-6968-1-git-send-email-pbonzini@redhat.com> References: <1376237638-6968-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] vmdk: support vmfs files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com VMware ESX hosts also use different create and extent types for flat files, respectively "vmfs" and "VMFS". This is not documented, but it can be found at http://kb.vmware.com/kb/10002511 (Recreating a missing virtual machine disk (VMDK) descriptor file). Signed-off-by: Paolo Bonzini --- block/vmdk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index eaf484a..2a5b63d 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -751,7 +751,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, if (sectors <= 0 || (strcmp(type, "FLAT") && strcmp(type, "SPARSE") && - strcmp(type, "VMFSSPARSE")) || + strcmp(type, "VMFS") && strcmp(type, "VMFSSPARSE")) || (strcmp(access, "RW"))) { goto next_line; } @@ -764,7 +764,7 @@ static int vmdk_parse_extents(const char *desc, BlockDriverState *bs, } /* save to extents array */ - if (!strcmp(type, "FLAT")) { + if (!strcmp(type, "FLAT") || !strcmp(type, "VMFS")) { /* FLAT extent */ VmdkExtent *extent; @@ -829,6 +829,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, goto exit; } if (strcmp(ct, "monolithicFlat") && + strcmp(ct, "vmfs") && strcmp(ct, "vmfsSparse") && strcmp(ct, "twoGbMaxExtentSparse") && strcmp(ct, "twoGbMaxExtentFlat")) { -- 1.8.3.1