diff mbox series

[07/10] meson: do not use config_host to pick tap implementations

Message ID 20230829082931.67601-8-pbonzini@redhat.com
State New
Headers show
Series configure cleanups for QEMU 8.2 | expand

Commit Message

Paolo Bonzini Aug. 29, 2023, 8:29 a.m. UTC 
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(-)

Comments

Philippe Mathieu-Daudé Aug. 29, 2023, 2:26 p.m. UTC | #1 
On 29/8/23 10:29, Paolo Bonzini wrote:
> 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(-)

Nice.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Daniel P. Berrangé Aug. 29, 2023, 5:05 p.m. UTC | #2 
On Tue, Aug 29, 2023 at 10:29:28AM +0200, Paolo Bonzini wrote:
> 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(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
diff mbox series

Patch

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'))