[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/32] stubs: merge all monitor stubs in one file, re
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 05/32] stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub |
Date: |
Mon, 16 Jan 2017 17:58:49 +0100 |
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 <address@hidden>
---
stubs/Makefile.objs | 4 +---
stubs/mon-is-qmp.c | 10 ----------
stubs/monitor-init.c | 7 -------
stubs/{get-fd.c => monitor.c} | 6 ++++++
4 files changed, 7 insertions(+), 20 deletions(-)
delete mode 100644 stubs/mon-is-qmp.c
delete mode 100644 stubs/monitor-init.c
rename stubs/{get-fd.c => monitor.c} (75%)
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 2b5bb74..9fc373e 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 a8344ce..0000000
--- 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 de1bc7c..0000000
--- 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
similarity index 75%
rename from stubs/get-fd.c
rename to stubs/monitor.c
index 7dfdfb5..1d574b1 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)
+{
+}
--
2.9.3
- [Qemu-devel] [PULL v2 00/32] Misc patches for 2017-01-11, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 01/32] bugfix: vm halt when in reset looping, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 02/32] megasas: fix guest-triggered memory leak, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 03/32] qom: Make all interface types abstract, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 05/32] stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub,
Paolo Bonzini <=
- [Qemu-devel] [PULL 04/32] smbios: filter based on CONFIG_SMBIOS rather than TARGET, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 06/32] stubs: move smbios stubs to hw/smbios, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 07/32] stubs: move acpi stubs to hw/acpi, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 08/32] stubs: remove unused stub for serial_hd, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 11/32] stubs: group all monitor_fdset_* functions in a single file, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 12/32] stubs: move vhost stubs to stubs/vhost.o, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 10/32] stubs: group stubs for user-mode emulation, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 09/32] hw: move reset handlers from vl.c to hw/core, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 13/32] event_notifier: cleanups around event_notifier_set_handler, Paolo Bonzini, 2017/01/16
- [Qemu-devel] [PULL 14/32] build: remove --enable-colo/--disable-colo, Paolo Bonzini, 2017/01/16