summary refs log tree commit diff stats
path: root/tests/test-qmp-event.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-01-25 11:52:12 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-01-25 11:52:12 +0000
commit9dd0d8111fbb8015db75a38933aee1d45f9e64a3 (patch)
treea2062212ac4345164221f25d06945e26fd10de16 /tests/test-qmp-event.c
parent87f6a866f12b8ca037b0a5cfc2dc9b8db9e67696 (diff)
parentbbc0586ced6e9ffdfd29d89fcc917b3d90ac3938 (diff)
downloadfocaccia-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 'tests/test-qmp-event.c')
-rw-r--r--tests/test-qmp-event.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index 9cddd72adb..bf900f14f4 100644
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -93,9 +93,7 @@ static bool qdict_cmp_simple(QDict *a, QDict *b)
     return d.result;
 }
 
-/* This function is hooked as final emit function, which can verify the
-   correctness. */
-static void event_test_emit(test_QAPIEvent event, QDict *d)
+void test_qapi_event_emit(test_QAPIEvent event, QDict *d)
 {
     QDict *t;
     int64_t s, ms;
@@ -241,8 +239,6 @@ static void test_event_d(TestEventData *data,
 
 int main(int argc, char **argv)
 {
-    qmp_event_set_func_emit(event_test_emit);
-
     g_test_init(&argc, &argv, NULL);
 
     event_test_add("/event/event_a", test_event_a);