From patchwork Wed Oct 5 07:12:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 117768 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0B980B6F8B for ; Wed, 5 Oct 2011 19:38:23 +1100 (EST) Received: from localhost ([::1]:45055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLek-0006a1-H9 for incoming@patchwork.ozlabs.org; Wed, 05 Oct 2011 03:12:42 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLeO-0005d3-EL for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:12:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RBLeN-0005NW-4I for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:12:20 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:55000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RBLeM-0005I9-DE for qemu-devel@nongnu.org; Wed, 05 Oct 2011 03:12:18 -0400 Received: by mail-ww0-f53.google.com with SMTP id 14so1754242wwg.10 for ; Wed, 05 Oct 2011 00:12:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=rqI93R1LqoYwRpyxOntSr1BaV8adkLWRAFBZteDnFFM=; b=mckBu6etiw8lPnhv/3s9J19MLshMNQ+q4yE0MCEeLDC9Tkj+oRlAjjfslrdsAXpdya at/7pgen7XcjBsNHb5+Mml1pI4fDOR5uPzcnnYYkl+2VtaZlizDFZ4p4Bcti8ju0Uun2 fVSz3ObGeV4pq7p6c6t0XKFitn2AgmgkDdTGQ= Received: by 10.216.133.96 with SMTP id p74mr2628569wei.17.1317798737823; Wed, 05 Oct 2011 00:12:17 -0700 (PDT) Received: from localhost.localdomain (93-34-218-143.ip51.fastwebnet.it. [93.34.218.143]) by mx.google.com with ESMTPS id s30sm1186914wbm.12.2011.10.05.00.12.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Oct 2011 00:12:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 5 Oct 2011 09:12:08 +0200 Message-Id: <1317798728-28938-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1317798728-28938-1-git-send-email-pbonzini@redhat.com> References: <1317798728-28938-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.53 Subject: [Qemu-devel] [PATCH 6/6] vvfat: reorganize computation of disk geometry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org First determine FAT12/16/32, then compute geometry from that for both FDD and HDD. For floppies, change to 1 sector/cluster since the limit for that is ~2 MB for FAT12 (which we use for 1.44 MB floppies only) and well over 2.88 MB for FAT16. This matches the actual format used by 1.44 MB floppies. Real 2.88 MB floppies used FAT12 with 2 sectors/cluster. This patch does not make things worse than they were before it, though. FAT32 is totally broken. Signed-off-by: Paolo Bonzini --- block/vvfat.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index fb3d62e..1a0216c 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -996,7 +996,6 @@ static int is_consistent(BDRVVVFATState *s); static int vvfat_open(BlockDriverState *bs, const char* dirname, int flags) { BDRVVVFATState *s = bs->opaque; - int floppy = 0; int i; #ifdef DEBUG @@ -1013,8 +1012,6 @@ DLOG(if (stderr == NULL) { s->fat_type=16; /* LATER TODO: if FAT32, adjust */ s->sectors_per_cluster=0x10; - /* 504MB disk*/ - bs->cyls=1024; bs->heads=16; bs->secs=63; s->current_cluster=0xffffffff; @@ -1029,14 +1026,6 @@ DLOG(if (stderr == NULL) { if (!strstart(dirname, "fat:", NULL)) return -1; - if (strstr(dirname, ":floppy:")) { - floppy = 1; - s->fat_type = 12; - s->first_sectors_number = 1; - s->sectors_per_cluster=2; - bs->cyls = 80; bs->heads = 2; bs->secs = 36; - } - if (strstr(dirname, ":32:")) { fprintf(stderr, "Big fat greek warning: FAT32 has not been tested. You are welcome to do so!\n"); s->fat_type = 32; @@ -1044,7 +1033,18 @@ DLOG(if (stderr == NULL) { s->fat_type = 16; } else if (strstr(dirname, ":12:")) { s->fat_type = 12; - bs->secs = 18; + } + + if (strstr(dirname, ":floppy:")) { + /* Real ED floppies used FAT12, 2 sec/cluster. Take a shortcut. */ + s->first_sectors_number = 1; + s->sectors_per_cluster=1; + bs->cyls=80; bs->heads=2; + bs->secs=(s->fat_type == 12 ? 18 : 36); + } else { + /* 32MB or 504MB disk*/ + bs->cyls=(s->fat_type == 12 ? 64 : 1024); + bs->heads=16; bs->secs=63; } s->sector_count=bs->cyls*bs->heads*bs->secs-(s->first_sectors_number-1); @@ -1072,10 +1072,10 @@ DLOG(if (stderr == NULL) { if(s->first_sectors_number==0x40) init_mbr(s); - - /* for some reason or other, MS-DOS does not like to know about CHS... */ - if (floppy) + else { + /* MS-DOS does not like to know about CHS (?). */ bs->heads = bs->cyls = bs->secs = 0; + } // assert(is_consistent(s)); return 0;