From 342846c1eecc972fcfae84d9d1ae65a318101792 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 10 Dec 2008 15:30:49 +0000 Subject: [PATCH] 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 Signed-off-by: Ian Jackson (cherry picked from commit f2ce5c35f60bb606bd3ddb55c361bb8a9aad5c5c) --- vl.c | 2 ++ 1 file changed, 2 insertions(+) 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: -- 2.39.5