External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Rename some device_conf predicates

Browse Source 
The affected functions are

  virDeviceInfoPCIAddressWanted()
  virDeviceInfoPCIAddressPresent()

which get renamed to

  virDeviceInfoPCIAddressIsWanted()
  virDeviceInfoPCIAddressIsPresent()

to comply with the naming convention used for other
predicates.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-08-17 15:12:42 +02:00
parent e950310f14
commit 76151a53a1
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bhyve/bhyve_device.c
View File

@ -110,7 +110,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def,
((def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) && ((def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) &&
(def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI))) { (def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI))) {
if (def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT || if (def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT ||
!virDeviceInfoPCIAddressWanted(&def->controllers[i]->info)) !virDeviceInfoPCIAddressIsWanted(&def->controllers[i]->info))
continue; continue;
if (virDomainPCIAddressReserveNextAddr(addrs, if (virDomainPCIAddressReserveNextAddr(addrs,
@ -122,7 +122,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def,
} }
for (i = 0; i < def->nnets; i++) { for (i = 0; i < def->nnets; i++) {
if (!virDeviceInfoPCIAddressWanted(&def->nets[i]->info)) if (!virDeviceInfoPCIAddressIsWanted(&def->nets[i]->info))
continue; continue;
if (virDomainPCIAddressReserveNextAddr(addrs, if (virDomainPCIAddressReserveNextAddr(addrs,
&def->nets[i]->info, &def->nets[i]->info,
@ -148,7 +148,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def,
} }
for (i = 0; i < def->nvideos; i++) { for (i = 0; i < def->nvideos; i++) {
if (!virDeviceInfoPCIAddressWanted(&def->videos[i]->info)) if (!virDeviceInfoPCIAddressIsWanted(&def->videos[i]->info))
continue; continue;
if (virDomainPCIAddressReserveNextAddr(addrs, if (virDomainPCIAddressReserveNextAddr(addrs,
&def->videos[i]->info, &def->videos[i]->info,

4
src/conf/device_conf.h
View File

@ -196,7 +196,7 @@ virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr)
} }
static inline bool static inline bool
virDeviceInfoPCIAddressWanted(const virDomainDeviceInfo *info) virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info)
{ {
return info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || return info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE ||
(info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
@ -204,7 +204,7 @@ virDeviceInfoPCIAddressWanted(const virDomainDeviceInfo *info)
} }
static inline bool static inline bool
virDeviceInfoPCIAddressPresent(const virDomainDeviceInfo *info) virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info)
{ {
return info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && return info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI &&
!virPCIDeviceAddressIsEmpty(&info->addr.pci); !virPCIDeviceAddressIsEmpty(&info->addr.pci);

2
src/conf/domain_addr.c
View File

@ -706,7 +706,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr addrs,
if (!(addrStr = virDomainPCIAddressAsString(&dev->addr.pci))) if (!(addrStr = virDomainPCIAddressAsString(&dev->addr.pci)))
goto cleanup; goto cleanup;
if (virDeviceInfoPCIAddressPresent(dev)) { if (virDeviceInfoPCIAddressIsPresent(dev)) {
/* We do not support hotplug multi-function PCI device now, so we should /* We do not support hotplug multi-function PCI device now, so we should
* reserve the whole slot. The function of the PCI device must be 0. * reserve the whole slot. The function of the PCI device must be 0.
*/ */

52
src/qemu/qemu_domain_address.c
View File

@ -697,7 +697,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
return pciFlags; return pciFlags;
} }
if (virDeviceInfoPCIAddressPresent(hostdev->info)) { if (virDeviceInfoPCIAddressIsPresent(hostdev->info)) {
/* A guest-side address has already been assigned, so /* A guest-side address has already been assigned, so
* we can avoid reading the PCI config, and just use * we can avoid reading the PCI config, and just use
* pcieFlags, since the pciConnectFlags checking is * pcieFlags, since the pciConnectFlags checking is
@ -1284,7 +1284,7 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
int ret = -1; int ret = -1;
virPCIDeviceAddressPtr addr = &info->addr.pci; virPCIDeviceAddressPtr addr = &info->addr.pci;
if (!virDeviceInfoPCIAddressPresent(info) || if (!virDeviceInfoPCIAddressIsPresent(info) ||
((device->type == VIR_DOMAIN_DEVICE_HOSTDEV) && ((device->type == VIR_DOMAIN_DEVICE_HOSTDEV) &&
(device->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE))) { (device->data.hostdev->parent.type != VIR_DOMAIN_DEVICE_NONE))) {
/* If a hostdev has a parent, its info will be a part of the /* If a hostdev has a parent, its info will be a part of the
@ -1482,7 +1482,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
/* First IDE controller lives on the PIIX3 at slot=1, function=1 */ /* First IDE controller lives on the PIIX3 at slot=1, function=1 */
if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE && if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE &&
cont->idx == 0) { cont->idx == 0) {
if (virDeviceInfoPCIAddressPresent(&cont->info)) { if (virDeviceInfoPCIAddressIsPresent(&cont->info)) {
if (cont->info.addr.pci.domain != 0 || if (cont->info.addr.pci.domain != 0 ||
cont->info.addr.pci.bus != 0 || cont->info.addr.pci.bus != 0 ||
cont->info.addr.pci.slot != 1 || cont->info.addr.pci.slot != 1 ||
@ -1502,7 +1502,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
cont->idx == 0 && cont->idx == 0 &&
(cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI || (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI ||
cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT)) { cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT)) {
if (virDeviceInfoPCIAddressPresent(&cont->info)) { if (virDeviceInfoPCIAddressIsPresent(&cont->info)) {
if (cont->info.addr.pci.domain != 0 || if (cont->info.addr.pci.domain != 0 ||
cont->info.addr.pci.bus != 0 || cont->info.addr.pci.bus != 0 ||
cont->info.addr.pci.slot != 1 || cont->info.addr.pci.slot != 1 ||
@ -1550,7 +1550,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
*/ */
virDomainVideoDefPtr primaryVideo = def->videos[0]; virDomainVideoDefPtr primaryVideo = def->videos[0];
if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) { if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) {
memset(&tmp_addr, 0, sizeof(tmp_addr)); memset(&tmp_addr, 0, sizeof(tmp_addr));
tmp_addr.slot = 2; tmp_addr.slot = 2;
@ -1631,7 +1631,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
* address. * address.
*/ */
if (cont->idx == 0) { if (cont->idx == 0) {
if (virDeviceInfoPCIAddressPresent(&cont->info)) { if (virDeviceInfoPCIAddressIsPresent(&cont->info)) {
if (cont->info.addr.pci.domain != 0 || if (cont->info.addr.pci.domain != 0 ||
cont->info.addr.pci.bus != 0 || cont->info.addr.pci.bus != 0 ||
cont->info.addr.pci.slot != 0x1F || cont->info.addr.pci.slot != 0x1F ||
@ -1739,7 +1739,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
* on pc machinetypes). * on pc machinetypes).
*/ */
virDomainVideoDefPtr primaryVideo = def->videos[0]; virDomainVideoDefPtr primaryVideo = def->videos[0];
if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) { if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) {
memset(&tmp_addr, 0, sizeof(tmp_addr)); memset(&tmp_addr, 0, sizeof(tmp_addr));
tmp_addr.slot = 1; tmp_addr.slot = 1;
@ -1805,7 +1805,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
virDomainSoundDefPtr sound = def->sounds[i]; virDomainSoundDefPtr sound = def->sounds[i];
if (sound->model != VIR_DOMAIN_SOUND_MODEL_ICH9 || if (sound->model != VIR_DOMAIN_SOUND_MODEL_ICH9 ||
!virDeviceInfoPCIAddressWanted(&sound->info)) { !virDeviceInfoPCIAddressIsWanted(&sound->info)) {
continue; continue;
} }
if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0) if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0)
@ -1895,7 +1895,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
if (model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT || if (model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT ||
model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT || model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT ||
!virDeviceInfoPCIAddressWanted(&cont->info)) !virDeviceInfoPCIAddressIsWanted(&cont->info))
continue; continue;
if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info) < 0) if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info) < 0)
@ -1904,7 +1904,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
} }
for (i = 0; i < def->nfss; i++) { for (i = 0; i < def->nfss; i++) {
if (!virDeviceInfoPCIAddressWanted(&def->fss[i]->info)) if (!virDeviceInfoPCIAddressIsWanted(&def->fss[i]->info))
continue; continue;
/* Only support VirtIO-9p-pci so far. If that changes, /* Only support VirtIO-9p-pci so far. If that changes,
@ -1922,7 +1922,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
* instead of here. * instead of here.
*/ */
if ((net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) || if ((net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) ||
!virDeviceInfoPCIAddressWanted(&net->info)) { !virDeviceInfoPCIAddressIsWanted(&net->info)) {
continue; continue;
} }
@ -1934,7 +1934,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
for (i = 0; i < def->nsounds; i++) { for (i = 0; i < def->nsounds; i++) {
virDomainSoundDefPtr sound = def->sounds[i]; virDomainSoundDefPtr sound = def->sounds[i];
if (!virDeviceInfoPCIAddressWanted(&sound->info)) if (!virDeviceInfoPCIAddressIsWanted(&sound->info))
continue; continue;
/* Skip ISA sound card, PCSPK and usb-audio */ /* Skip ISA sound card, PCSPK and usb-audio */
@ -1972,7 +1972,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
cont->idx == 0) cont->idx == 0)
continue; continue;
if (!virDeviceInfoPCIAddressWanted(&cont->info)) if (!virDeviceInfoPCIAddressIsWanted(&cont->info))
continue; continue;
/* USB2 needs special handling to put all companions in the same slot */ /* USB2 needs special handling to put all companions in the same slot */
@ -1983,7 +1983,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
for (j = 0; j < def->ncontrollers; j++) { for (j = 0; j < def->ncontrollers; j++) {
if (IS_USB2_CONTROLLER(def->controllers[j]) && if (IS_USB2_CONTROLLER(def->controllers[j]) &&
def->controllers[j]->idx == cont->idx && def->controllers[j]->idx == cont->idx &&
virDeviceInfoPCIAddressPresent(&def->controllers[j]->info)) { virDeviceInfoPCIAddressIsPresent(&def->controllers[j]->info)) {
addr = def->controllers[j]->info.addr.pci; addr = def->controllers[j]->info.addr.pci;
foundAddr = true; foundAddr = true;
break; break;
@ -2043,7 +2043,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
continue; continue;
/* don't touch s390 devices */ /* don't touch s390 devices */
if (virDeviceInfoPCIAddressPresent(&def->disks[i]->info) || if (virDeviceInfoPCIAddressIsPresent(&def->disks[i]->info) ||
def->disks[i]->info.type == def->disks[i]->info.type ==
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 || VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 ||
def->disks[i]->info.type == def->disks[i]->info.type ==
@ -2056,7 +2056,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO))
continue; continue;
if (!virDeviceInfoPCIAddressWanted(&def->disks[i]->info)) { if (!virDeviceInfoPCIAddressIsWanted(&def->disks[i]->info)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("virtio disk cannot have an address of type '%s'"), _("virtio disk cannot have an address of type '%s'"),
virDomainDeviceAddressTypeToString(def->disks[i]->info.type)); virDomainDeviceAddressTypeToString(def->disks[i]->info.type));
@ -2070,7 +2070,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
/* Host PCI devices */ /* Host PCI devices */
for (i = 0; i < def->nhostdevs; i++) { for (i = 0; i < def->nhostdevs; i++) {
virDomainHostdevSubsysPtr subsys = &def->hostdevs[i]->source.subsys; virDomainHostdevSubsysPtr subsys = &def->hostdevs[i]->source.subsys;
if (!virDeviceInfoPCIAddressWanted(def->hostdevs[i]->info)) if (!virDeviceInfoPCIAddressIsWanted(def->hostdevs[i]->info))
continue; continue;
if (def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) if (def->hostdevs[i]->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
continue; continue;
@ -2089,7 +2089,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
/* VirtIO balloon */ /* VirtIO balloon */
if (def->memballoon && if (def->memballoon &&
def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO && def->memballoon->model == VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO &&
virDeviceInfoPCIAddressWanted(&def->memballoon->info)) { virDeviceInfoPCIAddressIsWanted(&def->memballoon->info)) {
if (qemuDomainPCIAddressReserveNextAddr(addrs, if (qemuDomainPCIAddressReserveNextAddr(addrs,
&def->memballoon->info) < 0) &def->memballoon->info) < 0)
@ -2099,7 +2099,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
/* VirtIO RNG */ /* VirtIO RNG */
for (i = 0; i < def->nrngs; i++) { for (i = 0; i < def->nrngs; i++) {
if (def->rngs[i]->model != VIR_DOMAIN_RNG_MODEL_VIRTIO || if (def->rngs[i]->model != VIR_DOMAIN_RNG_MODEL_VIRTIO ||
!virDeviceInfoPCIAddressWanted(&def->rngs[i]->info)) !virDeviceInfoPCIAddressIsWanted(&def->rngs[i]->info))
continue; continue;
if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->rngs[i]->info) < 0) if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->rngs[i]->info) < 0)
@ -2109,7 +2109,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
/* A watchdog - check if it is a PCI device */ /* A watchdog - check if it is a PCI device */
if (def->watchdog && if (def->watchdog &&
def->watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB && def->watchdog->model == VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB &&
virDeviceInfoPCIAddressWanted(&def->watchdog->info)) { virDeviceInfoPCIAddressIsWanted(&def->watchdog->info)) {
if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->watchdog->info) < 0) if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->watchdog->info) < 0)
goto error; goto error;
} }
@ -2119,7 +2119,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE) if (def->videos[i]->type == VIR_DOMAIN_VIDEO_TYPE_NONE)
continue; continue;
if (!virDeviceInfoPCIAddressWanted(&def->videos[i]->info)) if (!virDeviceInfoPCIAddressIsWanted(&def->videos[i]->info))
continue; continue;
if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->videos[i]->info) < 0) if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->videos[i]->info) < 0)
@ -2128,7 +2128,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
/* Shared Memory */ /* Shared Memory */
for (i = 0; i < def->nshmems; i++) { for (i = 0; i < def->nshmems; i++) {
if (!virDeviceInfoPCIAddressWanted(&def->shmems[i]->info)) if (!virDeviceInfoPCIAddressIsWanted(&def->shmems[i]->info))
continue; continue;
if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->shmems[i]->info) < 0) if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->shmems[i]->info) < 0)
@ -2136,7 +2136,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
} }
for (i = 0; i < def->ninputs; i++) { for (i = 0; i < def->ninputs; i++) {
if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO || if (def->inputs[i]->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO ||
!virDeviceInfoPCIAddressWanted(&def->inputs[i]->info)) !virDeviceInfoPCIAddressIsWanted(&def->inputs[i]->info))
continue; continue;
if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->inputs[i]->info) < 0) if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->inputs[i]->info) < 0)
@ -2149,7 +2149,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
virDomainChrDefPtr chr = def->serials[i]; virDomainChrDefPtr chr = def->serials[i];
if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI || if (chr->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI ||
!virDeviceInfoPCIAddressWanted(&chr->info)) !virDeviceInfoPCIAddressIsWanted(&chr->info))
continue; continue;
if (qemuDomainPCIAddressReserveNextAddr(addrs, &chr->info) < 0) if (qemuDomainPCIAddressReserveNextAddr(addrs, &chr->info) < 0)
@ -2163,7 +2163,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
} }
if (def->vsock && if (def->vsock &&
virDeviceInfoPCIAddressWanted(&def->vsock->info)) { virDeviceInfoPCIAddressIsWanted(&def->vsock->info)) {
if (qemuDomainPCIAddressReserveNextAddr(addrs, if (qemuDomainPCIAddressReserveNextAddr(addrs,
&def->vsock->info) < 0) &def->vsock->info) < 0)
@ -3003,7 +3003,7 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm,
if (!devstr) if (!devstr)
devstr = info->alias; devstr = info->alias;
if (virDeviceInfoPCIAddressPresent(info)) if (virDeviceInfoPCIAddressIsPresent(info))
virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci); virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci);
if (virDomainUSBAddressRelease(priv->usbaddrs, info) < 0) if (virDomainUSBAddressRelease(priv->usbaddrs, info) < 0)