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>
This commit is contained in:
Paolo Bonzini 2016-10-24 10:15:17 +02:00
parent 1007a37e20
commit 869e9aecbe
4 changed files with 7 additions and 20 deletions

View File

@ -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

View File

@ -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;
}

View File

@ -1,7 +0,0 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "monitor/monitor.h"
void monitor_init(CharDriverState *chr, int flags)
{
}

View File

@ -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)
{
}