External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen: ensure /usr/sbin/xend exists before checking status

Browse Source 
With xend on the way out, installations may not even have
/usr/sbin/xend, which results in the following error when the
drivers are probed

2014-04-28 18:21:19.271+0000: 22129: error : virCommandWait:2426 :
internal error: Child process (/usr/sbin/xend status) unexpected exit
status 127: libvirt:  error : cannot execute binary /usr/sbin/xend:
No such file or directory

Check for existence of /usr/sbin/xend before trying to run it with
the 'status' option.
This commit is contained in:
Jim Fehlig 2014-04-28 12:35:44 -06:00
parent 04515a3438
commit 4f70ae2409
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libxl/libxl_driver.c
View File

@ -223,7 +223,6 @@ static bool
libxlDriverShouldLoad(bool privileged)
{
bool ret = false;
virCommandPtr cmd;
int status;
char *output = NULL;
@ -236,7 +235,7 @@ libxlDriverShouldLoad(bool privileged)
if (!virFileExists(HYPERVISOR_CAPABILITIES)) {
VIR_INFO("Disabling driver as " HYPERVISOR_CAPABILITIES
" does not exist");
return false;
return ret;
}
/*
* Don't load if not running on a Xen control domain (dom0). It is not
@ -256,14 +255,20 @@ libxlDriverShouldLoad(bool privileged)
}
/* Don't load if legacy xen toolstack (xend) is in use */
cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
if (virCommandRun(cmd, &status) == 0 && status == 0) {
VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
"libxenlight driver.");
if (virFileExists("/usr/sbin/xend")) {
virCommandPtr cmd;
cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
if (virCommandRun(cmd, NULL) == 0) {
VIR_INFO("Legacy xen tool stack seems to be in use, disabling "
"libxenlight driver.");
} else {
ret = true;
}
virCommandFree(cmd);
} else {
ret = true;
}
virCommandFree(cmd);
return ret;
}

13
src/xen/xen_driver.c
View File

@ -315,13 +315,16 @@ xenUnifiedProbe(void)
static bool
xenUnifiedXendProbe(void)
{
virCommandPtr cmd;
bool ret = false;
cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
if (virCommandRun(cmd, NULL) == 0)
ret = true;
virCommandFree(cmd);
if (virFileExists("/usr/sbin/xend")) {
virCommandPtr cmd;
cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL);
if (virCommandRun(cmd, NULL) == 0)
ret = true;
virCommandFree(cmd);
}
return ret;
}