mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
6be610bfaa
pciTrySecondaryBusReset checks if there is active device on the
same bus, however, qemu driver doesn't maintain an effective
list for the inactive devices, and it passes meaningless argument
for parameter "inactiveDevs". e.g. (qemuPrepareHostdevPCIDevices)
if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs)))
return -1;
..skipped...
if (pciResetDevice(dev, driver->activePciHostdevs, pcidevs) < 0)
goto reattachdevs;
NB, the "pcidevs" used above are extracted from domain def, and
thus one won't be able to attach a device of which bus has other
device even detached from host (nodedev-detach). To see more
details of the problem:
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=773667
This patch is to resolve the problem by introducing an inactive
PCI device list (just like qemu_driver->activePciHostdevs), and
the whole logic is:
* Add the device to inactive list during nodedev-dettach
* Remove the device from inactive list during nodedev-reattach
* Remove the device from inactive list during attach-device
(for non-managed device)
* Add the device to inactive list after detach-device, only
if the device is not managed
With the above, we have a sufficient inactive PCI device list, and thus
we can use it for pciResetDevice. e.g.(qemuPrepareHostdevPCIDevices)
if (pciResetDevice(dev, driver->activePciHostdevs,
driver->inactivePciHostdevs) < 0)
goto reattachdevs;
126 lines
5.0 KiB
C
126 lines
5.0 KiB
C
/*
|
|
* Copyright (C) 2009, 2011-2012 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* Authors:
|
|
* Mark McLoughlin <markmc@redhat.com>
|
|
*/
|
|
|
|
#ifndef __VIR_PCI_H__
|
|
# define __VIR_PCI_H__
|
|
|
|
# include "internal.h"
|
|
|
|
typedef struct _pciDevice pciDevice;
|
|
typedef struct _pciDeviceList pciDeviceList;
|
|
|
|
struct pci_config_address {
|
|
unsigned int domain;
|
|
unsigned int bus;
|
|
unsigned int slot;
|
|
unsigned int function;
|
|
};
|
|
|
|
pciDevice *pciGetDevice (unsigned domain,
|
|
unsigned bus,
|
|
unsigned slot,
|
|
unsigned function);
|
|
void pciFreeDevice (pciDevice *dev);
|
|
const char *pciDeviceGetName (pciDevice *dev);
|
|
int pciDettachDevice (pciDevice *dev,
|
|
pciDeviceList *activeDevs,
|
|
pciDeviceList *inactiveDevs);
|
|
int pciReAttachDevice (pciDevice *dev,
|
|
pciDeviceList *activeDevs,
|
|
pciDeviceList *inactiveDevs);
|
|
int pciResetDevice (pciDevice *dev,
|
|
pciDeviceList *activeDevs,
|
|
pciDeviceList *inactiveDevs);
|
|
void pciDeviceSetManaged(pciDevice *dev,
|
|
unsigned managed);
|
|
unsigned pciDeviceGetManaged(pciDevice *dev);
|
|
void pciDeviceSetUsedBy(pciDevice *dev,
|
|
const char *used_by);
|
|
const char *pciDeviceGetUsedBy(pciDevice *dev);
|
|
unsigned pciDeviceGetUnbindFromStub(pciDevice *dev);
|
|
void pciDeviceSetUnbindFromStub(pciDevice *dev,
|
|
unsigned unbind);
|
|
unsigned pciDeviceGetRemoveSlot(pciDevice *dev);
|
|
void pciDeviceSetRemoveSlot(pciDevice *dev,
|
|
unsigned remove_slot);
|
|
unsigned pciDeviceGetReprobe(pciDevice *dev);
|
|
void pciDeviceSetReprobe(pciDevice *dev,
|
|
unsigned reprobe);
|
|
void pciDeviceReAttachInit(pciDevice *dev);
|
|
|
|
pciDeviceList *pciDeviceListNew (void);
|
|
void pciDeviceListFree (pciDeviceList *list);
|
|
int pciDeviceListAdd (pciDeviceList *list,
|
|
pciDevice *dev);
|
|
pciDevice * pciDeviceListGet (pciDeviceList *list,
|
|
int idx);
|
|
int pciDeviceListCount (pciDeviceList *list);
|
|
pciDevice * pciDeviceListSteal (pciDeviceList *list,
|
|
pciDevice *dev);
|
|
void pciDeviceListDel (pciDeviceList *list,
|
|
pciDevice *dev);
|
|
pciDevice * pciDeviceListFind (pciDeviceList *list,
|
|
pciDevice *dev);
|
|
|
|
/*
|
|
* Callback that will be invoked once for each file
|
|
* associated with / used for PCI host device access.
|
|
*
|
|
* Should return 0 if successfully processed, or
|
|
* -1 to indicate error and abort iteration
|
|
*/
|
|
typedef int (*pciDeviceFileActor)(pciDevice *dev,
|
|
const char *path, void *opaque);
|
|
|
|
int pciDeviceFileIterate(pciDevice *dev,
|
|
pciDeviceFileActor actor,
|
|
void *opaque);
|
|
|
|
int pciDeviceIsAssignable(pciDevice *dev,
|
|
int strict_acs_check);
|
|
int pciWaitForDeviceCleanup(pciDevice *dev, const char *matcher);
|
|
|
|
int pciGetPhysicalFunction(const char *sysfs_path,
|
|
struct pci_config_address **phys_fn);
|
|
|
|
int pciGetVirtualFunctions(const char *sysfs_path,
|
|
struct pci_config_address ***virtual_functions,
|
|
unsigned int *num_virtual_functions);
|
|
|
|
int pciDeviceIsVirtualFunction(const char *vf_sysfs_device_link);
|
|
|
|
int pciGetVirtualFunctionIndex(const char *pf_sysfs_device_link,
|
|
const char *vf_sysfs_device_link,
|
|
int *vf_index);
|
|
|
|
int pciDeviceNetName(char *device_link_sysfs_path, char **netname);
|
|
|
|
int pciSysfsFile(char *pciDeviceName, char **pci_sysfs_device_link)
|
|
ATTRIBUTE_RETURN_CHECK;
|
|
|
|
int pciGetDeviceAddrString(unsigned domain,
|
|
unsigned bus,
|
|
unsigned slot,
|
|
unsigned function,
|
|
char **pciConfigAddr)
|
|
ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK;
|
|
#endif /* __VIR_PCI_H__ */
|