From 8722ee949b2099c4a4ac246fba868ae47cb828d2 Mon Sep 17 00:00:00 2001 Message-Id: <8722ee949b2099c4a4ac246fba868ae47cb828d2@dist-git> From: Andrea Bolognani Date: Tue, 11 Jun 2019 10:13:50 +0200 Subject: [PATCH] util: Propagate numad failures correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Right now, if numad fails, we raise an error but return an empty string to the caller instead of a NULL pointer, which means processing will continue and the user will see # virsh start guest error: Failed to start domain guest error: invalid argument: Failed to parse bitmap '' instead of a more reasonable # virsh start guest error: Failed to start domain guest error: operation failed: Failed to query numad for the advisory nodeset Make sure the user gets a better error message. https://bugzilla.redhat.com/show_bug.cgi?id=1716387 Signed-off-by: Andrea Bolognani Reviewed-by: Daniel Henrique Barboza Reviewed-by: Ján Tomko (cherry picked from commit b34fb1fb6f99628932ad68db1ce4985a06def17f) https://bugzilla.redhat.com/show_bug.cgi?id=1716907 Signed-off-by: Andrea Bolognani Message-Id: <20190611081350.6476-2-abologna@redhat.com> Reviewed-by: Ján Tomko --- src/util/virnuma.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 784db0a7ce..fd15714553 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -66,10 +66,12 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus, virCommandSetOutputBuffer(cmd, &output); - if (virCommandRun(cmd, NULL) < 0) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + if (virCommandRun(cmd, NULL) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to query numad for the " "advisory nodeset")); + VIR_FREE(output); + } virCommandFree(cmd); return output; -- 2.22.0