diff options
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/dbus-console.c | 8 | ||||
| -rw-r--r-- | ui/dbus-display1.xml | 16 | ||||
| -rw-r--r-- | ui/dbus.c | 10 |
3 files changed, 29 insertions, 5 deletions
diff --git a/ui/dbus-console.c b/ui/dbus-console.c index 5eb1d40d16..85e215ef23 100644 --- a/ui/dbus-console.c +++ b/ui/dbus-console.c @@ -305,10 +305,16 @@ dbus_console_register_listener(DBusDisplayConsole *ddc, #endif ); + GDBusConnectionFlags flags = + G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER; +#ifdef WIN32 + flags |= G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS; +#endif + listener_conn = g_dbus_connection_new_sync( G_IO_STREAM(socket_conn), guid, - G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER, + flags, NULL, NULL, &err); if (err) { error_report("Failed to setup peer connection: %s", err->message); diff --git a/ui/dbus-display1.xml b/ui/dbus-display1.xml index e70f2848b7..72deefa455 100644 --- a/ui/dbus-display1.xml +++ b/ui/dbus-display1.xml @@ -527,14 +527,14 @@ <interface name="org.qemu.Display1.Listener.Win32.Map"> <!-- ScanoutMap: - @handle: the shared map handle value. + @handle: the shared file mapping handle value (not a file handle) @offset: mapping offset. @width: display width, in pixels. @height: display height, in pixels. @stride: stride, in bytes. @pixman_format: image format (ex: ``PIXMAN_X8R8G8B8``). - Resize and update the display content with a shared map. + Resize and update the display content with a shared file mapping object. --> <method name="ScanoutMap"> <arg type="t" name="handle" direction="in"/> @@ -774,6 +774,18 @@ </method> <!-- + NSamples: + + The number of samples per read/write frames. (for example the default is + 480, or 10ms at 48kHz) + + (earlier version of the display interface do not provide this property) + --> + <property name="NSamples" type="u" access="read"> + <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="const"/> + </property> + + <!-- Interfaces: This property lists extra interfaces provided by the diff --git a/ui/dbus.c b/ui/dbus.c index 7b258c6823..2eb03aa247 100644 --- a/ui/dbus.c +++ b/ui/dbus.c @@ -317,11 +317,17 @@ dbus_display_add_client(int csock, Error **errp) conn = g_socket_connection_factory_create_connection(socket); dbus_display->add_client_cancellable = g_cancellable_new(); + GDBusConnectionFlags flags = + G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER | + G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING; + +#ifdef WIN32 + flags |= G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_ALLOW_ANONYMOUS; +#endif g_dbus_connection_new(G_IO_STREAM(conn), guid, - G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_SERVER | - G_DBUS_CONNECTION_FLAGS_DELAY_MESSAGE_PROCESSING, + flags, NULL, dbus_display->add_client_cancellable, dbus_display_add_client_ready, |