mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-11 07:17:44 +00:00
move virHostdevPrepare(ReAttach)PCIDevices to virhostdev.c
This commit is contained in:
Chunyan Liu
Daniel P. Berrange
parent
63d4dd0336
commit
899b261127
@ -1299,7 +1299,8 @@ virHookPresent;
|
|||||||
|
|
||||||
#util/virhostdev.h
|
#util/virhostdev.h
|
||||||
virHostdevManagerGetDefault;
|
virHostdevManagerGetDefault;
|
||||||
|
virHostdevPreparePCIDevices;
|
||||||
|
virHostdevReAttachPCIDevices;
|
||||||
|
|
||||||
# util/viridentity.h
|
# util/viridentity.h
|
||||||
virIdentityGetAttr;
|
virIdentityGetAttr;
|
||||||
|
|||||||
@ -41,102 +41,6 @@
|
|||||||
|
|
||||||
#define VIR_FROM_THIS VIR_FROM_QEMU
|
#define VIR_FROM_THIS VIR_FROM_QEMU
|
||||||
|
|
||||||
static virPCIDeviceListPtr
|
|
||||||
virHostdevGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
|
|
||||||
{
|
|
||||||
virPCIDeviceListPtr list;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (!(list = virPCIDeviceListNew()))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 0; i < nhostdevs; i++) {
|
|
||||||
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
|
||||||
virPCIDevicePtr dev;
|
|
||||||
|
|
||||||
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
|
||||||
continue;
|
|
||||||
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain,
|
|
||||||
hostdev->source.subsys.u.pci.addr.bus,
|
|
||||||
hostdev->source.subsys.u.pci.addr.slot,
|
|
||||||
hostdev->source.subsys.u.pci.addr.function);
|
|
||||||
if (!dev) {
|
|
||||||
virObjectUnref(list);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virPCIDeviceListAdd(list, dev) < 0) {
|
|
||||||
virPCIDeviceFree(dev);
|
|
||||||
virObjectUnref(list);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
virPCIDeviceSetManaged(dev, hostdev->managed);
|
|
||||||
if (hostdev->source.subsys.u.pci.backend
|
|
||||||
== VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
|
|
||||||
if (virPCIDeviceSetStubDriver(dev, "vfio-pci") < 0) {
|
|
||||||
virObjectUnref(list);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (virPCIDeviceSetStubDriver(dev, "pci-stub") < 0) {
|
|
||||||
virObjectUnref(list);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* virHostdevGetActivePciHostDeviceList - make a new list with a *copy* of
|
|
||||||
* every virPCIDevice object that is found on the activePciHostdevs
|
|
||||||
* list *and* is in the hostdev list for this domain.
|
|
||||||
*
|
|
||||||
* Return the new list, or NULL if there was a failure.
|
|
||||||
*
|
|
||||||
* Pre-condition: activePciHostdevs is locked
|
|
||||||
*/
|
|
||||||
static virPCIDeviceListPtr
|
|
||||||
virHostdevGetActivePciHostDeviceList(virHostdevManagerPtr mgr,
|
|
||||||
virDomainHostdevDefPtr *hostdevs,
|
|
||||||
int nhostdevs)
|
|
||||||
{
|
|
||||||
virPCIDeviceListPtr list;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
if (!(list = virPCIDeviceListNew()))
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
for (i = 0; i < nhostdevs; i++) {
|
|
||||||
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
|
||||||
virDevicePCIAddressPtr addr;
|
|
||||||
virPCIDevicePtr activeDev;
|
|
||||||
|
|
||||||
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
|
||||||
continue;
|
|
||||||
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
addr = &hostdev->source.subsys.u.pci.addr;
|
|
||||||
activeDev = virPCIDeviceListFindByIDs(mgr->activePciHostdevs,
|
|
||||||
addr->domain, addr->bus,
|
|
||||||
addr->slot, addr->function);
|
|
||||||
if (activeDev && virPCIDeviceListAddCopy(list, activeDev) < 0) {
|
|
||||||
virObjectUnref(list);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int
|
int
|
||||||
qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
|
qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
|
||||||
virDomainDefPtr def)
|
virDomainDefPtr def)
|
||||||
@ -298,233 +202,6 @@ cleanup:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virHostdevPciSysfsPath(virDomainHostdevDefPtr hostdev,
|
|
||||||
char **sysfs_path)
|
|
||||||
{
|
|
||||||
virPCIDeviceAddress config_address;
|
|
||||||
|
|
||||||
config_address.domain = hostdev->source.subsys.u.pci.addr.domain;
|
|
||||||
config_address.bus = hostdev->source.subsys.u.pci.addr.bus;
|
|
||||||
config_address.slot = hostdev->source.subsys.u.pci.addr.slot;
|
|
||||||
config_address.function = hostdev->source.subsys.u.pci.addr.function;
|
|
||||||
|
|
||||||
return virPCIDeviceAddressGetSysfsFile(&config_address, sysfs_path);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virHostdevIsVirtualFunction(virDomainHostdevDefPtr hostdev)
|
|
||||||
{
|
|
||||||
char *sysfs_path = NULL;
|
|
||||||
int ret = -1;
|
|
||||||
|
|
||||||
if (virHostdevPciSysfsPath(hostdev, &sysfs_path) < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
ret = virPCIIsVirtualFunction(sysfs_path);
|
|
||||||
|
|
||||||
VIR_FREE(sysfs_path);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virHostdevNetDevice(virDomainHostdevDefPtr hostdev, char **linkdev,
|
|
||||||
int *vf)
|
|
||||||
{
|
|
||||||
int ret = -1;
|
|
||||||
char *sysfs_path = NULL;
|
|
||||||
|
|
||||||
if (virHostdevPciSysfsPath(hostdev, &sysfs_path) < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
if (virPCIIsVirtualFunction(sysfs_path) == 1) {
|
|
||||||
if (virPCIGetVirtualFunctionInfo(sysfs_path, linkdev,
|
|
||||||
vf) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
} else {
|
|
||||||
if (virPCIGetNetName(sysfs_path, linkdev) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
*vf = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
VIR_FREE(sysfs_path);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virHostdevNetConfigVirtPortProfile(const char *linkdev, int vf,
|
|
||||||
virNetDevVPortProfilePtr virtPort,
|
|
||||||
const virMacAddr *macaddr,
|
|
||||||
const unsigned char *uuid,
|
|
||||||
bool associate)
|
|
||||||
{
|
|
||||||
int ret = -1;
|
|
||||||
|
|
||||||
if (!virtPort)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
switch (virtPort->virtPortType) {
|
|
||||||
case VIR_NETDEV_VPORT_PROFILE_NONE:
|
|
||||||
case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH:
|
|
||||||
case VIR_NETDEV_VPORT_PROFILE_8021QBG:
|
|
||||||
case VIR_NETDEV_VPORT_PROFILE_LAST:
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("virtualport type %s is "
|
|
||||||
"currently not supported on interfaces of type "
|
|
||||||
"hostdev"),
|
|
||||||
virNetDevVPortTypeToString(virtPort->virtPortType));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case VIR_NETDEV_VPORT_PROFILE_8021QBH:
|
|
||||||
if (associate)
|
|
||||||
ret = virNetDevVPortProfileAssociate(NULL, virtPort, macaddr,
|
|
||||||
linkdev, vf, uuid,
|
|
||||||
VIR_NETDEV_VPORT_PROFILE_OP_CREATE, false);
|
|
||||||
else
|
|
||||||
ret = virNetDevVPortProfileDisassociate(NULL, virtPort,
|
|
||||||
macaddr, linkdev, vf,
|
|
||||||
VIR_NETDEV_VPORT_PROFILE_OP_DESTROY);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static int
|
|
||||||
virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
|
|
||||||
const unsigned char *uuid,
|
|
||||||
char *stateDir)
|
|
||||||
{
|
|
||||||
char *linkdev = NULL;
|
|
||||||
virNetDevVlanPtr vlan;
|
|
||||||
virNetDevVPortProfilePtr virtPort;
|
|
||||||
int ret = -1;
|
|
||||||
int vf = -1;
|
|
||||||
int vlanid = -1;
|
|
||||||
bool port_profile_associate = true;
|
|
||||||
int isvf;
|
|
||||||
|
|
||||||
isvf = virHostdevIsVirtualFunction(hostdev);
|
|
||||||
if (isvf <= 0) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
||||||
_("Interface type hostdev is currently supported on"
|
|
||||||
" SR-IOV Virtual Functions only"));
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
vlan = virDomainNetGetActualVlan(hostdev->parent.data.net);
|
|
||||||
virtPort = virDomainNetGetActualVirtPortProfile(
|
|
||||||
hostdev->parent.data.net);
|
|
||||||
if (virtPort) {
|
|
||||||
if (vlan) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("direct setting of the vlan tag is not allowed "
|
|
||||||
"for hostdev devices using %s mode"),
|
|
||||||
virNetDevVPortTypeToString(virtPort->virtPortType));
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
ret = virHostdevNetConfigVirtPortProfile(linkdev, vf,
|
|
||||||
virtPort, &hostdev->parent.data.net->mac, uuid,
|
|
||||||
port_profile_associate);
|
|
||||||
} else {
|
|
||||||
/* Set only mac and vlan */
|
|
||||||
if (vlan) {
|
|
||||||
if (vlan->nTags != 1 || vlan->trunk) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
||||||
_("vlan trunking is not supported "
|
|
||||||
"by SR-IOV network devices"));
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
if (vf == -1) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
||||||
_("vlan can only be set for SR-IOV VFs, but "
|
|
||||||
"%s is not a VF"), linkdev);
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
vlanid = vlan->tag[0];
|
|
||||||
} else if (vf >= 0) {
|
|
||||||
vlanid = 0; /* assure any current vlan tag is reset */
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = virNetDevReplaceNetConfig(linkdev, vf,
|
|
||||||
&hostdev->parent.data.net->mac,
|
|
||||||
vlanid, stateDir);
|
|
||||||
}
|
|
||||||
cleanup:
|
|
||||||
VIR_FREE(linkdev);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* @oldStateDir:
|
|
||||||
* For upgrade purpose:
|
|
||||||
* To an existing VM on QEMU, the hostdev netconfig file is originally stored
|
|
||||||
* in cfg->stateDir (/var/run/libvirt/qemu). Switch to new version, it uses new
|
|
||||||
* location (hostdev_mgr->stateDir) but certainly will not find it. In this
|
|
||||||
* case, try to find in the old state dir.
|
|
||||||
*/
|
|
||||||
static int
|
|
||||||
virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
|
|
||||||
char *stateDir,
|
|
||||||
char *oldStateDir)
|
|
||||||
{
|
|
||||||
char *linkdev = NULL;
|
|
||||||
virNetDevVPortProfilePtr virtPort;
|
|
||||||
int ret = -1;
|
|
||||||
int vf = -1;
|
|
||||||
bool port_profile_associate = false;
|
|
||||||
int isvf;
|
|
||||||
|
|
||||||
/* This is only needed for PCI devices that have been defined
|
|
||||||
* using <interface type='hostdev'>. For all others, it is a NOP.
|
|
||||||
*/
|
|
||||||
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
|
|
||||||
hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI ||
|
|
||||||
hostdev->parent.type != VIR_DOMAIN_DEVICE_NET ||
|
|
||||||
!hostdev->parent.data.net)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
isvf = virHostdevIsVirtualFunction(hostdev);
|
|
||||||
if (isvf <= 0) {
|
|
||||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
||||||
_("Interface type hostdev is currently supported on"
|
|
||||||
" SR-IOV Virtual Functions only"));
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
virtPort = virDomainNetGetActualVirtPortProfile(
|
|
||||||
hostdev->parent.data.net);
|
|
||||||
if (virtPort) {
|
|
||||||
ret = virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
|
|
||||||
&hostdev->parent.data.net->mac,
|
|
||||||
NULL,
|
|
||||||
port_profile_associate);
|
|
||||||
} else {
|
|
||||||
ret = virNetDevRestoreNetConfig(linkdev, vf, stateDir);
|
|
||||||
if (ret < 0 && oldStateDir != NULL)
|
|
||||||
ret = virNetDevRestoreNetConfig(linkdev, vf, oldStateDir);
|
|
||||||
}
|
|
||||||
|
|
||||||
VIR_FREE(linkdev);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
qemuHostdevHostSupportsPassthroughVFIO(void)
|
qemuHostdevHostSupportsPassthroughVFIO(void)
|
||||||
{
|
{
|
||||||
@ -657,204 +334,6 @@ qemuPrepareHostdevPCICheckSupport(virDomainHostdevDefPtr *hostdevs,
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int
|
|
||||||
virHostdevPreparePCIDevices(virHostdevManagerPtr hostdev_mgr,
|
|
||||||
const char *drv_name,
|
|
||||||
const char *name,
|
|
||||||
const unsigned char *uuid,
|
|
||||||
virDomainHostdevDefPtr *hostdevs,
|
|
||||||
int nhostdevs,
|
|
||||||
unsigned int flags)
|
|
||||||
{
|
|
||||||
virPCIDeviceListPtr pcidevs = NULL;
|
|
||||||
int last_processed_hostdev_vf = -1;
|
|
||||||
size_t i;
|
|
||||||
int ret = -1;
|
|
||||||
|
|
||||||
virObjectLock(hostdev_mgr->activePciHostdevs);
|
|
||||||
virObjectLock(hostdev_mgr->inactivePciHostdevs);
|
|
||||||
|
|
||||||
if (!(pcidevs = virHostdevGetPciHostDeviceList(hostdevs, nhostdevs)))
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
/* We have to use 9 loops here. *All* devices must
|
|
||||||
* be detached before we reset any of them, because
|
|
||||||
* in some cases you have to reset the whole PCI,
|
|
||||||
* which impacts all devices on it. Also, all devices
|
|
||||||
* must be reset before being marked as active.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Loop 1: validate that non-managed device isn't in use, eg
|
|
||||||
* by checking that device is either un-bound, or bound
|
|
||||||
* to pci-stub.ko
|
|
||||||
*/
|
|
||||||
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
virPCIDevicePtr other;
|
|
||||||
bool strict_acs_check = !!(flags & VIR_HOSTDEV_STRICT_ACS_CHECK);
|
|
||||||
|
|
||||||
if (!virPCIDeviceIsAssignable(dev, strict_acs_check)) {
|
|
||||||
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
||||||
_("PCI device %s is not assignable"),
|
|
||||||
virPCIDeviceGetName(dev));
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
/* The device is in use by other active domain if
|
|
||||||
* the dev is in list activePciHostdevs.
|
|
||||||
*/
|
|
||||||
if ((other = virPCIDeviceListFind(hostdev_mgr->activePciHostdevs, dev))) {
|
|
||||||
const char *other_drvname;
|
|
||||||
const char *other_domname;
|
|
||||||
|
|
||||||
virPCIDeviceGetUsedBy(other, &other_drvname, &other_domname);
|
|
||||||
if (other_drvname && other_domname)
|
|
||||||
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
||||||
_("PCI device %s is in use by "
|
|
||||||
"driver %s, domain %s"),
|
|
||||||
virPCIDeviceGetName(dev),
|
|
||||||
other_drvname, other_domname);
|
|
||||||
else
|
|
||||||
virReportError(VIR_ERR_OPERATION_INVALID,
|
|
||||||
_("PCI device %s is already in use"),
|
|
||||||
virPCIDeviceGetName(dev));
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 2: detach managed devices (i.e. bind to appropriate stub driver) */
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
if (virPCIDeviceGetManaged(dev) &&
|
|
||||||
virPCIDeviceDetach(dev, hostdev_mgr->activePciHostdevs, NULL) < 0)
|
|
||||||
goto reattachdevs;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 3: Now that all the PCI hostdevs have been detached, we
|
|
||||||
* can safely reset them */
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
|
|
||||||
if (virPCIDeviceReset(dev, hostdev_mgr->activePciHostdevs,
|
|
||||||
hostdev_mgr->inactivePciHostdevs) < 0)
|
|
||||||
goto reattachdevs;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 4: For SRIOV network devices, Now that we have detached the
|
|
||||||
* the network device, set the netdev config */
|
|
||||||
for (i = 0; i < nhostdevs; i++) {
|
|
||||||
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
|
||||||
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
|
||||||
continue;
|
|
||||||
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
|
||||||
continue;
|
|
||||||
if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET &&
|
|
||||||
hostdev->parent.data.net) {
|
|
||||||
if (virHostdevNetConfigReplace(hostdev, uuid,
|
|
||||||
hostdev_mgr->stateDir) < 0) {
|
|
||||||
goto resetvfnetconfig;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
last_processed_hostdev_vf = i;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 5: Now mark all the devices as active */
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
if (virPCIDeviceListAdd(hostdev_mgr->activePciHostdevs, dev) < 0)
|
|
||||||
goto inactivedevs;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 6: Now remove the devices from inactive list. */
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
virPCIDeviceListDel(hostdev_mgr->inactivePciHostdevs, dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 7: Now set the used_by_domain of the device in
|
|
||||||
* activePciHostdevs as domain name.
|
|
||||||
*/
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev, activeDev;
|
|
||||||
|
|
||||||
dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
activeDev = virPCIDeviceListFind(hostdev_mgr->activePciHostdevs, dev);
|
|
||||||
|
|
||||||
if (activeDev)
|
|
||||||
virPCIDeviceSetUsedBy(activeDev, drv_name, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 8: Now set the original states for hostdev def */
|
|
||||||
for (i = 0; i < nhostdevs; i++) {
|
|
||||||
virPCIDevicePtr dev;
|
|
||||||
virPCIDevicePtr pcidev;
|
|
||||||
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
|
||||||
|
|
||||||
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
|
||||||
continue;
|
|
||||||
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain,
|
|
||||||
hostdev->source.subsys.u.pci.addr.bus,
|
|
||||||
hostdev->source.subsys.u.pci.addr.slot,
|
|
||||||
hostdev->source.subsys.u.pci.addr.function);
|
|
||||||
|
|
||||||
/* original states "unbind_from_stub", "remove_slot",
|
|
||||||
* "reprobe" were already set by pciDettachDevice in
|
|
||||||
* loop 2.
|
|
||||||
*/
|
|
||||||
if ((pcidev = virPCIDeviceListFind(pcidevs, dev))) {
|
|
||||||
hostdev->origstates.states.pci.unbind_from_stub =
|
|
||||||
virPCIDeviceGetUnbindFromStub(pcidev);
|
|
||||||
hostdev->origstates.states.pci.remove_slot =
|
|
||||||
virPCIDeviceGetRemoveSlot(pcidev);
|
|
||||||
hostdev->origstates.states.pci.reprobe =
|
|
||||||
virPCIDeviceGetReprobe(pcidev);
|
|
||||||
}
|
|
||||||
|
|
||||||
virPCIDeviceFree(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Loop 9: Now steal all the devices from pcidevs */
|
|
||||||
while (virPCIDeviceListCount(pcidevs) > 0)
|
|
||||||
virPCIDeviceListStealIndex(pcidevs, 0);
|
|
||||||
|
|
||||||
ret = 0;
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
inactivedevs:
|
|
||||||
/* Only steal all the devices from activePciHostdevs. We will
|
|
||||||
* free them in virObjectUnref().
|
|
||||||
*/
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
virPCIDeviceListSteal(hostdev_mgr->activePciHostdevs, dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
resetvfnetconfig:
|
|
||||||
for (i = 0;
|
|
||||||
last_processed_hostdev_vf != -1 && i < last_processed_hostdev_vf; i++)
|
|
||||||
virHostdevNetConfigRestore(hostdevs[i], hostdev_mgr->stateDir, NULL);
|
|
||||||
|
|
||||||
reattachdevs:
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
|
|
||||||
/* NB: This doesn't actually re-bind to original driver, just
|
|
||||||
* unbinds from the stub driver
|
|
||||||
*/
|
|
||||||
ignore_value(virPCIDeviceReattach(dev, hostdev_mgr->activePciHostdevs,
|
|
||||||
NULL));
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup:
|
|
||||||
virObjectUnlock(hostdev_mgr->activePciHostdevs);
|
|
||||||
virObjectUnlock(hostdev_mgr->inactivePciHostdevs);
|
|
||||||
virObjectUnref(pcidevs);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
int
|
||||||
qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
|
qemuPrepareHostdevPCIDevices(virQEMUDriverPtr driver,
|
||||||
const char *name,
|
const char *name,
|
||||||
@ -1248,132 +727,6 @@ qemuPrepareHostDevices(virQEMUDriverPtr driver,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Pre-condition: inactivePciHostdevs & activePciHostdevs
|
|
||||||
* are locked
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
virHostdevReattachPciDevice(virPCIDevicePtr dev, virHostdevManagerPtr mgr)
|
|
||||||
{
|
|
||||||
/* If the device is not managed and was attached to guest
|
|
||||||
* successfully, it must have been inactive.
|
|
||||||
*/
|
|
||||||
if (!virPCIDeviceGetManaged(dev)) {
|
|
||||||
if (virPCIDeviceListAdd(mgr->inactivePciHostdevs, dev) < 0)
|
|
||||||
virPCIDeviceFree(dev);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Wait for device cleanup if it is qemu/kvm */
|
|
||||||
if (STREQ(virPCIDeviceGetStubDriver(dev), "pci-stub")) {
|
|
||||||
int retries = 100;
|
|
||||||
while (virPCIDeviceWaitForCleanup(dev, "kvm_assigned_device")
|
|
||||||
&& retries) {
|
|
||||||
usleep(100*1000);
|
|
||||||
retries--;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (virPCIDeviceReattach(dev, mgr->activePciHostdevs,
|
|
||||||
mgr->inactivePciHostdevs) < 0) {
|
|
||||||
virErrorPtr err = virGetLastError();
|
|
||||||
VIR_ERROR(_("Failed to re-attach PCI device: %s"),
|
|
||||||
err ? err->message : _("unknown error"));
|
|
||||||
virResetError(err);
|
|
||||||
}
|
|
||||||
virPCIDeviceFree(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* @oldStateDir:
|
|
||||||
* For upgrade purpose: see virHostdevNetConfigRestore
|
|
||||||
*/
|
|
||||||
static void
|
|
||||||
virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
|
|
||||||
const char *drv_name,
|
|
||||||
const char *name,
|
|
||||||
virDomainHostdevDefPtr *hostdevs,
|
|
||||||
int nhostdevs,
|
|
||||||
char *oldStateDir)
|
|
||||||
{
|
|
||||||
virPCIDeviceListPtr pcidevs;
|
|
||||||
size_t i;
|
|
||||||
|
|
||||||
virObjectLock(hostdev_mgr->activePciHostdevs);
|
|
||||||
virObjectLock(hostdev_mgr->inactivePciHostdevs);
|
|
||||||
|
|
||||||
if (!(pcidevs = virHostdevGetActivePciHostDeviceList(hostdev_mgr,
|
|
||||||
hostdevs,
|
|
||||||
nhostdevs))) {
|
|
||||||
virErrorPtr err = virGetLastError();
|
|
||||||
VIR_ERROR(_("Failed to allocate PCI device list: %s"),
|
|
||||||
err ? err->message : _("unknown error"));
|
|
||||||
virResetError(err);
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Again 4 loops; mark all devices as inactive before reset
|
|
||||||
* them and reset all the devices before re-attach.
|
|
||||||
* Attach mac and port profile parameters to devices
|
|
||||||
*/
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
virPCIDevicePtr activeDev = NULL;
|
|
||||||
|
|
||||||
/* delete the copy of the dev from pcidevs if it's used by
|
|
||||||
* other domain. Or delete it from activePciHostDevs if it had
|
|
||||||
* been used by this domain.
|
|
||||||
*/
|
|
||||||
activeDev = virPCIDeviceListFind(hostdev_mgr->activePciHostdevs, dev);
|
|
||||||
if (activeDev) {
|
|
||||||
const char *usedby_drvname;
|
|
||||||
const char *usedby_domname;
|
|
||||||
virPCIDeviceGetUsedBy(activeDev, &usedby_drvname, &usedby_domname);
|
|
||||||
if (STRNEQ_NULLABLE(drv_name, usedby_drvname) ||
|
|
||||||
STRNEQ_NULLABLE(name, usedby_domname)) {
|
|
||||||
virPCIDeviceListDel(pcidevs, dev);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
virPCIDeviceListDel(hostdev_mgr->activePciHostdevs, dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* At this point, any device that had been used by the guest is in
|
|
||||||
* pcidevs, but has been removed from activePciHostdevs.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* For SRIOV net host devices, unset mac and port profile before
|
|
||||||
* reset and reattach device
|
|
||||||
*/
|
|
||||||
for (i = 0; i < nhostdevs; i++)
|
|
||||||
virHostdevNetConfigRestore(hostdevs[i], hostdev_mgr->stateDir,
|
|
||||||
oldStateDir);
|
|
||||||
|
|
||||||
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
|
||||||
|
|
||||||
if (virPCIDeviceReset(dev, hostdev_mgr->activePciHostdevs,
|
|
||||||
hostdev_mgr->inactivePciHostdevs) < 0) {
|
|
||||||
virErrorPtr err = virGetLastError();
|
|
||||||
VIR_ERROR(_("Failed to reset PCI device: %s"),
|
|
||||||
err ? err->message : _("unknown error"));
|
|
||||||
virResetError(err);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
while (virPCIDeviceListCount(pcidevs) > 0) {
|
|
||||||
virPCIDevicePtr dev = virPCIDeviceListStealIndex(pcidevs, 0);
|
|
||||||
virHostdevReattachPciDevice(dev, hostdev_mgr);
|
|
||||||
}
|
|
||||||
|
|
||||||
virObjectUnref(pcidevs);
|
|
||||||
cleanup:
|
|
||||||
virObjectUnlock(hostdev_mgr->activePciHostdevs);
|
|
||||||
virObjectUnlock(hostdev_mgr->inactivePciHostdevs);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
|
qemuDomainReAttachHostdevDevices(virQEMUDriverPtr driver,
|
||||||
const char *name,
|
const char *name,
|
||||||
|
|||||||
@ -27,11 +27,6 @@
|
|||||||
# include "qemu_conf.h"
|
# include "qemu_conf.h"
|
||||||
# include "domain_conf.h"
|
# include "domain_conf.h"
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
VIR_HOSTDEV_STRICT_ACS_CHECK = (1 << 0), /* strict acs check */
|
|
||||||
VIR_HOSTDEV_COLD_BOOT = (1 << 1), /* cold boot */
|
|
||||||
} virHostdevFlag;
|
|
||||||
|
|
||||||
int qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
|
int qemuUpdateActivePciHostdevs(virQEMUDriverPtr driver,
|
||||||
virDomainDefPtr def);
|
virDomainDefPtr def);
|
||||||
int qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
|
int qemuUpdateActiveUsbHostdevs(virQEMUDriverPtr driver,
|
||||||
|
|||||||
@ -65,6 +65,7 @@
|
|||||||
#include "viratomic.h"
|
#include "viratomic.h"
|
||||||
#include "virnuma.h"
|
#include "virnuma.h"
|
||||||
#include "virstring.h"
|
#include "virstring.h"
|
||||||
|
#include "virhostdev.h"
|
||||||
|
|
||||||
#define VIR_FROM_THIS VIR_FROM_QEMU
|
#define VIR_FROM_THIS VIR_FROM_QEMU
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
/* virhostdev.c: hostdev management
|
/* virhostdev.c: hostdev management
|
||||||
*
|
*
|
||||||
|
* Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc.
|
||||||
|
* Copyright (C) 2006 Daniel P. Berrange
|
||||||
* Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
* Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
@ -16,6 +18,7 @@
|
|||||||
* License along with this library. If not, see
|
* License along with this library. If not, see
|
||||||
* <http://www.gnu.org/licenses/>.
|
* <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
||||||
* Author: Chunyan Liu <cyliu@suse.com>
|
* Author: Chunyan Liu <cyliu@suse.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -36,6 +39,7 @@
|
|||||||
#include "virerror.h"
|
#include "virerror.h"
|
||||||
#include "virlog.h"
|
#include "virlog.h"
|
||||||
#include "virutil.h"
|
#include "virutil.h"
|
||||||
|
#include "virnetdev.h"
|
||||||
#include "configmake.h"
|
#include "configmake.h"
|
||||||
|
|
||||||
#define VIR_FROM_THIS VIR_FROM_NONE
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
||||||
@ -125,3 +129,647 @@ virHostdevManagerGetDefault(void)
|
|||||||
|
|
||||||
return virObjectRef(manager);
|
return virObjectRef(manager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static virPCIDeviceListPtr
|
||||||
|
virHostdevGetPciHostDeviceList(virDomainHostdevDefPtr *hostdevs, int nhostdevs)
|
||||||
|
{
|
||||||
|
virPCIDeviceListPtr list;
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
if (!(list = virPCIDeviceListNew()))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
for (i = 0; i < nhostdevs; i++) {
|
||||||
|
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
||||||
|
virPCIDevicePtr dev;
|
||||||
|
|
||||||
|
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
||||||
|
continue;
|
||||||
|
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain,
|
||||||
|
hostdev->source.subsys.u.pci.addr.bus,
|
||||||
|
hostdev->source.subsys.u.pci.addr.slot,
|
||||||
|
hostdev->source.subsys.u.pci.addr.function);
|
||||||
|
if (!dev) {
|
||||||
|
virObjectUnref(list);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (virPCIDeviceListAdd(list, dev) < 0) {
|
||||||
|
virPCIDeviceFree(dev);
|
||||||
|
virObjectUnref(list);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
virPCIDeviceSetManaged(dev, hostdev->managed);
|
||||||
|
if (hostdev->source.subsys.u.pci.backend
|
||||||
|
== VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
|
||||||
|
if (virPCIDeviceSetStubDriver(dev, "vfio-pci") < 0) {
|
||||||
|
virObjectUnref(list);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (virPCIDeviceSetStubDriver(dev, "pci-stub") < 0) {
|
||||||
|
virObjectUnref(list);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* virHostdevGetActivePciHostDeviceList - make a new list with a *copy* of
|
||||||
|
* every virPCIDevice object that is found on the activePciHostdevs
|
||||||
|
* list *and* is in the hostdev list for this domain.
|
||||||
|
*
|
||||||
|
* Return the new list, or NULL if there was a failure.
|
||||||
|
*
|
||||||
|
* Pre-condition: activePciHostdevs is locked
|
||||||
|
*/
|
||||||
|
static virPCIDeviceListPtr
|
||||||
|
virHostdevGetActivePciHostDeviceList(virHostdevManagerPtr mgr,
|
||||||
|
virDomainHostdevDefPtr *hostdevs,
|
||||||
|
int nhostdevs)
|
||||||
|
{
|
||||||
|
virPCIDeviceListPtr list;
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
if (!(list = virPCIDeviceListNew()))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
for (i = 0; i < nhostdevs; i++) {
|
||||||
|
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
||||||
|
virDevicePCIAddressPtr addr;
|
||||||
|
virPCIDevicePtr activeDev;
|
||||||
|
|
||||||
|
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
||||||
|
continue;
|
||||||
|
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
addr = &hostdev->source.subsys.u.pci.addr;
|
||||||
|
activeDev = virPCIDeviceListFindByIDs(mgr->activePciHostdevs,
|
||||||
|
addr->domain, addr->bus,
|
||||||
|
addr->slot, addr->function);
|
||||||
|
if (activeDev && virPCIDeviceListAddCopy(list, activeDev) < 0) {
|
||||||
|
virObjectUnref(list);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
virHostdevPciSysfsPath(virDomainHostdevDefPtr hostdev,
|
||||||
|
char **sysfs_path)
|
||||||
|
{
|
||||||
|
virPCIDeviceAddress config_address;
|
||||||
|
|
||||||
|
config_address.domain = hostdev->source.subsys.u.pci.addr.domain;
|
||||||
|
config_address.bus = hostdev->source.subsys.u.pci.addr.bus;
|
||||||
|
config_address.slot = hostdev->source.subsys.u.pci.addr.slot;
|
||||||
|
config_address.function = hostdev->source.subsys.u.pci.addr.function;
|
||||||
|
|
||||||
|
return virPCIDeviceAddressGetSysfsFile(&config_address, sysfs_path);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int
|
||||||
|
virHostdevIsVirtualFunction(virDomainHostdevDefPtr hostdev)
|
||||||
|
{
|
||||||
|
char *sysfs_path = NULL;
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
|
if (virHostdevPciSysfsPath(hostdev, &sysfs_path) < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
ret = virPCIIsVirtualFunction(sysfs_path);
|
||||||
|
|
||||||
|
VIR_FREE(sysfs_path);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int
|
||||||
|
virHostdevNetDevice(virDomainHostdevDefPtr hostdev, char **linkdev,
|
||||||
|
int *vf)
|
||||||
|
{
|
||||||
|
int ret = -1;
|
||||||
|
char *sysfs_path = NULL;
|
||||||
|
|
||||||
|
if (virHostdevPciSysfsPath(hostdev, &sysfs_path) < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
if (virPCIIsVirtualFunction(sysfs_path) == 1) {
|
||||||
|
if (virPCIGetVirtualFunctionInfo(sysfs_path, linkdev,
|
||||||
|
vf) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
} else {
|
||||||
|
if (virPCIGetNetName(sysfs_path, linkdev) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
*vf = -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
VIR_FREE(sysfs_path);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int
|
||||||
|
virHostdevNetConfigVirtPortProfile(const char *linkdev, int vf,
|
||||||
|
virNetDevVPortProfilePtr virtPort,
|
||||||
|
const virMacAddr *macaddr,
|
||||||
|
const unsigned char *uuid,
|
||||||
|
bool associate)
|
||||||
|
{
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
|
if (!virtPort)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
switch (virtPort->virtPortType) {
|
||||||
|
case VIR_NETDEV_VPORT_PROFILE_NONE:
|
||||||
|
case VIR_NETDEV_VPORT_PROFILE_OPENVSWITCH:
|
||||||
|
case VIR_NETDEV_VPORT_PROFILE_8021QBG:
|
||||||
|
case VIR_NETDEV_VPORT_PROFILE_LAST:
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
|
_("virtualport type %s is "
|
||||||
|
"currently not supported on interfaces of type "
|
||||||
|
"hostdev"),
|
||||||
|
virNetDevVPortTypeToString(virtPort->virtPortType));
|
||||||
|
break;
|
||||||
|
|
||||||
|
case VIR_NETDEV_VPORT_PROFILE_8021QBH:
|
||||||
|
if (associate)
|
||||||
|
ret = virNetDevVPortProfileAssociate(NULL, virtPort, macaddr,
|
||||||
|
linkdev, vf, uuid,
|
||||||
|
VIR_NETDEV_VPORT_PROFILE_OP_CREATE, false);
|
||||||
|
else
|
||||||
|
ret = virNetDevVPortProfileDisassociate(NULL, virtPort,
|
||||||
|
macaddr, linkdev, vf,
|
||||||
|
VIR_NETDEV_VPORT_PROFILE_OP_DESTROY);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static int
|
||||||
|
virHostdevNetConfigReplace(virDomainHostdevDefPtr hostdev,
|
||||||
|
const unsigned char *uuid,
|
||||||
|
char *stateDir)
|
||||||
|
{
|
||||||
|
char *linkdev = NULL;
|
||||||
|
virNetDevVlanPtr vlan;
|
||||||
|
virNetDevVPortProfilePtr virtPort;
|
||||||
|
int ret = -1;
|
||||||
|
int vf = -1;
|
||||||
|
int vlanid = -1;
|
||||||
|
bool port_profile_associate = true;
|
||||||
|
int isvf;
|
||||||
|
|
||||||
|
isvf = virHostdevIsVirtualFunction(hostdev);
|
||||||
|
if (isvf <= 0) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||||
|
_("Interface type hostdev is currently supported on"
|
||||||
|
" SR-IOV Virtual Functions only"));
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
vlan = virDomainNetGetActualVlan(hostdev->parent.data.net);
|
||||||
|
virtPort = virDomainNetGetActualVirtPortProfile(
|
||||||
|
hostdev->parent.data.net);
|
||||||
|
if (virtPort) {
|
||||||
|
if (vlan) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
|
_("direct setting of the vlan tag is not allowed "
|
||||||
|
"for hostdev devices using %s mode"),
|
||||||
|
virNetDevVPortTypeToString(virtPort->virtPortType));
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
ret = virHostdevNetConfigVirtPortProfile(linkdev, vf,
|
||||||
|
virtPort, &hostdev->parent.data.net->mac, uuid,
|
||||||
|
port_profile_associate);
|
||||||
|
} else {
|
||||||
|
/* Set only mac and vlan */
|
||||||
|
if (vlan) {
|
||||||
|
if (vlan->nTags != 1 || vlan->trunk) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||||
|
_("vlan trunking is not supported "
|
||||||
|
"by SR-IOV network devices"));
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
if (vf == -1) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||||
|
_("vlan can only be set for SR-IOV VFs, but "
|
||||||
|
"%s is not a VF"), linkdev);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
vlanid = vlan->tag[0];
|
||||||
|
} else if (vf >= 0) {
|
||||||
|
vlanid = 0; /* assure any current vlan tag is reset */
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = virNetDevReplaceNetConfig(linkdev, vf,
|
||||||
|
&hostdev->parent.data.net->mac,
|
||||||
|
vlanid, stateDir);
|
||||||
|
}
|
||||||
|
cleanup:
|
||||||
|
VIR_FREE(linkdev);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* @oldStateDir:
|
||||||
|
* For upgrade purpose:
|
||||||
|
* To an existing VM on QEMU, the hostdev netconfig file is originally stored
|
||||||
|
* in cfg->stateDir (/var/run/libvirt/qemu). Switch to new version, it uses new
|
||||||
|
* location (hostdev_mgr->stateDir) but certainly will not find it. In this
|
||||||
|
* case, try to find in the old state dir.
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
virHostdevNetConfigRestore(virDomainHostdevDefPtr hostdev,
|
||||||
|
char *stateDir,
|
||||||
|
char *oldStateDir)
|
||||||
|
{
|
||||||
|
char *linkdev = NULL;
|
||||||
|
virNetDevVPortProfilePtr virtPort;
|
||||||
|
int ret = -1;
|
||||||
|
int vf = -1;
|
||||||
|
bool port_profile_associate = false;
|
||||||
|
int isvf;
|
||||||
|
|
||||||
|
/* This is only needed for PCI devices that have been defined
|
||||||
|
* using <interface type='hostdev'>. For all others, it is a NOP.
|
||||||
|
*/
|
||||||
|
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
|
||||||
|
hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI ||
|
||||||
|
hostdev->parent.type != VIR_DOMAIN_DEVICE_NET ||
|
||||||
|
!hostdev->parent.data.net)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
isvf = virHostdevIsVirtualFunction(hostdev);
|
||||||
|
if (isvf <= 0) {
|
||||||
|
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
||||||
|
_("Interface type hostdev is currently supported on"
|
||||||
|
" SR-IOV Virtual Functions only"));
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (virHostdevNetDevice(hostdev, &linkdev, &vf) < 0)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
virtPort = virDomainNetGetActualVirtPortProfile(
|
||||||
|
hostdev->parent.data.net);
|
||||||
|
if (virtPort) {
|
||||||
|
ret = virHostdevNetConfigVirtPortProfile(linkdev, vf, virtPort,
|
||||||
|
&hostdev->parent.data.net->mac,
|
||||||
|
NULL,
|
||||||
|
port_profile_associate);
|
||||||
|
} else {
|
||||||
|
ret = virNetDevRestoreNetConfig(linkdev, vf, stateDir);
|
||||||
|
if (ret < 0 && oldStateDir != NULL)
|
||||||
|
ret = virNetDevRestoreNetConfig(linkdev, vf, oldStateDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
VIR_FREE(linkdev);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
virHostdevPreparePCIDevices(virHostdevManagerPtr hostdev_mgr,
|
||||||
|
const char *drv_name,
|
||||||
|
const char *name,
|
||||||
|
const unsigned char *uuid,
|
||||||
|
virDomainHostdevDefPtr *hostdevs,
|
||||||
|
int nhostdevs,
|
||||||
|
unsigned int flags)
|
||||||
|
{
|
||||||
|
virPCIDeviceListPtr pcidevs = NULL;
|
||||||
|
int last_processed_hostdev_vf = -1;
|
||||||
|
size_t i;
|
||||||
|
int ret = -1;
|
||||||
|
|
||||||
|
virObjectLock(hostdev_mgr->activePciHostdevs);
|
||||||
|
virObjectLock(hostdev_mgr->inactivePciHostdevs);
|
||||||
|
|
||||||
|
if (!(pcidevs = virHostdevGetPciHostDeviceList(hostdevs, nhostdevs)))
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
/* We have to use 9 loops here. *All* devices must
|
||||||
|
* be detached before we reset any of them, because
|
||||||
|
* in some cases you have to reset the whole PCI,
|
||||||
|
* which impacts all devices on it. Also, all devices
|
||||||
|
* must be reset before being marked as active.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Loop 1: validate that non-managed device isn't in use, eg
|
||||||
|
* by checking that device is either un-bound, or bound
|
||||||
|
* to pci-stub.ko
|
||||||
|
*/
|
||||||
|
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
virPCIDevicePtr other;
|
||||||
|
bool strict_acs_check = !!(flags & VIR_HOSTDEV_STRICT_ACS_CHECK);
|
||||||
|
|
||||||
|
if (!virPCIDeviceIsAssignable(dev, strict_acs_check)) {
|
||||||
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
||||||
|
_("PCI device %s is not assignable"),
|
||||||
|
virPCIDeviceGetName(dev));
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
/* The device is in use by other active domain if
|
||||||
|
* the dev is in list activePciHostdevs.
|
||||||
|
*/
|
||||||
|
if ((other = virPCIDeviceListFind(hostdev_mgr->activePciHostdevs, dev))) {
|
||||||
|
const char *other_drvname;
|
||||||
|
const char *other_domname;
|
||||||
|
|
||||||
|
virPCIDeviceGetUsedBy(other, &other_drvname, &other_domname);
|
||||||
|
if (other_drvname && other_domname)
|
||||||
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
||||||
|
_("PCI device %s is in use by "
|
||||||
|
"driver %s, domain %s"),
|
||||||
|
virPCIDeviceGetName(dev),
|
||||||
|
other_drvname, other_domname);
|
||||||
|
else
|
||||||
|
virReportError(VIR_ERR_OPERATION_INVALID,
|
||||||
|
_("PCI device %s is already in use"),
|
||||||
|
virPCIDeviceGetName(dev));
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 2: detach managed devices (i.e. bind to appropriate stub driver) */
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
if (virPCIDeviceGetManaged(dev) &&
|
||||||
|
virPCIDeviceDetach(dev, hostdev_mgr->activePciHostdevs, NULL) < 0)
|
||||||
|
goto reattachdevs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 3: Now that all the PCI hostdevs have been detached, we
|
||||||
|
* can safely reset them */
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
|
||||||
|
if (virPCIDeviceReset(dev, hostdev_mgr->activePciHostdevs,
|
||||||
|
hostdev_mgr->inactivePciHostdevs) < 0)
|
||||||
|
goto reattachdevs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 4: For SRIOV network devices, Now that we have detached the
|
||||||
|
* the network device, set the netdev config */
|
||||||
|
for (i = 0; i < nhostdevs; i++) {
|
||||||
|
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
||||||
|
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
||||||
|
continue;
|
||||||
|
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
||||||
|
continue;
|
||||||
|
if (hostdev->parent.type == VIR_DOMAIN_DEVICE_NET &&
|
||||||
|
hostdev->parent.data.net) {
|
||||||
|
if (virHostdevNetConfigReplace(hostdev, uuid,
|
||||||
|
hostdev_mgr->stateDir) < 0) {
|
||||||
|
goto resetvfnetconfig;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
last_processed_hostdev_vf = i;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 5: Now mark all the devices as active */
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
if (virPCIDeviceListAdd(hostdev_mgr->activePciHostdevs, dev) < 0)
|
||||||
|
goto inactivedevs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 6: Now remove the devices from inactive list. */
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
virPCIDeviceListDel(hostdev_mgr->inactivePciHostdevs, dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 7: Now set the used_by_domain of the device in
|
||||||
|
* activePciHostdevs as domain name.
|
||||||
|
*/
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev, activeDev;
|
||||||
|
|
||||||
|
dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
activeDev = virPCIDeviceListFind(hostdev_mgr->activePciHostdevs, dev);
|
||||||
|
|
||||||
|
if (activeDev)
|
||||||
|
virPCIDeviceSetUsedBy(activeDev, drv_name, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 8: Now set the original states for hostdev def */
|
||||||
|
for (i = 0; i < nhostdevs; i++) {
|
||||||
|
virPCIDevicePtr dev;
|
||||||
|
virPCIDevicePtr pcidev;
|
||||||
|
virDomainHostdevDefPtr hostdev = hostdevs[i];
|
||||||
|
|
||||||
|
if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
|
||||||
|
continue;
|
||||||
|
if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dev = virPCIDeviceNew(hostdev->source.subsys.u.pci.addr.domain,
|
||||||
|
hostdev->source.subsys.u.pci.addr.bus,
|
||||||
|
hostdev->source.subsys.u.pci.addr.slot,
|
||||||
|
hostdev->source.subsys.u.pci.addr.function);
|
||||||
|
|
||||||
|
/* original states "unbind_from_stub", "remove_slot",
|
||||||
|
* "reprobe" were already set by pciDettachDevice in
|
||||||
|
* loop 2.
|
||||||
|
*/
|
||||||
|
if ((pcidev = virPCIDeviceListFind(pcidevs, dev))) {
|
||||||
|
hostdev->origstates.states.pci.unbind_from_stub =
|
||||||
|
virPCIDeviceGetUnbindFromStub(pcidev);
|
||||||
|
hostdev->origstates.states.pci.remove_slot =
|
||||||
|
virPCIDeviceGetRemoveSlot(pcidev);
|
||||||
|
hostdev->origstates.states.pci.reprobe =
|
||||||
|
virPCIDeviceGetReprobe(pcidev);
|
||||||
|
}
|
||||||
|
|
||||||
|
virPCIDeviceFree(dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Loop 9: Now steal all the devices from pcidevs */
|
||||||
|
while (virPCIDeviceListCount(pcidevs) > 0)
|
||||||
|
virPCIDeviceListStealIndex(pcidevs, 0);
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
goto cleanup;
|
||||||
|
|
||||||
|
inactivedevs:
|
||||||
|
/* Only steal all the devices from activePciHostdevs. We will
|
||||||
|
* free them in virObjectUnref().
|
||||||
|
*/
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
virPCIDeviceListSteal(hostdev_mgr->activePciHostdevs, dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
resetvfnetconfig:
|
||||||
|
for (i = 0;
|
||||||
|
last_processed_hostdev_vf != -1 && i < last_processed_hostdev_vf; i++)
|
||||||
|
virHostdevNetConfigRestore(hostdevs[i], hostdev_mgr->stateDir, NULL);
|
||||||
|
|
||||||
|
reattachdevs:
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
|
||||||
|
/* NB: This doesn't actually re-bind to original driver, just
|
||||||
|
* unbinds from the stub driver
|
||||||
|
*/
|
||||||
|
ignore_value(virPCIDeviceReattach(dev, hostdev_mgr->activePciHostdevs,
|
||||||
|
NULL));
|
||||||
|
}
|
||||||
|
|
||||||
|
cleanup:
|
||||||
|
virObjectUnlock(hostdev_mgr->activePciHostdevs);
|
||||||
|
virObjectUnlock(hostdev_mgr->inactivePciHostdevs);
|
||||||
|
virObjectUnref(pcidevs);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Pre-condition: inactivePciHostdevs & activePciHostdevs
|
||||||
|
* are locked
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
virHostdevReattachPciDevice(virPCIDevicePtr dev, virHostdevManagerPtr mgr)
|
||||||
|
{
|
||||||
|
/* If the device is not managed and was attached to guest
|
||||||
|
* successfully, it must have been inactive.
|
||||||
|
*/
|
||||||
|
if (!virPCIDeviceGetManaged(dev)) {
|
||||||
|
if (virPCIDeviceListAdd(mgr->inactivePciHostdevs, dev) < 0)
|
||||||
|
virPCIDeviceFree(dev);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Wait for device cleanup if it is qemu/kvm */
|
||||||
|
if (STREQ(virPCIDeviceGetStubDriver(dev), "pci-stub")) {
|
||||||
|
int retries = 100;
|
||||||
|
while (virPCIDeviceWaitForCleanup(dev, "kvm_assigned_device")
|
||||||
|
&& retries) {
|
||||||
|
usleep(100*1000);
|
||||||
|
retries--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (virPCIDeviceReattach(dev, mgr->activePciHostdevs,
|
||||||
|
mgr->inactivePciHostdevs) < 0) {
|
||||||
|
virErrorPtr err = virGetLastError();
|
||||||
|
VIR_ERROR(_("Failed to re-attach PCI device: %s"),
|
||||||
|
err ? err->message : _("unknown error"));
|
||||||
|
virResetError(err);
|
||||||
|
}
|
||||||
|
virPCIDeviceFree(dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* @oldStateDir:
|
||||||
|
* For upgrade purpose: see virHostdevNetConfigRestore
|
||||||
|
*/
|
||||||
|
void
|
||||||
|
virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
|
||||||
|
const char *drv_name,
|
||||||
|
const char *name,
|
||||||
|
virDomainHostdevDefPtr *hostdevs,
|
||||||
|
int nhostdevs,
|
||||||
|
char *oldStateDir)
|
||||||
|
{
|
||||||
|
virPCIDeviceListPtr pcidevs;
|
||||||
|
size_t i;
|
||||||
|
|
||||||
|
virObjectLock(hostdev_mgr->activePciHostdevs);
|
||||||
|
virObjectLock(hostdev_mgr->inactivePciHostdevs);
|
||||||
|
|
||||||
|
if (!(pcidevs = virHostdevGetActivePciHostDeviceList(hostdev_mgr,
|
||||||
|
hostdevs,
|
||||||
|
nhostdevs))) {
|
||||||
|
virErrorPtr err = virGetLastError();
|
||||||
|
VIR_ERROR(_("Failed to allocate PCI device list: %s"),
|
||||||
|
err ? err->message : _("unknown error"));
|
||||||
|
virResetError(err);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Again 4 loops; mark all devices as inactive before reset
|
||||||
|
* them and reset all the devices before re-attach.
|
||||||
|
* Attach mac and port profile parameters to devices
|
||||||
|
*/
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
virPCIDevicePtr activeDev = NULL;
|
||||||
|
|
||||||
|
/* delete the copy of the dev from pcidevs if it's used by
|
||||||
|
* other domain. Or delete it from activePciHostDevs if it had
|
||||||
|
* been used by this domain.
|
||||||
|
*/
|
||||||
|
activeDev = virPCIDeviceListFind(hostdev_mgr->activePciHostdevs, dev);
|
||||||
|
if (activeDev) {
|
||||||
|
const char *usedby_drvname;
|
||||||
|
const char *usedby_domname;
|
||||||
|
virPCIDeviceGetUsedBy(activeDev, &usedby_drvname, &usedby_domname);
|
||||||
|
if (STRNEQ_NULLABLE(drv_name, usedby_drvname) ||
|
||||||
|
STRNEQ_NULLABLE(name, usedby_domname)) {
|
||||||
|
virPCIDeviceListDel(pcidevs, dev);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
virPCIDeviceListDel(hostdev_mgr->activePciHostdevs, dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* At this point, any device that had been used by the guest is in
|
||||||
|
* pcidevs, but has been removed from activePciHostdevs.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For SRIOV net host devices, unset mac and port profile before
|
||||||
|
* reset and reattach device
|
||||||
|
*/
|
||||||
|
for (i = 0; i < nhostdevs; i++)
|
||||||
|
virHostdevNetConfigRestore(hostdevs[i], hostdev_mgr->stateDir,
|
||||||
|
oldStateDir);
|
||||||
|
|
||||||
|
for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i);
|
||||||
|
|
||||||
|
if (virPCIDeviceReset(dev, hostdev_mgr->activePciHostdevs,
|
||||||
|
hostdev_mgr->inactivePciHostdevs) < 0) {
|
||||||
|
virErrorPtr err = virGetLastError();
|
||||||
|
VIR_ERROR(_("Failed to reset PCI device: %s"),
|
||||||
|
err ? err->message : _("unknown error"));
|
||||||
|
virResetError(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
while (virPCIDeviceListCount(pcidevs) > 0) {
|
||||||
|
virPCIDevicePtr dev = virPCIDeviceListStealIndex(pcidevs, 0);
|
||||||
|
virHostdevReattachPciDevice(dev, hostdev_mgr);
|
||||||
|
}
|
||||||
|
|
||||||
|
virObjectUnref(pcidevs);
|
||||||
|
cleanup:
|
||||||
|
virObjectUnlock(hostdev_mgr->activePciHostdevs);
|
||||||
|
virObjectUnlock(hostdev_mgr->inactivePciHostdevs);
|
||||||
|
}
|
||||||
|
|||||||
@ -1,5 +1,7 @@
|
|||||||
/* virhostdev.h: hostdev management
|
/* virhostdev.h: hostdev management
|
||||||
*
|
*
|
||||||
|
* Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc.
|
||||||
|
* Copyright (C) 2006 Daniel P. Berrange
|
||||||
* Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
* Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
*
|
*
|
||||||
* This library is free software; you can redistribute it and/or
|
* This library is free software; you can redistribute it and/or
|
||||||
@ -16,6 +18,7 @@
|
|||||||
* License along with this library. If not, see
|
* License along with this library. If not, see
|
||||||
* <http://www.gnu.org/licenses/>.
|
* <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
|
* Author: Daniel P. Berrange <berrange@redhat.com>
|
||||||
* Author: Chunyan Liu <cyliu@suse.com>
|
* Author: Chunyan Liu <cyliu@suse.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -27,6 +30,13 @@
|
|||||||
# include "virpci.h"
|
# include "virpci.h"
|
||||||
# include "virusb.h"
|
# include "virusb.h"
|
||||||
# include "virscsi.h"
|
# include "virscsi.h"
|
||||||
|
# include "domain_conf.h"
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
VIR_HOSTDEV_STRICT_ACS_CHECK = (1 << 0), /* strict acs check */
|
||||||
|
VIR_HOSTDEV_COLD_BOOT = (1 << 1), /* cold boot */
|
||||||
|
} virHostdevFlag;
|
||||||
|
|
||||||
|
|
||||||
typedef struct _virHostdevManager virHostdevManager;
|
typedef struct _virHostdevManager virHostdevManager;
|
||||||
typedef virHostdevManager *virHostdevManagerPtr;
|
typedef virHostdevManager *virHostdevManagerPtr;
|
||||||
@ -40,5 +50,20 @@ struct _virHostdevManager {
|
|||||||
};
|
};
|
||||||
|
|
||||||
virHostdevManagerPtr virHostdevManagerGetDefault(void);
|
virHostdevManagerPtr virHostdevManagerGetDefault(void);
|
||||||
|
int
|
||||||
|
virHostdevPreparePCIDevices(virHostdevManagerPtr hostdev_mgr,
|
||||||
|
const char *drv_name,
|
||||||
|
const char *name,
|
||||||
|
const unsigned char *uuid,
|
||||||
|
virDomainHostdevDefPtr *hostdevs,
|
||||||
|
int nhostdevs,
|
||||||
|
unsigned int flags);
|
||||||
|
void
|
||||||
|
virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr,
|
||||||
|
const char *drv_name,
|
||||||
|
const char *name,
|
||||||
|
virDomainHostdevDefPtr *hostdevs,
|
||||||
|
int nhostdevs,
|
||||||
|
char *oldStateDir);
|
||||||
|
|
||||||
#endif /* __VIR_HOSTDEV_H__ */
|
#endif /* __VIR_HOSTDEV_H__ */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user