From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2Lj-00076C-No for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:19:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WV2Le-0002W2-Jk for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:19:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WV2Le-0002Vv-BT for qemu-devel@nongnu.org; Tue, 01 Apr 2014 13:19:42 -0400 From: Stefan Hajnoczi Date: Tue, 1 Apr 2014 19:18:40 +0200 Message-Id: <1396372769-11688-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1396372769-11688-1-git-send-email-stefanha@redhat.com> References: <1396372769-11688-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.0 02/51] vvfat: Fix :floppy: option to suppress partition table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Stefan Hajnoczi From: Markus Armbruster Regressed in commit 7ad9be6, v1.5.0. Reported-by: Kiyokazu SUTO Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- block/vvfat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/vvfat.c b/block/vvfat.c index f966ea5..1978c9e 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1119,6 +1119,7 @@ DLOG(if (stderr == NULL) { if (!s->fat_type) { s->fat_type = 16; } + s->first_sectors_number = 0x40; cyls = s->fat_type == 12 ? 64 : 1024; heads = 16; secs = 63; @@ -1146,7 +1147,6 @@ DLOG(if (stderr == NULL) { s->current_cluster=0xffffffff; - s->first_sectors_number=0x40; /* read only is the default for safety */ bs->read_only = 1; s->qcow = s->write_target = NULL; -- 1.9.0