From 869e9aecbe138e5e88920c0a8d444685fb3304e9 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini
Date: Mon, 24 Oct 2016 10:15:17 +0200
Subject: stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp
 stub

monitor_cur_is_qmp was previously used by other stubs, but it's not
since 397d30e ("qemu-error: remove dependency of stubs on monitor",
2016-11-01).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 stubs/Makefile.objs  |  4 +---
 stubs/get-fd.c       | 10 ----------
 stubs/mon-is-qmp.c   | 10 ----------
 stubs/monitor-init.c |  7 -------
 stubs/monitor.c      | 16 ++++++++++++++++
 5 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 stubs/get-fd.c
 delete mode 100644 stubs/mon-is-qmp.c
 delete mode 100644 stubs/monitor-init.c
 create mode 100644 stubs/monitor.c

(limited to 'stubs')

diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 2b5bb74fce..9fc373ed3f 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -15,7 +15,6 @@ stub-obj-y += fdset-find-fd.o
 stub-obj-y += fdset-get-fd.o
 stub-obj-y += fdset-remove-fd.o
 stub-obj-y += gdbstub.o
-stub-obj-y += get-fd.o
 stub-obj-y += get-next-serial.o
 stub-obj-y += get-vm-name.o
 stub-obj-y += iothread.o
@@ -23,8 +22,7 @@ stub-obj-y += iothread-lock.o
 stub-obj-y += is-daemonized.o
 stub-obj-y += machine-init-done.o
 stub-obj-y += migr-blocker.o
-stub-obj-y += mon-is-qmp.o
-stub-obj-y += monitor-init.o
+stub-obj-y += monitor.o
 stub-obj-y += notify-event.o
 stub-obj-y += qtest.o
 stub-obj-y += replay.o
diff --git a/stubs/get-fd.c b/stubs/get-fd.c
deleted file mode 100644
index 7dfdfb55f7..0000000000
--- a/stubs/get-fd.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
-{
-    error_setg(errp, "only QEMU supports file descriptor passing");
-    return -1;
-}
diff --git a/stubs/mon-is-qmp.c b/stubs/mon-is-qmp.c
deleted file mode 100644
index a8344ced80..0000000000
--- a/stubs/mon-is-qmp.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-Monitor *cur_mon;
-
-bool monitor_cur_is_qmp(void)
-{
-    return false;
-}
diff --git a/stubs/monitor-init.c b/stubs/monitor-init.c
deleted file mode 100644
index de1bc7cd54..0000000000
--- a/stubs/monitor-init.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-void monitor_init(CharDriverState *chr, int flags)
-{
-}
diff --git a/stubs/monitor.c b/stubs/monitor.c
new file mode 100644
index 0000000000..1d574b1c6f
--- /dev/null
+++ b/stubs/monitor.c
@@ -0,0 +1,16 @@
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu-common.h"
+#include "monitor/monitor.h"
+
+Monitor *cur_mon = NULL;
+
+int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
+{
+    error_setg(errp, "only QEMU supports file descriptor passing");
+    return -1;
+}
+
+void monitor_init(CharDriverState *chr, int flags)
+{
+}
-- 
cgit v1.2.3-55-g7522