| Message ID | 1432294585-5984-21-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/22/2015 05:36 AM, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > include/monitor/monitor.h | 2 +- > monitor.c | 6 ++++-- > stubs/mon-is-qmp.c | 2 +- > 3 files changed, 6 insertions(+), 4 deletions(-) > > +++ b/stubs/mon-is-qmp.c > @@ -1,7 +1,7 @@ > #include "qemu-common.h" > #include "monitor/monitor.h" > > -int monitor_cur_is_qmp(void) > +bool monitor_cur_is_qmp(void) > { > return 0; s/0/false/ with that change, Reviewed-by: Eric Blake <eblake@redhat.com>
Eric Blake <eblake@redhat.com> writes: > On 05/22/2015 05:36 AM, Markus Armbruster wrote: >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> include/monitor/monitor.h | 2 +- >> monitor.c | 6 ++++-- >> stubs/mon-is-qmp.c | 2 +- >> 3 files changed, 6 insertions(+), 4 deletions(-) >> > >> +++ b/stubs/mon-is-qmp.c >> @@ -1,7 +1,7 @@ >> #include "qemu-common.h" >> #include "monitor/monitor.h" >> >> -int monitor_cur_is_qmp(void) >> +bool monitor_cur_is_qmp(void) >> { >> return 0; > > s/0/false/ Yes. > with that change, > Reviewed-by: Eric Blake <eblake@redhat.com> Thanks!
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index d409b6a..57f8394 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -16,7 +16,7 @@ extern Monitor *default_mon; #define MONITOR_USE_CONTROL 0x04 #define MONITOR_USE_PRETTY 0x08 -int monitor_cur_is_qmp(void); +bool monitor_cur_is_qmp(void); void monitor_init(CharDriverState *chr, int flags); diff --git a/monitor.c b/monitor.c index 2bdde35..6ab1817 100644 --- a/monitor.c +++ b/monitor.c @@ -239,8 +239,10 @@ static inline bool monitor_is_qmp(const Monitor *mon) return (mon->flags & MONITOR_USE_CONTROL); } -/* Return non-zero iff we have a current monitor, and it is in QMP mode. */ -int monitor_cur_is_qmp(void) +/** + * Is the current monitor, if any, a QMP monitor? + */ +bool monitor_cur_is_qmp(void) { return cur_mon && monitor_is_qmp(cur_mon); } diff --git a/stubs/mon-is-qmp.c b/stubs/mon-is-qmp.c index 1f0a8fd..3cff163 100644 --- a/stubs/mon-is-qmp.c +++ b/stubs/mon-is-qmp.c @@ -1,7 +1,7 @@ #include "qemu-common.h" #include "monitor/monitor.h" -int monitor_cur_is_qmp(void) +bool monitor_cur_is_qmp(void) { return 0; }
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- include/monitor/monitor.h | 2 +- monitor.c | 6 ++++-- stubs/mon-is-qmp.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)