From 0c1e03508584ab0daa9da33ea07f720c9587538c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Thu, 23 May 2019 16:55:22 +0100 Subject: [PATCH] nodesuspend: report unsupported if systemd & pm-utils aren't available MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When libvirtd is run inside a container it is normal that neither systemd nor pm-utils will be available. In this case there is no way to suspend the host, so libvirt should just report the feature unsupported instead of raising an error. Signed-off-by: Daniel P. Berrangé --- src/util/virnodesuspend.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 0af0908e4a..3fc5b93ac7 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -330,11 +330,10 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) if (ret == -2) ret = virNodeSuspendSupportsTargetPMUtils(target, supported); - /* If still unavailable, then report error */ + /* If still unavailable, then report unsupported */ if (ret == -2) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot probe for supported suspend types")); - ret = -1; + *supported = false; + ret = 0; } return ret; -- 2.47.2