public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] qemu: accept filename for incoming migration
@ 2007-08-09 20:05 Jim Paris
       [not found] ` <11866899043188-git-send-email-jim-XrPbb/hENzg@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Jim Paris @ 2007-08-09 20:05 UTC (permalink / raw)
  To: Uri Lublin, kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f; +Cc: Jim Paris

Extends option syntax to allow "-incoming file://<path>" for
file-based migration.

Signed-off-by: Jim Paris <jim-XrPbb/hENzg@public.gmane.org>
---

For some applications (e.g. qemu launched by libvirt) it's much easier
to just pass a filename on the commandline than to feed data via
stdin.

 qemu/migration.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/qemu/migration.c b/qemu/migration.c
index 96b0c2f..737bb22 100644
--- a/qemu/migration.c
+++ b/qemu/migration.c
@@ -949,7 +949,15 @@ int migrate_incoming(const char *device)
 
     if (strcmp(device, "stdio") == 0)
 	ret = migrate_incoming_fd(STDIN_FILENO);
-    else if (strstart(device, "tcp://", &ptr)) {
+    else if (strstart(device, "file://", &ptr)) {
+	int fd = open(ptr, O_RDONLY);
+	if (fd < 0) {
+	    ret = MIG_STAT_DST_INVALID_PARAMS;
+	} else {
+	    ret = migrate_incoming_fd(fd);
+	    close(fd);
+	}
+    } else if (strstart(device, "tcp://", &ptr)) {
 	char *host, *end;
 	host = strdup(ptr);
 	end = strchr(host, '/');
-- 
1.5.3.rc4


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-08-09 21:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-09 20:05 [PATCH] qemu: accept filename for incoming migration Jim Paris
     [not found] ` <11866899043188-git-send-email-jim-XrPbb/hENzg@public.gmane.org>
2007-08-09 21:46   ` Avi Kivity

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox