From: Pierrick Bouvier <[email protected]> Removes conflict with several targets where some support vhost, and some don't.
Signed-off-by: Pierrick Bouvier <[email protected]> Reviewed-by: Manos Pitsidianakis <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- hw/net/meson.build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/net/meson.build b/hw/net/meson.build index 31025874699..84f142df222 100644 --- a/hw/net/meson.build +++ b/hw/net/meson.build @@ -48,10 +48,9 @@ system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('net_rx_pkt.c')) system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) if have_vhost_net - system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c')) -else - system_ss.add(files('vhost_net-stub.c')) + system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost_net.c')) endif +stub_ss.add(files('vhost_net-stub.c')) system_ss.add(when: 'CONFIG_ETSEC', if_true: files( 'fsl_etsec/etsec.c', -- 2.53.0
