[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/38] vhost-user-test: check ownership during migrat
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 33/38] vhost-user-test: check ownership during migration |
Date: |
Wed, 21 Oct 2015 13:28:28 +0300 |
From: Marc-André Lureau <address@hidden>
Check that backend source and destination do not have simultaneous
ownership during migration.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Thibaut Collet <address@hidden>
---
tests/vhost-user-test.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index ef22e3e..a74c934 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -307,6 +307,10 @@ static void chr_read(void *opaque, const uint8_t *buf, int
size)
g_cond_signal(&s->data_cond);
break;
+ case VHOST_USER_RESET_DEVICE:
+ s->fds_num = 0;
+ break;
+
default:
break;
}
@@ -461,12 +465,37 @@ static guint64 get_log_size(TestServer *s)
return log_size;
}
+typedef struct TestMigrateSource {
+ GSource source;
+ TestServer *src;
+ TestServer *dest;
+} TestMigrateSource;
+
+static gboolean
+test_migrate_source_check(GSource *source)
+{
+ TestMigrateSource *t = (TestMigrateSource *)source;
+ gboolean overlap = t->src->fds_num > 0 && t->dest->fds_num > 0;
+
+ g_assert(!overlap);
+
+ return FALSE;
+}
+
+GSourceFuncs test_migrate_source_funcs = {
+ NULL,
+ test_migrate_source_check,
+ NULL,
+ NULL
+};
+
static void test_migrate(void)
{
TestServer *s = test_server_new("src");
TestServer *dest = test_server_new("dest");
const char *uri = "tcp:127.0.0.1:1234";
QTestState *global = global_qtest, *from, *to;
+ GSource *source;
gchar *cmd;
QDict *rsp;
guint8 *log;
@@ -484,6 +513,12 @@ static void test_migrate(void)
to = qtest_init(cmd);
g_free(cmd);
+ source = g_source_new(&test_migrate_source_funcs,
+ sizeof(TestMigrateSource));
+ ((TestMigrateSource *)source)->src = s;
+ ((TestMigrateSource *)source)->dest = dest;
+ g_source_attach(source, NULL);
+
/* slow down migration to have time to fiddle with log */
/* TODO: qtest could learn to break on some places */
rsp = qmp("{ 'execute': 'migrate_set_speed',"
@@ -522,6 +557,9 @@ static void test_migrate(void)
read_guest_mem(dest);
+ g_source_destroy(source);
+ g_source_unref(source);
+
qtest_quit(to);
test_server_free(dest);
qtest_quit(from);
--
MST
- [Qemu-devel] [PULL 23/38] net: add trace_vhost_user_event, (continued)
- [Qemu-devel] [PULL 23/38] net: add trace_vhost_user_event, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 24/38] vhost user: add support of live migration, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 25/38] vhost user: add rarp sending after live migration for legacy guest, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 26/38] vhost-user: use an enum helper for features mask, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 27/38] vhost: add migration block if memfd failed, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 28/38] vhost-user-test: move wait_for_fds() out, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 29/38] vhost-user-test: remove useless static check, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 30/38] vhost-user-test: wrap server in TestServer struct, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 31/38] vhost-user-test: learn to tweak various qemu arguments, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 32/38] vhost-user-test: add live-migration test, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 33/38] vhost-user-test: check ownership during migration,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 34/38] seccomp: add memfd_create to whitelist, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 35/38] piix: fix resource leak reported by Coverity, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 36/38] vhost: set the correct queue index in case of migration with multiqueue, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 38/38] hw/isa/lpc_ich9: inject the SMI on the VCPU that is writing to APM_CNT, Michael S. Tsirkin, 2015/10/21
- [Qemu-devel] [PULL 37/38] i386: keep cpu_model field in MachineState uptodate, Michael S. Tsirkin, 2015/10/21
- Re: [Qemu-devel] [PULL 00/38] vhost, pc, virtio features, fixes, cleanups, Peter Maydell, 2015/10/21