From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Wed, 10 Dec 2008 15:30:49 +0000 (+0000)
Subject: Always treat floppy images as raw
X-Git-Tag: xen-3.3.1-rc2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=342846c1eecc972fcfae84d9d1ae65a318101792;p=qemu-xen-4.0-testing.git

Always treat floppy images as raw

The fix for the image format guessing vulnerability breaks raw floppy
images.  In our environment it is difficult to apply the same
configuration change as envisaged upstream, so instead we arrange to
always treat a floppy image as raw.

Two-line patch supplied by James Harper <james.harper@bendigoit.com.au>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
(cherry picked from commit f2ce5c35f60bb606bd3ddb55c361bb8a9aad5c5c)
---

diff --git a/vl.c b/vl.c
index 2f567410..57b88f31 100644
--- a/vl.c
+++ b/vl.c
@@ -5401,6 +5401,8 @@ static int drive_init(struct drive_opt *arg, int snapshot,
            approximation.  */
     case IF_FLOPPY:
         bdrv_set_type_hint(bdrv, BDRV_TYPE_FLOPPY);
+        if (!drv)
+            drv = &bdrv_raw;
         break;
     case IF_PFLASH:
     case IF_MTD: