motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-01 23:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,10 +27,13 @@
#include "libqos/malloc-pc.h"
#include "hw/virtio/virtio-net.h"
#include <linux/vhost.h>
#include <linux/virtio_ids.h>
#include <linux/virtio_net.h>
#include "standard-headers/linux/vhost_types.h"
#include "standard-headers/linux/virtio_ids.h"
#include "standard-headers/linux/virtio_net.h"
#ifdef CONFIG_LINUX
#include <sys/vfs.h>
#endif
#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);
}
#ifdef CONFIG_LINUX
static const char *init_hugepagefs(const char *path)
{
struct statfs fs;
@ -485,6 +489,7 @@ static const char *init_hugepagefs(const char *path)
return path;
}
#endif
static TestServer *test_server_new(const gchar *name)
{
@ -983,13 +988,14 @@ int main(int argc, char **argv)
}
g_assert(tmpfs);
root = tmpfs;
#ifdef CONFIG_LINUX
hugefs = getenv("QTEST_HUGETLBFS_PATH");
if (hugefs) {
root = init_hugepagefs(hugefs);
g_assert(root);
} else {
root = tmpfs;
}
#endif
loop = g_main_loop_new(NULL, FALSE);
/* run the main loop thread so the chardev may operate */