From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C49FDC433E6 for ; Tue, 2 Mar 2021 02:33:31 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1F1BF64DA8 for ; Tue, 2 Mar 2021 02:33:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1F1BF64DA8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGuqo-0005A5-51 for qemu-devel@archiver.kernel.org; Mon, 01 Mar 2021 21:33:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGupQ-00048A-73; Mon, 01 Mar 2021 21:32:04 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:36463 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGupN-0005od-HF; Mon, 01 Mar 2021 21:32:03 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 4DqLk435F2z9sWC; Tue, 2 Mar 2021 13:31:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1614652316; bh=KmIDHRzwwmRUk86R84oNEvUAsKrV7npCpf2HMqNFRss=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=isXQC+ZdN6eMY92qAMKdXZKUtgrgyrGL/dvtiTLuhJmZCav4FAvz3Ky7TraDceuvN oNMKuGbYn3JcWYP3kYMd+Ih8DktXq5JSRhyP0brBi5pHyuvfop+8dy0HMAudyiEXMQ 7G92XPz629ZCxC+uKLJNQ2R61WkKvb3xZhzpQKug= Date: Tue, 2 Mar 2021 13:13:40 +1100 From: David Gibson To: Daniel Henrique Barboza Subject: Re: [PATCH v2 1/1] qemu_timer.c: add timer_deadline_ms() helper Message-ID: References: <20210301124133.23800-1-danielhb413@gmail.com> <20210301124133.23800-2-danielhb413@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="mKr1PWo0DRGWkDQ+" Content-Disposition: inline In-Reply-To: <20210301124133.23800-2-danielhb413@gmail.com> Received-SPF: pass client-ip=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , qemu-ppc@nongnu.org, qemu-devel@nongnu.org, groug@kaod.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --mKr1PWo0DRGWkDQ+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Mar 01, 2021 at 09:41:33AM -0300, Daniel Henrique Barboza wrote: > The pSeries machine is using QEMUTimer internals to return the timeout > in seconds for a timer object, in hw/ppc/spapr.c, function > spapr_drc_unplug_timeout_remaining_sec(). >=20 > Create a helper in qemu-timer.c to retrieve the deadline for a QEMUTimer > object, in ms, to avoid exposing timer internals to the PPC code. >=20 > CC: Paolo Bonzini > Acked-by: Paolo Bonzini > Signed-off-by: Daniel Henrique Barboza Applied to ppc-for-6.0, replacing the earlier version. > --- > hw/ppc/spapr_drc.c | 5 ++--- > include/qemu/timer.h | 8 ++++++++ > util/qemu-timer.c | 13 +++++++++++++ > 3 files changed, 23 insertions(+), 3 deletions(-) >=20 > diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c > index 8c4997d795..98b626acf9 100644 > --- a/hw/ppc/spapr_drc.c > +++ b/hw/ppc/spapr_drc.c > @@ -421,9 +421,8 @@ void spapr_drc_unplug_request(SpaprDrc *drc) > =20 > int spapr_drc_unplug_timeout_remaining_sec(SpaprDrc *drc) > { > - if (drc->unplug_requested && timer_pending(drc->unplug_timeout_timer= )) { > - return (qemu_timeout_ns_to_ms(drc->unplug_timeout_timer->expire_= time) - > - qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL)) / 1000; > + if (drc->unplug_requested) { > + return timer_deadline_ms(drc->unplug_timeout_timer) / 1000; > } > =20 > return 0; > diff --git a/include/qemu/timer.h b/include/qemu/timer.h > index 1678238384..5e76e3f8c2 100644 > --- a/include/qemu/timer.h > +++ b/include/qemu/timer.h > @@ -795,6 +795,14 @@ static inline int64_t get_max_clock_jump(void) > return 60 * NANOSECONDS_PER_SECOND; > } > =20 > +/** > + * timer_deadline_ms: > + * > + * Returns the remaining miliseconds for @timer to expire, or zero > + * if the timer is no longer pending. > + */ > +int64_t timer_deadline_ms(QEMUTimer *timer); > + > /* > * Low level clock functions > */ > diff --git a/util/qemu-timer.c b/util/qemu-timer.c > index 81c28af517..02424bc1b6 100644 > --- a/util/qemu-timer.c > +++ b/util/qemu-timer.c > @@ -243,6 +243,19 @@ int64_t timerlist_deadline_ns(QEMUTimerList *timer_l= ist) > return delta; > } > =20 > +/* > + * Returns the time remaining for the deadline, in ms. > + */ > +int64_t timer_deadline_ms(QEMUTimer *timer) > +{ > + if (timer_pending(timer)) { > + return qemu_timeout_ns_to_ms(timer->expire_time) - > + qemu_clock_get_ms(timer->timer_list->clock->type); > + } > + > + return 0; > +} > + > /* Calculate the soonest deadline across all timerlists attached > * to the clock. This is used for the icount timeout so we > * ignore whether or not the clock should be used in deadline --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --mKr1PWo0DRGWkDQ+ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmA9n1QACgkQbDjKyiDZ s5IUjA/+Kno2UJVHSt1nmA73kNc5VRsrfImRWxxcwdspBLkUkWUbYkdsNSuDXNLG LoETMwaaH0bShNI2OMpku1vbOgSvTDeHXlna3otTer6lZeZFVDd7kpu44A3joguD pODZ/UQNdNmFfdRtVKr+PoFTAeQiia9Ai3ib2lBE72LIePgQzO5+FeAVJJxeHmv3 kGWB6hDuCalR12qBqJqsrA+qtduEPVp9WzNbfNjkaAkN6kzCFlAWos1i4I8jYdN/ q2yqv6IpwPsH+YaZ8IvNbjYw749lLyMqkCAGS6gvTOPMdbX7F/5aiKupnFmLtefN b+4bhBKYZ/ND6/qlYtWjkgt3pC9JFbYULtI9S5DzSb5OeBaqgh2SDA8OBKOdnrcD JR1BtfkXGNND/k/KcumU26n2a4onu19Xy3TOyKZhkXdftnwD2fSXyTt/kf8kVsS0 31liIbYUTjMP0iM+jnjzxIX7G7EoQiy4cdDqDYrbxvFQFakcrKPxixDgi6ev60wv FfMaqDbO1zPuUdmn0p5Y9qYYHYAaHXZZUHyTyOcCmzBY7RyeuRV0gTnp99EvATds pbjKx52kfcqTdt8Qc+BLENHUrSyA2pniMKRidAxzjBG10ppptP7z4Pcw3OwxWQ+O fjWQbrlmsOZII83XWmQkAo/YVzn0EoLl5L1qsd9m2DrAbWoCehY= =banN -----END PGP SIGNATURE----- --mKr1PWo0DRGWkDQ+--