aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2013-09-11 13:33:31 +0300
committerMichael Roth <mdroth@linux.vnet.ibm.com>2013-09-30 22:48:18 -0500
commitae00a27feab0ca12d2a802cfae9ee65ba3d43602 (patch)
tree76816dc92f68c222e64aff1130b4ca35ec86752e
parent61fbeb6e81f648d25c2d3ba5f0d663d54abed1c1 (diff)
piix4: disable io on reset
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>
-rw-r--r--hw/acpi/piix4.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index c88569061c..3aaf18c28a 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -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);
}