]> git.proxmox.com Git - mirror_qemu.git/commitdiff
libqtest: Remove dead qtest_instances variable
authorEric Blake <eblake@redhat.com>
Mon, 11 Sep 2017 17:19:49 +0000 (12:19 -0500)
committerThomas Huth <thuth@redhat.com>
Fri, 15 Sep 2017 07:05:19 +0000 (09:05 +0200)
Prior to commit 063c23d9, we were tracking a list of parallel
qtest objects, in order to safely clean up a SIGABRT handler
only after the last connection quits.  But when we switched to
more of glib's infrastructure, the list became dead code that
is never assigned to.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
tests/libqtest.c

index 3daa0e3917c42aa50cf5cd6d63db0b4b7a8e5e0d..cbd709470b5df3a46d64e7295f8fb8f27a110db5 100644 (file)
@@ -42,7 +42,6 @@ struct QTestState
 };
 
 static GHookList abrt_hooks;
-static GList *qtest_instances;
 static struct sigaction sigact_old;
 
 #define g_assert_no_errno(ret) do { \
@@ -247,13 +246,10 @@ QTestState *qtest_init(const char *extra_args)
 
 void qtest_quit(QTestState *s)
 {
-    qtest_instances = g_list_remove(qtest_instances, s);
     g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s));
 
     /* Uninstall SIGABRT handler on last instance */
-    if (!qtest_instances) {
-        cleanup_sigabrt_handler();
-    }
+    cleanup_sigabrt_handler();
 
     kill_qemu(s);
     close(s->fd);