Commit 869e9aec authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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 397d30e9 ("qemu-error: remove dependency of stubs on monitor",
2016-11-01).

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1007a37e

stubs/Makefile.objs

+1 −3
Original line number Diff line number Diff line
@@ -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

stubs/mon-is-qmp.c

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "monitor/monitor.h"



Monitor *cur_mon;



bool monitor_cur_is_qmp(void)

{

    return false;

}

stubs/monitor-init.c

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qemu-common.h"

#include "monitor/monitor.h"



void monitor_init(CharDriverState *chr, int flags)

{

}

stubs/get-fd.c→stubs/monitor.c

+6 −0
Original line number Diff line number Diff line
@@ -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)

{

}