mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 22:25:25 +00:00
unbreak migration
Fix migration, broken in two different ways by the QEMU monitor abstraction. Note that the QEMU console emits a "\r\n" as the line-ending. * src/qemu/qemu_monitor_text.c (qemuMonitorGetMigrationStatus): Fix "info migrate" command and its output's parsing.
This commit is contained in:
parent
6e16575a37
commit
1a09553e52
@ -1072,7 +1072,7 @@ int qemuMonitorGetMigrationStatus(const virDomainObjPtr vm,
|
||||
*remaining = 0;
|
||||
*total = 0;
|
||||
|
||||
if (qemuMonitorCommand(vm, "info migration", &reply) < 0) {
|
||||
if (qemuMonitorCommand(vm, "info migrate", &reply) < 0) {
|
||||
qemudReportError(NULL, NULL, NULL, VIR_ERR_OPERATION_FAILED,
|
||||
"%s", _("cannot query migration status"));
|
||||
return -1;
|
||||
@ -1080,7 +1080,7 @@ int qemuMonitorGetMigrationStatus(const virDomainObjPtr vm,
|
||||
|
||||
if ((tmp = strstr(reply, MIGRATION_PREFIX)) != NULL) {
|
||||
tmp += strlen(MIGRATION_PREFIX);
|
||||
end = strchr(tmp, '\n');
|
||||
end = strchr(tmp, '\r');
|
||||
*end = '\0';
|
||||
|
||||
if ((*status = qemuMonitorMigrationStatusTypeFromString(tmp)) < 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user