{"id":807728,"url":"http://patchwork.ozlabs.org/api/patches/807728/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-9-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830165252.13421-9-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:16","name":"[PULL,08/44] tests: Add network filter tests to the check-qtest-s390x list","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bf8df862be30b1a9db893ba01c1331b8da943c7c","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-9-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807728/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807728/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjBWz1qCsz9sNn\n\tfor ;\n\tThu, 31 Aug 2017 02:57:51 +1000 (AEST)","from localhost ([::1]:51637 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6JJ-0005MQ-1A\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 12:57:49 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:56594)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6FC-0001cf-CI\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6FB-00056B-6I\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:34 -0400","from mx1.redhat.com ([209.132.183.28]:52050)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6FA-00055p-Th\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:53:33 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C7E52C0587D3;\n\tWed, 30 Aug 2017 16:53:31 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 5F43C5E24A;\n\tWed, 30 Aug 2017 16:53:29 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C7E52C0587D3","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\n\t(mx1.redhat.com [10.5.110.32]);\n\tWed, 30 Aug 2017 16:53:31 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 08/44] tests: Add network filter tests to the\n\tcheck-qtest-s390x list","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, david@redhat.com, Cornelia Huck ,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Thomas Huth \n\nWith some small modifications, we can also use the the netfilter,\nthe filter-mirror and the filter-redirector tests on s390x.\n\nSigned-off-by: Thomas Huth \nReviewed-by: Cornelia Huck \nMessage-Id: <1502951113-4246-3-git-send-email-thuth@redhat.com>\nReviewed-by: Zhang Chen \nSigned-off-by: Cornelia Huck \n---\n tests/Makefile.include | 3 +++\n tests/test-filter-mirror.c | 9 +++++++--\n tests/test-filter-redirector.c | 22 ++++++++++++++++------\n tests/test-netfilter.c | 11 ++++++++++-\n 4 files changed, 36 insertions(+), 9 deletions(-)","diff":"diff --git a/tests/Makefile.include b/tests/Makefile.include\nindex 871791d2fc..f08b7418f0 100644\n--- a/tests/Makefile.include\n+++ b/tests/Makefile.include\n@@ -361,6 +361,9 @@ check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)\n \n check-qtest-s390x-y = tests/boot-serial-test$(EXESUF)\n check-qtest-s390x-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)\n+check-qtest-s390x-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)\n+check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)\n+check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)\n \n check-qtest-generic-y += tests/qom-test$(EXESUF)\n check-qtest-generic-y += tests/test-hmp$(EXESUF)\ndiff --git a/tests/test-filter-mirror.c b/tests/test-filter-mirror.c\nindex a1d5865ef7..d569d27657 100644\n--- a/tests/test-filter-mirror.c\n+++ b/tests/test-filter-mirror.c\n@@ -25,6 +25,11 @@ static void test_mirror(void)\n char *recv_buf;\n uint32_t size = sizeof(send_buf);\n size = htonl(size);\n+ const char *devstr = \"e1000\";\n+\n+ if (g_str_equal(qtest_get_arch(), \"s390x\")) {\n+ devstr = \"virtio-net-ccw\";\n+ }\n \n ret = socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock);\n g_assert_cmpint(ret, !=, -1);\n@@ -33,10 +38,10 @@ static void test_mirror(void)\n g_assert_cmpint(ret, !=, -1);\n \n cmdline = g_strdup_printf(\"-netdev socket,id=qtest-bn0,fd=%d \"\n- \"-device e1000,netdev=qtest-bn0,id=qtest-e0 \"\n+ \"-device %s,netdev=qtest-bn0,id=qtest-e0 \"\n \"-chardev socket,id=mirror0,path=%s,server,nowait \"\n \"-object filter-mirror,id=qtest-f0,netdev=qtest-bn0,queue=tx,outdev=mirror0 \"\n- , send_sock[1], sock_path);\n+ , send_sock[1], devstr, sock_path);\n qtest_start(cmdline);\n g_free(cmdline);\n \ndiff --git a/tests/test-filter-redirector.c b/tests/test-filter-redirector.c\nindex 69c663b183..3afd41110d 100644\n--- a/tests/test-filter-redirector.c\n+++ b/tests/test-filter-redirector.c\n@@ -57,6 +57,16 @@\n #include \"qemu/error-report.h\"\n #include \"qemu/main-loop.h\"\n \n+static const char *get_devstr(void)\n+{\n+ if (g_str_equal(qtest_get_arch(), \"s390x\")) {\n+ return \"virtio-net-ccw\";\n+ }\n+\n+ return \"rtl8139\";\n+}\n+\n+\n static void test_redirector_tx(void)\n {\n int backend_sock[2], recv_sock;\n@@ -78,7 +88,7 @@ static void test_redirector_tx(void)\n g_assert_cmpint(ret, !=, -1);\n \n cmdline = g_strdup_printf(\"-netdev socket,id=qtest-bn0,fd=%d \"\n- \"-device rtl8139,netdev=qtest-bn0,id=qtest-e0 \"\n+ \"-device %s,netdev=qtest-bn0,id=qtest-e0 \"\n \"-chardev socket,id=redirector0,path=%s,server,nowait \"\n \"-chardev socket,id=redirector1,path=%s,server,nowait \"\n \"-chardev socket,id=redirector2,path=%s,nowait \"\n@@ -87,8 +97,8 @@ static void test_redirector_tx(void)\n \"-object filter-redirector,id=qtest-f1,netdev=qtest-bn0,\"\n \"queue=tx,indev=redirector2 \"\n \"-object filter-redirector,id=qtest-f2,netdev=qtest-bn0,\"\n- \"queue=tx,outdev=redirector1 \"\n- , backend_sock[1], sock_path0, sock_path1, sock_path0);\n+ \"queue=tx,outdev=redirector1 \", backend_sock[1], get_devstr(),\n+ sock_path0, sock_path1, sock_path0);\n qtest_start(cmdline);\n g_free(cmdline);\n \n@@ -149,7 +159,7 @@ static void test_redirector_rx(void)\n g_assert_cmpint(ret, !=, -1);\n \n cmdline = g_strdup_printf(\"-netdev socket,id=qtest-bn0,fd=%d \"\n- \"-device rtl8139,netdev=qtest-bn0,id=qtest-e0 \"\n+ \"-device %s,netdev=qtest-bn0,id=qtest-e0 \"\n \"-chardev socket,id=redirector0,path=%s,server,nowait \"\n \"-chardev socket,id=redirector1,path=%s,server,nowait \"\n \"-chardev socket,id=redirector2,path=%s,nowait \"\n@@ -158,8 +168,8 @@ static void test_redirector_rx(void)\n \"-object filter-redirector,id=qtest-f1,netdev=qtest-bn0,\"\n \"queue=rx,outdev=redirector2 \"\n \"-object filter-redirector,id=qtest-f2,netdev=qtest-bn0,\"\n- \"queue=rx,indev=redirector1 \"\n- , backend_sock[1], sock_path0, sock_path1, sock_path0);\n+ \"queue=rx,indev=redirector1 \", backend_sock[1], get_devstr(),\n+ sock_path0, sock_path1, sock_path0);\n qtest_start(cmdline);\n g_free(cmdline);\n \ndiff --git a/tests/test-netfilter.c b/tests/test-netfilter.c\nindex 8b5a9b21b5..2506473365 100644\n--- a/tests/test-netfilter.c\n+++ b/tests/test-netfilter.c\n@@ -182,6 +182,12 @@ static void remove_netdev_with_multi_netfilter(void)\n int main(int argc, char **argv)\n {\n int ret;\n+ char *args;\n+ const char *devstr = \"e1000\";\n+\n+ if (g_str_equal(qtest_get_arch(), \"s390x\")) {\n+ devstr = \"virtio-net-ccw\";\n+ }\n \n g_test_init(&argc, &argv, NULL);\n qtest_add_func(\"/netfilter/addremove_one\", add_one_netfilter);\n@@ -191,10 +197,13 @@ int main(int argc, char **argv)\n qtest_add_func(\"/netfilter/remove_netdev_multi\",\n remove_netdev_with_multi_netfilter);\n \n- qtest_start(\"-netdev user,id=qtest-bn0 -device e1000,netdev=qtest-bn0\");\n+ args = g_strdup_printf(\"-netdev user,id=qtest-bn0 \"\n+ \"-device %s,netdev=qtest-bn0\", devstr);\n+ qtest_start(args);\n ret = g_test_run();\n \n qtest_end();\n+ g_free(args);\n \n return ret;\n }\n","prefixes":["PULL","08/44"]}