monitor: no need to save need_resume
There is no need for per-command need_resume granularity, it should resume after running an non-oob command on oob-disabled monitor. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20180829134043.31706-5-marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
27656018d8
commit
176160ce78
13
monitor.c
13
monitor.c
|
@ -256,12 +256,6 @@ struct QMPRequest {
|
||||||
*/
|
*/
|
||||||
QObject *req;
|
QObject *req;
|
||||||
Error *err;
|
Error *err;
|
||||||
/*
|
|
||||||
* Whether we need to resume the monitor afterward. This flag is
|
|
||||||
* used to emulate the old QMP server behavior that the current
|
|
||||||
* command must be completed before execution of the next one.
|
|
||||||
*/
|
|
||||||
bool need_resume;
|
|
||||||
};
|
};
|
||||||
typedef struct QMPRequest QMPRequest;
|
typedef struct QMPRequest QMPRequest;
|
||||||
|
|
||||||
|
@ -4131,11 +4125,14 @@ static void monitor_qmp_bh_dispatcher(void *data)
|
||||||
{
|
{
|
||||||
QMPRequest *req_obj = monitor_qmp_requests_pop_any();
|
QMPRequest *req_obj = monitor_qmp_requests_pop_any();
|
||||||
QDict *rsp;
|
QDict *rsp;
|
||||||
|
bool need_resume;
|
||||||
|
|
||||||
if (!req_obj) {
|
if (!req_obj) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* qmp_oob_enabled() might change after "qmp_capabilities" */
|
||||||
|
need_resume = !qmp_oob_enabled(req_obj->mon);
|
||||||
if (req_obj->req) {
|
if (req_obj->req) {
|
||||||
trace_monitor_qmp_cmd_in_band(qobject_get_try_str(req_obj->id) ?: "");
|
trace_monitor_qmp_cmd_in_band(qobject_get_try_str(req_obj->id) ?: "");
|
||||||
monitor_qmp_dispatch(req_obj->mon, req_obj->req, req_obj->id);
|
monitor_qmp_dispatch(req_obj->mon, req_obj->req, req_obj->id);
|
||||||
|
@ -4147,7 +4144,7 @@ static void monitor_qmp_bh_dispatcher(void *data)
|
||||||
qobject_unref(rsp);
|
qobject_unref(rsp);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (req_obj->need_resume) {
|
if (need_resume) {
|
||||||
/* Pairs with the monitor_suspend() in handle_qmp_command() */
|
/* Pairs with the monitor_suspend() in handle_qmp_command() */
|
||||||
monitor_resume(req_obj->mon);
|
monitor_resume(req_obj->mon);
|
||||||
}
|
}
|
||||||
|
@ -4195,7 +4192,6 @@ static void handle_qmp_command(void *opaque, QObject *req, Error *err)
|
||||||
req_obj->id = id;
|
req_obj->id = id;
|
||||||
req_obj->req = req;
|
req_obj->req = req;
|
||||||
req_obj->err = err;
|
req_obj->err = err;
|
||||||
req_obj->need_resume = false;
|
|
||||||
|
|
||||||
/* Protect qmp_requests and fetching its length. */
|
/* Protect qmp_requests and fetching its length. */
|
||||||
qemu_mutex_lock(&mon->qmp.qmp_queue_lock);
|
qemu_mutex_lock(&mon->qmp.qmp_queue_lock);
|
||||||
|
@ -4208,7 +4204,6 @@ static void handle_qmp_command(void *opaque, QObject *req, Error *err)
|
||||||
*/
|
*/
|
||||||
if (!qmp_oob_enabled(mon)) {
|
if (!qmp_oob_enabled(mon)) {
|
||||||
monitor_suspend(mon);
|
monitor_suspend(mon);
|
||||||
req_obj->need_resume = true;
|
|
||||||
} else {
|
} else {
|
||||||
/* Drop the request if queue is full. */
|
/* Drop the request if queue is full. */
|
||||||
if (mon->qmp.qmp_requests->length >= QMP_REQ_QUEUE_LEN_MAX) {
|
if (mon->qmp.qmp_requests->length >= QMP_REQ_QUEUE_LEN_MAX) {
|
||||||
|
|
Loading…
Reference in a new issue