From nobody Sun Nov 2 11:45:10 2025 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 1527574007062939.488446373831; Mon, 28 May 2018 23:06:47 -0700 (PDT) Received: from localhost ([::1]:59097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNXmH-00020Z-4c for importer@patchew.org; Tue, 29 May 2018 02:06:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58791) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNXeQ-0004Tz-Mh for qemu-devel@nongnu.org; Tue, 29 May 2018 01:58:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNXeP-0001Qg-Si for qemu-devel@nongnu.org; Tue, 29 May 2018 01:58:30 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52728 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 1fNXeP-0001QW-N6 for qemu-devel@nongnu.org; Tue, 29 May 2018 01:58:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 389E7401EF09 for ; Tue, 29 May 2018 05:58:29 +0000 (UTC) Received: from xz-mi.nay.redhat.com (dhcp-14-151.nay.redhat.com [10.66.14.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5588B42227; Tue, 29 May 2018 05:58:26 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 13:57:53 +0800 Message-Id: <20180529055755.12404-6-peterx@redhat.com> In-Reply-To: <20180529055755.12404-1-peterx@redhat.com> References: <20180529055755.12404-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Tue, 29 May 2018 05:58:29 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Tue, 29 May 2018 05:58:29 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@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] [PATCH v9 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: Markus Armbruster , peterx@redhat.com, "Dr . David Alan Gilbert" , Stefan Hajnoczi , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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" Instead, use a dynamic function to detect which clock we'll use. The problem is that the old code will let monitor initialization depends on qtest_enabled(). After this change, we don't have such a dependency any more. Suggested-by: Markus Armbruster Signed-off-by: Peter Xu --- monitor.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/monitor.c b/monitor.c index 2504696d76..bd9ab5597f 100644 --- a/monitor.c +++ b/monitor.c @@ -282,8 +282,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 @@ -310,6 +308,15 @@ static inline bool monitor_is_hmp_non_interactive(cons= t Monitor *mon) return !monitor_is_qmp(mon) && !monitor_uses_readline(mon); } =20 +static inline QEMUClockType monitor_get_clock(void) +{ + if (qtest_enabled()) { + return QEMU_CLOCK_VIRTUAL; + } else { + return QEMU_CLOCK_REALTIME; + } +} + /** * Is the current monitor, if any, a QMP monitor? */ @@ -633,7 +640,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_clock()); =20 monitor_qapi_event_emit(event, qdict); =20 @@ -641,7 +648,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_clock(), monitor_qapi_event_handler, evstate); g_hash_table_add(monitor_qapi_event_state, evstate); @@ -666,7 +673,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_clock()); =20 monitor_qapi_event_emit(evstate->event, evstate->qdict); qobject_unref(evstate->qdict); @@ -722,10 +729,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.0