This removes the need for using monitor_is_qmp() to check the
subclass type, which is an anti-pattern.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
monitor/hmp.c | 12 ++++++++++++
monitor/monitor-internal.h | 3 +++
monitor/monitor.c | 11 ++++-------
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/monitor/hmp.c b/monitor/hmp.c
index 833de0eee8..3fe6f5715a 100644
--- a/monitor/hmp.c
+++ b/monitor/hmp.c
@@ -50,14 +50,26 @@ static void monitor_hmp_finalize(Object *obj)
readline_free(mon->rs);
}
+int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap)
+ G_GNUC_PRINTF(2, 0);
+
static void monitor_hmp_class_init(ObjectClass *cls, const void *data)
{
+ MonitorClass *moncls = MONITOR_CLASS(cls);
+
+ moncls->vprintf = monitor_hmp_vprintf;
}
static void monitor_hmp_init(Object *obj)
{
}
+int monitor_hmp_vprintf(Monitor *mon, const char *fmt, va_list ap)
+{
+ g_autofree char *buf = g_strdup_vprintf(fmt, ap);
+ return monitor_puts(mon, buf);
+}
+
static void monitor_command_cb(void *opaque, const char *cmdline,
void *readline_opaque)
{
diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
index 5bfe3b7325..3f05c46e88 100644
--- a/monitor/monitor-internal.h
+++ b/monitor/monitor-internal.h
@@ -95,6 +95,9 @@ typedef struct HMPCommand {
struct MonitorClass {
ObjectClass parent_class;
+
+ int (*vprintf)(Monitor *mon, const char *fmt, va_list ap)
+ G_GNUC_PRINTF(2, 0);
};
struct Monitor {
diff --git a/monitor/monitor.c b/monitor/monitor.c
index f6c90145f6..b51046c0c9 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -243,21 +243,18 @@ int monitor_puts(Monitor *mon, const char *str)
int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
{
- char *buf;
- int n;
+ MonitorClass *moncls;
if (!mon) {
return -1;
}
- if (monitor_is_qmp(mon)) {
+ moncls = MONITOR_GET_CLASS(mon);
+ if (!moncls->vprintf) {
return -1;
}
- buf = g_strdup_vprintf(fmt, ap);
- n = monitor_puts(mon, buf);
- g_free(buf);
- return n;
+ return moncls->vprintf(mon, fmt, ap);
}
int monitor_printf(Monitor *mon, const char *fmt, ...)
--
2.53.0