mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas 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: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-02-14 18:35:52 +01:00 committed by Michael S. Tsirkin
parent ba28889838
commit af3bba761a
6 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure vendored
View File

@ -6589,7 +6589,10 @@ fi
if test "$vhost_scsi" = "yes" ; then if test "$vhost_scsi" = "yes" ; then
echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
fi 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 echo "CONFIG_VHOST_NET_USER=y" >> $config_host_mak
fi fi
if test "$vhost_crypto" = "yes" ; then if test "$vhost_crypto" = "yes" ; then
@ -7368,12 +7371,6 @@ if supported_xen_target $target; then
fi fi
if supported_kvm_target $target; then if supported_kvm_target $target; then
echo "CONFIG_KVM=y" >> $config_target_mak 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 fi
if supported_hax_target $target; then if supported_hax_target $target; then
echo "CONFIG_HAX=y" >> $config_target_mak echo "CONFIG_HAX=y" >> $config_target_mak

4
hw/net/Makefile.objs
View File

@ -37,8 +37,8 @@ obj-$(CONFIG_PSERIES) += spapr_llan.o
obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o
obj-$(CONFIG_VIRTIO_NET) += virtio-net.o obj-$(CONFIG_VIRTIO_NET) += virtio-net.o
obj-$(CONFIG_VHOST_NET) += vhost_net.o common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o
common-obj-$(call lnot,$(CONFIG_VHOST_NET)) += vhost_net-stub.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 common-obj-$(CONFIG_ALL) += vhost_net-stub.o
obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \ obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \

4
hw/net/vhost_net.c
View File

@ -25,8 +25,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <netpacket/packet.h>
#include <net/ethernet.h>
#include <net/if.h> #include <net/if.h>
#include <netinet/in.h> #include <netinet/in.h>
@ -134,7 +132,7 @@ static int vhost_net_get_fd(NetClientState *backend)
return tap_get_fd(backend); return tap_get_fd(backend);
default: default:
fprintf(stderr, "vhost-net requires tap backend\n"); fprintf(stderr, "vhost-net requires tap backend\n");
return -EBADFD; return -ENOSYS;
} }
} }

1
include/exec/poison.h
View File

@ -86,7 +86,6 @@
#pragma GCC poison CONFIG_XTENSA_DIS #pragma GCC poison CONFIG_XTENSA_DIS
#pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_LINUX_USER
#pragma GCC poison CONFIG_VHOST_NET
#pragma GCC poison CONFIG_KVM #pragma GCC poison CONFIG_KVM
#pragma GCC poison CONFIG_SOFTMMU #pragma GCC poison CONFIG_SOFTMMU

5
tests/Makefile.include
View File

@ -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/cpu-plug-test$(EXESUF)
check-qtest-i386-y += tests/q35-test$(EXESUF) check-qtest-i386-y += tests/q35-test$(EXESUF)
check-qtest-i386-y += tests/vmgenid-test$(EXESUF) check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) += tests/vhost-user-test$(EXESUF) check-qtest-i386-$(CONFIG_VHOST_NET_USER) += 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_TPM_CRB) += tests/tpm-crb-swtpm-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_CRB) += tests/tpm-crb-test$(EXESUF)
check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-swtpm-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-swtpm-test$(EXESUF)

16
tests/vhost-user-test.c
View File

@ -27,10 +27,13 @@
#include "libqos/malloc-pc.h" #include "libqos/malloc-pc.h"
#include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-net.h"
#include <linux/vhost.h> #include "standard-headers/linux/vhost_types.h"
#include <linux/virtio_ids.h> #include "standard-headers/linux/virtio_ids.h"
#include <linux/virtio_net.h> #include "standard-headers/linux/virtio_net.h"
#ifdef CONFIG_LINUX
#include <sys/vfs.h> #include <sys/vfs.h>
#endif
#define QEMU_CMD_MEM " -m %d -object memory-backend-file,id=mem,size=%dM," \ #define QEMU_CMD_MEM " -m %d -object memory-backend-file,id=mem,size=%dM," \
@ -459,6 +462,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
g_mutex_unlock(&s->data_mutex); g_mutex_unlock(&s->data_mutex);
} }
#ifdef CONFIG_LINUX
static const char *init_hugepagefs(const char *path) static const char *init_hugepagefs(const char *path)
{ {
struct statfs fs; struct statfs fs;
@ -485,6 +489,7 @@ static const char *init_hugepagefs(const char *path)
return path; return path;
} }
#endif
static TestServer *test_server_new(const gchar *name) static TestServer *test_server_new(const gchar *name)
{ {
@ -983,13 +988,14 @@ int main(int argc, char **argv)
} }
g_assert(tmpfs); g_assert(tmpfs);
root = tmpfs;
#ifdef CONFIG_LINUX
hugefs = getenv("QTEST_HUGETLBFS_PATH"); hugefs = getenv("QTEST_HUGETLBFS_PATH");
if (hugefs) { if (hugefs) {
root = init_hugepagefs(hugefs); root = init_hugepagefs(hugefs);
g_assert(root); g_assert(root);
} else {
root = tmpfs;
} }
#endif
loop = g_main_loop_new(NULL, FALSE); loop = g_main_loop_new(NULL, FALSE);
/* run the main loop thread so the chardev may operate */ /* run the main loop thread so the chardev may operate */