diff options
| author | Paolo Bonzini | 2016-10-24 10:15:17 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2017-01-16 17:52:35 +0100 |
| commit | 869e9aecbe138e5e88920c0a8d444685fb3304e9 (patch) | |
| tree | 86fe5e2287b6bc6a1094a39a6ddcaba334e499a9 | |
| parent | smbios: filter based on CONFIG_SMBIOS rather than TARGET (diff) | |
| download | qemu-869e9aecbe138e5e88920c0a8d444685fb3304e9.tar.gz qemu-869e9aecbe138e5e88920c0a8d444685fb3304e9.tar.xz qemu-869e9aecbe138e5e88920c0a8d444685fb3304e9.zip | |
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>
| -rw-r--r-- | stubs/Makefile.objs | 4 | ||||
| -rw-r--r-- | stubs/mon-is-qmp.c | 10 | ||||
| -rw-r--r-- | stubs/monitor-init.c | 7 | ||||
| -rw-r--r-- | stubs/monitor.c (renamed from stubs/get-fd.c) | 6 |
4 files changed, 7 insertions, 20 deletions
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/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/get-fd.c b/stubs/monitor.c index 7dfdfb55f7..1d574b1c6f 100644 --- a/stubs/get-fd.c +++ b/stubs/monitor.c @@ -3,8 +3,14 @@ #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) +{ +} |