From nobody Tue Feb 10 04:03:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513868134400630.2359644389601; Thu, 21 Dec 2017 06:55:34 -0800 (PST) Received: from localhost ([::1]:53369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS2Fi-0003nA-7y for importer@patchew.org; Thu, 21 Dec 2017 09:55:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eS1qa-0007sM-H0 for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eS1qX-0005ey-32 for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56260) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eS1qW-0005eS-Sm for qemu-devel@nongnu.org; Thu, 21 Dec 2017 09:29:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1721E61472; Thu, 21 Dec 2017 14:29:16 +0000 (UTC) Received: from redhat.com (ovpn-124-215.rdu2.redhat.com [10.10.124.215]) by smtp.corp.redhat.com (Postfix) with SMTP id 4986B60C8E; Thu, 21 Dec 2017 14:29:15 +0000 (UTC) Date: Thu, 21 Dec 2017 16:29:14 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1513866427-27125-12-git-send-email-mst@redhat.com> References: <1513866427-27125-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1513866427-27125-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 21 Dec 2017 14:29:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 11/25] tests/pxe-test: Remove unnecessary special case test functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Cornelia Huck , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Gibson All of the x86 and some of the other test cases here use a common test function, test_pxe_ipv4(), but one ppc and one s390 test use different functions. In the s390 case, this is completely pointless, the right parameter to test_pxe_ipv4() will already do exactly the right thing. For the spapr-vlan case there's a slight difference - it will use IPv6 instead of IPv4. But testing just one case with IPv6 (and NOT IPv4) is rather haphazard. Change everything to use the common test function, until we have a better way of testing IPv6 across the board. Signed-off-by: David Gibson Reviewed-by: Thomas Huth Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/pxe-test.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tests/pxe-test.c b/tests/pxe-test.c index 937f29e..eb70aa2 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -47,16 +47,6 @@ static void test_pxe_ipv4(gconstpointer data) g_free(dev_arg); } =20 -static void test_pxe_spapr_vlan(void) -{ - test_pxe_one("-device spapr-vlan,netdev=3D" NETNAME, true); -} - -static void test_pxe_virtio_ccw(void) -{ - test_pxe_one("-device virtio-net-ccw,bootindex=3D1,netdev=3D" NETNAME,= false); -} - int main(int argc, char *argv[]) { int ret; @@ -79,13 +69,14 @@ int main(int argc, char *argv[]) qtest_add_data_func("pxe/vmxnet3", "vmxnet3", test_pxe_ipv4); } } else if (strcmp(arch, "ppc64") =3D=3D 0) { - qtest_add_func("pxe/spapr-vlan", test_pxe_spapr_vlan); + qtest_add_data_func("pxe/spapr-vlan", "spapr-vlan", test_pxe_ipv4); if (g_test_slow()) { qtest_add_data_func("pxe/virtio", "virtio-net-pci", test_pxe_i= pv4); qtest_add_data_func("pxe/e1000", "e1000", test_pxe_ipv4); } } else if (g_str_equal(arch, "s390x")) { - qtest_add_func("pxe/virtio-ccw", test_pxe_virtio_ccw); + qtest_add_data_func("pxe/virtio-ccw", + "virtio-net-ccw,bootindex=3D1", test_pxe_ipv4); } ret =3D g_test_run(); boot_sector_cleanup(disk); --=20 MST