[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch()
From: |
Kevin Wolf |
Subject: |
Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch() |
Date: |
Fri, 25 Sep 2020 17:13:04 +0200 |
Am 14.09.2020 um 17:10 hat Markus Armbruster geschrieben:
> Kevin Wolf <kwolf@redhat.com> writes:
>
> > The correct way to set the current monitor for a coroutine handler will
> > be different than for a blocking handler, so monitor_set_cur() needs to
> > be called in qmp_dispatch().
> >
> > Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> > ---
> > include/qapi/qmp/dispatch.h | 3 ++-
> > monitor/qmp.c | 8 +-------
> > qapi/qmp-dispatch.c | 8 +++++++-
> > qga/main.c | 2 +-
> > stubs/monitor-core.c | 5 +++++
> > tests/test-qmp-cmds.c | 6 +++---
> > 6 files changed, 19 insertions(+), 13 deletions(-)
> >
> > diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h
> > index 5a9cf82472..0c2f467028 100644
> > --- a/include/qapi/qmp/dispatch.h
> > +++ b/include/qapi/qmp/dispatch.h
> > @@ -14,6 +14,7 @@
> > #ifndef QAPI_QMP_DISPATCH_H
> > #define QAPI_QMP_DISPATCH_H
> >
> > +#include "monitor/monitor.h"
> > #include "qemu/queue.h"
> >
> > typedef void (QmpCommandFunc)(QDict *, QObject **, Error **);
> > @@ -49,7 +50,7 @@ const char *qmp_command_name(const QmpCommand *cmd);
> > bool qmp_has_success_response(const QmpCommand *cmd);
> > QDict *qmp_error_response(Error *err);
> > QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request,
> > - bool allow_oob);
> > + bool allow_oob, Monitor *cur_mon);
> > bool qmp_is_oob(const QDict *dict);
> >
> > typedef void (*qmp_cmd_callback_fn)(const QmpCommand *cmd, void *opaque);
> > diff --git a/monitor/qmp.c b/monitor/qmp.c
> > index 8469970c69..922fdb5541 100644
> > --- a/monitor/qmp.c
> > +++ b/monitor/qmp.c
> > @@ -135,16 +135,10 @@ static void monitor_qmp_respond(MonitorQMP *mon,
> > QDict *rsp)
> >
> > static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
> > {
> > - Monitor *old_mon;
> > QDict *rsp;
> > QDict *error;
> >
> > - old_mon = monitor_set_cur(&mon->common);
> > - assert(old_mon == NULL);
> > -
> > - rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon));
> > -
> > - monitor_set_cur(NULL);
> > + rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon),
> > &mon->common);
>
> Long line. Happy to wrap it in my tree. A few more in PATCH 08-11.
It's 79 characters. Should be fine even with your local deviation from
the coding style to require less than that for comments?
Kevin
- [PATCH v7 00/13] monitor: Optionally run handlers in coroutines, Kevin Wolf, 2020/09/09
- [PATCH v7 01/13] monitor: Add Monitor parameter to monitor_set_cpu(), Kevin Wolf, 2020/09/09
- [PATCH v7 02/13] monitor: Add Monitor parameter to monitor_get_cpu_index(), Kevin Wolf, 2020/09/09
- [PATCH v7 03/13] monitor: Use getter/setter functions for cur_mon, Kevin Wolf, 2020/09/09
- [PATCH v7 04/13] hmp: Update current monitor only in handle_hmp_command(), Kevin Wolf, 2020/09/09
- [PATCH v7 05/13] qmp: Assert that no other monitor is active, Kevin Wolf, 2020/09/09
- [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/09/09
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Markus Armbruster, 2020/09/14
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(),
Kevin Wolf <=
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Markus Armbruster, 2020/09/28
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/09/28
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Markus Armbruster, 2020/09/30
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/09/30
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Markus Armbruster, 2020/09/30
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Kevin Wolf, 2020/09/30
- Re: [PATCH v7 06/13] qmp: Call monitor_set_cur() only in qmp_dispatch(), Dr. David Alan Gilbert, 2020/09/30
[PATCH v7 07/13] monitor: Make current monitor a per-coroutine property, Kevin Wolf, 2020/09/09