mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-02 11:21:12 +00:00
d84b36263c
To support "managed" mode of host PCI device, we record the original
states (unbind_from_stub, remove_slot, and reprobe) so that could
reattach the device to host with original driver. But there is no XML
for theses attrs, and thus after daemon is restarted, we lose the
original states. It's easy to reproduce:
1) virsh start domain
2) virsh attach-device dom hostpci.xml (in 'managed' mode)
3) service libvirtd restart
4) virsh destroy domain
You will see the device won't be bound to the original driver
if there was one.
This patch is to solve the problem by introducing internal XML
(won't be dumped to user, only dumped to status XML). The XML is:
<origstates>
<unbind/>
<remove_slot/>
<reprobe/>
</origstates>
Which will be child node of <hostdev><source>...</souce></hostdev>.
(only for PCI device).
A new struct "virDomainHostdevOrigStates" is introduced for the XML,
and the according members are updated when preparing the PCI device.
And function "qemuUpdateActivePciHostdevs" is modified to honor
the original states. Use of qemuGetPciHostDeviceList is removed
in function "qemuUpdateActivePciHostdevs", and the "managed" value of
the device config is honored by the change. This fixes another problem
alongside:
qemuGetPciHostDeviceList set the device as "managed" force
regardless of whether the device is configured as "managed='yes'"
or not in XML, which is not right.
113 lines
4.4 KiB
C
113 lines
4.4 KiB
C
/*
|
|
* Copyright (C) 2009, 2011 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);
|
|
int pciReAttachDevice (pciDevice *dev, pciDeviceList *activeDevs);
|
|
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);
|
|
|
|
#endif /* __VIR_PCI_H__ */
|