From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:45931)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1Smk04-0007jc-AA
	for qemu-devel@nongnu.org; Thu, 05 Jul 2012 07:13:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1Smjzy-00024w-8t
	for qemu-devel@nongnu.org; Thu, 05 Jul 2012 07:13:31 -0400
Received: from mx1.redhat.com ([209.132.183.28]:23826)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <armbru@redhat.com>) id 1Smjzy-00024l-0v
	for qemu-devel@nongnu.org; Thu, 05 Jul 2012 07:13:26 -0400
From: Markus Armbruster <armbru@redhat.com>
References: <1340984094-5451-1-git-send-email-armbru@redhat.com>
	<1340984094-5451-5-git-send-email-armbru@redhat.com>
	<4FF46008.1080404@redhat.com>
Date: Thu, 05 Jul 2012 13:13:22 +0200
In-Reply-To: <4FF46008.1080404@redhat.com> (Kevin Wolf's message of "Wed, 04
	Jul 2012 17:23:52 +0200")
Message-ID: <m3mx3eea0d.fsf@blackfin.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Re: [Qemu-devel] [PATCH 04/32] vvfat: Do not clobber the user's
	geometry
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>
Cc: pbonzini@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org, stefanha@linux.vnet.ibm.com

Kevin Wolf <kwolf@redhat.com> writes:

> Am 29.06.2012 17:34, schrieb Markus Armbruster:
[...]
>> @@ -1067,19 +1074,16 @@ DLOG(if (stderr == NULL) {
>>      else
>>  	dirname += i+1;
>>  
>> -    bs->total_sectors=bs->cyls*bs->heads*bs->secs;
>> +    bs->total_sectors = cyls * heads * secs;
>>  
>> -    if(init_directories(s, dirname))
>> +    if (init_directories(s, dirname, heads, secs)) {
>>  	return -1;
>> +    }
>>  
>>      s->sector_count = s->faked_sectors + s->sectors_per_cluster*s->cluster_count;
>>  
>>      if(s->first_sectors_number==0x40)
>> -	init_mbr(s);
>> -    else {
>> -        /* MS-DOS does not like to know about CHS (?). */
>> -	bs->heads = bs->cyls = bs->secs = 0;
>> -    }
>> +        init_mbr(s, cyls, heads, secs);
>
> You can add braces here while touching the code.

I'm not touching the if...  I'll do it if you insist.