commit 557772f26b361ade84acecb366fe6fdd2d55a6d9
author Marcel Apfelbaum <marcel@redhat.com> Mon Jun 01 17:09:12 2015 +0300
committer Michael S. Tsirkin <mst@redhat.com> Wed Jun 03 18:19:15 2015 +0200
tree 3c8fb721c7fb79c52b4176962872ea144c1c134a
parent cb3d37a93cc59da400d27361fcda024d49210abd

hw/q35: fix floppy controller definition in ich9

In DSDT FDC0 declares the IO region as IO(Decode16, 0x03F2, 0x03F2, 0x00, 0x04).
Use the same in lpc_ich9 initialization code.
Now the floppy drive is detected correctly on Windows.

Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

hw/isa/lpc_ich9.c

diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index dba7585..bc9afc6 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -494,7 +494,7 @@
         /* lpt */
         pci_conf[0x82] |= 0x04;
     }
-    if (memory_region_present(io_as, 0x3f0)) {
+    if (memory_region_present(io_as, 0x3f2)) {
         /* floppy */
         pci_conf[0x82] |= 0x08;
     }