[libvirt] [PATCH 5/9] virsh: domjobinfo: Print also job operation for failed jobs
Printing that a job failed is rather unhelpful. Print at least the
operation which failed.
Achieve this by moving the check whether to print stats later but
replace it with a check which will skip printing of the operation if
there's no job.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tools/virsh-domain.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 6e3814f1fd..577dec30c5 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6153,10 +6153,8 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd)
vshPrint(ctl, "%-17s %-12s\n", _("Job type:"),
virshDomainJobToString(info.type));
- if (info.type != VIR_DOMAIN_JOB_BOUNDED &&
- info.type != VIR_DOMAIN_JOB_UNBOUNDED &&
- (!(flags & VIR_DOMAIN_JOB_STATS_COMPLETED) ||
- info.type != VIR_DOMAIN_JOB_COMPLETED)) {
+
+ if (info.type == VIR_DOMAIN_JOB_NONE) {
ret = true;
goto cleanup;
}
@@ -6169,6 +6167,14 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd)
vshPrint(ctl, "%-17s %-12s\n", _("Operation:"),
virshDomainJobOperationToString(op));
+ if (info.type != VIR_DOMAIN_JOB_BOUNDED &&
+ info.type != VIR_DOMAIN_JOB_UNBOUNDED &&
+ (!(flags & VIR_DOMAIN_JOB_STATS_COMPLETED) ||
+ info.type != VIR_DOMAIN_JOB_COMPLETED)) {
+ ret = true;
+ goto cleanup;
+ }
+
vshPrint(ctl, "%-17s %-12llu ms\n", _("Time elapsed:"),
info.timeElapsed);
if ((rc = virTypedParamsGetULLong(params, nparams,
VIR_DOMAIN_JOB_TIME_ELAPSED_NET,
--
2.23.0