]> xenbits.xensource.com Git - qemu-upstream-4.5-testing.git/commitdiff
piix4: disable io on reset
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 11 Sep 2013 10:33:31 +0000 (13:33 +0300)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Tue, 1 Oct 2013 03:48:18 +0000 (22:48 -0500)
io base register at 0x40 is cleared on reset,
but io is not disabled until some other event
happens to call pm_io_space_update.

Invoke pm_io_space_update directly to make this
consistent.

Cc: qemu-stable@nongnu.org
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
(cherry picked from commit c046e8c4a26c902ca1b4f5bdf668a2da6bc75f54)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/acpi/piix4.c

index c88569061c6440cb5feaf7c025a53f6ebfc7f65d..3aaf18c28ab7465d6c54c3d10fb3a37679d5ccb7 100644 (file)
@@ -380,6 +380,7 @@ static void piix4_reset(void *opaque)
         /* Mark SMM as already inited (until KVM supports SMM). */
         pci_conf[0x5B] = 0x02;
     }
+    pm_io_space_update(s);
     piix4_update_hotplug(s);
 }