Commit cdafe929 authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

vhost-user-test: Use libqos instead of pxe-virtio.rom 



vhost-user-test relies on iPXE just to initialize the virtio-net
device, and doesn't do any actual packet tx/rx testing.

In addition to that, the test relies on TCG, which is
imcompatible with vhost. The test only worked by accident: a bug
the memory backend initialization made memory regions not have
the DIRTY_MEMORY_CODE bit set in dirty_log_mask.

This changes vhost-user-test to initialize the virtio-net device
using libqos, and not use TCG nor pxe-virtio.rom.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent cc728d14

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y) 
tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)

tests/pc-cpu-test$(EXESUF): tests/pc-cpu-test.o

tests/postcopy-test$(EXESUF): tests/postcopy-test.o

tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y)

tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o qemu-char.o qemu-timer.o $(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y)

tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o

tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)

tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-block-obj-y)

tests/vhost-user-test.c

+34 −3
Original line number Diff line number Diff line
@@ -16,8 +16,13 @@ 
#include "qemu/sockets.h"

#include "sysemu/char.h"

#include "sysemu/sysemu.h"

#include "libqos/libqos.h"

#include "libqos/pci-pc.h"

#include "libqos/virtio-pci.h"



#include <linux/vhost.h>

#include <linux/virtio_ids.h>

#include <linux/virtio_net.h>

#include <sys/vfs.h>



/* GLIB version compatibility flags */
@@ -29,14 +34,13 @@ 
#define HAVE_MONOTONIC_TIME

#endif



#define QEMU_CMD_ACCEL  " -machine accel=tcg"

#define QEMU_CMD_MEM    " -m %d -object memory-backend-file,id=mem,size=%dM,"\

                        "mem-path=%s,share=on -numa node,memdev=mem"

#define QEMU_CMD_CHR    " -chardev socket,id=%s,path=%s%s"

#define QEMU_CMD_NETDEV " -netdev vhost-user,id=net0,chardev=%s,vhostforce"

#define QEMU_CMD_NET    " -device virtio-net-pci,netdev=net0,romfile=./pc-bios/pxe-virtio.rom"

#define QEMU_CMD_NET    " -device virtio-net-pci,netdev=net0"



#define QEMU_CMD        QEMU_CMD_ACCEL QEMU_CMD_MEM QEMU_CMD_CHR \

#define QEMU_CMD        QEMU_CMD_MEM QEMU_CMD_CHR \

                        QEMU_CMD_NETDEV QEMU_CMD_NET



#define HUGETLBFS_MAGIC       0x958458f6
@@ -136,6 +140,30 @@ typedef struct TestServer { 
static const char *tmpfs;

static const char *root;



static void init_virtio_dev(TestServer *s)

{

    QPCIBus *bus;

    QVirtioPCIDevice *dev;

    uint32_t features;



    bus = qpci_init_pc();

    g_assert_nonnull(bus);



    dev = qvirtio_pci_device_find(bus, VIRTIO_ID_NET);

    g_assert_nonnull(dev);



    qvirtio_pci_device_enable(dev);

    qvirtio_reset(&qvirtio_pci, &dev->vdev);

    qvirtio_set_acknowledge(&qvirtio_pci, &dev->vdev);

    qvirtio_set_driver(&qvirtio_pci, &dev->vdev);



    features = qvirtio_get_features(&qvirtio_pci, &dev->vdev);

    features = features & VIRTIO_NET_F_MAC;

    qvirtio_set_features(&qvirtio_pci, &dev->vdev, features);



    qvirtio_set_driver_ok(&qvirtio_pci, &dev->vdev);

}



static void wait_for_fds(TestServer *s)

{

    gint64 end_time;
@@ -548,6 +576,7 @@ static void test_migrate(void) 
    from = qtest_start(cmd);

    g_free(cmd);



    init_virtio_dev(s);

    wait_for_fds(s);

    size = get_log_size(s);

    g_assert_cmpint(size, ==, (2 * 1024 * 1024) / (VHOST_LOG_PAGE * 8));
@@ -662,6 +691,7 @@ static void test_reconnect_subprocess(void) 
    qtest_start(cmd);

    g_free(cmd);



    init_virtio_dev(s);

    wait_for_fds(s);

    wait_for_rings_started(s, 2);
@@ -728,6 +758,7 @@ int main(int argc, char **argv) 


    s = qtest_start(qemu_cmd);

    g_free(qemu_cmd);

    init_virtio_dev(server);



    qtest_add_data_func("/vhost-user/read-guest-mem", server, read_guest_mem);

    qtest_add_func("/vhost-user/migrate", test_migrate);