On Mon, Mar 26, 2018 at 8:39 AM, Peter Xu <pet...@redhat.com> wrote:
> It is abstracted from qtest_init_without_qmp_handshake(). It works just
> like qtest_init_without_qmp_handshake() but further it would allow the
> caller to specify the QMP parameter.
>
> Signed-off-by: Peter Xu <pet...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> tests/libqtest.c | 14 +++++++++++---
> tests/libqtest.h | 14 ++++++++++++++
> 2 files changed, 25 insertions(+), 3 deletions(-)
>
> diff --git a/tests/libqtest.c b/tests/libqtest.c
> index 200b2b9e92..d2af1b17f0 100644
> --- a/tests/libqtest.c
> +++ b/tests/libqtest.c
> @@ -166,19 +166,22 @@ static const char *qtest_qemu_binary(void)
> return qemu_bin;
> }
>
> -QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
> +QTestState *qtest_init_with_qmp_format(const char *extra_args,
> + const char *qmp_format)
> {
> QTestState *s;
> int sock, qmpsock, i;
> gchar *socket_path;
> gchar *qmp_socket_path;
> gchar *command;
> + gchar *qmp_params;
> const char *qemu_binary = qtest_qemu_binary();
>
> s = g_new(QTestState, 1);
>
> socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid());
> qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid());
> + qmp_params = g_strdup_printf(qmp_format, qmp_socket_path);
>
> /* It's possible that if an earlier test run crashed it might
> * have left a stale unix socket lying around. Delete any
> @@ -199,12 +202,12 @@ QTestState *qtest_init_without_qmp_handshake(const char
> *extra_args)
> command = g_strdup_printf("exec %s "
> "-qtest unix:%s,nowait "
> "-qtest-log %s "
> - "-qmp unix:%s,nowait "
> + "%s "
> "-machine accel=qtest "
> "-display none "
> "%s", qemu_binary, socket_path,
> getenv("QTEST_LOG") ? "/dev/fd/2" :
> "/dev/null",
> - qmp_socket_path,
> + qmp_params,
> extra_args ?: "");
> execlp("/bin/sh", "sh", "-c", command, NULL);
> exit(1);
> @@ -237,6 +240,11 @@ QTestState *qtest_init_without_qmp_handshake(const char
> *extra_args)
> return s;
> }
>
> +QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
> +{
> + return qtest_init_with_qmp_format(extra_args, "-qmp unix:%s,nowait");
> +}
> +
> QTestState *qtest_init(const char *extra_args)
> {
> QTestState *s = qtest_init_without_qmp_handshake(extra_args);
> diff --git a/tests/libqtest.h b/tests/libqtest.h
> index 811169453a..1f3605ce73 100644
> --- a/tests/libqtest.h
> +++ b/tests/libqtest.h
> @@ -62,6 +62,20 @@ QTestState *qtest_init(const char *extra_args);
> */
> QTestState *qtest_init_without_qmp_handshake(const char *extra_args);
>
> +/**
> + * qtest_init_with_qmp_format:
> + * @extra_args: other arguments to pass to QEMU.
> + * @qmp_format: format of QMP parameters, should contain one "%s"
> + * field so that the socket path will be filled later.
> + *
> + * Note that this function will work just like
> + * qtest_init_without_qmp_handshake(), so no QMP handshake will be done.
> + *
> + * Returns: #QTestState instance.
> + */
> +QTestState *qtest_init_with_qmp_format(const char *extra_args,
> + const char *qmp_format);
> +
> /**
> * qtest_quit:
> * @s: #QTestState instance to operate on.
> --
> 2.14.3
>
