| Message ID | 20191017130204.16131-13-kwolf@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add qemu-storage-daemon | expand |
Kevin Wolf <kwolf@redhat.com> writes: > Before we can add the monitor to qemu-storage-daemon, we need to add a > few monitor stubs, I can see just one: monitor_fdsets_cleanup(). > 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. , by moving them from stubs/monitor.c to new stubs/monitor-core.c > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > 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" ../ is ugly. I don't have better ideas. > > 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
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
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 <kwolf@redhat.com> --- 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