From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 5 Oct 2011 07:12:07 +0000 (+0200)
Subject: vvfat: do not hardcode sector counts in error message
X-Git-Tag: v1.0-rc1~9^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d71cff42e4cd614986e2d0b8ded7aa3acaf28d92;p=thirdparty%2Fqemu.git

vvfat: do not hardcode sector counts in error message

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/vvfat.c b/block/vvfat.c
index 3e7b40786fe..faf29476649 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -916,11 +916,8 @@ static int init_directories(BDRVVVFATState* s,
 	cluster = mapping->end;
 
 	if(cluster > s->cluster_count) {
-	    fprintf(stderr,"Directory does not fit in FAT%d (capacity %s)\n",
-		    s->fat_type,
-		    s->fat_type == 12 ? s->sector_count == 2880 ? "1.44 MB"
-								: "2.88 MB"
-				      : "504MB");
+	    fprintf(stderr,"Directory does not fit in FAT%d (capacity %.2f MB)\n",
+		    s->fat_type, s->sector_count / 2000.0);
 	    return -EINVAL;
 	}