Commit af3bba76 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Michael S. Tsirkin
Browse files

vhost-net: compile it on all targets that have virtio-net. 



This shows a preexisting bug: if a KVM target did not have virtio-net enabled,
it would fail with undefined symbols when vhost was enabled.  This must now
be fixed, lest targets that have no virtio-net fail to compile.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1543851204-41186-5-git-send-email-pbonzini@redhat.com>
Message-Id: <1550165756-21617-6-git-send-email-pbonzini@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ba288898

configure

+4 −7
Original line number Diff line number Diff line
@@ -6589,7 +6589,10 @@ fi 
if test "$vhost_scsi" = "yes" ; then

  echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak

fi

if test "$vhost_net" = "yes" && test "$vhost_user" = "yes"; then

if test "$vhost_net" = "yes" ; then

  echo "CONFIG_VHOST_NET=y" >> $config_host_mak

fi

if test "$vhost_net_user" = "yes" ; then

  echo "CONFIG_VHOST_NET_USER=y" >> $config_host_mak

fi

if test "$vhost_crypto" = "yes" ; then
@@ -7368,12 +7371,6 @@ if supported_xen_target $target; then 
fi

if supported_kvm_target $target; then

    echo "CONFIG_KVM=y" >> $config_target_mak

    if test "$vhost_net" = "yes" ; then

        echo "CONFIG_VHOST_NET=y" >> $config_target_mak

        if test "$vhost_user" = "yes" ; then

            echo "CONFIG_VHOST_USER_NET_TEST_$target_name=y" >> $config_host_mak

        fi

    fi

fi

if supported_hax_target $target; then

    echo "CONFIG_HAX=y" >> $config_target_mak

hw/net/Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ obj-$(CONFIG_PSERIES) += spapr_llan.o 
obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o



obj-$(CONFIG_VIRTIO_NET) += virtio-net.o

obj-$(CONFIG_VHOST_NET) += vhost_net.o

common-obj-$(call lnot,$(CONFIG_VHOST_NET)) += vhost_net-stub.o

common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o

common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(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 \

hw/net/vhost_net.c

+1 −3
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 




#include <sys/socket.h>

#include <netpacket/packet.h>

#include <net/ethernet.h>

#include <net/if.h>

#include <netinet/in.h>
@@ -134,7 +132,7 @@ static int vhost_net_get_fd(NetClientState *backend) 
        return tap_get_fd(backend);

    default:

        fprintf(stderr, "vhost-net requires tap backend\n");

        return -EBADFD;

        return -ENOSYS;

    }

}

include/exec/poison.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 
#pragma GCC poison CONFIG_XTENSA_DIS



#pragma GCC poison CONFIG_LINUX_USER

#pragma GCC poison CONFIG_VHOST_NET

#pragma GCC poison CONFIG_KVM

#pragma GCC poison CONFIG_SOFTMMU

tests/Makefile.include

+1 −4
Original line number Diff line number Diff line
@@ -209,10 +209,7 @@ check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF) 
check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)

check-qtest-i386-y += tests/q35-test$(EXESUF)

check-qtest-i386-y += tests/vmgenid-test$(EXESUF)

check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) += tests/vhost-user-test$(EXESUF)

ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),)

check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)

endif

check-qtest-i386-$(CONFIG_VHOST_NET_USER) += tests/vhost-user-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-swtpm-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-swtpm-test$(EXESUF)