openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

util: mdev: Improve the error msg on non-existent mdev prior to VM start 

What one currently gets is:
failed to read '/sys/bus/mdev/devices/<UUID>/mdev_type/device_api': No
such file or directory

This indicates that something is missing within the device's sysfs tree
which likely might be not be the case here because the device simply
doesn't exist yet. So, when creating our internal mdev obj, let's check
whether the device exists first prior to trying to verify the
user-provided model within domain XML.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Erik Skultety 2018-03-16 10:06:04 +01:00
parent 29d6bb7045
commit 3d2e4c3e53
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/virmdev.c
View File

@ -150,13 +150,22 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model)
{
virMediatedDevicePtr ret = NULL;
virMediatedDevicePtr dev = NULL;
char *sysfspath = NULL;
if (!(sysfspath = virMediatedDeviceGetSysfsPath(uuidstr)))
goto cleanup;
if (!virFileExists(sysfspath)) {
virReportError(VIR_ERR_DEVICE_MISSING,
_("mediated device '%s' not found"), uuidstr);
goto cleanup;
}
if (VIR_ALLOC(dev) < 0)
return NULL;
if (!(dev->path = virMediatedDeviceGetSysfsPath(uuidstr)))
goto cleanup;
VIR_STEAL_PTR(dev->path, sysfspath);
/* Check whether the user-provided model corresponds with the actually
* supported mediated device's API.
*/
@ -167,6 +176,7 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDeviceModelType model)
VIR_STEAL_PTR(ret, dev);
cleanup:
VIR_FREE(sysfspath);
virMediatedDeviceFree(dev);
return ret;
}