From nobody Wed Nov 5 08:48:40 2025 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504112335542822.2502589587428; Wed, 30 Aug 2017 09:58:55 -0700 (PDT) Received: from localhost ([::1]:51642 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn6KL-0006W4-Hl for importer@patchew.org; Wed, 30 Aug 2017 12:58:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn6FC-0001cf-CI for qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dn6FB-00056B-6I for qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52050) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dn6FA-00055p-Th for qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7E52C0587D3; Wed, 30 Aug 2017 16:53:31 +0000 (UTC) Received: from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F43C5E24A; Wed, 30 Aug 2017 16:53:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C7E52C0587D3 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=cohuck@redhat.com From: Cornelia Huck To: peter.maydell@linaro.org Date: Wed, 30 Aug 2017 18:52:16 +0200 Message-Id: <20170830165252.13421-9-cohuck@redhat.com> In-Reply-To: <20170830165252.13421-1-cohuck@redhat.com> References: <20170830165252.13421-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 30 Aug 2017 16:53:31 +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 08/44] tests: Add network filter tests to the check-qtest-s390x list 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: thuth@redhat.com, david@redhat.com, Cornelia Huck , agraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com, rth@twiddle.net 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth With some small modifications, we can also use the the netfilter, the filter-mirror and the filter-redirector tests on s390x. Signed-off-by: Thomas Huth Reviewed-by: Cornelia Huck Message-Id: <1502951113-4246-3-git-send-email-thuth@redhat.com> Reviewed-by: Zhang Chen Signed-off-by: Cornelia Huck --- tests/Makefile.include | 3 +++ tests/test-filter-mirror.c | 9 +++++++-- tests/test-filter-redirector.c | 22 ++++++++++++++++------ tests/test-netfilter.c | 11 ++++++++++- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 871791d2fc..f08b7418f0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -361,6 +361,9 @@ check-qtest-xtensaeb-y =3D $(check-qtest-xtensa-y) =20 check-qtest-s390x-y =3D tests/boot-serial-test$(EXESUF) check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/pxe-test$(EXESUF) +check-qtest-s390x-$(CONFIG_SLIRP) +=3D tests/test-netfilter$(EXESUF) +check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-mirror$(EXESUF) +check-qtest-s390x-$(CONFIG_POSIX) +=3D tests/test-filter-redirector$(EXESU= F) =20 check-qtest-generic-y +=3D tests/qom-test$(EXESUF) check-qtest-generic-y +=3D tests/test-hmp$(EXESUF) diff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c index a1d5865ef7..d569d27657 100644 --- a/tests/test-filter-mirror.c +++ b/tests/test-filter-mirror.c @@ -25,6 +25,11 @@ static void test_mirror(void) char *recv_buf; uint32_t size =3D sizeof(send_buf); size =3D htonl(size); + const char *devstr =3D "e1000"; + + if (g_str_equal(qtest_get_arch(), "s390x")) { + devstr =3D "virtio-net-ccw"; + } =20 ret =3D socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock); g_assert_cmpint(ret, !=3D, -1); @@ -33,10 +38,10 @@ static void test_mirror(void) g_assert_cmpint(ret, !=3D, -1); =20 cmdline =3D g_strdup_printf("-netdev socket,id=3Dqtest-bn0,fd=3D%d " - "-device e1000,netdev=3Dqtest-bn0,id=3Dqtest-e0 " + "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " "-chardev socket,id=3Dmirror0,path=3D%s,server,nowait " "-object filter-mirror,id=3Dqtest-f0,netdev=3Dqtest-bn0,q= ueue=3Dtx,outdev=3Dmirror0 " - , send_sock[1], sock_path); + , send_sock[1], devstr, sock_path); qtest_start(cmdline); g_free(cmdline); =20 diff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirector.c index 69c663b183..3afd41110d 100644 --- a/tests/test-filter-redirector.c +++ b/tests/test-filter-redirector.c @@ -57,6 +57,16 @@ #include "qemu/error-report.h" #include "qemu/main-loop.h" =20 +static const char *get_devstr(void) +{ + if (g_str_equal(qtest_get_arch(), "s390x")) { + return "virtio-net-ccw"; + } + + return "rtl8139"; +} + + static void test_redirector_tx(void) { int backend_sock[2], recv_sock; @@ -78,7 +88,7 @@ static void test_redirector_tx(void) g_assert_cmpint(ret, !=3D, -1); =20 cmdline =3D g_strdup_printf("-netdev socket,id=3Dqtest-bn0,fd=3D%d " - "-device rtl8139,netdev=3Dqtest-bn0,id=3Dqtest-e0 " + "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " "-chardev socket,id=3Dredirector0,path=3D%s,server,nowait " "-chardev socket,id=3Dredirector1,path=3D%s,server,nowait " "-chardev socket,id=3Dredirector2,path=3D%s,nowait " @@ -87,8 +97,8 @@ static void test_redirector_tx(void) "-object filter-redirector,id=3Dqtest-f1,netdev=3Dqtest-bn= 0," "queue=3Dtx,indev=3Dredirector2 " "-object filter-redirector,id=3Dqtest-f2,netdev=3Dqtest-bn= 0," - "queue=3Dtx,outdev=3Dredirector1 " - , backend_sock[1], sock_path0, sock_path1, sock_path0); + "queue=3Dtx,outdev=3Dredirector1 ", backend_sock[1], get_d= evstr(), + sock_path0, sock_path1, sock_path0); qtest_start(cmdline); g_free(cmdline); =20 @@ -149,7 +159,7 @@ static void test_redirector_rx(void) g_assert_cmpint(ret, !=3D, -1); =20 cmdline =3D g_strdup_printf("-netdev socket,id=3Dqtest-bn0,fd=3D%d " - "-device rtl8139,netdev=3Dqtest-bn0,id=3Dqtest-e0 " + "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " "-chardev socket,id=3Dredirector0,path=3D%s,server,nowait " "-chardev socket,id=3Dredirector1,path=3D%s,server,nowait " "-chardev socket,id=3Dredirector2,path=3D%s,nowait " @@ -158,8 +168,8 @@ static void test_redirector_rx(void) "-object filter-redirector,id=3Dqtest-f1,netdev=3Dqtest-bn= 0," "queue=3Drx,outdev=3Dredirector2 " "-object filter-redirector,id=3Dqtest-f2,netdev=3Dqtest-bn= 0," - "queue=3Drx,indev=3Dredirector1 " - , backend_sock[1], sock_path0, sock_path1, sock_path0); + "queue=3Drx,indev=3Dredirector1 ", backend_sock[1], get_de= vstr(), + sock_path0, sock_path1, sock_path0); qtest_start(cmdline); g_free(cmdline); =20 diff --git a/tests/test-netfilter.c b/tests/test-netfilter.c index 8b5a9b21b5..2506473365 100644 --- a/tests/test-netfilter.c +++ b/tests/test-netfilter.c @@ -182,6 +182,12 @@ static void remove_netdev_with_multi_netfilter(void) int main(int argc, char **argv) { int ret; + char *args; + const char *devstr =3D "e1000"; + + if (g_str_equal(qtest_get_arch(), "s390x")) { + devstr =3D "virtio-net-ccw"; + } =20 g_test_init(&argc, &argv, NULL); qtest_add_func("/netfilter/addremove_one", add_one_netfilter); @@ -191,10 +197,13 @@ int main(int argc, char **argv) qtest_add_func("/netfilter/remove_netdev_multi", remove_netdev_with_multi_netfilter); =20 - qtest_start("-netdev user,id=3Dqtest-bn0 -device e1000,netdev=3Dqtest-= bn0"); + args =3D g_strdup_printf("-netdev user,id=3Dqtest-bn0 " + "-device %s,netdev=3Dqtest-bn0", devstr); + qtest_start(args); ret =3D g_test_run(); =20 qtest_end(); + g_free(args); =20 return ret; } --=20 2.13.5