motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-23 10:01:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

monitor: Rename use_io_thr to use_io_thread

Browse source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-20-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-07-03 10:53:45 +02:00
parent 1cc3747152
commit f91dc2a0d0
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
monitor.c
View file

@ -207,11 +207,11 @@ struct Monitor {
int flags; int flags;
int suspend_cnt; /* Needs to be accessed atomically */ int suspend_cnt; /* Needs to be accessed atomically */
bool skip_flush; bool skip_flush;
bool use_io_thr; bool use_io_thread;
/* /*
* State used only in the thread "owning" the monitor. * 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. * Else, it's the main thread.
* These members can be safely accessed without locks. * These members can be safely accessed without locks.
*/ */
@ -521,7 +521,7 @@ static void monitor_json_emitter_raw(Monitor *mon,
static void monitor_json_emitter(Monitor *mon, QObject *data) 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 * 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 * thread will do the rest for us. Take refcount so that
@ -767,7 +767,7 @@ static void monitor_qapi_event_init(void)
static void handle_hmp_command(Monitor *mon, const char *cmdline); static void handle_hmp_command(Monitor *mon, const char *cmdline);
static void monitor_data_init(Monitor *mon, bool skip_flush, static void monitor_data_init(Monitor *mon, bool skip_flush,
bool use_io_thr) bool use_io_thread)
{ {
memset(mon, 0, sizeof(Monitor)); memset(mon, 0, sizeof(Monitor));
qemu_mutex_init(&mon->mon_lock); qemu_mutex_init(&mon->mon_lock);
@ -776,7 +776,7 @@ static void monitor_data_init(Monitor *mon, bool skip_flush,
/* Use *mon_cmds by default. */ /* Use *mon_cmds by default. */
mon->cmd_table = mon_cmds; mon->cmd_table = mon_cmds;
mon->skip_flush = skip_flush; 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_requests = g_queue_new();
mon->qmp.qmp_responses = g_queue_new(); mon->qmp.qmp_responses = g_queue_new();
} }
@ -1271,7 +1271,7 @@ static void qmp_caps_check(Monitor *mon, QMPCapabilityList *list,
assert(list->value < QMP_CAPABILITY__MAX); assert(list->value < QMP_CAPABILITY__MAX);
switch (list->value) { switch (list->value) {
case QMP_CAPABILITY_OOB: case QMP_CAPABILITY_OOB:
if (!mon->use_io_thr) { if (!mon->use_io_thread) {
/* /*
* Out-of-band only works with monitors that are * Out-of-band only works with monitors that are
* running on dedicated I/O thread. * running on dedicated I/O thread.
@ -4377,7 +4377,7 @@ void monitor_resume(Monitor *mon)
* For QMP monitors that are running in I/O thread, let's * For QMP monitors that are running in I/O thread, let's
* kick the thread in case it's sleeping. * 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)); aio_notify(iothread_get_aio_context(mon_global.mon_iothread));
} }
} else { } else {
@ -4397,7 +4397,7 @@ static QObject *get_qmp_greeting(Monitor *mon)
qmp_marshal_query_version(NULL, &ver, NULL); qmp_marshal_query_version(NULL, &ver, NULL);
for (cap = 0; cap < QMP_CAPABILITY__MAX; cap++) { 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 */ /* Monitors that are not using I/O thread won't support OOB */
continue; continue;
} }
@ -4610,9 +4610,9 @@ static void monitor_qmp_setup_handlers_bh(void *opaque)
Monitor *mon = opaque; Monitor *mon = opaque;
GMainContext *context; 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. * I/O thread for this monitor to handle input/output.
*/ */
context = monitor_get_io_context(); context = monitor_get_io_context();
@ -4661,7 +4661,7 @@ void monitor_init(Chardev *chr, int flags)
if (monitor_is_qmp(mon)) { if (monitor_is_qmp(mon)) {
qemu_chr_fe_set_echo(&mon->chr, true); qemu_chr_fe_set_echo(&mon->chr, true);
json_message_parser_init(&mon->qmp.parser, handle_qmp_command); 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 * Make sure the old iowatch is gone. It's possible when
* e.g. the chardev is in client mode, with wait=on. * e.g. the chardev is in client mode, with wait=on.