From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39544 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PvvtH-00023C-Q5 for qemu-devel@nongnu.org; Sat, 05 Mar 2011 13:07:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PvvtG-00076R-Om for qemu-devel@nongnu.org; Sat, 05 Mar 2011 13:07:43 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:48333) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PvvtG-00075l-8y for qemu-devel@nongnu.org; Sat, 05 Mar 2011 13:07:42 -0500 Message-ID: <4D727BE7.1090001@web.de> Date: Sat, 05 Mar 2011 19:07:35 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1299345255-577-1-git-send-email-pbonzini@redhat.com> <1299345255-577-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1299345255-577-2-git-send-email-pbonzini@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig3141E98D9D2C443A3A312CA5" Sender: jan.kiszka@web.de Subject: [Qemu-devel] Re: [PATCH 1/3] qemu_next_deadline should not consider host-time timers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: edgar.iglesias@gmail.com, mtosatti@redhat.com, qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig3141E98D9D2C443A3A312CA5 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 2011-03-05 18:14, Paolo Bonzini wrote: > It is purely for icount-based virtual timers. How about renaming the function to clarify its scope? Jan >=20 > Signed-off-by: Paolo Bonzini > --- > qemu-timer.c | 7 +------ > 1 files changed, 1 insertions(+), 6 deletions(-) >=20 > diff --git a/qemu-timer.c b/qemu-timer.c > index 88c7b28..06fa507 100644 > --- a/qemu-timer.c > +++ b/qemu-timer.c > @@ -689,16 +689,11 @@ int64_t qemu_next_deadline(void) > /* To avoid problems with overflow limit this to 2^32. */ > int64_t delta =3D INT32_MAX; > =20 > + assert(use_icount); > if (active_timers[QEMU_CLOCK_VIRTUAL]) { > delta =3D active_timers[QEMU_CLOCK_VIRTUAL]->expire_time - > qemu_get_clock_ns(vm_clock); > } > - if (active_timers[QEMU_CLOCK_HOST]) { > - int64_t hdelta =3D active_timers[QEMU_CLOCK_HOST]->expire_time= - > - qemu_get_clock_ns(host_clock); > - if (hdelta < delta) > - delta =3D hdelta; > - } > =20 > if (delta < 0) > delta =3D 0; --------------enig3141E98D9D2C443A3A312CA5 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.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk1ye+oACgkQitSsb3rl5xTL1ACgoprHI48gL12jrwfQ0F4qi1QI vZQAmwS+yLbvM8uG/PKUnzzA05dfXX56 =GtsX -----END PGP SIGNATURE----- --------------enig3141E98D9D2C443A3A312CA5--