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

virpcimock: Introduce and use pci_driver_get_path()

Browse Source 
Have just one function to generate path to a PCI driver so that
when we change it in near future there's only few of the places
we need to fix.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Tested-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Michal Privoznik 2019-08-13 16:11:17 +02:00
parent 7f7bd6016e
commit af3ddc1369
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/virpcimock.c
View File

@ -504,6 +504,29 @@ pci_device_autobind(struct pciDevice *dev)
/*
* PCI Driver functions
*/
static char *
pci_driver_get_path(const struct pciDriver *driver,
const char *file,
bool faked)
{
char *ret = NULL;
const char *prefix = "";
if (faked)
prefix = fakerootdir;
if (file) {
ignore_value(virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s/%s",
prefix, driver->name, file));
} else {
ignore_value(virAsprintfQuiet(&ret, "%s" SYSFS_PCI_PREFIX "drivers/%s",
prefix, driver->name));
}
return ret;
}
static void
pci_driver_new(const char *name, int fail, ...)
{
@ -514,7 +537,7 @@ pci_driver_new(const char *name, int fail, ...)
if (VIR_ALLOC_QUIET(driver) < 0 ||
VIR_STRDUP_QUIET(driver->name, name) < 0 ||
virAsprintfQuiet(&driverpath, "%s/sys/bus/pci/drivers/%s", fakerootdir, name) < 0)
!(driverpath = pci_driver_get_path(driver, NULL, true)))
ABORT_OOM();
driver->fail = fail;
@ -620,8 +643,7 @@ pci_driver_bind(struct pciDriver *driver,
/* Make symlink under device tree */
if (!(devpath = pci_device_get_path(dev, "driver", true)) ||
virAsprintfQuiet(&driverpath, "%s/sys/bus/pci/drivers/%s",
fakerootdir, driver->name) < 0) {
!(driverpath = pci_driver_get_path(driver, NULL, true))) {
errno = ENOMEM;
return -1;
}
@ -633,8 +655,7 @@ pci_driver_bind(struct pciDriver *driver,
VIR_FREE(devpath);
VIR_FREE(driverpath);
if (!(devpath = pci_device_get_path(dev, NULL, true)) ||
virAsprintfQuiet(&driverpath, "%s/sys/bus/pci/drivers/%s/%s",
fakerootdir, driver->name, dev->id) < 0) {
!(driverpath = pci_driver_get_path(driver, dev->id, true))) {
errno = ENOMEM;
return -1;
}
@ -661,8 +682,7 @@ pci_driver_unbind(struct pciDriver *driver,
/* Make symlink under device tree */
if (!(devpath = pci_device_get_path(dev, "driver", true)) ||
virAsprintfQuiet(&driverpath, "%s/sys/bus/pci/drivers/%s/%s",
fakerootdir, driver->name, dev->id) < 0) {
!(driverpath = pci_driver_get_path(driver, dev->id, true))) {
errno = ENOMEM;
return -1;
}