External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: monitor: Refactor error handling for 'savevm'

Browse Source 
Unify few error conditions into a single error reporting case.
This commit is contained in:
Peter Krempa 2016-01-15 12:53:30 +01:00
parent ef01addb38
commit 0c1b0d83bb
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_monitor_text.c
View File

@ -2640,7 +2640,10 @@ int qemuMonitorTextSetDrivePassphrase(qemuMonitorPtr mon,
return ret;
}
int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name)
int
qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon,
const char *name)
{
char *cmd = NULL;
char *reply = NULL;
@ -2654,21 +2657,16 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name)
if (qemuMonitorHMPCommand(mon, cmd, &reply))
goto cleanup;
if (strstr(reply, "Error while creating snapshot") != NULL) {
if (strstr(reply, "Error while creating snapshot") ||
strstr(reply, "Could not open VM state file") ||
(strstr(reply, "Error") && strstr(reply, "while writing VM"))) {
virReportError(VIR_ERR_OPERATION_FAILED,
_("Failed to take snapshot: %s"), reply);
goto cleanup;
} else if (strstr(reply, "No block device can accept snapshots") != NULL) {
} else if (strstr(reply, "No block device can accept snapshots")) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("this domain does not have a device to take snapshots"));
goto cleanup;
} else if (strstr(reply, "Could not open VM state file") != NULL) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply);
goto cleanup;
} else if (strstr(reply, "Error") != NULL
&& strstr(reply, "while writing VM") != NULL) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply);
goto cleanup;
}
ret = 0;