summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael S. Tsirkin2015-11-26 14:14:02 +0100
committerMichael S. Tsirkin2015-11-26 17:39:34 +0100
commitd08e42a1125d384cb53423f5810b0c7ea52dc6c9 (patch)
treefe214e56978d6b18d4db368a0fb3a28b2f9ff16a /tests
parentFix memory leak on error (diff)
downloadqemu-d08e42a1125d384cb53423f5810b0c7ea52dc6c9.tar.gz
qemu-d08e42a1125d384cb53423f5810b0c7ea52dc6c9.tar.xz
qemu-d08e42a1125d384cb53423f5810b0c7ea52dc6c9.zip
vhost-user-test: fix migration overlap test
During migration, source does GET_BASE, destination does SET_BASE. Use that as opposed to fds being configured to detect vhost user running on both source and destination. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/vhost-user-test.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 022223b2a7..e4c36afbda 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -131,6 +131,7 @@ typedef struct TestServer {
GMutex data_mutex;
GCond data_cond;
int log_fd;
+ uint64_t rings;
} TestServer;
#if !GLIB_CHECK_VERSION(2, 32, 0)
@@ -279,6 +280,9 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
msg.payload.state.num = 0;
p = (uint8_t *) &msg;
qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
+
+ assert(msg.payload.state.index < 2);
+ s->rings &= ~(0x1ULL << msg.payload.state.index);
break;
case VHOST_USER_SET_MEM_TABLE:
@@ -316,10 +320,9 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
g_cond_signal(&s->data_cond);
break;
- case VHOST_USER_SET_VRING_ENABLE:
- if (!msg.payload.state.num) {
- s->fds_num = 0;
- }
+ case VHOST_USER_SET_VRING_BASE:
+ assert(msg.payload.state.index < 2);
+ s->rings |= 0x1ULL << msg.payload.state.index;
break;
default:
@@ -486,7 +489,7 @@ static gboolean
test_migrate_source_check(GSource *source)
{
TestMigrateSource *t = (TestMigrateSource *)source;
- gboolean overlap = t->src->fds_num > 0 && t->dest->fds_num > 0;
+ gboolean overlap = t->src->rings && t->dest->rings;
g_assert(!overlap);