Commit e6426b74 authored by Thomas Huth's avatar Thomas Huth
Browse files

tests/boot-serial: Get rid of global_qtest variable 



The test does not use any of the functions that require global_qtest,
so we can simply get rid of this global variable here.

Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 791a289b

tests/boot-serial-test.c

+7 −6
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ static void test_machine(const void *data) 
    char codetmp[] = "/tmp/qtest-boot-serial-cXXXXXX";

    const char *codeparam = "";

    const uint8_t *code = NULL;

    QTestState *qts;

    int ser_fd;



    ser_fd = mkstemp(serialtmp);
@@ -189,11 +190,11 @@ static void test_machine(const void *data) 
     * Make sure that this test uses tcg if available: It is used as a

     * fast-enough smoketest for that.

     */

    global_qtest = qtest_initf("%s %s -M %s,accel=tcg:kvm "

    qts = qtest_initf("%s %s -M %s,accel=tcg:kvm -no-shutdown "

                      "-chardev file,id=serial0,path=%s "

                               "-no-shutdown -serial chardev:serial0 %s",

                               codeparam, code ? codetmp : "",

                               test->machine, serialtmp, test->extra);

                      "-serial chardev:serial0 %s",

                      codeparam, code ? codetmp : "", test->machine,

                      serialtmp, test->extra);

    if (code) {

        unlink(codetmp);

    }
@@ -204,7 +205,7 @@ static void test_machine(const void *data) 
    }

    unlink(serialtmp);



    qtest_quit(global_qtest);

    qtest_quit(qts);



    close(ser_fd);

}