aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOleinik, Alexander <alxndr@bu.edu>2019-08-05 03:13:01 +0000
committerThomas Huth <thuth@redhat.com>2019-08-15 19:23:59 +0200
commit2b8985f1b82ea994dbe37986536c5c623c38ea86 (patch)
tree0b1011fb3c0a073e61a4f83f60695d7c2948bba8
parent9e06029aea3b2eca1d5261352e695edc1e7d7b8b (diff)
downloadqemu-2b8985f1b82ea994dbe37986536c5c623c38ea86.zip
qemu-2b8985f1b82ea994dbe37986536c5c623c38ea86.tar.gz
qemu-2b8985f1b82ea994dbe37986536c5c623c38ea86.tar.bz2
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>
-rw-r--r--include/sysemu/qtest.h2
-rw-r--r--qtest.c3
-rw-r--r--vl.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
index cd114b8..5ed09c8 100644
--- a/include/sysemu/qtest.h
+++ b/include/sysemu/qtest.h
@@ -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
diff --git a/qtest.c b/qtest.c
index 15e27e9..c9681db 100644
--- a/qtest.c
+++ b/qtest.c
@@ -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;
diff --git a/vl.c b/vl.c
index b426b32..130a389 100644
--- a/vl.c
+++ b/vl.c
@@ -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();