Re: [Qemu-devel] [PATCH 01/71] vhost-net: move stubs to a separate file

[Thomas Huth]

On 2018-12-03 16:32, Paolo Bonzini wrote:
> There is no reason for CONFIG_VHOST_NET to be specific to a single target;
> it is a host feature that can be add to all targets, as long as they support
> the virtio-net device.  Currently CONFIG_VHOST_NET depends on CONFIG_KVM,
> but ioeventfd support is present in the core memory API and works with
> other accelerators as well.
> 
> As a first step, move the vhost-net stubs to a separate file.  Later, they
> will become conditional on CONFIG_VIRTIO_NET, which is not available in .c
> files.
> 
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  hw/net/Makefile.objs    |  4 ++-
>  hw/net/vhost_net-stub.c | 95 
> +++++++++++++++++++++++++++++++++++++++++++++++++
>  hw/net/vhost_net.c      | 74 --------------------------------------
>  3 files changed, 98 insertions(+), 75 deletions(-)
>  create mode 100644 hw/net/vhost_net-stub.c
> 
> diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
> index fa461d4..c2705e6 100644
> --- a/hw/net/Makefile.objs
> +++ b/hw/net/Makefile.objs
> @@ -37,7 +37,9 @@ obj-$(CONFIG_PSERIES) += spapr_llan.o
>  obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o
>  
>  obj-$(CONFIG_VIRTIO_NET) += virtio-net.o
> -obj-y += vhost_net.o
> +obj-$(CONFIG_VHOST_NET) += vhost_net.o
> +common-obj-$(call lnot,$(CONFIG_VHOST_NET)) += vhost_net-stub.o
> +common-obj-$(CONFIG_ALL) += vhost_net-stub.o
>  
>  obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
>                       fsl_etsec/rings.o fsl_etsec/miim.o
> diff --git a/hw/net/vhost_net-stub.c b/hw/net/vhost_net-stub.c
> new file mode 100644
> index 0000000..4de1dfb
> --- /dev/null
> +++ b/hw/net/vhost_net-stub.c
> @@ -0,0 +1,95 @@
> +/*
> + * vhost-net support
> + *
> + * Copyright Red Hat, Inc. 2010
> + *
> + * Authors:
> + *  Michael S. Tsirkin <address@hidden>
> + *
> + * This work is licensed under the terms of the GNU GPL, version 2.  See
> + * the COPYING file in the top-level directory.
> + *
> + * Contributions after 2012-01-13 are licensed under the terms of the
> + * GNU GPL, version 2 or (at your option) any later version.

According to "git blame", most of the stubs line have been added after
January in 2012, so if Michael agrees for the remaining lines, you could
maybe use a proper GPLv2+ text only for this file instead of the
confusing "dual" licensing?

Anyway,
Reviewed-by: Thomas Huth <address@hidden>