From nobody Sun Feb 8 12:52:05 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1640025737946550.4731986766891; Mon, 20 Dec 2021 10:42:17 -0800 (PST) Received: from localhost ([::1]:58482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzNc0-0005pj-3L for importer@patchew.org; Mon, 20 Dec 2021 13:42:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzKuE-0006sH-Qq for qemu-devel@nongnu.org; Mon, 20 Dec 2021 10:48:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzKuC-0003mi-8b for qemu-devel@nongnu.org; Mon, 20 Dec 2021 10:48:54 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-466-d1DylhiQM9CQUOP7GVw0ow-1; Mon, 20 Dec 2021 05:30:43 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 17920640A0; Mon, 20 Dec 2021 10:30:42 +0000 (UTC) Received: from thuth.com (dhcp-192-183.str.redhat.com [10.33.192.183]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E29D6ABBA; Mon, 20 Dec 2021 10:30:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640015331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q+Xk3O/LjRDf2Wp1rmglgGgwqt2XrHHw2r6jvJus/Uw=; b=NBWigA0ikdgBYJqXfXJCFtfRddz4YCLDzHhFpHS4gyGhBVHySnpsyzBY4NoOFB6XB/3j9E TZ0yb4AxXQdr/kKIiDvmrVSMXuXV6AL7vmehdWyN4LBM1H3xKJOvfqsnUqRKHebqoeWb6U HAp33nqVByqdWOxHTcOclRG9uCbymwM= X-MC-Unique: d1DylhiQM9CQUOP7GVw0ow-1 From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Subject: [PATCH] tests/qtest: Make the filter tests independent from a specific NIC Date: Mon, 20 Dec 2021 11:30:25 +0100 Message-Id: <20211220103025.311759-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.209, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Yang Hongyang , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1640025738665100001 Content-Type: text/plain; charset="utf-8" These filter tests need a NIC, no matter which one, so they use a common NIC by default. However, these common NIC models might not always have been compiled into the QEMU target binary, so assuming that a certain NIC is available is a bad idea. Since the exact type of NIC does not really matter for these tests, let's switch to "-nic" instead of "-netdev" so that QEMU can simply pick a default NIC for us. This way we can now run the tests on other targets that have a default machine with an on-board/default NIC, too. Signed-off-by: Thomas Huth Reviewed-by: Zhang Chen --- tests/qtest/meson.build | 40 +++++++++++++++++++++------- tests/qtest/test-filter-mirror.c | 10 ++----- tests/qtest/test-filter-redirector.c | 20 +++----------- tests/qtest/test-netfilter.c | 8 +----- 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index ebeac59b3f..7811177f03 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -47,7 +47,6 @@ qtests_i386 =3D \ (have_tools ? ['ahci-test'] : []) + = \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) += \ - (config_all_devices.has_key('CONFIG_RTL8139_PCI') ? ['test-filter-redire= ctor'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] := []) + \ (config_host.has_key('CONFIG_LINUX') and = \ config_all_devices.has_key('CONFIG_ISA_IPMI_BT') ? ['ipmi-bt-test'] : [= ]) + \ @@ -90,7 +89,9 @@ qtests_i386 =3D \ 'vmgenid-test', 'migration-test', 'test-x86-cpuid-compat', - 'numa-test'] + 'numa-test', + 'test-filter-redirector' + ] =20 dbus_daemon =3D find_program('dbus-daemon', required: false) if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN') @@ -109,31 +110,49 @@ endif =20 qtests_x86_64 =3D qtests_i386 =20 -qtests_alpha =3D [ 'boot-serial-test' ] + = \ +qtests_alpha =3D ['boot-serial-test'] + \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) =20 qtests_avr =3D [ 'boot-serial-test' ] =20 -qtests_hppa =3D [ 'boot-serial-test' ] + = \ +qtests_hppa =3D ['boot-serial-test'] + \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) =20 -qtests_m68k =3D [ 'boot-serial-test' ] -qtests_microblaze =3D [ 'boot-serial-test' ] +qtests_m68k =3D ['boot-serial-test'] + \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + +qtests_microblaze =3D ['boot-serial-test'] + \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + qtests_microblazeel =3D qtests_microblaze =20 qtests_mips =3D \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) =20 qtests_mips64 =3D \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) =20 qtests_mips64el =3D \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : []) =20 qtests_ppc =3D \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + = \ ['boot-order-test', 'prom-env-test', 'boot-serial-test'] = \ @@ -143,19 +162,22 @@ qtests_ppc64 =3D \ (config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : [= ]) + \ (config_all_devices.has_key('CONFIG_POWERNV') ? ['pnv-xscom-test'] : [])= + \ (config_all_devices.has_key('CONFIG_PSERIES') ? ['rtas-test'] : []) + = \ - (slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \ + (slirp.found() ? ['pxe-test'] : []) + \ (config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] := []) + \ (config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test= '] : []) + \ - (config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + = \ qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test', 'drive_del= -test'] =20 qtests_sh4 =3D (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endia= nness-test'] : []) qtests_sh4eb =3D (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['end= ianness-test'] : []) =20 -qtests_sparc =3D ['prom-env-test', 'm48t59-test', 'boot-serial-test'] +qtests_sparc =3D ['prom-env-test', 'm48t59-test', 'boot-serial-test'] + \ + ['test-filter-mirror', 'test-filter-redirector'] + \ + (slirp.found() ? ['test-netfilter'] : []) =20 qtests_sparc64 =3D \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + (slirp.found() ? ['test-netfilter'] : []) + \ + ['test-filter-mirror', 'test-filter-redirector'] + \ ['prom-env-test', 'boot-serial-test'] =20 qtests_npcm7xx =3D \ diff --git a/tests/qtest/test-filter-mirror.c b/tests/qtest/test-filter-mir= ror.c index bc0dee64dd..95367d14d3 100644 --- a/tests/qtest/test-filter-mirror.c +++ b/tests/qtest/test-filter-mirror.c @@ -28,13 +28,8 @@ static void test_mirror(void) char *recv_buf; uint32_t size =3D sizeof(send_buf); size =3D htonl(size); - const char *devstr =3D "e1000"; QTestState *qts; =20 - if (g_str_equal(qtest_get_arch(), "s390x")) { - devstr =3D "virtio-net-ccw"; - } - ret =3D socketpair(PF_UNIX, SOCK_STREAM, 0, send_sock); g_assert_cmpint(ret, !=3D, -1); =20 @@ -42,11 +37,10 @@ static void test_mirror(void) g_assert_cmpint(ret, !=3D, -1); =20 qts =3D qtest_initf( - "-netdev socket,id=3Dqtest-bn0,fd=3D%d " - "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " + "-nic socket,id=3Dqtest-bn0,fd=3D%d " "-chardev socket,id=3Dmirror0,fd=3D%d " "-object filter-mirror,id=3Dqtest-f0,netdev=3Dqtest-bn0,queue=3Dtx= ,outdev=3Dmirror0 " - , send_sock[1], devstr, recv_sock[1]); + , send_sock[1], recv_sock[1]); =20 struct iovec iov[] =3D { { diff --git a/tests/qtest/test-filter-redirector.c b/tests/qtest/test-filter= -redirector.c index 4269b2cdd9..4f3f59cba8 100644 --- a/tests/qtest/test-filter-redirector.c +++ b/tests/qtest/test-filter-redirector.c @@ -62,16 +62,6 @@ /* TODO actually test the results and get rid of this */ #define qmp_discard_response(qs, ...) qobject_unref(qtest_qmp(qs, __VA_ARG= S__)) =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; @@ -93,8 +83,7 @@ static void test_redirector_tx(void) g_assert_cmpint(ret, !=3D, -1); =20 qts =3D qtest_initf( - "-netdev socket,id=3Dqtest-bn0,fd=3D%d " - "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " + "-nic socket,id=3Dqtest-bn0,fd=3D%d " "-chardev socket,id=3Dredirector0,path=3D%s,server=3Don,wait=3Doff= " "-chardev socket,id=3Dredirector1,path=3D%s,server=3Don,wait=3Doff= " "-chardev socket,id=3Dredirector2,path=3D%s " @@ -103,7 +92,7 @@ static void test_redirector_tx(void) "-object filter-redirector,id=3Dqtest-f1,netdev=3Dqtest-bn0," "queue=3Dtx,indev=3Dredirector2 " "-object filter-redirector,id=3Dqtest-f2,netdev=3Dqtest-bn0," - "queue=3Dtx,outdev=3Dredirector1 ", backend_sock[1], get_devstr(), + "queue=3Dtx,outdev=3Dredirector1 ", backend_sock[1], sock_path0, sock_path1, sock_path0); =20 recv_sock =3D unix_connect(sock_path1, NULL); @@ -163,8 +152,7 @@ static void test_redirector_rx(void) g_assert_cmpint(ret, !=3D, -1); =20 qts =3D qtest_initf( - "-netdev socket,id=3Dqtest-bn0,fd=3D%d " - "-device %s,netdev=3Dqtest-bn0,id=3Dqtest-e0 " + "-nic socket,id=3Dqtest-bn0,fd=3D%d " "-chardev socket,id=3Dredirector0,path=3D%s,server=3Don,wait=3Doff= " "-chardev socket,id=3Dredirector1,path=3D%s,server=3Don,wait=3Doff= " "-chardev socket,id=3Dredirector2,path=3D%s " @@ -173,7 +161,7 @@ static void test_redirector_rx(void) "-object filter-redirector,id=3Dqtest-f1,netdev=3Dqtest-bn0," "queue=3Drx,outdev=3Dredirector2 " "-object filter-redirector,id=3Dqtest-f2,netdev=3Dqtest-bn0," - "queue=3Drx,indev=3Dredirector1 ", backend_sock[1], get_devstr(), + "queue=3Drx,indev=3Dredirector1 ", backend_sock[1], sock_path0, sock_path1, sock_path0); =20 struct iovec iov[] =3D { diff --git a/tests/qtest/test-netfilter.c b/tests/qtest/test-netfilter.c index 785b6f3226..b09ef7fae9 100644 --- a/tests/qtest/test-netfilter.c +++ b/tests/qtest/test-netfilter.c @@ -178,11 +178,6 @@ 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); @@ -192,8 +187,7 @@ int main(int argc, char **argv) qtest_add_func("/netfilter/remove_netdev_multi", remove_netdev_with_multi_netfilter); =20 - args =3D g_strdup_printf("-netdev user,id=3Dqtest-bn0 " - "-device %s,netdev=3Dqtest-bn0", devstr); + args =3D g_strdup_printf("-nic user,id=3Dqtest-bn0"); qtest_start(args); ret =3D g_test_run(); =20 --=20 2.27.0