External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: add new PCI_CONNECT flag AUTOASSIGN

Browse Source 
This new flag will be set for any controller that we decide can have
devices assigned to it automatically during PCI device assignment. In
the past PCI_CONNECT_TYPE_HOTPLUGGABLE was used for this purpose, but
that is overloading that flag, and no longer technically correct; what
we *really* want is to auto-assign devices to any pcie-root-port or
pcie-switch-downstream-port regardless of whether or not that
controller happens to have hotplug enabled.

This patch just adds the flag, but doesn't use it at all. Note that
the numbering of all the other flags was changed in order to insert
the new flag near the beginning of the list; that doesn't cause any
problem because the connect flags aren't stored anywhere between runs
of libvirtd.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Laine Stump 2020-03-22 22:32:49 -04:00
parent 389811d517
commit c296a846ad
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/conf/domain_addr.h
View File

@ -32,26 +32,27 @@ typedef enum {
} virPCIDeviceAddressExtensionFlags; } virPCIDeviceAddressExtensionFlags;
typedef enum { typedef enum {
VIR_PCI_CONNECT_HOTPLUGGABLE = 1 << 0, /* is hotplug needed/supported */ VIR_PCI_CONNECT_AUTOASSIGN = 1 << 0, /* okay to autoassign a device to this controller */
VIR_PCI_CONNECT_HOTPLUGGABLE = 1 << 1, /* is hotplug needed/supported */
/* set for devices that can share a single slot in auto-assignment /* set for devices that can share a single slot in auto-assignment
* (by assigning one device to each of the 8 functions on the slot) * (by assigning one device to each of the 8 functions on the slot)
*/ */
VIR_PCI_CONNECT_AGGREGATE_SLOT = 1 << 1, VIR_PCI_CONNECT_AGGREGATE_SLOT = 1 << 2,
/* kinds of devices as a bitmap so they can be combined (some PCI /* kinds of devices as a bitmap so they can be combined (some PCI
* controllers permit connecting multiple types of devices) * controllers permit connecting multiple types of devices)
*/ */
VIR_PCI_CONNECT_TYPE_PCI_DEVICE = 1 << 2, VIR_PCI_CONNECT_TYPE_PCI_DEVICE = 1 << 3,
VIR_PCI_CONNECT_TYPE_PCIE_DEVICE = 1 << 3, VIR_PCI_CONNECT_TYPE_PCIE_DEVICE = 1 << 4,
VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT = 1 << 4, VIR_PCI_CONNECT_TYPE_PCIE_ROOT_PORT = 1 << 5,
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT = 1 << 5, VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT = 1 << 6,
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT = 1 << 6, VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_DOWNSTREAM_PORT = 1 << 7,
VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE = 1 << 7, VIR_PCI_CONNECT_TYPE_DMI_TO_PCI_BRIDGE = 1 << 8,
VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS = 1 << 8, VIR_PCI_CONNECT_TYPE_PCI_EXPANDER_BUS = 1 << 9,
VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS = 1 << 9, VIR_PCI_CONNECT_TYPE_PCIE_EXPANDER_BUS = 1 << 10,
VIR_PCI_CONNECT_TYPE_PCI_BRIDGE = 1 << 10, VIR_PCI_CONNECT_TYPE_PCI_BRIDGE = 1 << 11,
VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE = 1 << 11, VIR_PCI_CONNECT_TYPE_PCIE_TO_PCI_BRIDGE = 1 << 12,
} virDomainPCIConnectFlags; } virDomainPCIConnectFlags;
/* a combination of all bits that describe the type of connections /* a combination of all bits that describe the type of connections