From ab193a7368375c73e232f3b64d9c372c70bbf52c Mon Sep 17 00:00:00 2001

Message-Id: <ab193a7368375c73e232f3b64d9c372c70bbf52c.1383564115.git.minovotn@redhat.com>

In-Reply-To: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>

References: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

Date: Fri, 27 Sep 2013 13:31:18 +0200

Subject: [PATCH 08/14] libqtest: New qtest_end() to go with qtest_start()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Markus Armbruster <armbru@redhat.com>

Message-id: <1380288680-26645-9-git-send-email-armbru@redhat.com>

Patchwork-id: 54566

O-Subject: [PATCH 7.0 qemu-kvm 08/10] libqtest: New qtest_end() to go with qtest_start()

Bugzilla: 997817

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Laszlo Ersek <lersek@redhat.com>

RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>

From: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Andreas Färber <afaerber@suse.de>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Message-id: 1371711329-9144-3-git-send-email-armbru@redhat.com

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

(cherry picked from commit 1d9358e686125c125b52529fa68baf36aa2d0d09)

---

 tests/fdc-test.c    |  2 +-

 tests/hd-geo-test.c |  8 ++++----

 tests/ide-test.c    |  2 +-

 tests/libqtest.h    | 12 ++++++++++++

 4 files changed, 18 insertions(+), 6 deletions(-)

Signed-off-by: Michal Novotny <minovotn@redhat.com>

---

 tests/fdc-test.c    |  2 +-

 tests/hd-geo-test.c |  8 ++++----

 tests/ide-test.c    |  2 +-

 tests/libqtest.h    | 12 ++++++++++++

 4 files changed, 18 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 365e995..177ab00 100644

--- a/tests/ide-test.c

+++ b/tests/ide-test.c

@@ -120,7 +120,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..0f6aade 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>

@@ -319,6 +320,17 @@ static inline QTestState *qtest_start(const char *args)

 }

 /**

+ * qtest_end:

+ *

+ * Shut down the QEMU process started by qtest_start().

+ */

+static inline void qtest_end(void)

+{

+    qtest_quit(global_qtest);

+    global_qtest = NULL;

+}

+

+/**

  * qmp:

  * @fmt...: QMP message to send to qemu

  *

-- 

1.7.11.7