Markus Armbruster a95291007b qapi: Eliminate indirection through qmp_event_get_func_emit() ... The qapi_event_send_FOO() functions emit events like this: QMPEventFuncEmit emit; emit = qmp_event_get_func_emit(); if (!emit) { return; } qmp = qmp_event_build_dict("FOO"); [put event arguments into @qmp...] emit(QAPI_EVENT_FOO, qmp); The value of qmp_event_get_func_emit() depends only on the program: * In qemu-system-FOO, it's always monitor_qapi_event_queue. * In tests/test-qmp-event, it's always event_test_emit. * In all other programs, it's always null. This is exactly the kind of dependence the linker is supposed to resolve; we don't actually need an indirection. Note that things would fall apart if we linked more than one QAPI schema into a single program: each set of qapi_event_send_FOO() uses its own event enumeration, yet they share a single emit function. Which takes the event enumeration as an argument. Which one if there's more than one? More seriously: how does this work even now? qemu-system-FOO wants QAPIEvent, and passes a function taking that to qmp_event_set_func_emit(). test-qmp-event wants test_QAPIEvent, and passes a function taking that to qmp_event_set_func_emit(). It works by type trickery, of course: typedef void (*QMPEventFuncEmit)(unsigned event, QDict *dict); void qmp_event_set_func_emit(QMPEventFuncEmit emit); QMPEventFuncEmit qmp_event_get_func_emit(void); We use unsigned instead of the enumeration type. Relies on both enumerations boiling down to unsigned, which happens to be true for the compilers we use. Clean this up as follows: * Generate qapi_event_send_FOO() that call PREFIX_qapi_event_emit() instead of the value of qmp_event_set_func_emit(). * Generate a prototype for PREFIX_qapi_event_emit() into qapi-events.h. * PREFIX_ is empty for qapi/qapi-schema.json, and test_ for tests/qapi-schema/qapi-schema-test.json. It's qga_ for qga/qapi-schema.json, and doc-good- for tests/qapi-schema/doc-good.json, but those don't define any events. * Rename monitor_qapi_event_queue() to qapi_event_emit() instead of passing it to qmp_event_set_func_emit(). This takes care of qemu-system-FOO. * Rename event_test_emit() to test_qapi_event_emit() instead of passing it to qmp_event_set_func_emit(). This takes care of tests/test-qmp-event. * Add a qapi_event_emit() that does nothing to stubs/monitor.c. This takes care of all other programs that link code emitting QMP events. * Drop qmp_event_set_func_emit(), qmp_event_get_func_emit(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20181218182234.28876-3-armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> [Commit message typos fixed]		2019-01-24 10:01:05 +01:00
..
arch-query-cpu-def.c
arch-query-cpu-model-baseline.c
arch-query-cpu-model-comparison.c
arch-query-cpu-model-expansion.c
bdrv-next-monitor-owned.c
blk-commit-all.c
blockdev-close-all-bdrv-states.c
change-state-handler.c
clock-warp.c
cpu-get-clock.c
cpu-get-icount.c
dump.c
error-printf.c
fd-register.c
fdset.c
gdbstub.c
get-vm-name.c
iothread-lock.c
iothread.c
is-daemonized.c
linux-aio.c
machine-init-done.c
Makefile.objs
migr-blocker.c
monitor.c	qapi: Eliminate indirection through qmp_event_get_func_emit()	2019-01-24 10:01:05 +01:00
notify-event.c
pc_madt_cpu_entry.c
pci-host-piix.c
qmp_memory_device.c
qtest.c
ram-block.c
ramfb.c
replay.c
runstate-check.c
set-fd-handler.c
slirp.c
sysbus.c
target-get-monitor-def.c
target-monitor-defs.c
tpm.c	acpi: build TPM Physical Presence interface	2019-01-17 21:10:57 -05:00
trace-control.c
uuid.c
vm-stop.c
vmgenid.c
vmstate.c
xen-common.c
xen-hvm.c