[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/8] migration: add vsock as data channel support
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 2/8] migration: add vsock as data channel support |
Date: |
Fri, 28 Aug 2020 13:45:03 +0100 |
From: "Longpeng(Mike)" <longpeng2@huawei.com>
The vsock channel is more widely use in some new features, for example,
the Nitro/Enclave. It can also be used as the migration channel.
Signed-off-by: Longpeng(Mike) <longpeng2@huawei.com>
Message-Id: <20200806074030.174-3-longpeng2@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/migration.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index ac37a386dd..58a5452471 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -384,7 +384,8 @@ void qemu_start_incoming_migration(const char *uri, Error
**errp)
if (!strcmp(uri, "defer")) {
deferred_incoming_migration(errp);
} else if (strstart(uri, "tcp:", &p) ||
- strstart(uri, "unix:", NULL)) {
+ strstart(uri, "unix:", NULL) ||
+ strstart(uri, "vsock:", NULL)) {
socket_start_incoming_migration(p ? p : uri, errp);
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
@@ -2102,7 +2103,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
}
if (strstart(uri, "tcp:", &p) ||
- strstart(uri, "unix:", NULL)) {
+ strstart(uri, "unix:", NULL) ||
+ strstart(uri, "vsock:", NULL)) {
socket_start_outgoing_migration(s, p ? p : uri, &local_err);
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
--
2.26.2
- [PULL 0/8] migration and virtiofsd queue, Dr. David Alan Gilbert (git), 2020/08/28
- [PULL 1/8] migration: unify the framework of socket-type channel, Dr. David Alan Gilbert (git), 2020/08/28
- [PULL 2/8] migration: add vsock as data channel support,
Dr. David Alan Gilbert (git) <=
- [PULL 3/8] migration: improve error reporting of block driver state name, Dr. David Alan Gilbert (git), 2020/08/28
- [PULL 4/8] migration: tls: fix memory leak in migration_tls_get_creds, Dr. David Alan Gilbert (git), 2020/08/28
- [PULL 6/8] virtiofsd: Remove "norace" from cmdline help and docs, Dr. David Alan Gilbert (git), 2020/08/28
- [PULL 5/8] virtiofsd: Disable remote posix locks by default, Dr. David Alan Gilbert (git), 2020/08/28
- [PULL 7/8] virtiofsd: drop CAP_DAC_READ_SEARCH, Dr. David Alan Gilbert (git), 2020/08/28
- [PULL 8/8] virtiofsd: probe unshare(CLONE_FS) and print an error, Dr. David Alan Gilbert (git), 2020/08/28
- Re: [PULL 0/8] migration and virtiofsd queue, Peter Maydell, 2020/08/28