On 8/4/19 11:13 PM, Oleinik, Alexander wrote:
> 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 <alx...@bu.edu>
> ---
> Thank you, Thomas Huth for the suggestion.
Sometimes we use:
Suggested-by: Thomas Huth <th...@redhat.com>
to give people credit in a way that our tooling has the ability to
track. We don't really rigorously check or enforce such things, though.
>
> include/sysemu/qtest.h | 2 +-
> qtest.c | 3 +--
> vl.c | 2 +-
> 3 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h
> index cd114b8d80..5ed09c80b1 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 15e27e911f..c9681dbdf3 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 b426b32134..130a389712 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();
>
Makes good sense to me, that IS confusing.
Reviewed-by: John Snow <js...@redhat.com>
