From e14c8062f4c4c336c6e5fa5b51472ffff5f3fe38 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 12 Mar 2011 09:52:25 +0000 Subject: [PATCH] pc: fix wrong CMOS values for floppy drives Before commit 63ffb564dca94f8bda01ed6d209784104630a4d2, states for floppy drives were calculated in fdc.c:fd_revalidate(). There it is also considered whether a disk is inserted or not. The commit didn't copy the logic completely to pc.c, which caused a regression. Fix by adding the same check also to pc.c. Reported-by: Stefan Hajnoczi Tested-by: Stefan Hajnoczi Signed-off-by: Blue Swirl --- hw/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pc.c b/hw/pc.c index 5966bf1c2c..4d67d9f9be 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -382,7 +382,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, /* floppy type */ for (i = 0; i < 2; i++) { fd[i] = drive_get(IF_FLOPPY, 0, i); - if (fd[i]) { + if (fd[i] && bdrv_is_inserted(fd[i]->bdrv)) { bdrv_get_floppy_geometry_hint(fd[i]->bdrv, &nb_heads, &max_track, &last_sect, FDRIVE_DRV_NONE, &fd_type[i]);