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

Fix disability to run on systems with no PCI bus 

The patch which moved libpciaccess initialization to one place caused
regression - we were not able to run on system with no PCI bus, like
s390(x).
This commit is contained in:
Michal Privoznik 2011-04-22 14:24:54 +02:00
parent 0e7f7f8566
commit a2eab0033c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node_device/node_device_udev.c
View File

@ -1421,8 +1421,12 @@ static int udevDeviceMonitorShutdown(void)
ret = -1;
}
#if defined __s390__ || defined __s390x_
/* Nothing was initialized, nothing needs to be cleaned up */
#else
/* pci_system_cleanup returns void */
pci_system_cleanup();
#endif
return ret;
}
@ -1593,6 +1597,11 @@ static int udevDeviceMonitorStartup(int privileged)
udevPrivate *priv = NULL;
struct udev *udev = NULL;
int ret = 0;
#if defined __s390__ || defined __s390x_
/* On s390(x) system there is no PCI bus.
* Therefore there is nothing to initialize here. */
#else
int pciret;
if ((pciret = pci_system_init()) != 0) {
@ -1607,6 +1616,7 @@ static int udevDeviceMonitorStartup(int privileged)
goto out;
}
}
#endif
if (VIR_ALLOC(priv) < 0) {
virReportOOMError();