[Xen-changelog] [qemu-xen-unstable] Always treat floppy images as raw

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

commit 8aba8e15b6050dfd94d12a737562d3f6fe67d30f
Author: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Date:   Wed Jul 8 15:52:31 2009 +0100

    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@xxxxxxxxxxxxxxxx>
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
    (cherry picked from commit f2ce5c35f60bb606bd3ddb55c361bb8a9aad5c5c)
    
    [ Also originally committed as 342846c1eecc972fcfae84d9d1ae65a318101792
      Mistakenly dropped from qemu-xen-unstable.git and now reapplied.
      Thanks to report from James Harper.   -iwj ]
---
 vl.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/vl.c b/vl.c
index d86e49b..8ad9c9e 100644
--- a/vl.c
+++ b/vl.c
@@ -2629,6 +2629,8 @@ int drive_init(struct drive_opt *arg, int snapshot, void 
*opaque)
            approximation.  */
     case IF_FLOPPY:
         bdrv_set_type_hint(bdrv, BDRV_TYPE_FLOPPY);
+        if (!drv)
+            drv = &bdrv_raw;
         break;
     case IF_PFLASH:
     case IF_MTD:
--
generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog