Add support for the mapped-ram migration capability on restore.
Signed-off-by: Jim Fehlig <jfehlig@xxxxxxxx>
---
src/qemu/qemu_driver.c | 26 +++++++++++++-----
src/qemu/qemu_migration.c | 12 ++++----
src/qemu/qemu_process.c | 58 +++++++++++++++++++++++++++++++--------
src/qemu/qemu_process.h | 15 ++++++----
src/qemu/qemu_saveimage.c | 12 +++++---
src/qemu/qemu_saveimage.h | 2 ++
src/qemu/qemu_snapshot.c | 8 +++---
7 files changed, 95 insertions(+), 38 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 5afc2ea846..ad58ec92f1 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1614,7 +1614,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
}
if (qemuProcessStart(conn, driver, vm, NULL, VIR_ASYNC_JOB_START,
- NULL, -1, NULL, NULL,
+ NULL, -1, NULL, NULL, NULL,
VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
start_flags) < 0) {
virDomainAuditStart(vm, "booted", false);
@@ -5783,6 +5783,8 @@ qemuDomainRestoreInternal(virConnectPtr conn,
virFileWrapperFd *wrapperFd = NULL;
bool hook_taint = false;
bool reset_nvram = false;
+ bool sparse = false;
+ g_autoptr(qemuMigrationParams) restoreParams = NULL;
virCheckFlags(VIR_DOMAIN_SAVE_BYPASS_CACHE |
VIR_DOMAIN_SAVE_RUNNING |
@@ -5795,9 +5797,13 @@ qemuDomainRestoreInternal(virConnectPtr conn,
if (qemuSaveImageGetMetadata(driver, NULL, path, &def, &data, false) < 0)
goto cleanup;
+ sparse = data->header.format == QEMU_SAVE_FORMAT_SPARSE;
+ if (!(restoreParams = qemuMigrationParamsForSave(sparse)))
+ goto cleanup;
+
fd = qemuSaveImageOpen(driver, path,
(flags & VIR_DOMAIN_SAVE_BYPASS_CACHE) != 0,
- &wrapperFd, false);
+ sparse, &wrapperFd, false);
if (fd < 0)
goto cleanup;
@@ -5851,7 +5857,7 @@ qemuDomainRestoreInternal(virConnectPtr conn,
if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_RESTORE, flags) < 0)
goto cleanup;
- ret = qemuSaveImageStartVM(conn, driver, vm, &fd, data, path,
+ ret = qemuSaveImageStartVM(conn, driver, vm, &fd, data, path, restoreParams,
false, reset_nvram, VIR_ASYNC_JOB_START);
qemuProcessEndJob(vm);
@@ -5966,7 +5972,7 @@ qemuDomainSaveImageDefineXML(virConnectPtr conn, const char *path,
if (qemuSaveImageGetMetadata(driver, NULL, path, &def, &data, false) < 0)
goto cleanup;
- fd = qemuSaveImageOpen(driver, path, 0, NULL, false);
+ fd = qemuSaveImageOpen(driver, path, 0, false, NULL, false);
if (fd < 0)
goto cleanup;
@@ -6107,6 +6113,8 @@ qemuDomainObjRestore(virConnectPtr conn,
g_autofree char *xmlout = NULL;
virQEMUSaveData *data = NULL;
virFileWrapperFd *wrapperFd = NULL;
+ bool sparse = false;
+ g_autoptr(qemuMigrationParams) restoreParams = NULL;
ret = qemuSaveImageGetMetadata(driver, NULL, path, &def, &data, true);
if (ret < 0) {
@@ -6115,7 +6123,11 @@ qemuDomainObjRestore(virConnectPtr conn,
goto cleanup;
}
- fd = qemuSaveImageOpen(driver, path, bypass_cache, &wrapperFd, false);
+ sparse = data->header.format == QEMU_SAVE_FORMAT_SPARSE;
+ if (!(restoreParams = qemuMigrationParamsForSave(sparse)))
+ return -1;
+
+ fd = qemuSaveImageOpen(driver, path, bypass_cache, sparse, &wrapperFd, false);
if (fd < 0)
goto cleanup;
@@ -6157,7 +6169,7 @@ qemuDomainObjRestore(virConnectPtr conn,
virDomainObjAssignDef(vm, &def, true, NULL);
- ret = qemuSaveImageStartVM(conn, driver, vm, &fd, data, path,
+ ret = qemuSaveImageStartVM(conn, driver, vm, &fd, data, path, restoreParams,
start_paused, reset_nvram, asyncJob);
cleanup:
@@ -6363,7 +6375,7 @@ qemuDomainObjStart(virConnectPtr conn,
}
ret = qemuProcessStart(conn, driver, vm, NULL, asyncJob,
- NULL, -1, NULL, NULL,
+ NULL, -1, NULL, NULL, NULL,
VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags);
virDomainAuditStart(vm, "booted", ret >= 0);
if (ret >= 0) {
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index b2f17f8006..8af6d1d3e2 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3064,9 +3064,8 @@ qemuMigrationDstPrepare(virDomainObj *vm,
const char *protocol,
const char *listenAddress,
unsigned short port,
- int fd)
+ int *fd)
{
- qemuDomainObjPrivate *priv = vm->privateData;
g_autofree char *migrateFrom = NULL;
if (tunnel) {
@@ -3120,8 +3119,9 @@ qemuMigrationDstPrepare(virDomainObj *vm,
migrateFrom = g_strdup_printf(incFormat, protocol, listenAddress, port);
}
- return qemuProcessIncomingDefNew(priv->qemuCaps, listenAddress,
- migrateFrom, fd, NULL);
+ return qemuProcessIncomingDefNew(vm, listenAddress,
+ migrateFrom, fd,
+ NULL, NULL);
}
@@ -3263,7 +3263,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
if (!(incoming = qemuMigrationDstPrepare(vm, tunnel, protocol,
listenAddress, port,
- dataFD[0])))
+ &dataFD[0])))
goto error;
qemuMigrationDstPrepareDiskSeclabels(vm, migrate_disks, flags);
@@ -3634,7 +3634,7 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver,
priv->origname = g_strdup(origname);
if (!(incoming = qemuMigrationDstPrepare(vm, false, protocol,
- listenAddress, port, -1)))
+ listenAddress, port, NULL)))
goto cleanup;
if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_IN) < 0)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 8d51da77c5..e5ad6f0528 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4804,6 +4804,7 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDef *inc)
g_free(inc->address);
g_free(inc->uri);
+ qemuFDPassFree(inc->fdPassMigrate);
g_free(inc);
}
@@ -4817,26 +4818,54 @@ qemuProcessIncomingDefFree(qemuProcessIncomingDef *inc)
* qemuProcessIncomingDefFree will NOT close it.
*/
qemuProcessIncomingDef *
-qemuProcessIncomingDefNew(virQEMUCaps *qemuCaps,
+qemuProcessIncomingDefNew(virDomainObj *vm,
const char *listenAddress,
const char *migrateFrom,
- int fd,
- const char *path)
+ int *fd,
+ const char *path,
+ virQEMUSaveData *data)
{
+ qemuDomainObjPrivate *priv = vm->privateData;
qemuProcessIncomingDef *inc = NULL;
- if (qemuMigrationDstCheckProtocol(qemuCaps, migrateFrom) < 0)
+ if (qemuMigrationDstCheckProtocol(priv->qemuCaps, migrateFrom) < 0)
return NULL;
inc = g_new0(qemuProcessIncomingDef, 1);
inc->address = g_strdup(listenAddress);
- inc->uri = qemuMigrationDstGetURI(migrateFrom, fd);
+ if (data) {
+ size_t offset = sizeof(virQEMUSaveHeader) + data->header.data_len;
+
+ if (data->header.format == QEMU_SAVE_FORMAT_SPARSE) {
+ unsigned int fdsetId;
+
+ inc->fdPassMigrate = qemuFDPassNew("migrate", priv);
+ qemuFDPassAddFD(inc->fdPassMigrate, fd, "-fd");
+ qemuFDPassGetId(inc->fdPassMigrate, &fdsetId);
+ inc->uri = g_strdup_printf("file:/dev/fdset/%u,offset=%#lx", fdsetId, offset);
+ } else {
+ g_autofree char *tmp = g_new(char, offset);
+
+ /* HACK:
+ * We provide qemu the offset in case of mapped-ram, but must set
+ * the file offset for the legacy save format. Unfortunately we
+ * can't lseek when the fd is wrapped by virFileWrapperFd, so
+ * we do a needless read instead.
+ */
+ if (saferead(*fd, tmp, offset) != offset)
+ VIR_DEBUG("failed to read from save file");
+ inc->uri = qemuMigrationDstGetURI(migrateFrom, *fd);
+ }
+ } else {
+ inc->uri = qemuMigrationDstGetURI(migrateFrom, *fd);
+ }
+
if (!inc->uri)
goto error;
- inc->fd = fd;
+ inc->fd = *fd;
inc->path = path;
return inc;
@@ -7879,8 +7908,11 @@ qemuProcessLaunch(virConnectPtr conn,
&nnicindexes, &nicindexes)))
goto cleanup;
- if (incoming && incoming->fd != -1)
- virCommandPassFD(cmd, incoming->fd, 0);
+ if (incoming) {
+ if (incoming->fd != -1)
+ virCommandPassFD(cmd, incoming->fd, 0);
+ qemuFDPassTransferCommand(incoming->fdPassMigrate, cmd);
+ }
/* now that we know it is about to start call the hook if present */
if (qemuProcessStartHook(driver, vm,
@@ -8299,6 +8331,7 @@ qemuProcessStart(virConnectPtr conn,
int migrateFd,
const char *migratePath,
virDomainMomentObj *snapshot,
+ qemuMigrationParams *migParams,
virNetDevVPortProfileOp vmop,
unsigned int flags)
{
@@ -8352,7 +8385,7 @@ qemuProcessStart(virConnectPtr conn,
relabel = true;
if (incoming) {
- if (qemuMigrationDstRun(vm, incoming->uri, asyncJob, NULL, 0) < 0)
+ if (qemuMigrationDstRun(vm, incoming->uri, asyncJob, migParams, 0) < 0)
goto stop;
} else {
/* Refresh state of devices from QEMU. During migration this happens
@@ -8406,6 +8439,7 @@ qemuProcessStart(virConnectPtr conn,
* @path: path to memory state file
* @snapshot: internal snapshot to load when starting QEMU process or NULL
* @data: data from memory state file or NULL
+ * @migParams: Migration params to use on restore or NULL
* @asyncJob: type of asynchronous job
* @start_flags: flags to start QEMU process with
* @reason: audit log reason
@@ -8432,6 +8466,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
const char *path,
virDomainMomentObj *snapshot,
virQEMUSaveData *data,
+ qemuMigrationParams *migParams,
virDomainAsyncJob asyncJob,
unsigned int start_flags,
const char *reason,
@@ -8446,8 +8481,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
int rc = 0;
int ret = -1;
- incoming = qemuProcessIncomingDefNew(priv->qemuCaps, NULL, "stdio",
- *fd, path);
+ incoming = qemuProcessIncomingDefNew(vm, NULL, "stdio", fd, path, data);
if (!incoming)
return -1;
@@ -8473,7 +8507,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn,
if (qemuProcessStart(conn, driver, vm, cookie ? cookie->cpu : NULL,
asyncJob, incoming, *fd, path, snapshot,
- VIR_NETDEV_VPORT_PROFILE_OP_RESTORE,
+ migParams, VIR_NETDEV_VPORT_PROFILE_OP_RESTORE,
start_flags) == 0)
*started = true;
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 1dd6ae23c8..a6258b075c 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -53,14 +53,17 @@ struct _qemuProcessIncomingDef {
char *address; /* address where QEMU is supposed to listen */
char *uri; /* used when calling migrate-incoming QMP command */
int fd; /* for fd:N URI */
+ qemuFDPass *fdPassMigrate; /* for file:/dev/fdset/n,offset=x URI */
const char *path; /* path associated with fd */
};
-qemuProcessIncomingDef *qemuProcessIncomingDefNew(virQEMUCaps *qemuCaps,
- const char *listenAddress,
- const char *migrateFrom,
- int fd,
- const char *path);
+qemuProcessIncomingDef *qemuProcessIncomingDefNew(virDomainObj *vm,
+ const char *listenAddress,
+ const char *migrateFrom,
+ int *fd,
+ const char *path,
+ virQEMUSaveData *data);
+
void qemuProcessIncomingDefFree(qemuProcessIncomingDef *inc);
int qemuProcessBeginJob(virDomainObj *vm,
@@ -87,6 +90,7 @@ int qemuProcessStart(virConnectPtr conn,
int stdin_fd,
const char *stdin_path,
virDomainMomentObj *snapshot,
+ qemuMigrationParams *migParams,
virNetDevVPortProfileOp vmop,
unsigned int flags);
@@ -97,6 +101,7 @@ int qemuProcessStartWithMemoryState(virConnectPtr conn,
const char *path,
virDomainMomentObj *snapshot,
virQEMUSaveData *data,
+ qemuMigrationParams *migParams,
virDomainAsyncJob asyncJob,
unsigned int start_flags,
const char *reason,
diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c
index 3a71c23c01..3e89f88301 100644
--- a/src/qemu/qemu_saveimage.c
+++ b/src/qemu/qemu_saveimage.c
@@ -264,7 +264,8 @@ qemuSaveImageDecompressionStart(virQEMUSaveData *data,
if (header->version != 2)
return 0;
- if (header->format == QEMU_SAVE_FORMAT_RAW)
+ if (header->format == QEMU_SAVE_FORMAT_RAW ||
+ header->format == QEMU_SAVE_FORMAT_SPARSE)
return 0;
if (!(cmd = qemuSaveImageGetCompressionCommand(header->format)))
@@ -671,6 +672,7 @@ qemuSaveImageGetMetadata(virQEMUDriver *driver,
* @driver: qemu driver data
* @path: path of the save image
* @bypass_cache: bypass cache when opening the file
+ * @sparse: Image contains mapped-ram save format
* @wrapperFd: returns the file wrapper structure
* @open_write: open the file for writing (for updates)
*
@@ -680,6 +682,7 @@ int
qemuSaveImageOpen(virQEMUDriver *driver,
const char *path,
bool bypass_cache,
+ bool sparse,
virFileWrapperFd **wrapperFd,
bool open_write)
{
@@ -701,7 +704,7 @@ qemuSaveImageOpen(virQEMUDriver *driver,
if ((fd = qemuDomainOpenFile(cfg, NULL, path, oflags, NULL)) < 0)
return -1;
- if (bypass_cache &&
+ if (!sparse && bypass_cache &&
!(*wrapperFd = virFileWrapperFdNew(&fd, path,
VIR_FILE_WRAPPER_BYPASS_CACHE)))
return -1;
@@ -720,6 +723,7 @@ qemuSaveImageStartVM(virConnectPtr conn,
int *fd,
virQEMUSaveData *data,
const char *path,
+ qemuMigrationParams *restoreParams,
bool start_paused,
bool reset_nvram,
virDomainAsyncJob asyncJob)
@@ -736,8 +740,8 @@ qemuSaveImageStartVM(virConnectPtr conn,
start_flags |= VIR_QEMU_PROCESS_START_RESET_NVRAM;
if (qemuProcessStartWithMemoryState(conn, driver, vm, fd, path, NULL, data,
- asyncJob, start_flags, "restored",
- &started) < 0) {
+ restoreParams, asyncJob, start_flags,
+ "restored", &started) < 0) {
goto cleanup;
}
diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h
index 7340925274..320728145a 100644
--- a/src/qemu/qemu_saveimage.h
+++ b/src/qemu/qemu_saveimage.h
@@ -84,6 +84,7 @@ qemuSaveImageStartVM(virConnectPtr conn,
int *fd,
virQEMUSaveData *data,
const char *path,
+ qemuMigrationParams *restoreParams,
bool start_paused,
bool reset_nvram,
virDomainAsyncJob asyncJob)
@@ -102,6 +103,7 @@ int
qemuSaveImageOpen(virQEMUDriver *driver,
const char *path,
bool bypass_cache,
+ bool sparse,
virFileWrapperFd **wrapperFd,
bool open_write);
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 5991455a4e..cc304add88 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -2394,7 +2394,7 @@ qemuSnapshotRevertExternalPrepare(virDomainObj *vm,
return -1;
memdata->fd = qemuSaveImageOpen(driver, memdata->path,
- false, NULL, false);
+ false, false, NULL, false);
if (memdata->fd < 0)
return -1;
@@ -2634,7 +2634,7 @@ qemuSnapshotRevertActive(virDomainObj *vm,
if (qemuProcessStartWithMemoryState(snapshot->domain->conn, driver, vm,
&memdata.fd, memdata.path, loadSnap,
- memdata.data, VIR_ASYNC_JOB_SNAPSHOT,
+ memdata.data, NULL, VIR_ASYNC_JOB_SNAPSHOT,
start_flags, "from-snapshot",
&started) < 0) {
if (started) {
@@ -2787,7 +2787,7 @@ qemuSnapshotRevertInactive(virDomainObj *vm,
rc = qemuProcessStart(snapshot->domain->conn, driver, vm, NULL,
VIR_ASYNC_JOB_SNAPSHOT, NULL, -1, NULL, NULL,
- VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
+ NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
start_flags);
virDomainAuditStart(vm, "from-snapshot", rc >= 0);
if (rc < 0) {
@@ -3264,7 +3264,7 @@ qemuSnapshotDeleteExternalPrepare(virDomainObj *vm,
if (!virDomainObjIsActive(vm)) {
if (qemuProcessStart(NULL, driver, vm, NULL, VIR_ASYNC_JOB_SNAPSHOT,
- NULL, -1, NULL, NULL,
+ NULL, -1, NULL, NULL, NULL,
VIR_NETDEV_VPORT_PROFILE_OP_CREATE,
VIR_QEMU_PROCESS_START_PAUSED) < 0) {
return -1;
--
2.43.0
