summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorBeth Kon <eak@us.ibm.com>2009-07-13 19:43:13 -0400
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-16 17:28:50 -0500
commit7d93b1fa188a7e32bd5e53fce819d39cf6d90fcc (patch)
tree7ad0f29123d8d99e5617bcb1a9db999e09c481a9 /hw
parentca94dbc753ecc7318f329106f55712f1faaa7cf2 (diff)
downloadqemu-7d93b1fa188a7e32bd5e53fce819d39cf6d90fcc.tar.gz
Reset HPET config register on hpet_reset
Without this, after system reset, hpet does not detect transition from non-legacy to legacy mode. Signed-off-by: Beth Kon <eak@us.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/hpet.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/hpet.c b/hw/hpet.c
index 3873f4c850..24aee6a2cc 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -553,6 +553,7 @@ static void hpet_reset(void *opaque) {
/* 64-bit main counter; 3 timers supported; LegacyReplacementRoute. */
s->capability = 0x8086a201ULL;
s->capability |= ((HPET_CLK_PERIOD) << 32);
+ s->config = 0ULL;
if (count > 0)
/* we don't enable pit when hpet_reset is first called (by hpet_init)
* because hpet is taking over for pit here. On subsequent invocations,