From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1MQV7o-00013H-Ev
	for qemu-devel@nongnu.org; Mon, 13 Jul 2009 19:40:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1MQV7i-000134-MU
	for qemu-devel@nongnu.org; Mon, 13 Jul 2009 19:39:59 -0400
Received: from [199.232.76.173] (port=47035 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1MQV7i-000131-F1
	for qemu-devel@nongnu.org; Mon, 13 Jul 2009 19:39:54 -0400
Received: from e31.co.us.ibm.com ([32.97.110.149]:48436)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <eak@us.ibm.com>) id 1MQV7i-0005H8-2r
	for qemu-devel@nongnu.org; Mon, 13 Jul 2009 19:39:54 -0400
Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com
	[9.17.195.227])
	by e31.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n6DNYwd5001943
	for <qemu-devel@nongnu.org>; Mon, 13 Jul 2009 17:34:58 -0600
Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168])
	by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id
	n6DNdoGJ228704
	for <qemu-devel@nongnu.org>; Mon, 13 Jul 2009 17:39:50 -0600
Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1])
	by d03av02.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id
	n6DNdo4j007817
	for <qemu-devel@nongnu.org>; Mon, 13 Jul 2009 17:39:50 -0600
From: Beth Kon <eak@us.ibm.com>
Date: Mon, 13 Jul 2009 19:43:13 -0400
Message-Id: <1247528593-14538-1-git-send-email-eak@us.ibm.com>
Subject: [Qemu-devel] [PATCH] Reset HPET config register on hpet_reset
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Beth Kon <eak@us.ibm.com>

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>


diff --git a/hw/hpet.c b/hw/hpet.c
index 186d671..60dff90 100644
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -554,6 +554,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,