From 79eec4a8ab4eb5897563cc140c0fc2ee0738dc0b Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 11 Jan 2014 18:00:04 +0100 Subject: [PATCH 14/22] i440fx-test: qtest_start() should be paired with qtest_end() RH-Author: Laszlo Ersek Message-id: <1389463208-6278-15-git-send-email-lersek@redhat.com> Patchwork-id: 56627 O-Subject: [RHEL-7.0 qemu-kvm PATCH 14/18] i440fx-test: qtest_start() should be paired with qtest_end() Bugzilla: 1032346 RH-Acked-by: Paolo Bonzini RH-Acked-by: Amos Kong RH-Acked-by: Andrew Jones Similarly to commit 1d9358e6 ("libqtest: New qtest_end() to go with qtest_start()"). Signed-off-by: Laszlo Ersek Signed-off-by: Michael S. Tsirkin (cherry picked from commit b817e3fb5401bfab49e3c212e6daa1ff1f5a4c9a) --- tests/i440fx-test.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) Signed-off-by: Miroslav Rezanina --- tests/i440fx-test.c | 10 ++++------ 1 files 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 + * Laszlo Ersek * * 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; } -- 1.7.1