From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59565) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCmPf-00004x-GR for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:40:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCmPZ-0000Rs-5t for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:40:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCmPY-0000Rk-U3 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 03:40:17 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1A8eGnh014360 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 10 Feb 2014 03:40:16 -0500 Date: Mon, 10 Feb 2014 16:40:12 +0800 From: Fam Zheng Message-ID: <20140210084012.GS15707@T430.nay.redhat.com> References: <1391939335-31580-1-git-send-email-pbonzini@redhat.com> <1391939335-31580-18-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1391939335-31580-18-git-send-email-pbonzini@redhat.com> Subject: Re: [Qemu-devel] [PATCH 17/20] vmdk: do not try opening a file as both image and descriptor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, mreitz@redhat.com On Sun, 02/09 10:48, Paolo Bonzini wrote: > This prepares for propagating errors from vmdk_open_sparse and > vmdk_open_desc_file up to the caller of vmdk_open. > > Signed-off-by: Paolo Bonzini > --- > block/vmdk.c | 22 +++++++++++++++------- > tests/qemu-iotests/059.out | 4 ++-- > 2 files changed, 17 insertions(+), 9 deletions(-) > > diff --git a/block/vmdk.c b/block/vmdk.c > index 74a0bac..750e632 100644 > --- a/block/vmdk.c > +++ b/block/vmdk.c > @@ -883,20 +883,28 @@ static int vmdk_open(BlockDriverState *bs, QDict *options, int flags, > char *buf = NULL; > int ret; > BDRVVmdkState *s = bs->opaque; > + uint32_t magic; > > buf = vmdk_read_desc(bs->file, 0, errp); > if (!buf) { > return -EINVAL; > } > > - if (vmdk_open_sparse(bs, bs->file, flags, buf, errp) == 0) { > - s->desc_offset = 0x200; > - } else { > - ret = vmdk_open_desc_file(bs, flags, buf, errp); > - if (ret) { > - goto fail; > - } > + magic = ldl_be_p(buf); > + switch (magic) { > + case VMDK3_MAGIC: > + case VMDK4_MAGIC: > + ret = vmdk_open_sparse(bs, bs->file, flags, buf, errp); > + s->desc_offset = 0x200; > + break; > + default: > + ret = vmdk_open_desc_file(bs, flags, buf, errp); > + break; > } > + if (ret) { > + goto fail; > + } > + > /* try to open parent images, if exist */ > ret = vmdk_parent_open(bs); > if (ret) { > diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out > index 4ffeb54..4600670 100644 > --- a/tests/qemu-iotests/059.out > +++ b/tests/qemu-iotests/059.out > @@ -8,7 +8,7 @@ no file open, try 'help open' > === Testing too big L2 table size === > Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > L2 table size too big > -qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Wrong medium type > +qemu-io: can't open device TEST_DIR/t.vmdk: Could not open 'TEST_DIR/t.vmdk': Invalid argument > no file open, try 'help open' > > === Testing too big L1 table size === > @@ -2046,7 +2046,7 @@ RW 12582912 VMFS "dummy.IMGFMT" 1 > === Testing truncated sparse === > Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=107374182400 > qemu-img: File truncated, expecting at least 13172736 bytes > -qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'TEST_DIR/t.IMGFMT': Wrong medium type > +qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Could not open 'TEST_DIR/t.IMGFMT': Invalid argument > > === Testing version 3 === > image: TEST_DIR/iotest-version3.IMGFMT > -- > 1.8.5.3 > > > Reviewed-by: Fam Zheng