Am 19.06.2013 09:44, schrieb Markus Armbruster:
> Signed-off-by: Markus Armbruster <arm...@redhat.com>
> ---
> tests/fdc-test.c | 2 +-
> tests/hd-geo-test.c | 8 ++++----
> tests/ide-test.c | 2 +-
> tests/libqtest.h | 7 +++++++
> 4 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/tests/fdc-test.c b/tests/fdc-test.c
> index 4b0301d..fd198dc 100644
> --- a/tests/fdc-test.c
> +++ b/tests/fdc-test.c
> @@ -556,7 +556,7 @@ int main(int argc, char **argv)
> ret = g_test_run();
>
> /* Cleanup */
> - qtest_quit(global_qtest);
> + qtest_end();
> unlink(test_image);
>
> return ret;
> diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
> index 9a31e85..b72042e 100644
> --- a/tests/hd-geo-test.c
> +++ b/tests/hd-geo-test.c
> @@ -244,7 +244,7 @@ static void test_ide_none(void)
> setup_common(argv, ARRAY_SIZE(argv));
> qtest_start(g_strjoinv(" ", argv));
> test_cmos();
> - qtest_quit(global_qtest);
> + qtest_end();
> }
>
> static void test_ide_mbr(bool use_device, MBRcontents mbr)
> @@ -262,7 +262,7 @@ static void test_ide_mbr(bool use_device, MBRcontents mbr)
> }
> qtest_start(g_strjoinv(" ", argv));
> test_cmos();
> - qtest_quit(global_qtest);
> + qtest_end();
> }
>
> /*
> @@ -334,7 +334,7 @@ static void test_ide_drive_user(const char *dev, bool
> trans)
> g_free(opts);
> qtest_start(g_strjoinv(" ", argv));
> test_cmos();
> - qtest_quit(global_qtest);
> + qtest_end();
> }
>
> /*
> @@ -387,7 +387,7 @@ static void test_ide_drive_cd_0(void)
> }
> qtest_start(g_strjoinv(" ", argv));
> test_cmos();
> - qtest_quit(global_qtest);
> + qtest_end();
> }
>
> int main(int argc, char **argv)
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index 7e2eb94..7307f1d 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -122,7 +122,7 @@ static void ide_test_start(const char *cmdline_fmt, ...)
>
> static void ide_test_quit(void)
> {
> - qtest_quit(global_qtest);
> + qtest_end();
> }
>
> static QPCIDevice *get_pci_device(uint16_t *bmdma_base)
> diff --git a/tests/libqtest.h b/tests/libqtest.h
> index 437bda3..329325b 100644
> --- a/tests/libqtest.h
> +++ b/tests/libqtest.h
> @@ -17,6 +17,7 @@
> #ifndef LIBQTEST_H
> #define LIBQTEST_H
>
> +#include <stddef.h>
> #include <stdint.h>
> #include <stdbool.h>
> #include <stdarg.h>
> @@ -318,6 +319,12 @@ static inline QTestState *qtest_start(const char *args)
> return global_qtest;
> }
>
> +static inline void qtest_end(void)
> +{
> + qtest_quit(global_qtest);
> + global_qtest = NULL;
> +}
> +
> /**
> * qmp:
> * @fmt...: QMP message to send to qemu
>
Function and usage looks fine, but please add a gtk-doc comment.
qtest_start() does have one.
Thanks,
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
