From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43936)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1Un2yK-0000R0-2k
	for qemu-devel@nongnu.org; Thu, 13 Jun 2013 04:33:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <stefanha@gmail.com>) id 1Un2yD-0000oB-Mt
	for qemu-devel@nongnu.org; Thu, 13 Jun 2013 04:33:32 -0400
Date: Thu, 13 Jun 2013 10:33:21 +0200
From: Stefan Hajnoczi <stefanha@gmail.com>
Message-ID: <20130613083321.GC2633@stefanha-thinkpad.redhat.com>
References: <1370855253-7842-1-git-send-email-stefanha@redhat.com>
	<20130610140454.GI3636@dhcp-200-207.str.redhat.com>
	<20130610143223.GA4838@stefanha-thinkpad.redhat.com>
	<20130613020643.GC4350@localhost.nay.redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130613020643.GC4350@localhost.nay.redhat.com>
Subject: Re: [Qemu-devel] [PATCH] vmdk: byteswap VMDK4Header.desc_offset
	field
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, qemu-devel@nongnu.org, qemu-stable@nongnu.org

On Thu, Jun 13, 2013 at 10:06:43AM +0800, Fam Zheng wrote:
> On Mon, 06/10 16:32, Stefan Hajnoczi wrote:
> > On Mon, Jun 10, 2013 at 04:04:55PM +0200, Kevin Wolf wrote:
> > > Am 10.06.2013 um 11:07 hat Stefan Hajnoczi geschrieben:
> > > > Remember to byteswap VMDK4Header.desc_offset on big-endian machines.
> > > > 
> > > > Cc: qemu-stable@nongnu.org
> > > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> > > 
> > > Thanks, applied to the block layer.
> > > 
> > > > @@ -507,8 +507,11 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
> > > >      if (ret < 0) {
> > > >          return ret;
> > > >      }
> > > > -    if (header.capacity == 0 && header.desc_offset) {
> > > > -        return vmdk_open_desc_file(bs, flags, header.desc_offset << 9);
> > > > +    if (header.capacity == 0) {
> > > > +        int64_t desc_offset = le64_to_cpu(header.desc_offset);
> > > > +        if (desc_offset) {
> > > > +            return vmdk_open_desc_file(bs, flags, desc_offset << 9);
> > > > +        }
> > > >      }
> > > 
> > > Splitting up the if condition wouldn't have been necessary, strictly
> > > speaking. But I don't mind too much here.
> > 
> > True.  The reason I did it is because accessing header.desc_offset
> > directly is a bad habit.  Someone modifying the code might conclude it's
> > safe to access directly when it actually only works for the limited
> > cases of zero and non-zero.
> > 
> 
> Not byteswapping header.capacity here, any reason?

Byteswapping header.capacity too is fine by me.  This patch is focussed
on just header.desc_offset.

Stefan