Change:
Describe the bug On (not quite latest master), spice-vdagent causes now a 90s downtime when powering off or rebooting my notebook. I didn't do that before. To Reproduce Steps to reproduce the behavior: Spice VDAgent in the with a current master to the new generation and power off/reboot. Expected behavior "Immediate" powering off without 90s timeout. Screenshots Additional context Add any other context about the problem here. Notify maintainers <!-- Please @ people who are in the list of the offending package or module. If in doubt, check for whoever last touched something. --Metadata Please run and paste the result. system: host os: multi-user?: sandbox: version: channels(hyper): channels(root): nixpkgs: Maintainer information:
Seems it's a general problem with currentl spice-vdagent: and according merge

Discussion:
sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; <ins> patchFlags = [ "-uNp1" ]; # included in the next release. patches = [ ./timeout.diff ]; </ins> postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out '';

<ins> diff --git a/src/udscs.c b/src/udscs.c index 4de75f8..7c99eed 100644 --- a/src/udscs.c +++ b/src/udscs.c @@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new( server->read_callback = read_callback; server->error_cb = error_cb; server->service = g_socket_service_new(); +    g_socket_service_stop(server->service); g_signal_connect(server->service, "incoming", G_CALLBACK(udscs_server_accept_cb), server); @@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server, g_object_unref(sock_addr); } +void udscs_server_start(struct udscs_server *server) +{ +    g_socket_service_start(server->service); +} + void udscs_server_destroy_connection(struct udscs_server *server, UdscsConnection     *conn) { diff --git a/src/udscs.h b/src/udscs.h index 45ebd3f..4f7ea36 100644 --- a/src/udscs.h +++ b/src/udscs.h @@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server, const gchar         *addr, GError             **err); +void udscs_server_start(struct udscs_server *server); + void udscs_server_destroy_connection(struct udscs_server *server, UdscsConnection     *conn); diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c index cfd0a51..753c9bf 100644 --- a/src/vdagentd/vdagentd.c +++ b/src/vdagentd/vdagentd.c @@ -1184,10 +1184,6 @@ int main(int argc, char *argv[]) uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE); } -    g_unix_signal_add(SIGINT, signal_handler, NULL); -    g_unix_signal_add(SIGHUP, signal_handler, NULL); -    g_unix_signal_add(SIGTERM, signal_handler, NULL); - openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER); /* Setup communication with vdagent process(es) */ @@ -1228,9 +1224,6 @@ int main(int argc, char *argv[]) } } -    if (do_daemonize) -        daemonize(); - #ifdef WITH_STATIC_UINPUT uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0, debug > 1, uinput_fake); @@ -1240,6 +1233,13 @@ int main(int argc, char *argv[]) } #endif +    if (do_daemonize) +        daemonize(); + +    g_unix_signal_add(SIGINT, signal_handler, NULL); +    g_unix_signal_add(SIGHUP, signal_handler, NULL); +    g_unix_signal_add(SIGTERM, signal_handler, NULL); + if (want_session_info) session_info = session_info_create(debug); if (session_info) { @@ -1252,6 +1252,7 @@ int main(int argc, char *argv[]) active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal); +    udscs_server_start(server); loop = g_main_loop_new(NULL, FALSE); g_main_loop_run(loop); </ins>