From: Michael S. Tsirkin <mst@redhat.com>
Date: Wed, 11 Sep 2013 10:33:31 +0000 (+0300)
Subject: piix4: disable io on reset
X-Git-Tag: qemu-xen-4.4.0-rc1~1^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ae00a27feab0ca12d2a802cfae9ee65ba3d43602;p=qemu-upstream-4.4-testing.git

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>
---

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index c88569061..3aaf18c28 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);
 }