From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PATCH 07/10] meson: do not use config_host to pick tap implementations
Date: Tue, 29 Aug 2023 10:29:28 +0200 [thread overview]
Message-ID: <20230829082931.67601-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20230829082931.67601-1-pbonzini@redhat.com>
The target OS is invariant and does not depend on the configuration, so move
away from config_host and just use unconditional rules in softmmu_ss.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
net/meson.build | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/net/meson.build b/net/meson.build
index bdf564a57b2..d2d70634e5e 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -41,15 +41,17 @@ if have_vhost_net_user
system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c'))
endif
-system_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c'))
-system_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c'))
-system_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c'))
-tap_posix = ['tap.c']
-if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CONFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS')
- tap_posix += 'tap-stub.c'
+if targetos == 'windows'
+ system_ss.add(files('tap-win32.c'))
+elif targetos == 'linux'
+ system_ss.add(files('tap.c', 'tap-linux.c'))
+elif targetos in bsd_oses
+ system_ss.add(files('tap.c', 'tap-bsd.c'))
+elif targetos == 'solaris'
+ system_ss.add(files('tap.c', 'tap-solaris.c'))
+else
+ system_ss.add(files('tap.c', 'tap-stub.c'))
endif
-system_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
-system_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
if have_vhost_net_vdpa
system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c'))
system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
--
2.41.0
next prev parent reply other threads:[~2023-08-29 8:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 8:29 [PATCH 00/10] configure cleanups for QEMU 8.2 Paolo Bonzini
2023-08-29 8:29 ` [PATCH 01/10] meson: do not unnecessarily use cmake for dependencies Paolo Bonzini
2023-08-29 17:14 ` Daniel P. Berrangé
2023-08-29 8:29 ` [PATCH 02/10] meson: update unsupported host/CPU messages Paolo Bonzini
2023-08-29 10:34 ` Daniel P. Berrangé
2023-08-31 8:20 ` Paolo Bonzini
2023-08-31 8:51 ` Daniel P. Berrangé
2023-08-29 8:29 ` [PATCH 03/10] configure: remove HOST_CC Paolo Bonzini
2023-08-29 17:12 ` Daniel P. Berrangé
2023-08-29 18:40 ` Richard Henderson
2023-08-29 8:29 ` [PATCH 04/10] configure: create native file with contents of $host_cc Paolo Bonzini
2023-08-29 16:54 ` Peter Maydell
2023-08-29 17:14 ` Daniel P. Berrangé
2023-08-31 8:26 ` Paolo Bonzini
2023-08-29 18:45 ` Richard Henderson
2023-08-29 8:29 ` [PATCH 05/10] meson: compile bundled device trees Paolo Bonzini
2023-08-29 14:25 ` Philippe Mathieu-Daudé
2023-08-29 18:48 ` Richard Henderson
2023-08-29 18:47 ` Richard Henderson
2023-08-29 8:29 ` [PATCH 06/10] contrib/plugins: use an independent makefile Paolo Bonzini
2023-08-29 17:16 ` Daniel P. Berrangé
2023-08-29 8:29 ` Paolo Bonzini [this message]
2023-08-29 14:26 ` [PATCH 07/10] meson: do not use config_host to pick tap implementations Philippe Mathieu-Daudé
2023-08-29 17:05 ` Daniel P. Berrangé
2023-08-29 8:29 ` [PATCH 08/10] configure, meson: move simple OS definitions to meson Paolo Bonzini
2023-08-29 14:28 ` Philippe Mathieu-Daudé
2023-08-29 8:29 ` [PATCH 09/10] configure: remove $linux and $mingw32 variables Paolo Bonzini
2023-08-29 14:28 ` Philippe Mathieu-Daudé
2023-08-29 17:05 ` Daniel P. Berrangé
2023-08-29 8:29 ` [PATCH 10/10] configure: move --enable-debug-tcg to meson Paolo Bonzini
2023-08-29 16:57 ` Peter Maydell
2023-08-29 18:52 ` Richard Henderson
2023-08-31 8:17 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230829082931.67601-8-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).