From f477f555f0028286661610752e1da5fdf8132437 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Fri, 13 Jun 2014 22:51:18 +0400 Subject: [PATCH] bhyve: silent destroy command errors on cleanup When virBhyveProcessStart() fails, it tries to unload a guest that could have been already loaded using bhyveload(8) to make sure not to leave it hanging in memory. However, we could fail before loading a VM into memory, so 'bhyvectl --destroy' command will fail and print an error message that looks confusing to users. So ignore errors when running this in cleanup. --- src/bhyve/bhyve_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index b8db076366..f3898f5fc0 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -189,12 +189,13 @@ virBhyveProcessStart(virConnectPtr conn, cleanup: if (ret < 0) { + int exitstatus; /* Needed to avoid logging non-zero status */ virCommandPtr destroy_cmd; if ((destroy_cmd = virBhyveProcessBuildDestroyCmd(driver, vm->def)) != NULL) { virCommandSetOutputFD(load_cmd, &logfd); virCommandSetErrorFD(load_cmd, &logfd); - ignore_value(virCommandRun(destroy_cmd, NULL)); + ignore_value(virCommandRun(destroy_cmd, &exitstatus)); virCommandFree(destroy_cmd); } -- GitLab