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/qmp.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/qmp.c')
| -rw-r--r-- | monitor/qmp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/monitor/qmp.c b/monitor/qmp.c index d433ceae5b..bb2d9d0cc7 100644 --- a/monitor/qmp.c +++ b/monitor/qmp.c @@ -139,12 +139,9 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req) QDict *rsp; QDict *error; - old_mon = cur_mon; - cur_mon = &mon->common; - + old_mon = monitor_set_cur(&mon->common); rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon)); - - cur_mon = old_mon; + monitor_set_cur(old_mon); if (mon->commands == &qmp_cap_negotiation_commands) { error = qdict_get_qdict(rsp, "error"); |