diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-14 18:35:52 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2019-02-21 12:28:01 -0500 |
| commit | af3bba761a1208c8515bcc72fc48d0f9045d040c (patch) | |
| tree | b1b41e2575bdd5b3d543142c0c2f8b4a3b619001 /tests/vhost-user-test.c | |
| parent | ba28889838e6bdce540f30892d547cf634c1b0cd (diff) | |
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: 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>
Diffstat (limited to 'tests/vhost-user-test.c')
| -rw-r--r-- | tests/vhost-user-test.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index d961bd09d1..cdbdf3d411 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -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 */ |