[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 12/18] stubs: Update monitor stubs for qemu-storage-daemon
From: |
Kevin Wolf |
Subject: |
[RFC PATCH 12/18] stubs: Update monitor stubs for qemu-storage-daemon |
Date: |
Thu, 17 Oct 2019 15:01:58 +0200 |
Before we can add the monitor to qemu-storage-daemon, we need to add a
few monitor stubs, and we need to make sure that stubs that are actually
implemented in the monitor core aren't linked so that we don't get
linker errors because of duplicate symbols.
Signed-off-by: Kevin Wolf <address@hidden>
---
stubs/monitor-core.c | 21 +++++++++++++++++++++
stubs/monitor.c | 15 ++-------------
stubs/Makefile.objs | 1 +
3 files changed, 24 insertions(+), 13 deletions(-)
create mode 100644 stubs/monitor-core.c
diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
new file mode 100644
index 0000000000..403c00a6d0
--- /dev/null
+++ b/stubs/monitor-core.c
@@ -0,0 +1,21 @@
+#include "qemu/osdep.h"
+#include "monitor/monitor.h"
+#include "qemu-common.h"
+#include "qapi/qapi-emit-events.h"
+
+__thread Monitor *cur_mon;
+
+void monitor_init_qmp(Chardev *chr, bool pretty)
+{
+}
+
+void qapi_event_emit(QAPIEvent event, QDict *qdict)
+{
+}
+
+int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
+{
+ abort();
+}
+
+
diff --git a/stubs/monitor.c b/stubs/monitor.c
index c3e9a2e4dc..9403f8e72c 100644
--- a/stubs/monitor.c
+++ b/stubs/monitor.c
@@ -1,14 +1,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qapi/qapi-emit-events.h"
#include "monitor/monitor.h"
-
-__thread Monitor *cur_mon;
-
-int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
-{
- abort();
-}
+#include "../monitor/monitor-internal.h"
int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
{
@@ -16,14 +9,10 @@ int monitor_get_fd(Monitor *mon, const char *name, Error
**errp)
return -1;
}
-void monitor_init_qmp(Chardev *chr, bool pretty)
-{
-}
-
void monitor_init_hmp(Chardev *chr, bool use_readline)
{
}
-void qapi_event_emit(QAPIEvent event, QDict *qdict)
+void monitor_fdsets_cleanup(void)
{
}
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 77fbf72576..ad4515ac70 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -19,6 +19,7 @@ stub-obj-y += machine-init-done.o
stub-obj-y += migr-blocker.o
stub-obj-y += change-state-handler.o
stub-obj-y += monitor.o
+stub-obj-y += monitor-core.o
stub-obj-y += notify-event.o
stub-obj-y += qtest.o
stub-obj-y += replay.o
--
2.20.1
- [RFC PATCH 02/18] qemu-storage-daemon: Add --object option, (continued)
- [RFC PATCH 02/18] qemu-storage-daemon: Add --object option, Kevin Wolf, 2019/10/17
- [RFC PATCH 03/18] stubs: Add arch_type, Kevin Wolf, 2019/10/17
- [RFC PATCH 05/18] qemu-storage-daemon: Add --blockdev option, Kevin Wolf, 2019/10/17
- [RFC PATCH 04/18] stubs: Add blk_by_qdev_id(), Kevin Wolf, 2019/10/17
- [RFC PATCH 06/18] qemu-storage-daemon: Add --nbd-server option, Kevin Wolf, 2019/10/17
- [RFC PATCH 07/18] blockdev-nbd: Boxed argument type for nbd-server-add, Kevin Wolf, 2019/10/17
- [RFC PATCH 10/18] qemu-storage-daemon: Add --chardev option, Kevin Wolf, 2019/10/17
- [RFC PATCH 08/18] qemu-storage-daemon: Add --export option, Kevin Wolf, 2019/10/17
- [RFC PATCH 11/18] monitor: Move monitor option parsing to monitor/monitor.c, Kevin Wolf, 2019/10/17
- [RFC PATCH 09/18] qemu-storage-daemon: Add main loop, Kevin Wolf, 2019/10/17
- [RFC PATCH 12/18] stubs: Update monitor stubs for qemu-storage-daemon,
Kevin Wolf <=
- [RFC PATCH 15/18] qapi: Support empty modules, Kevin Wolf, 2019/10/17
- [RFC PATCH 14/18] monitor: Create monitor/qmp-cmds-monitor.c, Kevin Wolf, 2019/10/17
- [RFC PATCH 13/18] qapi: Create module 'monitor', Kevin Wolf, 2019/10/17
- [RFC PATCH 16/18] qapi: Create 'pragma' module, Kevin Wolf, 2019/10/17
- [RFC PATCH 17/18] monitor: Move qmp_query_qmp_schema to qmp-cmds-monitor.c, Kevin Wolf, 2019/10/17
- [RFC PATCH 18/18] qemu-storage-daemon: Add --monitor option, Kevin Wolf, 2019/10/17
- Re: [RFC PATCH 00/18] Add qemu-storage-daemon, Kevin Wolf, 2019/10/24
- Re: [RFC PATCH 00/18] Add qemu-storage-daemon, Vladimir Sementsov-Ogievskiy, 2019/10/24