[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 03/13] migration: Allow -incoming to work on file: url
From: |
zhanghailiang |
Subject: |
[Qemu-devel] [RFC 03/13] migration: Allow -incoming to work on file: urls |
Date: |
Thu, 7 Jan 2016 20:19:58 +0800 |
Usage:
-incoming file:/path/to/vm_statefile
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Benoit Canet <address@hidden>
---
- Rebase on qemu 2.5
- Use qemu_strtol instead of strtol
---
include/migration/migration.h | 4 +++-
migration/fd.c | 28 +++++++++++++++++++++++++---
migration/migration.c | 4 +++-
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index bf4f8e9..3f372a5 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -191,7 +191,9 @@ void unix_start_incoming_migration(const char *path, Error
**errp);
void unix_start_outgoing_migration(MigrationState *s, const char *path, Error
**errp);
-void fd_start_incoming_migration(const char *path, Error **errp);
+void fd_start_incoming_migration(const char *path, int fd, Error **errp);
+
+void file_start_incoming_migration(const char *filename, Error **errp);
void fd_start_outgoing_migration(MigrationState *s, const char *fdname,
int outfd, Error **errp);
diff --git a/migration/fd.c b/migration/fd.c
index b62161f..ac38256 100644
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -81,14 +81,24 @@ static void fd_accept_incoming_migration(void *opaque)
process_incoming_migration(f);
}
-void fd_start_incoming_migration(const char *infd, Error **errp)
+void fd_start_incoming_migration(const char *infd, int fd, Error **errp)
{
- int fd;
QEMUFile *f;
+ int err;
+ long in_fd;
DPRINTF("Attempting to start an incoming migration via fd\n");
- fd = strtol(infd, NULL, 0);
+ if (infd) {
+ err = qemu_strtol(infd, NULL, 0, &in_fd);
+ if (err < 0) {
+ error_setg_errno(errp, -err, "Failed to convert string '%s'"
+ " to number", infd);
+ return;
+ }
+ fd = (int)in_fd;
+ }
+
if (fd_is_socket(fd)) {
f = qemu_fopen_socket(fd, "rb");
} else {
@@ -101,3 +111,15 @@ void fd_start_incoming_migration(const char *infd, Error
**errp)
qemu_set_fd_handler(fd, fd_accept_incoming_migration, NULL, f);
}
+
+void file_start_incoming_migration(const char *filename, Error **errp)
+{
+ int fd;
+
+ fd = qemu_open(filename, O_RDONLY);
+ if (fd < 0) {
+ error_setg_errno(errp, errno, "Failed to open file:%s", filename);
+ return;
+ }
+ fd_start_incoming_migration(NULL, fd, NULL);
+}
diff --git a/migration/migration.c b/migration/migration.c
index 3ec3b85..e54910d 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -314,7 +314,9 @@ void qemu_start_incoming_migration(const char *uri, Error
**errp)
} else if (strstart(uri, "unix:", &p)) {
unix_start_incoming_migration(p, errp);
} else if (strstart(uri, "fd:", &p)) {
- fd_start_incoming_migration(p, errp);
+ fd_start_incoming_migration(p, -1, errp);
+ } else if (strstart(uri, "file:", &p)) {
+ file_start_incoming_migration(p, errp);
#endif
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
--
1.8.3.1
- [Qemu-devel] [RFC 00/13] Live memory snapshot based on userfaultfd, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 10/13] snapshot: Enable the write-protect notification capability for VM's RAM, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 04/13] migration: Create a snapshot thread to realize saving memory snapshot, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 05/13] migration: implement initialization work for snapshot, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 11/13] snapshot/migration: Save VM's RAM into snapshot file, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 13/13] snapshot: Remove page's write-protect and copy the content during setup stage, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 03/13] migration: Allow -incoming to work on file: urls,
zhanghailiang <=
- [Qemu-devel] [RFC 01/13] postcopy/migration: Split fault related state into struct UserfaultState, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 09/13] migration/postcopy-ram: fix some helper functions to support userfaultfd write-protect, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 02/13] migration: Allow the migrate command to work on file: urls, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 08/13] snapshot: Save VM's device state into snapshot file, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 06/13] QEMUSizedBuffer: Introduce two help functions for qsb, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 07/13] savevm: Split qemu_savevm_state_complete_precopy() into two helper functions, zhanghailiang, 2016/01/07
- [Qemu-devel] [RFC 12/13] migration/ram: Fix some helper functions' parameter to use PageSearchStatus, zhanghailiang, 2016/01/07