monitor: turn QMP and HMP into QOM objects

[PATCH 15/17] monitor: drop unused monitor_is_qmp method

Daniel P. Berrangé posted 17 patches 1 day, 1 hour ago

Download mbox

Maintainers: "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, "Dr. David Alan Gilbert" <dave@treblig.org>, Markus Armbruster <armbru@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eric Blake <eblake@redhat.com>, Kevin Wolf <kwolf@redhat.com>

Expand all Fold all

[PATCH 15/17] monitor: drop unused monitor_is_qmp method

Posted by Daniel P. Berrangé 1 day, 1 hour ago

The previous patch dropped the only remaining use of
monitor_is_qmp.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 monitor/monitor-internal.h | 9 ---------
 monitor/monitor.c          | 1 -
 2 files changed, 10 deletions(-)

diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
index 7004f5d002..d40fdde793 100644
--- a/monitor/monitor-internal.h
+++ b/monitor/monitor-internal.h
@@ -106,7 +106,6 @@ struct Monitor {
     Object parent;
     CharFrontend chr;
     int suspend_cnt;            /* Needs to be accessed atomically */
-    bool is_qmp;
     bool use_io_thread;
 
     char *mon_cpu_path;
@@ -171,14 +170,6 @@ struct MonitorQMP {
     GQueue *qmp_requests;
 };
 
-/**
- * Is @mon a QMP monitor?
- */
-static inline bool monitor_is_qmp(const Monitor *mon)
-{
-    return mon->is_qmp;
-}
-
 typedef QTAILQ_HEAD(MonitorList, Monitor) MonitorList;
 extern IOThread *mon_iothread;
 extern Coroutine *qmp_dispatcher_co;
diff --git a/monitor/monitor.c b/monitor/monitor.c
index c08b2c2ee1..f48603a7e8 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -94,7 +94,6 @@ static void monitor_init(Object *obj)
     Monitor *mon = MONITOR(obj);
 
     qemu_mutex_init(&mon->mon_lock);
-    mon->is_qmp = !!object_dynamic_cast(obj, TYPE_MONITOR_QMP);
     mon->outbuf = g_string_new(NULL);
 }
 
-- 
2.53.0