diff options
| author | Marc-André Lureau | 2022-06-09 17:26:47 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2022-07-19 14:35:00 +0200 |
| commit | c8ddcdd6886b34d5d55d8d59973280e4c1b49195 (patch) | |
| tree | 88783665453f5bf329603fef5f534d3b42ce57b5 /ui | |
| parent | Merge tag 'pull-target-arm-20220718' of https://git.linaro.org/people/pmaydel... (diff) | |
| download | qemu-c8ddcdd6886b34d5d55d8d59973280e4c1b49195.tar.gz qemu-c8ddcdd6886b34d5d55d8d59973280e4c1b49195.tar.xz qemu-c8ddcdd6886b34d5d55d8d59973280e4c1b49195.zip | |
dbus-display: fix test race when initializing p2p connection
The D-Bus connection starts processing messages before QEMU has the time
to set the object manager server. This is causing dbus-display-test to
fail randomly with:
ERROR:../tests/qtest/dbus-display-test.c:68:test_dbus_display_vm:
assertion failed
(qemu_dbus_display1_vm_get_name(QEMU_DBUS_DISPLAY1_VM(vm)) ==
"dbus-test"): (NULL == "dbus-test") ERROR
Use the delayed message processing flag and method to avoid that
situation.
(the bus connection doesn't need a fix, as the initialization is done
synchronously)
Reported-by: Robinson, Cole <crobinso@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: Cole Robinson <crobinso@redhat.com>
Message-Id: <20220609152647.870373-1-marcandre.lureau@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/dbus.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -268,6 +268,7 @@ dbus_display_add_client_ready(GObject *source_object, } g_dbus_object_manager_server_set_connection(dbus_display->server, conn); + g_dbus_connection_start_message_processing(conn); } @@ -300,7 +301,8 @@ dbus_display_add_client(int csock, Error **errp) g_dbus_connection_new(G_IO_STREAM(conn), guid, - G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER, + G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER | + G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING, NULL, dbus_display->add_client_cancellable, dbus_display_add_client_ready, |