[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/19] i440fx-test: qtest_start() should be paired wi
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 04/19] i440fx-test: qtest_start() should be paired with qtest_end() |
Date: |
Mon, 23 Dec 2013 18:11:41 +0200 |
From: Laszlo Ersek <address@hidden>
Similarly to commit 1d9358e6
("libqtest: New qtest_end() to go with qtest_start()").
Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
tests/i440fx-test.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
index 65c786c..6ac46bf 100644
--- a/tests/i440fx-test.c
+++ b/tests/i440fx-test.c
@@ -2,9 +2,11 @@
* qtest I440FX test case
*
* Copyright IBM, Corp. 2012-2013
+ * Copyright Red Hat, Inc. 2013
*
* Authors:
* Anthony Liguori <address@hidden>
+ * Laszlo Ersek <address@hidden>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
@@ -256,7 +258,6 @@ static void test_i440fx_pam(gconstpointer opaque)
int main(int argc, char **argv)
{
- QTestState *s;
TestData data;
char *cmdline;
int ret;
@@ -266,20 +267,17 @@ int main(int argc, char **argv)
data.num_cpus = 1;
cmdline = g_strdup_printf("-smp %d", data.num_cpus);
- s = qtest_start(cmdline);
+ qtest_start(cmdline);
g_free(cmdline);
data.bus = qpci_init_pc();
g_test_add_data_func("/i440fx/defaults", &data, test_i440fx_defaults);
g_test_add_data_func("/i440fx/pam", &data, test_i440fx_pam);
-
ret = g_test_run();
- if (s) {
- qtest_quit(s);
- }
+ qtest_end();
return ret;
}
--
MST
- [Qemu-devel] [PULL 00/19] acpi, pci, pc, fedora, virtio fixes and enhancements, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 01/19] piix: gigabyte alignment for ram, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 02/19] pc_piix: document gigabyte_align, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 03/19] hw/i386/pc_sysfw: support two flash drives, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 04/19] i440fx-test: qtest_start() should be paired with qtest_end(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 05/19] i440fx-test: give each GTest case its own qtest, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 06/19] i440fx-test: generate temporary firmware blob, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 07/19] i440fx-test: verify firmware under 4G and 1M, both -bios and -pflash, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 08/19] acpi: piix4: remove not needed GPE0 mask, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 09/19] acpi: factor out common pm_update_sci() into acpi core, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 10/19] acpi: ich9: allow guest to clear SCI rised by GPE, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 11/19] ACPI: Q35 DSDT: fix CPU hotplug GPE0.2 handler, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 12/19] ACPI/DSDT-CPU: cleanup bogus comment, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 13/19] pci: do not export pci_bus_reset, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 15/19] qdev: allow both pre- and post-order vists in qdev walking functions, Michael S. Tsirkin, 2013/12/23