Message ID | 20180905062313.4059-5-peterx@redhat.com |
---|---|
State | New |
Headers | show |
Series | monitor: enable OOB by default | expand |
Hi On Wed, Sep 5, 2018 at 10:26 AM Peter Xu <peterx@redhat.com> wrote: > > This reverts commit ddee57e0176f6ab53b13c6c97605b62737a8fd7a. > > Meanwhile, revert one line from fa198ad9bdef to make sure > qtest_init_without_qmp_handshake() will only pass in one parameter. > > Reviewed-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Peter Xu <peterx@redhat.com> > --- Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > tests/libqtest.c | 10 ++++------ > tests/libqtest.h | 4 +--- > tests/qmp-test.c | 4 ++-- > 3 files changed, 7 insertions(+), 11 deletions(-) > > diff --git a/tests/libqtest.c b/tests/libqtest.c > index ebd92f22f6..3c594abbc2 100644 > --- a/tests/libqtest.c > +++ b/tests/libqtest.c > @@ -191,8 +191,7 @@ static const char *qtest_qemu_binary(void) > return qemu_bin; > } > > -QTestState *qtest_init_without_qmp_handshake(bool use_oob, > - const char *extra_args) > +QTestState *qtest_init_without_qmp_handshake(const char *extra_args) > { > QTestState *s; > int sock, qmpsock, i; > @@ -225,13 +224,12 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, > command = g_strdup_printf("exec %s " > "-qtest unix:%s,nowait " > "-qtest-log %s " > - "-chardev socket,path=%s,nowait,id=char0 " > - "-mon chardev=char0,mode=control%s " > + "-qmp unix:%s,nowait " > "-machine accel=qtest " > "-display none " > "%s", qemu_binary, socket_path, > getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", > - qmp_socket_path, "", > + qmp_socket_path, > extra_args ?: ""); > execlp("/bin/sh", "sh", "-c", command, NULL); > exit(1); > @@ -266,7 +264,7 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, > > QTestState *qtest_init(const char *extra_args) > { > - QTestState *s = qtest_init_without_qmp_handshake(false, extra_args); > + QTestState *s = qtest_init_without_qmp_handshake(extra_args); > QDict *greeting; > > /* Read the QMP greeting and then do the handshake */ > diff --git a/tests/libqtest.h b/tests/libqtest.h > index 36d5caecd4..49ffc1ba9f 100644 > --- a/tests/libqtest.h > +++ b/tests/libqtest.h > @@ -55,14 +55,12 @@ QTestState *qtest_init(const char *extra_args); > > /** > * qtest_init_without_qmp_handshake: > - * @use_oob: true to have the server advertise OOB support > * @extra_args: other arguments to pass to QEMU. CAUTION: these > * arguments are subject to word splitting and shell evaluation. > * > * Returns: #QTestState instance. > */ > -QTestState *qtest_init_without_qmp_handshake(bool use_oob, > - const char *extra_args); > +QTestState *qtest_init_without_qmp_handshake(const char *extra_args); > > /** > * qtest_quit: > diff --git a/tests/qmp-test.c b/tests/qmp-test.c > index 5302bd07b9..91a90d1c9d 100644 > --- a/tests/qmp-test.c > +++ b/tests/qmp-test.c > @@ -135,7 +135,7 @@ static void test_qmp_protocol(void) > QList *capabilities; > QTestState *qts; > > - qts = qtest_init_without_qmp_handshake(false, common_args); > + qts = qtest_init_without_qmp_handshake(common_args); > > /* Test greeting */ > resp = qtest_qmp_receive(qts); > @@ -249,7 +249,7 @@ static void test_qmp_oob(void) > QList *capabilities; > QString *qstr; > > - qts = qtest_init_without_qmp_handshake(true, common_args); > + qts = qtest_init_without_qmp_handshake(common_args); > > /* Check the greeting message. */ > resp = qtest_qmp_receive(qts); > -- > 2.17.1 > >
diff --git a/tests/libqtest.c b/tests/libqtest.c index ebd92f22f6..3c594abbc2 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -191,8 +191,7 @@ static const char *qtest_qemu_binary(void) return qemu_bin; } -QTestState *qtest_init_without_qmp_handshake(bool use_oob, - const char *extra_args) +QTestState *qtest_init_without_qmp_handshake(const char *extra_args) { QTestState *s; int sock, qmpsock, i; @@ -225,13 +224,12 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, command = g_strdup_printf("exec %s " "-qtest unix:%s,nowait " "-qtest-log %s " - "-chardev socket,path=%s,nowait,id=char0 " - "-mon chardev=char0,mode=control%s " + "-qmp unix:%s,nowait " "-machine accel=qtest " "-display none " "%s", qemu_binary, socket_path, getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", - qmp_socket_path, "", + qmp_socket_path, extra_args ?: ""); execlp("/bin/sh", "sh", "-c", command, NULL); exit(1); @@ -266,7 +264,7 @@ QTestState *qtest_init_without_qmp_handshake(bool use_oob, QTestState *qtest_init(const char *extra_args) { - QTestState *s = qtest_init_without_qmp_handshake(false, extra_args); + QTestState *s = qtest_init_without_qmp_handshake(extra_args); QDict *greeting; /* Read the QMP greeting and then do the handshake */ diff --git a/tests/libqtest.h b/tests/libqtest.h index 36d5caecd4..49ffc1ba9f 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -55,14 +55,12 @@ QTestState *qtest_init(const char *extra_args); /** * qtest_init_without_qmp_handshake: - * @use_oob: true to have the server advertise OOB support * @extra_args: other arguments to pass to QEMU. CAUTION: these * arguments are subject to word splitting and shell evaluation. * * Returns: #QTestState instance. */ -QTestState *qtest_init_without_qmp_handshake(bool use_oob, - const char *extra_args); +QTestState *qtest_init_without_qmp_handshake(const char *extra_args); /** * qtest_quit: diff --git a/tests/qmp-test.c b/tests/qmp-test.c index 5302bd07b9..91a90d1c9d 100644 --- a/tests/qmp-test.c +++ b/tests/qmp-test.c @@ -135,7 +135,7 @@ static void test_qmp_protocol(void) QList *capabilities; QTestState *qts; - qts = qtest_init_without_qmp_handshake(false, common_args); + qts = qtest_init_without_qmp_handshake(common_args); /* Test greeting */ resp = qtest_qmp_receive(qts); @@ -249,7 +249,7 @@ static void test_qmp_oob(void) QList *capabilities; QString *qstr; - qts = qtest_init_without_qmp_handshake(true, common_args); + qts = qtest_init_without_qmp_handshake(common_args); /* Check the greeting message. */ resp = qtest_qmp_receive(qts);