From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm61q-0004io-J9 for qemu-devel@nongnu.org; Thu, 28 Nov 2013 13:09:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vm61g-0002bc-Ke for qemu-devel@nongnu.org; Thu, 28 Nov 2013 13:09:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vm61g-0002bQ-D1 for qemu-devel@nongnu.org; Thu, 28 Nov 2013 13:09:20 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rASI9J0I003647 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 28 Nov 2013 13:09:20 -0500 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-104.ams2.redhat.com [10.36.116.104]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id rASI9HnI029081 for ; Thu, 28 Nov 2013 13:09:19 -0500 From: Laszlo Ersek Date: Thu, 28 Nov 2013 19:09:12 +0100 Message-Id: <1385662155-15212-2-git-send-email-lersek@redhat.com> In-Reply-To: <1385662155-15212-1-git-send-email-lersek@redhat.com> References: <1385662155-15212-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/4] i440fx-test: qtest_start() should be paired with qtest_end() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Similarly to commit 1d9358e6 ("libqtest: New qtest_end() to go with qtest_start()"). Signed-off-by: Laszlo Ersek --- 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 + * 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.8.3.1