[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v15 04/14] fixup! migration: convert migration 'uri' into 'Migrat
|
From: |
Fabiano Rosas |
|
Subject: |
[PATCH v15 04/14] fixup! migration: convert migration 'uri' into 'MigrateAddress' |
|
Date: |
Mon, 23 Oct 2023 15:20:43 -0300 |
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/file.c | 2 +-
migration/file.h | 1 +
migration/migration.c | 7 +++++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/migration/file.c b/migration/file.c
index cf5b1bf365..ec069ef329 100644
--- a/migration/file.c
+++ b/migration/file.c
@@ -19,7 +19,7 @@
/* Remove the offset option from @filespec and return it in @offsetp. */
-static int file_parse_offset(char *filespec, uint64_t *offsetp, Error **errp)
+int file_parse_offset(char *filespec, uint64_t *offsetp, Error **errp)
{
char *option = strstr(filespec, OFFSET_OPTION);
int ret;
diff --git a/migration/file.h b/migration/file.h
index 90fa4849e0..3888a57105 100644
--- a/migration/file.h
+++ b/migration/file.h
@@ -11,4 +11,5 @@ void file_start_incoming_migration(const char *filename,
Error **errp);
void file_start_outgoing_migration(MigrationState *s, const char *filename,
Error **errp);
+int file_parse_offset(char *filespec, uint64_t *offsetp, Error **errp);
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 639e89db43..ac91984d39 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -465,6 +465,13 @@ static bool migrate_uri_parse(const char *uri,
}
addr->u.socket.type = saddr->type;
addr->u.socket.u = saddr->u;
+ } else if (strstart(uri, "file:", NULL)) {
+ addr->transport = MIGRATION_ADDRESS_TYPE_FILE;
+ addr->u.file.filename = g_strdup(uri + strlen("file:"));
+ if (file_parse_offset(addr->u.file.filename, &addr->u.file.offset,
+ errp)) {
+ return false;
+ }
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
return false;
--
2.35.3
- [PATCH v15 00/14] migration: Modify 'migrate' and 'migrate-incoming' QAPI commands for migration, Fabiano Rosas, 2023/10/23
- [PATCH v15 01/14] migration: New QAPI type 'MigrateAddress', Fabiano Rosas, 2023/10/23
- [PATCH v15 02/14] fixup! migration: New QAPI type 'MigrateAddress', Fabiano Rosas, 2023/10/23
- [PATCH v15 03/14] migration: convert migration 'uri' into 'MigrateAddress', Fabiano Rosas, 2023/10/23
- [PATCH v15 04/14] fixup! migration: convert migration 'uri' into 'MigrateAddress',
Fabiano Rosas <=
- [PATCH v15 05/14] migration: convert socket backend to accept MigrateAddress, Fabiano Rosas, 2023/10/23
- [PATCH v15 06/14] migration: convert rdma backend to accept MigrateAddress, Fabiano Rosas, 2023/10/23
- [PATCH v15 07/14] migration: convert exec backend to accept MigrateAddress., Fabiano Rosas, 2023/10/23
- [PATCH v15 08/14] migration: Convert the file backend to the new QAPI syntax, Fabiano Rosas, 2023/10/23
- [PATCH v15 09/14] migration: New migrate and migrate-incoming argument 'channels', Fabiano Rosas, 2023/10/23