OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

monitor: allow calling monitor_resume under mon_lock

Browse Source 
Move monitor_resume()'s call to readline_show_prompt() outside the
potentially locked section.  Reuse the existing monitor_accept_input()
bottom half for this purpose.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-17 17:19:03 +02:00
parent e37548ef13
commit c5d0c55f1a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
monitor/monitor.c
View File

@ -567,6 +567,12 @@ static void monitor_accept_input(void *opaque)
{ {
Monitor *mon = opaque; Monitor *mon = opaque;
if (!monitor_is_qmp(mon)) {
MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
assert(hmp_mon->rs);
readline_show_prompt(hmp_mon->rs);
}
qemu_chr_fe_accept_input(&mon->chr); qemu_chr_fe_accept_input(&mon->chr);
} }
@ -585,12 +591,6 @@ void monitor_resume(Monitor *mon)
ctx = qemu_get_aio_context(); ctx = qemu_get_aio_context();
} }
if (!monitor_is_qmp(mon)) {
MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
assert(hmp_mon->rs);
readline_show_prompt(hmp_mon->rs);
}
aio_bh_schedule_oneshot(ctx, monitor_accept_input, mon); aio_bh_schedule_oneshot(ctx, monitor_accept_input, mon);
} }