From: Lei Li <lilei@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: lagarcia@br.ibm.com, aliguori@us.ibm.com,
Lei Li <lilei@linux.vnet.ibm.com>,
quintela@redhat.com
Subject: [Qemu-devel] [PATCH 6/7] migration-local: add option to command line for -incoming-local
Date: Sun, 16 Jun 2013 23:37:32 +0800 [thread overview]
Message-ID: <1371397053-4503-7-git-send-email-lilei@linux.vnet.ibm.com> (raw)
In-Reply-To: <1371397053-4503-1-git-send-email-lilei@linux.vnet.ibm.com>
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
---
qemu-options.hx | 9 +++++++++
vl.c | 14 ++++++++++++++
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index bf94862..bb1a88a 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -2913,6 +2913,15 @@ STEXI
Prepare for incoming migration, listen on @var{port}.
ETEXI
+DEF("incoming-local", HAS_ARG, QEMU_OPTION_incoming_local, \
+ "-incoming-local p prepare for localhost incoming migration, listen on domain unix socket p\n",
+ QEMU_ARCH_ALL)
+STEXI
+@item -incoming-local @var{port}
+@findex -incoming-local
+Prepare for localhost incoming migration, listen on @var{port}
+ETEXI
+
DEF("nodefaults", 0, QEMU_OPTION_nodefaults, \
"-nodefaults don't create default devices\n", QEMU_ARCH_ALL)
STEXI
diff --git a/vl.c b/vl.c
index 9f8fd6e..496a264 100644
--- a/vl.c
+++ b/vl.c
@@ -2856,6 +2856,7 @@ int main(int argc, char **argv, char **envp)
const char *vga_model = "none";
const char *pid_file = NULL;
const char *incoming = NULL;
+ const char *incoming_local = NULL;
#ifdef CONFIG_VNC
int show_vnc_port = 0;
#endif
@@ -3755,6 +3756,10 @@ int main(int argc, char **argv, char **envp)
incoming = optarg;
runstate_set(RUN_STATE_INMIGRATE);
break;
+ case QEMU_OPTION_incoming_local:
+ incoming_local = optarg;
+ runstate_set(RUN_STATE_INMIGRATE);
+ break;
case QEMU_OPTION_nodefaults:
default_serial = 0;
default_parallel = 0;
@@ -4418,6 +4423,15 @@ int main(int argc, char **argv, char **envp)
error_free(local_err);
exit(1);
}
+ } else if (incoming_local) {
+ Error *local_err = NULL;
+ qemu_start_local_incoming_migration(incoming_local, &local_err);
+ if (local_err) {
+ fprintf(stderr, "-incoming_local %s: %s\n", incoming_local,
+ error_get_pretty(local_err));
+ error_free(local_err);
+ exit(1);
+ }
} else if (autostart) {
vm_start();
}
--
1.7.7.6
next prev parent reply other threads:[~2013-06-16 15:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-16 15:37 [Qemu-devel] [PATCH 0/7 RFC] Localhost live migration Lei Li
2013-06-16 15:37 ` [Qemu-devel] [PATCH 1/7] migration: export MIG_STATE_xxx flags Lei Li
2013-06-16 16:01 ` Anthony Liguori
2013-06-18 6:03 ` Lei Li
2013-06-16 15:37 ` [Qemu-devel] [PATCH 2/7] savevm: export qemu_save_device_state() Lei Li
2013-06-16 16:02 ` Anthony Liguori
2013-06-18 6:05 ` Lei Li
2013-06-16 15:37 ` [Qemu-devel] [PATCH 3/7] arch_init: add ram_madvise_free() Lei Li
2013-06-16 16:04 ` Anthony Liguori
2013-06-18 6:11 ` Lei Li
2013-08-02 19:34 ` Michael R. Hines
2013-06-16 15:37 ` [Qemu-devel] [PATCH 4/7] migration-local: implementation of outgoing part Lei Li
2013-06-16 16:07 ` Anthony Liguori
2013-06-18 6:25 ` Lei Li
2013-06-16 15:37 ` [Qemu-devel] [PATCH 5/7] migration-local: implementation of incoming part Lei Li
2013-06-16 15:37 ` Lei Li [this message]
2013-06-16 15:37 ` [Qemu-devel] [PATCH 7/7] hmp: add hmp_localhost_migration interface Lei Li
2013-06-16 16:01 ` [Qemu-devel] [PATCH 0/7 RFC] Localhost live migration Anthony Liguori
2013-06-18 6:02 ` Lei Li
2013-06-17 12:57 ` Stefan Hajnoczi
2013-06-18 6:01 ` Lei Li
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=1371397053-4503-7-git-send-email-lilei@linux.vnet.ibm.com \
--to=lilei@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=lagarcia@br.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.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).