@@ -104,27 +104,36 @@ endif
qtests_x86_64 = qtests_i386
-qtests_alpha = [ 'boot-serial-test' ] + \
+qtests_alpha = [ 'boot-serial-test' ] + \
+ (slirp.found() ? [ 'test-netfilter' ] : []) + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
qtests_avr = [ 'boot-serial-test' ]
-qtests_hppa = [ 'boot-serial-test' ] + \
+qtests_hppa = [ 'boot-serial-test' ] + \
+ (slirp.found() ? [ 'test-netfilter' ] : []) + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
-qtests_m68k = [ 'boot-serial-test' ]
-qtests_microblaze = [ 'boot-serial-test' ]
+qtests_m68k = [ 'boot-serial-test' ] + \
+ (slirp.found() ? [ 'test-netfilter' ] : [])
+
+qtests_microblaze = [ 'boot-serial-test' ] + \
+ (slirp.found() ? [ 'test-netfilter' ] : [])
+
qtests_microblazeel = qtests_microblaze
qtests_mips = \
+ (slirp.found() ? [ 'test-netfilter' ] : []) + \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
qtests_mips64 = \
+ (slirp.found() ? [ 'test-netfilter' ] : []) + \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
qtests_mips64el = \
+ (slirp.found() ? [ 'test-netfilter' ] : []) + \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
(config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
@@ -147,10 +156,12 @@ qtests_ppc64 = \
qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
-qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test']
+qtests_sparc = ['prom-env-test', 'm48t59-test', 'boot-serial-test'] + \
+ (slirp.found() ? [ 'test-netfilter' ] : [])
qtests_sparc64 = \
- (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']
qtests_npcm7xx = \
@@ -178,11 +178,6 @@ int main(int argc, char **argv)
{
int ret;
char *args;
- const char *devstr = "e1000";
-
- if (g_str_equal(qtest_get_arch(), "s390x")) {
- devstr = "virtio-net-ccw";
- }
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);
- args = g_strdup_printf("-netdev user,id=qtest-bn0 "
- "-device %s,netdev=qtest-bn0", devstr);
+ args = g_strdup_printf("-nic user,id=qtest-bn0");
qtest_start(args);
ret = g_test_run();
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 <thuth@redhat.com> --- tests/qtest/meson.build | 23 +++++++++++++++++------ tests/qtest/test-netfilter.c | 8 +------- 2 files changed, 18 insertions(+), 13 deletions(-)