Commit 192f26a7 authored by Peter Xu's avatar Peter Xu Committed by Markus Armbruster
Browse files

Revert "tests: Add parameter to qtest_init_without_qmp_handshake" 



This reverts commit ddee57e0.

Meanwhile, revert one line from fa198ad9 to make sure
qtest_init_without_qmp_handshake() will only pass in one parameter.

Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20181009062718.1914-5-peterx@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 8258292e

tests/libqtest.c

+4 −5
Original line number Diff line number Diff line
@@ -187,8 +187,7 @@ static const char *qtest_qemu_binary(void) 
    return qemu_bin;

}



QTestState *qtest_init_without_qmp_handshake(bool use_oob,

                                             const char *extra_args)

QTestState *qtest_init_without_qmp_handshake(const char *extra_args)

{

    QTestState *s;

    int sock, qmpsock, i;
@@ -219,12 +218,12 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, 
                              "-qtest unix:%s,nowait "

                              "-qtest-log %s "

                              "-chardev socket,path=%s,nowait,id=char0 "

                              "-mon chardev=char0,mode=control%s "

                              "-mon chardev=char0,mode=control "

                              "-machine accel=qtest "

                              "-display none "

                              "%s", qemu_binary, socket_path,

                              getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null",

                              qmp_socket_path, "",

                              qmp_socket_path,

                              extra_args ?: "");



    g_test_message("starting QEMU: %s", command);
@@ -266,7 +265,7 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, 


QTestState *qtest_init(const char *extra_args)

{

    QTestState *s = qtest_init_without_qmp_handshake(false, extra_args);

    QTestState *s = qtest_init_without_qmp_handshake(extra_args);

    QDict *greeting;



    /* Read the QMP greeting and then do the handshake */

tests/libqtest.h

+1 −3
Original line number Diff line number Diff line
@@ -55,14 +55,12 @@ QTestState *qtest_init(const char *extra_args); 


/**

 * qtest_init_without_qmp_handshake:

 * @use_oob: true to have the server advertise OOB support

 * @extra_args: other arguments to pass to QEMU.  CAUTION: these

 * arguments are subject to word splitting and shell evaluation.

 *

 * Returns: #QTestState instance.

 */

QTestState *qtest_init_without_qmp_handshake(bool use_oob,

                                             const char *extra_args);

QTestState *qtest_init_without_qmp_handshake(const char *extra_args);



/**

 * qtest_quit:

tests/qmp-test.c

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static void test_qmp_protocol(void) 
    QList *capabilities;

    QTestState *qts;



    qts = qtest_init_without_qmp_handshake(false, common_args);

    qts = qtest_init_without_qmp_handshake(common_args);



    /* Test greeting */

    resp = qtest_qmp_receive(qts);
@@ -219,7 +219,7 @@ static void test_qmp_oob(void) 
    QList *capabilities;

    QString *qstr;



    qts = qtest_init_without_qmp_handshake(true, common_args);

    qts = qtest_init_without_qmp_handshake(common_args);



    /* Check the greeting message. */

    resp = qtest_qmp_receive(qts);