From nobody Tue Nov 4 18:40:41 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 15306088862611004.0910334553693; Tue, 3 Jul 2018 02:08:06 -0700 (PDT) Received: from localhost ([::1]:38988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faHI5-0004j6-Ed for importer@patchew.org; Tue, 03 Jul 2018 05:08:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faH4Z-0001T7-Rn for qemu-devel@nongnu.org; Tue, 03 Jul 2018 04:54:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faH4W-0007Er-AN for qemu-devel@nongnu.org; Tue, 03 Jul 2018 04:54:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52200 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 1faH4W-0007EK-5O for qemu-devel@nongnu.org; Tue, 03 Jul 2018 04:54:04 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A75EF40704BC; Tue, 3 Jul 2018 08:54:03 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-126.ams2.redhat.com [10.36.116.126]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D2E82026D76; Tue, 3 Jul 2018 08:54:03 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D88D21132CB0; Tue, 3 Jul 2018 10:53:58 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 3 Jul 2018 10:53:45 +0200 Message-Id: <20180703085358.13941-20-armbru@redhat.com> In-Reply-To: <20180703085358.13941-1-armbru@redhat.com> References: <20180703085358.13941-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 03 Jul 2018 08:54:03 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 03 Jul 2018 08:54:03 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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] [PATCH v2 19/32] monitor: Rename use_io_thr to use_io_thread 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: mdroth@linux.vnet.ibm.com, stefanha@redhat.com, peterx@redhat.com, dgilbert@redhat.com 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" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- monitor.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/monitor.c b/monitor.c index fd83a57dda..10b6634d3e 100644 --- a/monitor.c +++ b/monitor.c @@ -206,11 +206,11 @@ struct Monitor { int flags; int suspend_cnt; /* Needs to be accessed atomically */ bool skip_flush; - bool use_io_thr; + bool use_io_thread; =20 /* * State used only in the thread "owning" the monitor. - * If @use_io_thr, this is mon_global.mon_iothread. + * If @use_io_thread, this is mon_global.mon_iothread. * Else, it's the main thread. * These members can be safely accessed without locks. */ @@ -520,7 +520,7 @@ static void monitor_json_emitter_raw(Monitor *mon, =20 static void monitor_json_emitter(Monitor *mon, QObject *data) { - if (mon->use_io_thr) { + if (mon->use_io_thread) { /* * If using I/O thread, we need to queue the item so that I/O * thread will do the rest for us. Take refcount so that @@ -766,7 +766,7 @@ static void monitor_qapi_event_init(void) static void handle_hmp_command(Monitor *mon, const char *cmdline); =20 static void monitor_data_init(Monitor *mon, bool skip_flush, - bool use_io_thr) + bool use_io_thread) { memset(mon, 0, sizeof(Monitor)); qemu_mutex_init(&mon->mon_lock); @@ -775,7 +775,7 @@ static void monitor_data_init(Monitor *mon, bool skip_f= lush, /* Use *mon_cmds by default. */ mon->cmd_table =3D mon_cmds; mon->skip_flush =3D skip_flush; - mon->use_io_thr =3D use_io_thr; + mon->use_io_thread =3D use_io_thread; mon->qmp.qmp_requests =3D g_queue_new(); mon->qmp.qmp_responses =3D g_queue_new(); } @@ -1270,7 +1270,7 @@ static void qmp_caps_check(Monitor *mon, QMPCapabilit= yList *list, assert(list->value < QMP_CAPABILITY__MAX); switch (list->value) { case QMP_CAPABILITY_OOB: - if (!mon->use_io_thr) { + if (!mon->use_io_thread) { /* * Out-of-band only works with monitors that are * running on dedicated I/O thread. @@ -4376,7 +4376,7 @@ void monitor_resume(Monitor *mon) * For QMP monitors that are running in I/O thread, let's * kick the thread in case it's sleeping. */ - if (mon->use_io_thr) { + if (mon->use_io_thread) { aio_notify(iothread_get_aio_context(mon_global.mon_iothrea= d)); } } else { @@ -4396,7 +4396,7 @@ static QObject *get_qmp_greeting(Monitor *mon) qmp_marshal_query_version(NULL, &ver, NULL); =20 for (cap =3D 0; cap < QMP_CAPABILITY__MAX; cap++) { - if (!mon->use_io_thr && cap =3D=3D QMP_CAPABILITY_OOB) { + if (!mon->use_io_thread && cap =3D=3D QMP_CAPABILITY_OOB) { /* Monitors that are not using I/O thread won't support OOB */ continue; } @@ -4609,9 +4609,9 @@ static void monitor_qmp_setup_handlers_bh(void *opaqu= e) Monitor *mon =3D opaque; GMainContext *context; =20 - if (mon->use_io_thr) { + if (mon->use_io_thread) { /* - * When use_io_thr is set, we use the global shared dedicated + * When @use_io_thread is set, we use the global shared dedicated * I/O thread for this monitor to handle input/output. */ context =3D monitor_get_io_context(); @@ -4660,7 +4660,7 @@ void monitor_init(Chardev *chr, int flags) if (monitor_is_qmp(mon)) { qemu_chr_fe_set_echo(&mon->chr, true); json_message_parser_init(&mon->qmp.parser, handle_qmp_command); - if (mon->use_io_thr) { + if (mon->use_io_thread) { /* * Make sure the old iowatch is gone. It's possible when * e.g. the chardev is in client mode, with wait=3Don. --=20 2.17.1