Message ID | 1503916557-1292-1-git-send-email-thuth@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 08/28/2017 05:35 AM, Thomas Huth wrote: > The user can currently still cause an abort() if running certain tests > (like the prom-env-test) without setting the QTEST_QEMU_BINARY first. > A similar problem has been fixed with commit 7c933ad61b8f3f51337 > already, but forgot to also take care of the qtest_get_arch() function, > so let's introduce a proper wrapper around getenv("QTEST_QEMU_BINARY") > that can be used in both locations now. > > Buglink: https://bugs.launchpad.net/qemu/+bug/1713434 > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tests/libqtest.c | 24 +++++++++++++++--------- > 1 file changed, 15 insertions(+), 9 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On 08/28/2017 07:35 AM, Thomas Huth wrote: > The user can currently still cause an abort() if running certain tests > (like the prom-env-test) without setting the QTEST_QEMU_BINARY first. > A similar problem has been fixed with commit 7c933ad61b8f3f51337 > already, but forgot to also take care of the qtest_get_arch() function, > so let's introduce a proper wrapper around getenv("QTEST_QEMU_BINARY") > that can be used in both locations now. > > Buglink: https://bugs.launchpad.net/qemu/+bug/1713434 > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > tests/libqtest.c | 24 +++++++++++++++--------- > 1 file changed, 15 insertions(+), 9 deletions(-) > > diff --git a/tests/libqtest.c b/tests/libqtest.c > index b9a1f18..342a77b 100644 > --- a/tests/libqtest.c > +++ b/tests/libqtest.c > @@ -150,6 +150,19 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data) > g_hook_prepend(&abrt_hooks, hook); > } > > +static const char *qtest_qemu_binary(void) > +{ > + const char *qemu_bin; > + > + qemu_bin = getenv("QTEST_QEMU_BINARY"); > + if (!qemu_bin) { > + fprintf(stderr, "Environment variable QTEST_QEMU_BINARY required\n"); > + exit(1); > + } > + > + return qemu_bin; > +} > + > QTestState *qtest_init_without_qmp_handshake(const char *extra_args) > { > QTestState *s; > @@ -157,13 +170,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) > gchar *socket_path; > gchar *qmp_socket_path; > gchar *command; > - const char *qemu_binary; > - > - qemu_binary = getenv("QTEST_QEMU_BINARY"); > - if (!qemu_binary) { > - fprintf(stderr, "Environment variable QTEST_QEMU_BINARY required\n"); > - exit(1); > - } > + const char *qemu_binary = qtest_qemu_binary(); > > s = g_malloc(sizeof(*s)); > > @@ -624,8 +631,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) > > const char *qtest_get_arch(void) > { > - const char *qemu = getenv("QTEST_QEMU_BINARY"); > - g_assert(qemu != NULL); > + const char *qemu = qtest_qemu_binary(); > const char *end = strrchr(qemu, '/'); > > return end + strlen("/qemu-system-"); >
On 08/28/2017 06:35 AM, Thomas Huth wrote: > The user can currently still cause an abort() if running certain tests > (like the prom-env-test) without setting the QTEST_QEMU_BINARY first. > A similar problem has been fixed with commit 7c933ad61b8f3f51337 > already, but forgot to also take care of the qtest_get_arch() function, > so let's introduce a proper wrapper around getenv("QTEST_QEMU_BINARY") > that can be used in both locations now. > > Buglink: https://bugs.launchpad.net/qemu/+bug/1713434 > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com>
28.08.2017 13:35, Thomas Huth weote: > The user can currently still cause an abort() if running certain tests > (like the prom-env-test) without setting the QTEST_QEMU_BINARY first. > A similar problem has been fixed with commit 7c933ad61b8f3f51337 > already, but forgot to also take care of the qtest_get_arch() function, > so let's introduce a proper wrapper around getenv("QTEST_QEMU_BINARY") > that can be used in both locations now. Applied to -trivial, thanks! /mjt
diff --git a/tests/libqtest.c b/tests/libqtest.c index b9a1f18..342a77b 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -150,6 +150,19 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data) g_hook_prepend(&abrt_hooks, hook); } +static const char *qtest_qemu_binary(void) +{ + const char *qemu_bin; + + qemu_bin = getenv("QTEST_QEMU_BINARY"); + if (!qemu_bin) { + fprintf(stderr, "Environment variable QTEST_QEMU_BINARY required\n"); + exit(1); + } + + return qemu_bin; +} + QTestState *qtest_init_without_qmp_handshake(const char *extra_args) { QTestState *s; @@ -157,13 +170,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) gchar *socket_path; gchar *qmp_socket_path; gchar *command; - const char *qemu_binary; - - qemu_binary = getenv("QTEST_QEMU_BINARY"); - if (!qemu_binary) { - fprintf(stderr, "Environment variable QTEST_QEMU_BINARY required\n"); - exit(1); - } + const char *qemu_binary = qtest_qemu_binary(); s = g_malloc(sizeof(*s)); @@ -624,8 +631,7 @@ char *qtest_hmp(QTestState *s, const char *fmt, ...) const char *qtest_get_arch(void) { - const char *qemu = getenv("QTEST_QEMU_BINARY"); - g_assert(qemu != NULL); + const char *qemu = qtest_qemu_binary(); const char *end = strrchr(qemu, '/'); return end + strlen("/qemu-system-");
The user can currently still cause an abort() if running certain tests (like the prom-env-test) without setting the QTEST_QEMU_BINARY first. A similar problem has been fixed with commit 7c933ad61b8f3f51337 already, but forgot to also take care of the qtest_get_arch() function, so let's introduce a proper wrapper around getenv("QTEST_QEMU_BINARY") that can be used in both locations now. Buglink: https://bugs.launchpad.net/qemu/+bug/1713434 Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/libqtest.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)