[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 19/32] monitor: Rename use_io_thr to use_io_threa
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 19/32] monitor: Rename use_io_thr to use_io_thread |
Date: |
Tue, 3 Jul 2018 10:53:45 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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;
/*
* 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,
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);
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_flush,
/* Use *mon_cmds by default. */
mon->cmd_table = mon_cmds;
mon->skip_flush = skip_flush;
- mon->use_io_thr = use_io_thr;
+ mon->use_io_thread = use_io_thread;
mon->qmp.qmp_requests = g_queue_new();
mon->qmp.qmp_responses = g_queue_new();
}
@@ -1270,7 +1270,7 @@ static void qmp_caps_check(Monitor *mon,
QMPCapabilityList *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_iothread));
}
} else {
@@ -4396,7 +4396,7 @@ static QObject *get_qmp_greeting(Monitor *mon)
qmp_marshal_query_version(NULL, &ver, NULL);
for (cap = 0; cap < QMP_CAPABILITY__MAX; cap++) {
- if (!mon->use_io_thr && cap == QMP_CAPABILITY_OOB) {
+ if (!mon->use_io_thread && cap == 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 *opaque)
Monitor *mon = opaque;
GMainContext *context;
- 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 = 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=on.
--
2.17.1
- [Qemu-devel] [PATCH v2 27/32] qmp: Add some comments around null responses, (continued)
- [Qemu-devel] [PATCH v2 27/32] qmp: Add some comments around null responses, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 24/32] qmp: Replace monitor_json_emitter{, raw}() by qmp_{queue, send}_response(), Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 07/32] qmp: Make "id" optional again even in "oob" monitors, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 12/32] qmp: Redo how the client requests out-of-band execution, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 31/32] monitor: Improve some comments, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 20/32] monitor: Peel off @mon_global wrapper, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 23/32] qmp: Use QDict * instead of QObject * for response objects, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 32/32] qapi: Polish command flags documentation in qapi-code-gen.txt, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 19/32] monitor: Rename use_io_thr to use_io_thread,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 30/32] qmp: Clean up capability negotiation after commit 02130314d8c, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 14/32] qmp: Always free QMPRequest with qmp_request_free(), Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 04/32] qmp: Document COMMAND_DROPPED design flaw, Markus Armbruster, 2018/07/03
- [Qemu-devel] [PATCH v2 21/32] qobject: New qdict_from_jsonf_nofail(), Markus Armbruster, 2018/07/03