Commit b15d422a authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

qtest: kill QEMU process on g_assert() failure 



The QEMU process stays running if the test case fails.  This patch fixes
the leak by installing a SIGABRT signal handler which invokes
qtest_end().

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent cef60c92

tests/libqtest.c

+25 −6
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct QTestState 
    bool irq_level[MAX_IRQ];

    GString *rx;

    pid_t qemu_pid;  /* our child QEMU process */

    struct sigaction sigact_old; /* restored on exit */

};



#define g_assert_no_errno(ret) do { \
@@ -88,6 +89,19 @@ static int socket_accept(int sock) 
    return ret;

}



static void kill_qemu(QTestState *s)

{

    if (s->qemu_pid != -1) {

        kill(s->qemu_pid, SIGTERM);

        waitpid(s->qemu_pid, NULL, 0);

    }

}



static void sigabrt_handler(int signo)

{

    kill_qemu(global_qtest);

}



QTestState *qtest_init(const char *extra_args)

{

    QTestState *s;
@@ -96,6 +110,7 @@ QTestState *qtest_init(const char *extra_args) 
    gchar *qmp_socket_path;

    gchar *command;

    const char *qemu_binary;

    struct sigaction sigact;



    qemu_binary = getenv("QTEST_QEMU_BINARY");

    g_assert(qemu_binary != NULL);
@@ -108,6 +123,14 @@ QTestState *qtest_init(const char *extra_args) 
    sock = init_socket(socket_path);

    qmpsock = init_socket(qmp_socket_path);



    /* Catch SIGABRT to clean up on g_assert() failure */

    sigact = (struct sigaction){

        .sa_handler = sigabrt_handler,

        .sa_flags = SA_RESETHAND,

    };

    sigemptyset(&sigact.sa_mask);

    sigaction(SIGABRT, &sigact, &s->sigact_old);



    s->qemu_pid = fork();

    if (s->qemu_pid == 0) {

        command = g_strdup_printf("exec %s "
@@ -148,13 +171,9 @@ QTestState *qtest_init(const char *extra_args) 


void qtest_quit(QTestState *s)

{

    int status;



    if (s->qemu_pid != -1) {

        kill(s->qemu_pid, SIGTERM);

        waitpid(s->qemu_pid, &status, 0);

    }

    sigaction(SIGABRT, &s->sigact_old, NULL);



    kill_qemu(s);

    close(s->fd);

    close(s->qmp_fd);

    g_string_free(s->rx, true);