diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-25 11:52:12 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-25 11:52:12 +0000 |
| commit | 9dd0d8111fbb8015db75a38933aee1d45f9e64a3 (patch) | |
| tree | a2062212ac4345164221f25d06945e26fd10de16 /monitor.c | |
| parent | 87f6a866f12b8ca037b0a5cfc2dc9b8db9e67696 (diff) | |
| parent | bbc0586ced6e9ffdfd29d89fcc917b3d90ac3938 (diff) | |
| download | focaccia-qemu-9dd0d8111fbb8015db75a38933aee1d45f9e64a3.tar.gz focaccia-qemu-9dd0d8111fbb8015db75a38933aee1d45f9e64a3.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2019-01-24' into staging
QAPI patches for 2019-01-24 # gpg: Signature made Thu 24 Jan 2019 14:25:19 GMT # gpg: using RSA key 3870B400EB918653 # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qapi-2019-01-24: json: Fix % handling when not interpolating qmp: Add examples to qom list, get, and set commands qapi: Eliminate indirection through qmp_event_get_func_emit() qapi: Belatedly update docs for commit 9c2f56e9f9d Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/monitor.c b/monitor.c index eb39fb015b..c09fa63940 100644 --- a/monitor.c +++ b/monitor.c @@ -590,8 +590,7 @@ monitor_qapi_event_queue_no_reenter(QAPIEvent event, QDict *qdict) qemu_mutex_unlock(&monitor_lock); } -static void -monitor_qapi_event_queue(QAPIEvent event, QDict *qdict) +void qapi_event_emit(QAPIEvent event, QDict *qdict) { /* * monitor_qapi_event_queue_no_reenter() is not reentrant: it @@ -704,7 +703,6 @@ static void monitor_qapi_event_init(void) { monitor_qapi_event_state = g_hash_table_new(qapi_event_throttle_hash, qapi_event_throttle_equal); - qmp_event_set_func_emit(monitor_qapi_event_queue); } static void handle_hmp_command(Monitor *mon, const char *cmdline); |