diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-10-05 17:58:44 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-10-09 07:08:19 +0200 |
| commit | 947e47448dcc4e4d7a8b7c42b43acb3435b3ad35 (patch) | |
| tree | 855a18a7da785ee7dff7919ec9a02be34c6ff51c /monitor/hmp.c | |
| parent | 87e6f4a4d6885006931b371771e2933c40700427 (diff) | |
monitor: Use getter/setter functions for cur_mon
cur_mon really needs to be coroutine-local as soon as we move monitor
command handlers to coroutines and let them yield. As a first step, just
remove all direct accesses to cur_mon so that we can implement this in
the getter function later.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201005155855.256490-4-kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'monitor/hmp.c')
| -rw-r--r-- | monitor/hmp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/monitor/hmp.c b/monitor/hmp.c index 4ecdefd705..e0cc9e65dd 100644 --- a/monitor/hmp.c +++ b/monitor/hmp.c @@ -1300,12 +1300,11 @@ cleanup: static void monitor_read(void *opaque, const uint8_t *buf, int size) { - MonitorHMP *mon; - Monitor *old_mon = cur_mon; + MonitorHMP *mon = container_of(opaque, MonitorHMP, common); + Monitor *old_mon; int i; - cur_mon = opaque; - mon = container_of(cur_mon, MonitorHMP, common); + old_mon = monitor_set_cur(&mon->common); if (mon->rs) { for (i = 0; i < size; i++) { @@ -1313,13 +1312,13 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size) } } else { if (size == 0 || buf[size - 1] != 0) { - monitor_printf(cur_mon, "corrupted command\n"); + monitor_printf(&mon->common, "corrupted command\n"); } else { handle_hmp_command(mon, (char *)buf); } } - cur_mon = old_mon; + monitor_set_cur(old_mon); } static void monitor_event(void *opaque, QEMUChrEvent event) |