External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-08 07:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load nbd module before running qemu-nbd

Browse Source 
So far qemu-nbd is run even if the nbd kernel module isn't loaded. This
leads to errors when the user starts his lxc container while libvirt
could easily load the nbd module automatically.
This commit is contained in:
Cédric Bosdonnat 2015-07-20 14:37:48 +02:00
parent b2960501c7
commit 0aedcbd37c
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/util/virfile.c
View File

@ -63,6 +63,7 @@
#include "vircommand.h"
#include "virerror.h"
#include "virfile.h"
#include "virkmod.h"
#include "virlog.h"
#include "virprocess.h"
#include "virstring.h"
@ -745,6 +746,7 @@ int virFileLoopDeviceAssociate(const char *file,
# define SYSFS_BLOCK_DIR "/sys/block"
# define NBD_DRIVER "nbd"
static int
@ -811,18 +813,42 @@ virFileNBDDeviceFindUnused(void)
return ret;
}
static bool
virFileNBDLoadDriver(void)
{
if (virKModIsBlacklisted(NBD_DRIVER)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to load nbd module: "
"administratively prohibited"));
return false;
} else {
char *errbuf = NULL;
if ((errbuf = virKModLoad(NBD_DRIVER, true))) {
VIR_FREE(errbuf);
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to load nbd module"));
return false;
}
VIR_FREE(errbuf);
}
return true;
}
int virFileNBDDeviceAssociate(const char *file,
virStorageFileFormat fmt,
bool readonly,
char **dev)
{
char *nbddev;
char *nbddev = NULL;
char *qemunbd = NULL;
virCommandPtr cmd = NULL;
int ret = -1;
const char *fmtstr = NULL;
if (!virFileNBDLoadDriver())
goto cleanup;
if (!(nbddev = virFileNBDDeviceFindUnused()))
goto cleanup;