From nobody Thu May 2 15:57:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1534513230593219.9333991488619; Fri, 17 Aug 2018 06:40:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 959C45F784; Fri, 17 Aug 2018 13:40:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BE175457C; Fri, 17 Aug 2018 13:40:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1122C4A464; Fri, 17 Aug 2018 13:40:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7HDeEVI007757 for ; Fri, 17 Aug 2018 09:40:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A0B61006EAB; Fri, 17 Aug 2018 13:40:14 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC6BD10DCF6D for ; Fri, 17 Aug 2018 13:40:13 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 17 Aug 2018 15:40:06 +0200 Message-Id: <20180817134007.22808-2-abologna@redhat.com> In-Reply-To: <20180817134007.22808-1-abologna@redhat.com> References: <20180817134007.22808-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] conf: Rename some device_conf predicates X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 17 Aug 2018 13:40:29 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: John Ferlan --- src/bhyve/bhyve_device.c | 6 ++-- src/conf/device_conf.h | 4 +-- src/conf/domain_addr.c | 2 +- src/qemu/qemu_domain_address.c | 52 +++++++++++++++++----------------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 03aa6c93bd..207ac6a2dd 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -110,7 +110,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, ((def->controllers[i]->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_= USB) && (def->controllers[i]->model =3D=3D VIR_DOMAIN_CONTROLLER_MODE= L_USB_NEC_XHCI))) { if (def->controllers[i]->model =3D=3D VIR_DOMAIN_CONTROLLER_MO= DEL_PCI_ROOT || - !virDeviceInfoPCIAddressWanted(&def->controllers[i]->info)) + !virDeviceInfoPCIAddressIsWanted(&def->controllers[i]->inf= o)) continue; =20 if (virDomainPCIAddressReserveNextAddr(addrs, @@ -122,7 +122,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, } =20 for (i =3D 0; i < def->nnets; i++) { - if (!virDeviceInfoPCIAddressWanted(&def->nets[i]->info)) + if (!virDeviceInfoPCIAddressIsWanted(&def->nets[i]->info)) continue; if (virDomainPCIAddressReserveNextAddr(addrs, &def->nets[i]->info, @@ -148,7 +148,7 @@ bhyveAssignDevicePCISlots(virDomainDefPtr def, } =20 for (i =3D 0; i < def->nvideos; i++) { - if (!virDeviceInfoPCIAddressWanted(&def->videos[i]->info)) + if (!virDeviceInfoPCIAddressIsWanted(&def->videos[i]->info)) continue; if (virDomainPCIAddressReserveNextAddr(addrs, &def->videos[i]->info, diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index a31ce9c376..8c2bda2f4f 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -196,7 +196,7 @@ virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *a= ddr) } =20 static inline bool -virDeviceInfoPCIAddressWanted(const virDomainDeviceInfo *info) +virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info) { return info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && @@ -204,7 +204,7 @@ virDeviceInfoPCIAddressWanted(const virDomainDeviceInfo= *info) } =20 static inline bool -virDeviceInfoPCIAddressPresent(const virDomainDeviceInfo *info) +virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info) { return info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && !virPCIDeviceAddressIsEmpty(&info->addr.pci); diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 16f7ffa928..b62fd53c66 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -706,7 +706,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, if (!(addrStr =3D virDomainPCIAddressAsString(&dev->addr.pci))) goto cleanup; =20 - if (virDeviceInfoPCIAddressPresent(dev)) { + if (virDeviceInfoPCIAddressIsPresent(dev)) { /* 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. */ diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 6671eccf6f..38278b3c3d 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -673,7 +673,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDefPtr dev, return pciFlags; } =20 - if (virDeviceInfoPCIAddressPresent(hostdev->info)) { + if (virDeviceInfoPCIAddressIsPresent(hostdev->info)) { /* A guest-side address has already been assigned, so * we can avoid reading the PCI config, and just use * pcieFlags, since the pciConnectFlags checking is @@ -1260,7 +1260,7 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRI= BUTE_UNUSED, int ret =3D -1; virPCIDeviceAddressPtr addr =3D &info->addr.pci; =20 - if (!virDeviceInfoPCIAddressPresent(info) || + if (!virDeviceInfoPCIAddressIsPresent(info) || ((device->type =3D=3D VIR_DOMAIN_DEVICE_HOSTDEV) && (device->data.hostdev->parent.type !=3D VIR_DOMAIN_DEVICE_NONE)))= { /* If a hostdev has a parent, its info will be a part of the @@ -1458,7 +1458,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr= def, /* First IDE controller lives on the PIIX3 at slot=3D1, function= =3D1 */ if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE && cont->idx =3D=3D 0) { - if (virDeviceInfoPCIAddressPresent(&cont->info)) { + if (virDeviceInfoPCIAddressIsPresent(&cont->info)) { if (cont->info.addr.pci.domain !=3D 0 || cont->info.addr.pci.bus !=3D 0 || cont->info.addr.pci.slot !=3D 1 || @@ -1478,7 +1478,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr= def, cont->idx =3D=3D 0 && (cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_PII= X3_UHCI || cont->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_USB_DEF= AULT)) { - if (virDeviceInfoPCIAddressPresent(&cont->info)) { + if (virDeviceInfoPCIAddressIsPresent(&cont->info)) { if (cont->info.addr.pci.domain !=3D 0 || cont->info.addr.pci.bus !=3D 0 || cont->info.addr.pci.slot !=3D 1 || @@ -1526,7 +1526,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr= def, */ virDomainVideoDefPtr primaryVideo =3D def->videos[0]; =20 - if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) { + if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) { memset(&tmp_addr, 0, sizeof(tmp_addr)); tmp_addr.slot =3D 2; =20 @@ -1607,7 +1607,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr d= ef, * address. */ if (cont->idx =3D=3D 0) { - if (virDeviceInfoPCIAddressPresent(&cont->info)) { + if (virDeviceInfoPCIAddressIsPresent(&cont->info)) { if (cont->info.addr.pci.domain !=3D 0 || cont->info.addr.pci.bus !=3D 0 || cont->info.addr.pci.slot !=3D 0x1F || @@ -1715,7 +1715,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr d= ef, * on pc machinetypes). */ virDomainVideoDefPtr primaryVideo =3D def->videos[0]; - if (virDeviceInfoPCIAddressWanted(&primaryVideo->info)) { + if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) { memset(&tmp_addr, 0, sizeof(tmp_addr)); tmp_addr.slot =3D 1; =20 @@ -1781,7 +1781,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr d= ef, virDomainSoundDefPtr sound =3D def->sounds[i]; =20 if (sound->model !=3D VIR_DOMAIN_SOUND_MODEL_ICH9 || - !virDeviceInfoPCIAddressWanted(&sound->info)) { + !virDeviceInfoPCIAddressIsWanted(&sound->info)) { continue; } if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0)= < 0) @@ -1871,7 +1871,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, =20 if (model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT || model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT || - !virDeviceInfoPCIAddressWanted(&cont->info)) + !virDeviceInfoPCIAddressIsWanted(&cont->info)) continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &cont->info) < = 0) @@ -1880,7 +1880,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } =20 for (i =3D 0; i < def->nfss; i++) { - if (!virDeviceInfoPCIAddressWanted(&def->fss[i]->info)) + if (!virDeviceInfoPCIAddressIsWanted(&def->fss[i]->info)) continue; =20 /* Only support VirtIO-9p-pci so far. If that changes, @@ -1898,7 +1898,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, * instead of here. */ if ((net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV) || - !virDeviceInfoPCIAddressWanted(&net->info)) { + !virDeviceInfoPCIAddressIsWanted(&net->info)) { continue; } =20 @@ -1910,7 +1910,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, for (i =3D 0; i < def->nsounds; i++) { virDomainSoundDefPtr sound =3D def->sounds[i]; =20 - if (!virDeviceInfoPCIAddressWanted(&sound->info)) + if (!virDeviceInfoPCIAddressIsWanted(&sound->info)) continue; =20 /* Skip ISA sound card, PCSPK and usb-audio */ @@ -1948,7 +1948,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, cont->idx =3D=3D 0) continue; =20 - if (!virDeviceInfoPCIAddressWanted(&cont->info)) + if (!virDeviceInfoPCIAddressIsWanted(&cont->info)) continue; =20 /* USB2 needs special handling to put all companions in the same s= lot */ @@ -1959,7 +1959,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, for (j =3D 0; j < def->ncontrollers; j++) { if (IS_USB2_CONTROLLER(def->controllers[j]) && def->controllers[j]->idx =3D=3D cont->idx && - virDeviceInfoPCIAddressPresent(&def->controllers[j]->i= nfo)) { + virDeviceInfoPCIAddressIsPresent(&def->controllers[j]-= >info)) { addr =3D def->controllers[j]->info.addr.pci; foundAddr =3D true; break; @@ -2019,7 +2019,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 /* don't touch s390 devices */ - if (virDeviceInfoPCIAddressPresent(&def->disks[i]->info) || + if (virDeviceInfoPCIAddressIsPresent(&def->disks[i]->info) || def->disks[i]->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 || def->disks[i]->info.type =3D=3D @@ -2032,7 +2032,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) continue; =20 - if (!virDeviceInfoPCIAddressWanted(&def->disks[i]->info)) { + if (!virDeviceInfoPCIAddressIsWanted(&def->disks[i]->info)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio disk cannot have an address of type '= %s'"), virDomainDeviceAddressTypeToString(def->disks[i= ]->info.type)); @@ -2046,7 +2046,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* Host PCI devices */ for (i =3D 0; i < def->nhostdevs; i++) { virDomainHostdevSubsysPtr subsys =3D &def->hostdevs[i]->source.sub= sys; - if (!virDeviceInfoPCIAddressWanted(def->hostdevs[i]->info)) + if (!virDeviceInfoPCIAddressIsWanted(def->hostdevs[i]->info)) continue; if (def->hostdevs[i]->mode !=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) continue; @@ -2065,7 +2065,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* VirtIO balloon */ if (def->memballoon && def->memballoon->model =3D=3D VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO && - virDeviceInfoPCIAddressWanted(&def->memballoon->info)) { + virDeviceInfoPCIAddressIsWanted(&def->memballoon->info)) { =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->memballoon->info) < = 0) @@ -2075,7 +2075,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* VirtIO RNG */ for (i =3D 0; i < def->nrngs; i++) { if (def->rngs[i]->model !=3D VIR_DOMAIN_RNG_MODEL_VIRTIO || - !virDeviceInfoPCIAddressWanted(&def->rngs[i]->info)) + !virDeviceInfoPCIAddressIsWanted(&def->rngs[i]->info)) continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->rngs[i]->info= ) < 0) @@ -2085,7 +2085,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, /* A watchdog - check if it is a PCI device */ if (def->watchdog && def->watchdog->model =3D=3D VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB && - virDeviceInfoPCIAddressWanted(&def->watchdog->info)) { + virDeviceInfoPCIAddressIsWanted(&def->watchdog->info)) { if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->watchdog->inf= o) < 0) goto error; } @@ -2095,7 +2095,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, if (def->videos[i]->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_NONE) continue; =20 - if (!virDeviceInfoPCIAddressWanted(&def->videos[i]->info)) + if (!virDeviceInfoPCIAddressIsWanted(&def->videos[i]->info)) continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->videos[i]->in= fo) < 0) @@ -2104,7 +2104,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, =20 /* Shared Memory */ for (i =3D 0; i < def->nshmems; i++) { - if (!virDeviceInfoPCIAddressWanted(&def->shmems[i]->info)) + if (!virDeviceInfoPCIAddressIsWanted(&def->shmems[i]->info)) continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->shmems[i]->in= fo) < 0) @@ -2112,7 +2112,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } for (i =3D 0; i < def->ninputs; i++) { if (def->inputs[i]->bus !=3D VIR_DOMAIN_INPUT_BUS_VIRTIO || - !virDeviceInfoPCIAddressWanted(&def->inputs[i]->info)) + !virDeviceInfoPCIAddressIsWanted(&def->inputs[i]->info)) continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->inputs[i]->in= fo) < 0) @@ -2125,7 +2125,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, virDomainChrDefPtr chr =3D def->serials[i]; =20 if (chr->targetType !=3D VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI || - !virDeviceInfoPCIAddressWanted(&chr->info)) + !virDeviceInfoPCIAddressIsWanted(&chr->info)) continue; =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &chr->info) < 0) @@ -2139,7 +2139,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, } =20 if (def->vsock && - virDeviceInfoPCIAddressWanted(&def->vsock->info)) { + virDeviceInfoPCIAddressIsWanted(&def->vsock->info)) { =20 if (qemuDomainPCIAddressReserveNextAddr(addrs, &def->vsock->info) < 0) @@ -2977,7 +2977,7 @@ qemuDomainReleaseDeviceAddress(virDomainObjPtr vm, if (!devstr) devstr =3D info->alias; =20 - if (virDeviceInfoPCIAddressPresent(info)) + if (virDeviceInfoPCIAddressIsPresent(info)) virDomainPCIAddressReleaseAddr(priv->pciaddrs, &info->addr.pci); =20 if (virDomainUSBAddressRelease(priv->usbaddrs, info) < 0) --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 15:57:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 153451322159738.924566569513786; Fri, 17 Aug 2018 06:40:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DEA323168AB4; Fri, 17 Aug 2018 13:40:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 84A91AE4C1; Fri, 17 Aug 2018 13:40:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CAB8E1808872; Fri, 17 Aug 2018 13:40:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w7HDeFcK007762 for ; Fri, 17 Aug 2018 09:40:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 15EA91006EAB; Fri, 17 Aug 2018 13:40:15 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A835F1007080 for ; Fri, 17 Aug 2018 13:40:14 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 17 Aug 2018 15:40:07 +0200 Message-Id: <20180817134007.22808-3-abologna@redhat.com> In-Reply-To: <20180817134007.22808-1-abologna@redhat.com> References: <20180817134007.22808-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] conf: Move some device_conf predicates X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 17 Aug 2018 13:40:19 +0000 (UTC) X-ZohoMail: RDMRC_0 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Turn virPCIDeviceAddressIsEmpty() virDeviceInfoPCIAddressIsWanted() virDeviceInfoPCIAddressIsPresent() from inline functions to regular functions. Signed-off-by: Andrea Bolognani Reviewed-by: John Ferlan --- src/conf/device_conf.c | 22 ++++++++++++++++++++++ src/conf/device_conf.h | 23 +++-------------------- src/libvirt_private.syms | 3 +++ 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index d69f94fadf..7a8f84e036 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -191,6 +191,28 @@ int virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr = addr, } =20 =20 +bool +virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) +{ + return !(addr->domain || addr->bus || addr->slot); +} + +bool +virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info) +{ + return info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && + virPCIDeviceAddressIsEmpty(&info->addr.pci)); +} + +bool +virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info) +{ + return info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && + !virPCIDeviceAddressIsEmpty(&info->addr.pci); +} + + int virPCIDeviceAddressParseXML(xmlNodePtr node, virPCIDeviceAddressPtr addr) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 8c2bda2f4f..ff7d6c9d5f 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -188,27 +188,10 @@ bool virDomainDeviceInfoAddressIsEqual(const virDomai= nDeviceInfo *a, =20 int virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, bool report); +bool virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr); =20 -static inline bool -virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) -{ - return !(addr->domain || addr->bus || addr->slot); -} - -static inline bool -virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info) -{ - return info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || - (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - virPCIDeviceAddressIsEmpty(&info->addr.pci)); -} - -static inline bool -virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info) -{ - return info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - !virPCIDeviceAddressIsEmpty(&info->addr.pci); -} +bool virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info); +bool virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info); =20 int virPCIDeviceAddressParseXML(xmlNodePtr node, virPCIDeviceAddressPtr addr); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ca4a192a4a..cd893f7108 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -93,12 +93,15 @@ virCPUModeTypeToString; =20 =20 # conf/device_conf.h +virDeviceInfoPCIAddressIsPresent; +virDeviceInfoPCIAddressIsWanted; virDomainDeviceInfoAddressIsEqual; virDomainDeviceInfoCopy; virInterfaceLinkFormat; virInterfaceLinkParseXML; virPCIDeviceAddressEqual; virPCIDeviceAddressFormat; +virPCIDeviceAddressIsEmpty; virPCIDeviceAddressIsValid; virPCIDeviceAddressParseXML; =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list