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: Alexander Oleinik <alxndr@bu.edu> Message-Id: <20190805031240.6024-1-alxndr@bu.edu> Reviewed-by: John Snow <jsnow@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
9e06029aea
commit
2b8985f1b8
|
@ -24,6 +24,6 @@ static inline bool qtest_enabled(void)
|
||||||
|
|
||||||
bool qtest_driver(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
|
#endif
|
||||||
|
|
3
qtest.c
3
qtest.c
|
@ -748,8 +748,7 @@ static void qtest_event(void *opaque, int event)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp)
|
||||||
void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp)
|
|
||||||
{
|
{
|
||||||
Chardev *chr;
|
Chardev *chr;
|
||||||
|
|
||||||
|
|
2
vl.c
2
vl.c
|
@ -4197,7 +4197,7 @@ int main(int argc, char **argv, char **envp)
|
||||||
migration_object_init();
|
migration_object_init();
|
||||||
|
|
||||||
if (qtest_chrdev) {
|
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();
|
machine_opts = qemu_get_machine_opts();
|
||||||
|
|
Loading…
Reference in a new issue