| Message ID | 20171221212125.19075-5-maxime.coquelin@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vhost-user-test: Fixes & code clean-up | expand |
On Thu, Dec 21, 2017 at 10:21 PM, Maxime Coquelin <maxime.coquelin@redhat.com> wrote: > 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: Maxime Coquelin <maxime.coquelin@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > tests/vhost-user-test.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c > index 969e3932cc..6a144e8d7e 100644 > --- a/tests/vhost-user-test.c > +++ b/tests/vhost-user-test.c > @@ -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); > > -- > 2.14.3 > >
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 969e3932cc..6a144e8d7e 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -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);
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: Maxime Coquelin <maxime.coquelin@redhat.com> --- tests/vhost-user-test.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)