qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com,
	slp@redhat.com, yezhenyu2@huawei.com, longpeng2@huawei.com,
	berrange@redhat.com
Subject: [PULL 2/8] migration: add vsock as data channel support
Date: Fri, 28 Aug 2020 13:45:03 +0100	[thread overview]
Message-ID: <20200828124509.311210-3-dgilbert@redhat.com> (raw)
In-Reply-To: <20200828124509.311210-1-dgilbert@redhat.com>

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



  parent reply	other threads:[~2020-08-28 12:49 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-28 12:45 [PULL 0/8] migration and virtiofsd queue Dr. David Alan Gilbert (git)
2020-08-28 12:45 ` [PULL 1/8] migration: unify the framework of socket-type channel Dr. David Alan Gilbert (git)
2020-08-28 12:45 ` Dr. David Alan Gilbert (git) [this message]
2020-08-28 12:45 ` [PULL 3/8] migration: improve error reporting of block driver state name Dr. David Alan Gilbert (git)
2020-08-28 12:45 ` [PULL 4/8] migration: tls: fix memory leak in migration_tls_get_creds Dr. David Alan Gilbert (git)
2020-08-28 12:45 ` [PULL 5/8] virtiofsd: Disable remote posix locks by default Dr. David Alan Gilbert (git)
2020-08-28 12:45 ` [PULL 6/8] virtiofsd: Remove "norace" from cmdline help and docs Dr. David Alan Gilbert (git)
2020-08-28 12:45 ` [PULL 7/8] virtiofsd: drop CAP_DAC_READ_SEARCH Dr. David Alan Gilbert (git)
2020-08-28 12:45 ` [PULL 8/8] virtiofsd: probe unshare(CLONE_FS) and print an error Dr. David Alan Gilbert (git)
2020-08-28 21:29 ` [PULL 0/8] migration and virtiofsd queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200828124509.311210-3-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=berrange@redhat.com \
    --cc=longpeng2@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=slp@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=vgoyal@redhat.com \
    --cc=yezhenyu2@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).