From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33786 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOeo3-0000fQ-05 for qemu-devel@nongnu.org; Tue, 15 Jun 2010 18:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOeo1-0005xR-Q5 for qemu-devel@nongnu.org; Tue, 15 Jun 2010 18:40:30 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]:52070) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOeo1-0005xI-FL for qemu-devel@nongnu.org; Tue, 15 Jun 2010 18:40:29 -0400 Message-ID: <4C18015C.1070306@web.de> Date: Wed, 16 Jun 2010 00:40:28 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: jan.kiszka@web.de Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] hpet: Clean up initial hpet counter List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Gleb Natapov From: Jan Kiszka There is no need starting with the special value for hpet_cfg.count. Either Seabios is aware of the new firmware interface and properly interprets the counter or it simply ignores it anyway. Signed-off-by: Jan Kiszka --- hw/hpet.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/hw/hpet.c b/hw/hpet.c index d5c406c..ed4e995 100644 --- a/hw/hpet.c +++ b/hw/hpet.c @@ -74,7 +74,7 @@ typedef struct HPETState { uint8_t hpet_id; /* instance id */ } HPETState; =20 -struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX}; +struct hpet_fw_config hpet_cfg; =20 static uint32_t hpet_in_legacy_mode(HPETState *s) { @@ -682,11 +682,6 @@ static int hpet_init(SysBusDevice *dev) int i, iomemtype; HPETTimer *timer; =20 - if (hpet_cfg.count =3D=3D UINT8_MAX) { - /* first instance */ - hpet_cfg.count =3D 0; - } - if (hpet_cfg.count =3D=3D 8) { fprintf(stderr, "Only 8 instances of HPET is allowed\n"); return -1; --=20 1.6.0.2