[libvirt] [PATCH v2 02/12] qemu: Return real error message for block_set_io_throttle
This patch will also adjust the qemuMonitorJSONSetBlockIoThrottle error
procession so that rather than returning/displaying:
"error: internal error: Unexpected error"
Fetch the actual error message from qemu and display that
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_monitor_json.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 349a64f..744c878 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4615,15 +4615,19 @@ int qemuMonitorJSONSetBlockIoThrottle(qemuMonitorPtr mon,
goto cleanup;
if (virJSONValueObjectHasKey(result, "error")) {
- if (qemuMonitorJSONHasError(result, "DeviceNotActive"))
+ if (qemuMonitorJSONHasError(result, "DeviceNotActive")) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("No active operation on device: %s"), device);
- else if (qemuMonitorJSONHasError(result, "NotSupported"))
+ } else if (qemuMonitorJSONHasError(result, "NotSupported")) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("Operation is not supported for device: %s"),
device);
- else
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Unexpected error"));
+ } else {
+ virJSONValuePtr error = virJSONValueObjectGet(result, "error");
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("unable to execute '%s', unexpected error:
'%s'"),
+ qemuMonitorJSONCommandName(cmd),
+ qemuMonitorJSONStringifyError(error));
+ }
goto cleanup;
}
--
2.7.4