qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 1/8] vpc: detect floppy disk geometries
Date: Wed, 19 Oct 2011 16:59:51 +0200	[thread overview]
Message-ID: <1319036398-14320-2-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1319036398-14320-1-git-send-email-pbonzini@redhat.com>

Converting a floppy image from RAW to VPC and back will generate
a zero-padded file of the wrong size, because the geometry is not
computed correctly.  Special case floppy disk images, handling
standard MS-DOS capacities (160/180/320/360 for low density
5.25" disks, 1200 for high density 5.25" disks, 720/1440/2880
for 3.5" disks).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/vpc.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/block/vpc.c b/block/vpc.c
index cb6c570..549a632 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -463,6 +463,14 @@ static int calculate_geometry(int64_t total_sectors, uint16_t* cyls,
 {
     uint32_t cyls_times_heads;
 
+    if (total_sectors <= 5760) {
+        /* Floppy disk geometry */
+        *heads = total_sectors < 640 ? 1 : 2; /* 1 = single side 5.25" */
+        *cyls = total_sectors < 1440 ? 40 : 80;  /* 40 = low density 5.25" */
+        *secs_per_cyl = total_sectors / *heads / *cyls;
+        return 0;
+    }
+
     if (total_sectors > 65535 * 16 * 255)
         return -EFBIG;
 
-- 
1.7.6

  reply	other threads:[~2011-10-19 15:00 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-19 14:59 [Qemu-devel] [PATCH 0/8] finish coroutinization of drivers Paolo Bonzini
2011-10-19 14:59 ` Paolo Bonzini [this message]
2011-10-20  9:14   ` [Qemu-devel] [PATCH 1/8] vpc: detect floppy disk geometries Kevin Wolf
2011-10-20 10:13     ` Paolo Bonzini
2011-10-19 14:59 ` [Qemu-devel] [PATCH 2/8] vmdk: fix return values of vmdk_parent_open Paolo Bonzini
2011-10-20  9:16   ` Kevin Wolf
2011-10-19 14:59 ` [Qemu-devel] [PATCH 3/8] vmdk: clean up open Paolo Bonzini
2011-10-20  9:28   ` Kevin Wolf
2011-10-20 10:12     ` Paolo Bonzini
2011-10-20 10:25       ` Kevin Wolf
2011-10-19 14:59 ` [Qemu-devel] [PATCH 4/8] block: add a Rwlock to synchronous read/write drivers Paolo Bonzini
2011-10-20  9:47   ` Kevin Wolf
2011-10-19 14:59 ` [Qemu-devel] [PATCH 5/8] block: take lock around bdrv_read implementations Paolo Bonzini
2011-10-19 14:59 ` [Qemu-devel] [PATCH 6/8] block: take lock around bdrv_write implementations Paolo Bonzini
2011-10-19 14:59 ` [Qemu-devel] [PATCH 7/8] block: change flush to co_flush Paolo Bonzini
2011-10-20 10:04   ` Kevin Wolf
2011-10-19 14:59 ` [Qemu-devel] [PATCH 8/8] block: change discard to co_discard Paolo Bonzini
2011-10-20 10:08   ` 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=1319036398-14320-2-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@linux.vnet.ibm.com \
    /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).