From nobody Sat May 18 12:29:51 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638868085; cv=none; d=zohomail.com; s=zohoarc; b=gldbS5ppEmHfnwb/pLp/s1u6+ub1Go8GgZUcjKdgxD2ekOs1zHiTzeSvC5ocTuDXO0YwyYWgirwni+Fwxnmq8cj/0mh1VuYjrdG31+V6mDapT5bHPlRHnHs+nIf09AeuDSgLhegaunJRXcwyG4CHbvHcSdZEzu9crOYSK1zv8yE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638868085; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=jH5Z+b+kHxLfWuoLPzACTnUO2SkL8BPHZ6haC4T6bSw=; b=lZ3zVUU/dMncMNKNmKzEIup9smMV2wERn18BCLxdy9pamSNMkJghdHmO8V2KUcIse75k1IFLjDAONYQ8mgsmjwotSymA9MndYqtuNhoYBJdIXKdvQobx9wHlwtkK6/ohzWsQT1496zhO/MyP27u1Hu9rrPdnyTbDZnMtxtIWRMY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163886808532094.1857914010186; Tue, 7 Dec 2021 01:08:05 -0800 (PST) Received: from localhost ([::1]:55462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1muWSB-0001ss-VL for importer@patchew.org; Tue, 07 Dec 2021 04:08:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muWQE-0000ZI-FU for qemu-devel@nongnu.org; Tue, 07 Dec 2021 04:06:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1muWQB-0007ad-3J for qemu-devel@nongnu.org; Tue, 07 Dec 2021 04:06:01 -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-441-Cvgc3HDeMpOenXIycO_a1g-1; Tue, 07 Dec 2021 04:05:52 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BFFFB6408E; Tue, 7 Dec 2021 09:05:51 +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 C26735D6CF; Tue, 7 Dec 2021 09:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638867957; 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=jH5Z+b+kHxLfWuoLPzACTnUO2SkL8BPHZ6haC4T6bSw=; b=D5VcLiVdYpH37H8tD5a/pIiD4HNLvWTeeu9XwhkAfNjxwhumPC4qgqNWDOkOrWCQzwKPcZ w7nc8GS3lkH3ZbDpxH7e34wHEF4SiyICKz/TByXs1mh7ui+qj6I8sDYiOv+mjo0oYWOohQ ouYHG9p3q38SSC2ECp+A2oYd9XCgEl0= X-MC-Unique: Cvgc3HDeMpOenXIycO_a1g-1 From: Thomas Huth To: qemu-devel@nongnu.org Subject: [PATCH for-7.0] tests/qtest: Make the netfilter test independent from a specific NIC Date: Tue, 7 Dec 2021 10:05:48 +0100 Message-Id: <20211207090548.105307-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.619, 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: Laurent Vivier , Paolo Bonzini , Yang Hongyang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1638868086625100001 Content-Type: text/plain; charset="utf-8" The netfilter test needs a NIC, no matter which one, so it uses e1000 by default (or virtio-net-ccw on s390x). However, this NIC might not be always compiled into the QEMU target binary, so assuming that this NIC is always available is a bad idea. Since the exact type of NIC does not really matter for this test, 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 test on other targets that have a default machine which features an on-board/default NIC, too. Signed-off-by: Thomas Huth --- tests/qtest/meson.build | 23 +++++++++++++++++------ tests/qtest/test-netfilter.c | 8 +------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 5260b33dc0..cd88cf4bf9 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -104,27 +104,36 @@ endif =20 qtests_x86_64 =3D qtests_i386 =20 -qtests_alpha =3D [ 'boot-serial-test' ] + = \ +qtests_alpha =3D [ 'boot-serial-test' ] + \ + (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' ] + \ + (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' ] + \ + (slirp.found() ? [ 'test-netfilter' ] : []) + +qtests_microblaze =3D [ 'boot-serial-test' ] + \ + (slirp.found() ? [ 'test-netfilter' ] : []) + qtests_microblazeel =3D qtests_microblaze =20 qtests_mips =3D \ + (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 \ + (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 \ + (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 @@ -147,10 +156,12 @@ qtests_ppc64 =3D \ 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'] + \ + (slirp.found() ? [ 'test-netfilter' ] : []) =20 qtests_sparc64 =3D \ - (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ + (slirp.found() ? [ 'test-netfilter' ] : []) + \ + (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ ['prom-env-test', 'boot-serial-test'] =20 qtests_npcm7xx =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