libqtest: Remove dead qtest_instances variable
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>
This commit is contained in:
		
							parent
							
								
									e8fc894b67
								
							
						
					
					
						commit
						4fb609adc9
					
				@ -42,7 +42,6 @@ struct QTestState
 | 
				
			|||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static GHookList abrt_hooks;
 | 
					static GHookList abrt_hooks;
 | 
				
			||||||
static GList *qtest_instances;
 | 
					 | 
				
			||||||
static struct sigaction sigact_old;
 | 
					static struct sigaction sigact_old;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define g_assert_no_errno(ret) do { \
 | 
					#define g_assert_no_errno(ret) do { \
 | 
				
			||||||
@ -247,13 +246,10 @@ QTestState *qtest_init(const char *extra_args)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void qtest_quit(QTestState *s)
 | 
					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));
 | 
					    g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Uninstall SIGABRT handler on last instance */
 | 
					    /* Uninstall SIGABRT handler on last instance */
 | 
				
			||||||
    if (!qtest_instances) {
 | 
					 | 
				
			||||||
    cleanup_sigabrt_handler();
 | 
					    cleanup_sigabrt_handler();
 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    kill_qemu(s);
 | 
					    kill_qemu(s);
 | 
				
			||||||
    close(s->fd);
 | 
					    close(s->fd);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user