qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 5/6] vvfat: do not hardcode sector counts in error message
Date: Wed,  5 Oct 2011 09:12:07 +0200	[thread overview]
Message-ID: <1317798728-28938-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1317798728-28938-1-git-send-email-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/vvfat.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/block/vvfat.c b/block/vvfat.c
index a682eae..fb3d62e 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -930,11 +930,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;
 	}
 
-- 
1.7.6

  parent reply	other threads:[~2011-10-05  7:12 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-05  7:12 [Qemu-devel] [PATCH 0/6] misc vvfat fixes Paolo Bonzini
2011-10-05  7:12 ` [Qemu-devel] [PATCH 1/6] vvfat: fix out of bounds array_get usage Paolo Bonzini
2011-10-05  7:12 ` [Qemu-devel] [PATCH 2/6] vvfat: do not fail if the disk has spare sectors Paolo Bonzini
2011-10-05  7:12 ` [Qemu-devel] [PATCH 3/6] vvfat: need to use first_sectors_number to distinguish fdd/hdd Paolo Bonzini
2011-10-05  7:12 ` [Qemu-devel] [PATCH 4/6] vvfat: unify and correct computation of sector count Paolo Bonzini
2011-10-05  7:12 ` Paolo Bonzini [this message]
2011-10-05  7:12 ` [Qemu-devel] [PATCH 6/6] vvfat: reorganize computation of disk geometry Paolo Bonzini
2011-11-04 16:21   ` [Qemu-devel] [PATCH 6/6 v2] " Paolo Bonzini
2011-11-04 16:39     ` Kevin Wolf
2011-10-27 11:46 ` [Qemu-devel] ping Re: [PATCH 0/6] misc vvfat fixes Paolo Bonzini
2011-10-27 12:38   ` Kevin Wolf
2011-10-27 13:10     ` Paolo Bonzini
2011-10-27 13:34       ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1317798728-28938-6-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).