Commit 2b8985f1 authored by Oleinik, Alexander's avatar Oleinik, Alexander Committed by Thomas Huth
Browse files

qtest: Rename qtest.c:qtest_init() 



Both the qtest client, libqtest.c, and server, qtest.c, used the same
name for initialization functions which can cause confusion.

Signed-off-by: default avatarAlexander Oleinik <alxndr@bu.edu>
Message-Id: <20190805031240.6024-1-alxndr@bu.edu>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 9e06029a

include/sysemu/qtest.h

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ static inline bool qtest_enabled(void) 


bool qtest_driver(void);



void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp);

void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp);



#endif

qtest.c

+1 −2
Original line number Diff line number Diff line
@@ -748,8 +748,7 @@ static void qtest_event(void *opaque, int event) 
        break;

    }

}



void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp)

void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp)

{

    Chardev *chr;

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -4197,7 +4197,7 @@ int main(int argc, char **argv, char **envp) 
    migration_object_init();



    if (qtest_chrdev) {

        qtest_init(qtest_chrdev, qtest_log, &error_fatal);

        qtest_server_init(qtest_chrdev, qtest_log, &error_fatal);

    }



    machine_opts = qemu_get_machine_opts();