From d9ed7bb1dd4d4c4e44b6a1a56c1bdf9852cb2ee5 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 10 Apr 2019 13:43:39 -0400 Subject: [PATCH] qemu: monitor cleanup delvm error handling Drop redundant NULL checks, and add an error string prefix Acked-by: Michal Privoznik Signed-off-by: Cole Robinson --- src/qemu/qemu_monitor_text.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 414da0ca28..76095674ab 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -259,16 +259,17 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name) if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - if (strstr(reply, "No block device supports snapshots") != NULL) { + if (strstr(reply, "No block device supports snapshots")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("this domain does not have a device to delete snapshots")); goto cleanup; - } else if (strstr(reply, "Snapshots not supported on device") != NULL) { + } else if (strstr(reply, "Snapshots not supported on device")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", reply); goto cleanup; - } else if (strstr(reply, "Error") != NULL - && strstr(reply, "while deleting snapshot") != NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply); + } else if (strstr(reply, "Error") && + strstr(reply, "while deleting snapshot")) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Failed to delete snapshot: %s"), reply); goto cleanup; } -- GitLab