NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "qemu: Do not require hostuuid in migration cookie"

Browse Source 
This reverts commit 8d75e47ede.

Libvirt was never released with support for migration cookies without
hostuuid.
This commit is contained in:
Jiri Denemark
2012-10-26 15:06:17 +02:00
parent 9a2975786b
commit 23f5e74ed3
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/qemu/qemu_migration.c
View File

@@ -783,23 +783,22 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig,
} }
if (!(tmp = virXPathString("string(./hostuuid[1])", ctxt))) { if (!(tmp = virXPathString("string(./hostuuid[1])", ctxt))) {
VIR_WARN("Missing hostuuid element in migration data; cannot " virReportError(VIR_ERR_INTERNAL_ERROR,
"detect migration to the same host"); "%s", _("missing hostuuid element in migration data"));
} else {
if (virUUIDParse(tmp, mig->remoteHostuuid) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("malformed hostuuid element in migration data"));
goto error; goto error;
} }
if (memcmp(mig->remoteHostuuid, mig->localHostuuid, if (virUUIDParse(tmp, mig->remoteHostuuid) < 0) {
VIR_UUID_BUFLEN) == 0) { virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("malformed hostuuid element in migration data"));
goto error;
}
if (memcmp(mig->remoteHostuuid, mig->localHostuuid, VIR_UUID_BUFLEN) == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Attempt to migrate guest to the same host %s"), _("Attempt to migrate guest to the same host %s"),
tmp); tmp);
goto error; goto error;
} }
VIR_FREE(tmp); VIR_FREE(tmp);
}
/* Check to ensure all mandatory features from XML are also /* Check to ensure all mandatory features from XML are also
* present in 'flags' */ * present in 'flags' */