From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55515 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OOmeT-0004YP-0D for qemu-devel@nongnu.org; Wed, 16 Jun 2010 03:03:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OOmeR-0005uk-B9 for qemu-devel@nongnu.org; Wed, 16 Jun 2010 03:03:08 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:36541) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OOmeR-0005uR-0I for qemu-devel@nongnu.org; Wed, 16 Jun 2010 03:03:07 -0400 Message-ID: <4C187725.2000902@web.de> Date: Wed, 16 Jun 2010 09:03:01 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <4C18015C.1070306@web.de> <20100616044047.GF13238@redhat.com> In-Reply-To: <20100616044047.GF13238@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigFC6546CA4891097F23AE4935" Sender: jan.kiszka@web.de Subject: [Qemu-devel] Re: [PATCH] hpet: Clean up initial hpet counter List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gleb Natapov Cc: qemu-devel This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigFC6546CA4891097F23AE4935 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Gleb Natapov wrote: > On Wed, Jun 16, 2010 at 12:40:28AM +0200, Jan Kiszka wrote: >> 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. >> > I want seabios to be able to distinguish between old qemu and new one. I see now. But isn't it a good chance to introduce a proper generic interface for exploring supported fw-cfg keys? Jan > Hence special value. I used it incorrectly in may v2 seabios patch. Wil= l > resend asap. Will teach me to not change logic at the last minute :( I > removed "valid" field between v1 and v2 of the patches and introduces > special value for count instead. As a result I made one bug in qemu and= > one is seabios. Heh. >=20 >> 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 >=20 > -- > Gleb. --------------enigFC6546CA4891097F23AE4935 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkwYdykACgkQitSsb3rl5xTeGwCg3ap1EgZ1Bxm9hmXtIc0SbYg3 GpwAoMT9yAwbuUNEROJCHrdv8ZbHoY6n =bjde -----END PGP SIGNATURE----- --------------enigFC6546CA4891097F23AE4935--