From nobody Tue Feb 10 09:02:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529331160334431.71358199022154; Mon, 18 Jun 2018 07:12:40 -0700 (PDT) Received: from localhost ([::1]:34977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUutb-0003gs-Ie for importer@patchew.org; Mon, 18 Jun 2018 10:12:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUuq2-0000yz-VH for qemu-devel@nongnu.org; Mon, 18 Jun 2018 10:09:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUuq1-0000TP-Td for qemu-devel@nongnu.org; Mon, 18 Jun 2018 10:08:58 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36314 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fUuq1-0000Sx-Ln for qemu-devel@nongnu.org; Mon, 18 Jun 2018 10:08:57 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18A60803F869 for ; Mon, 18 Jun 2018 14:08:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-237.ams2.redhat.com [10.36.117.237]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C6D1D2142F20; Mon, 18 Jun 2018 14:08:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 8B9B2113865B; Mon, 18 Jun 2018 16:08:54 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 16:08:52 +0200 Message-Id: <20180618140854.17824-6-armbru@redhat.com> In-Reply-To: <20180618140854.17824-1-armbru@redhat.com> References: <20180618140854.17824-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 18 Jun 2018 14:08:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 18 Jun 2018 14:08:57 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 5/7] monitor: remove event_clock_type X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Xu Instead, use a dynamic function to detect which clock we'll use. The problem is that the old code will let monitor initialization depend on configure_accelerator() (that's where qtest_enabled() start to take effect). After this change, we don't have such a dependency any more. We just need to make sure configure_accelerator() is called when we start to use it. Now it's only used in monitor_qapi_event_queue() and monitor_qapi_event_handler(), so we're good. Suggested-by: Markus Armbruster Signed-off-by: Peter Xu Message-Id: <20180608035511.7439-6-peterx@redhat.com> Reviewed-by: Markus Armbruster [monitor_get_event_clock() name and comment tweaked] Reviewed-by: Stefan Hajnoczi Signed-off-by: Markus Armbruster --- monitor.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/monitor.c b/monitor.c index fa9c35631f..e805e40799 100644 --- a/monitor.c +++ b/monitor.c @@ -281,8 +281,6 @@ QmpCommandList qmp_commands, qmp_cap_negotiation_comman= ds; =20 Monitor *cur_mon; =20 -static QEMUClockType event_clock_type =3D QEMU_CLOCK_REALTIME; - static void monitor_command_cb(void *opaque, const char *cmdline, void *readline_opaque); =20 @@ -309,6 +307,19 @@ static inline bool monitor_is_hmp_non_interactive(cons= t Monitor *mon) return !monitor_is_qmp(mon) && !monitor_uses_readline(mon); } =20 +/* + * Return the clock to use for recording an event's time. + * Beware: result is invalid before configure_accelerator(). + */ +static inline QEMUClockType monitor_get_event_clock(void) +{ + /* + * This allows us to perform tests on the monitor queues to verify + * that the rate limits are enforced. + */ + return qtest_enabled() ? QEMU_CLOCK_VIRTUAL : QEMU_CLOCK_REALTIME; +} + /** * Is the current monitor, if any, a QMP monitor? */ @@ -632,7 +643,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict,= Error **errp) * monitor_qapi_event_handler() in evconf->rate ns. Any * events arriving before then will be delayed until then. */ - int64_t now =3D qemu_clock_get_ns(event_clock_type); + int64_t now =3D qemu_clock_get_ns(monitor_get_event_clock()); =20 monitor_qapi_event_emit(event, qdict); =20 @@ -640,7 +651,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict,= Error **errp) evstate->event =3D event; evstate->data =3D qobject_ref(data); evstate->qdict =3D NULL; - evstate->timer =3D timer_new_ns(event_clock_type, + evstate->timer =3D timer_new_ns(monitor_get_event_clock(), monitor_qapi_event_handler, evstate); g_hash_table_add(monitor_qapi_event_state, evstate); @@ -665,7 +676,7 @@ static void monitor_qapi_event_handler(void *opaque) qemu_mutex_lock(&monitor_lock); =20 if (evstate->qdict) { - int64_t now =3D qemu_clock_get_ns(event_clock_type); + int64_t now =3D qemu_clock_get_ns(monitor_get_event_clock()); =20 monitor_qapi_event_emit(evstate->event, evstate->qdict); qobject_unref(evstate->qdict); @@ -721,10 +732,6 @@ static gboolean qapi_event_throttle_equal(const void *= a, const void *b) =20 static void monitor_qapi_event_init(void) { - if (qtest_enabled()) { - event_clock_type =3D QEMU_CLOCK_VIRTUAL; - } - monitor_qapi_event_state =3D g_hash_table_new(qapi_event_throttle_hash, qapi_event_throttle_equal); qmp_event_set_func_emit(monitor_qapi_event_queue); --=20 2.17.1