Commit d3b2a5d1 authored by Maxime Coquelin's avatar Maxime Coquelin Committed by Michael S. Tsirkin
Browse files

vhost-user-test: make features mask an init_virtio_dev() argument 



The goal is to generalize the use of [un]init_virtio_dev() to
all tests, which does not necessarily expose the same features
set.

Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 026eb179

tests/vhost-user-test.c

+7 −7
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ typedef struct TestServer { 
static const char *tmpfs;

static const char *root;



static void init_virtio_dev(TestServer *s)

static void init_virtio_dev(TestServer *s, uint32_t features_mask)

{

    uint32_t features;

    int i;
@@ -187,7 +187,7 @@ static void init_virtio_dev(TestServer *s) 
    }



    features = qvirtio_get_features(&s->dev->vdev);

    features = features & (1u << VIRTIO_NET_F_MAC);

    features = features & features_mask;

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



    qvirtio_set_driver_ok(&s->dev->vdev);
@@ -652,7 +652,7 @@ static void test_read_guest_mem(void) 
    s = qtest_start(qemu_cmd);

    g_free(qemu_cmd);



    init_virtio_dev(server);

    init_virtio_dev(server, 1u << VIRTIO_NET_F_MAC);



    read_guest_mem(server);
@@ -681,7 +681,7 @@ static void test_migrate(void) 
    from = qtest_start(cmd);

    g_free(cmd);



    init_virtio_dev(s);

    init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);

    wait_for_fds(s);

    size = get_log_size(s);

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

    g_free(cmd);



    init_virtio_dev(s);

    init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);

    wait_for_fds(s);

    wait_for_rings_started(s, 2);
@@ -841,7 +841,7 @@ static void test_connect_fail_subprocess(void) 
    qtest_start(cmd);

    g_free(cmd);



    init_virtio_dev(s);

    init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);

    wait_for_fds(s);

    wait_for_rings_started(s, 2);
@@ -871,7 +871,7 @@ static void test_flags_mismatch_subprocess(void) 
    qtest_start(cmd);

    g_free(cmd);



    init_virtio_dev(s);

    init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC);

    wait_for_fds(s);

    wait_for_rings_started(s, 2);