SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vhost-user-test: reduce usage of global_qtest

Browse Source 
Whenever the code can run on multiple QTestStates, use them explicitly instead of
global_qtest.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1543851204-41186-12-git-send-email-pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-12-03 16:32:24 +01:00
parent 3b72ca381f
commit bae6b59d46
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/vhost-user-test.c
View File

@ -187,12 +187,12 @@ static char *get_qemu_cmd(TestServer *s,
} }
} }
static void init_virtio_dev(TestServer *s, uint32_t features_mask) static void init_virtio_dev(QTestState *qts, TestServer *s, uint32_t features_mask)
{ {
uint32_t features; uint32_t features;
int i; int i;
s->bus = qpci_init_pc(global_qtest, NULL); s->bus = qpci_init_pc(qts, NULL);
g_assert_nonnull(s->bus); g_assert_nonnull(s->bus);
s->dev = qvirtio_pci_device_find(s->bus, VIRTIO_ID_NET); s->dev = qvirtio_pci_device_find(s->bus, VIRTIO_ID_NET);
@ -203,7 +203,7 @@ static void init_virtio_dev(TestServer *s, uint32_t features_mask)
qvirtio_set_acknowledge(&s->dev->vdev); qvirtio_set_acknowledge(&s->dev->vdev);
qvirtio_set_driver(&s->dev->vdev); qvirtio_set_driver(&s->dev->vdev);
s->alloc = pc_alloc_init(global_qtest); s->alloc = pc_alloc_init(qts);
for (i = 0; i < s->queues * 2; i++) { for (i = 0; i < s->queues * 2; i++) {
s->vq[i] = qvirtqueue_setup(&s->dev->vdev, s->alloc, i); s->vq[i] = qvirtqueue_setup(&s->dev->vdev, s->alloc, i);
@ -265,7 +265,7 @@ static bool wait_for_fds(TestServer *s)
return got_region; return got_region;
} }
static void read_guest_mem_server(TestServer *s) static void read_guest_mem_server(QTestState *qts, TestServer *s)
{ {
uint8_t *guest_mem; uint8_t *guest_mem;
int i, j; int i, j;
@ -293,7 +293,7 @@ static void read_guest_mem_server(TestServer *s)
guest_mem += (s->memory.regions[i].mmap_offset / sizeof(*guest_mem)); guest_mem += (s->memory.regions[i].mmap_offset / sizeof(*guest_mem));
for (j = 0; j < 1024; j++) { for (j = 0; j < 1024; j++) {
uint32_t a = readb(s->memory.regions[i].guest_phys_addr + j); uint32_t a = qtest_readb(qts, s->memory.regions[i].guest_phys_addr + j);
uint32_t b = guest_mem[j]; uint32_t b = guest_mem[j];
g_assert_cmpint(a, ==, b); g_assert_cmpint(a, ==, b);
@ -670,13 +670,13 @@ static void test_read_guest_mem(const void *arg)
s = qtest_start(qemu_cmd); s = qtest_start(qemu_cmd);
g_free(qemu_cmd); g_free(qemu_cmd);
init_virtio_dev(server, 1u << VIRTIO_NET_F_MAC); init_virtio_dev(global_qtest, server, 1u << VIRTIO_NET_F_MAC);
if (!wait_for_fds(server)) { if (!wait_for_fds(server)) {
goto exit; goto exit;
} }
read_guest_mem_server(server); read_guest_mem_server(global_qtest, server);
exit: exit:
uninit_virtio_dev(server); uninit_virtio_dev(server);
@ -690,7 +690,7 @@ static void test_migrate(void)
TestServer *s = test_server_new("src"); TestServer *s = test_server_new("src");
TestServer *dest = test_server_new("dest"); TestServer *dest = test_server_new("dest");
char *uri = g_strdup_printf("%s%s", "unix:", dest->mig_path); char *uri = g_strdup_printf("%s%s", "unix:", dest->mig_path);
QTestState *global = global_qtest, *from, *to; QTestState *from, *to;
GSource *source; GSource *source;
gchar *cmd, *tmp; gchar *cmd, *tmp;
QDict *rsp; QDict *rsp;
@ -704,7 +704,7 @@ static void test_migrate(void)
from = qtest_start(cmd); from = qtest_start(cmd);
g_free(cmd); g_free(cmd);
init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); init_virtio_dev(from, s, 1u << VIRTIO_NET_F_MAC);
if (!wait_for_fds(s)) { if (!wait_for_fds(s)) {
goto exit; goto exit;
} }
@ -717,7 +717,7 @@ static void test_migrate(void)
g_free(tmp); g_free(tmp);
to = qtest_init(cmd); to = qtest_init(cmd);
g_free(cmd); g_free(cmd);
init_virtio_dev(dest, 1u << VIRTIO_NET_F_MAC); init_virtio_dev(to, dest, 1u << VIRTIO_NET_F_MAC);
source = g_source_new(&test_migrate_source_funcs, source = g_source_new(&test_migrate_source_funcs,
sizeof(TestMigrateSource)); sizeof(TestMigrateSource));
@ -753,12 +753,10 @@ static void test_migrate(void)
qobject_unref(rsp); qobject_unref(rsp);
qmp_eventwait("STOP"); qmp_eventwait("STOP");
qtest_qmp_eventwait(to, "RESUME");
global_qtest = to; g_assert(wait_for_fds(dest));
qmp_eventwait("RESUME"); read_guest_mem_server(to, dest);
g_assert(wait_for_fds(s));
read_guest_mem_server(dest);
uninit_virtio_dev(dest); uninit_virtio_dev(dest);
qtest_quit(to); qtest_quit(to);
@ -773,8 +771,6 @@ exit:
qtest_quit(from); qtest_quit(from);
test_server_free(s); test_server_free(s);
g_free(uri); g_free(uri);
global_qtest = global;
} }
static void wait_for_rings_started(TestServer *s, size_t count) static void wait_for_rings_started(TestServer *s, size_t count)
@ -831,7 +827,7 @@ static void test_reconnect_subprocess(void)
qtest_start(cmd); qtest_start(cmd);
g_free(cmd); g_free(cmd);
init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); init_virtio_dev(global_qtest, s, 1u << VIRTIO_NET_F_MAC);
if (!wait_for_fds(s)) { if (!wait_for_fds(s)) {
goto exit; goto exit;
} }
@ -873,7 +869,7 @@ static void test_connect_fail_subprocess(void)
qtest_start(cmd); qtest_start(cmd);
g_free(cmd); g_free(cmd);
init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); init_virtio_dev(global_qtest, s, 1u << VIRTIO_NET_F_MAC);
if (!wait_for_fds(s)) { if (!wait_for_fds(s)) {
goto exit; goto exit;
} }
@ -906,7 +902,7 @@ static void test_flags_mismatch_subprocess(void)
qtest_start(cmd); qtest_start(cmd);
g_free(cmd); g_free(cmd);
init_virtio_dev(s, 1u << VIRTIO_NET_F_MAC); init_virtio_dev(global_qtest, s, 1u << VIRTIO_NET_F_MAC);
if (!wait_for_fds(s)) { if (!wait_for_fds(s)) {
goto exit; goto exit;
} }
@ -957,7 +953,7 @@ static void test_multiqueue(void)
qtest_start(cmd); qtest_start(cmd);
g_free(cmd); g_free(cmd);
init_virtio_dev(s, features_mask); init_virtio_dev(global_qtest, s, features_mask);
wait_for_rings_started(s, s->queues * 2); wait_for_rings_started(s, s->queues * 2);