From nobody Tue May 13 20:01:59 2025 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 1530649232968430.6572788795347; Tue, 3 Jul 2018 13:20:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F391581DF7; Tue, 3 Jul 2018 20:20:31 +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 B7329102BCC4; Tue, 3 Jul 2018 20:20:31 +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 648C63F601; Tue, 3 Jul 2018 20:20:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w63KKBR3005172 for ; Tue, 3 Jul 2018 16:20:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id D4588202704B; Tue, 3 Jul 2018 20:20:11 +0000 (UTC) Received: from dhcp-17-130.bos.redhat.com (dhcp-17-130.bos.redhat.com [10.18.17.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB5092026D76; Tue, 3 Jul 2018 20:20:11 +0000 (UTC) From: Anya Harter To: libvir-list@redhat.com Date: Tue, 3 Jul 2018 16:19:50 -0400 Message-Id: <31a2cc8f3de493790039a96ef88a018375b18577.1530648863.git.aharter@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH 3/4] domain_addr: make virDomainVirtioSerialAddr funcs static 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 03 Jul 2018 20:20:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" SetCreate, SetAddControllers, Reserve last uses of these functions outside domain_addr.c removed in commit: 40c284f0a6b53a182af7b12173bcb5dd3eb0c826 Assign never used outside domain_addr.c move Assign and Reserve above their first call within domain_addr.c Signed-off-by: Anya Harter --- src/conf/domain_addr.c | 187 +++++++++++++++++++-------------------- src/conf/domain_addr.h | 21 ----- src/libvirt_private.syms | 4 - 3 files changed, 93 insertions(+), 119 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 1922412853..33f859697b 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1216,7 +1216,7 @@ virDomainCCWAddressSetCreateFromDomain(virDomainDefPt= r def) * * Allocates an address set for virtio serial addresses */ -virDomainVirtioSerialAddrSetPtr +static virDomainVirtioSerialAddrSetPtr virDomainVirtioSerialAddrSetCreate(void) { virDomainVirtioSerialAddrSetPtr ret =3D NULL; @@ -1318,7 +1318,7 @@ virDomainVirtioSerialAddrSetAddController(virDomainVi= rtioSerialAddrSetPtr addrs, * Adds virtio serial ports of controllers present in the domain definition * to the address set. */ -int +static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) virDomainVirtioSerialAddrSetAddControllers(virDomainVirtioSerialAddrSetPtr= addrs, virDomainDefPtr def) { @@ -1346,6 +1346,65 @@ virDomainVirtioSerialAddrSetFree(virDomainVirtioSeri= alAddrSetPtr addrs) } } =20 +/* virDomainVirtioSerialAddrReserve + * + * Reserve the virtio serial address of the device + * + * For use with virDomainDeviceInfoIterate, + * opaque should be the address set + */ +static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) +virDomainVirtioSerialAddrReserve(virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDeviceDefPtr dev ATTRIBUTE_UNUSE= D, + virDomainDeviceInfoPtr info, + void *data) +{ + virDomainVirtioSerialAddrSetPtr addrs =3D data; + char *str =3D NULL; + int ret =3D -1; + virBitmapPtr map =3D NULL; + bool b; + ssize_t i; + + if (!virDomainVirtioSerialAddrIsComplete(info)) + return 0; + + VIR_DEBUG("Reserving virtio serial %u %u", info->addr.vioserial.contro= ller, + info->addr.vioserial.port); + + i =3D virDomainVirtioSerialAddrFindController(addrs, info->addr.vioser= ial.controller); + if (i < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("virtio serial controller %u is missing"), + info->addr.vioserial.controller); + goto cleanup; + } + + map =3D addrs->controllers[i]->ports; + if (virBitmapGetBit(map, info->addr.vioserial.port, &b) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("virtio serial controller %u does not have port %= u"), + info->addr.vioserial.controller, + info->addr.vioserial.port); + goto cleanup; + } + + if (b) { + virReportError(VIR_ERR_XML_ERROR, + _("virtio serial port %u on controller %u is alread= y occupied"), + info->addr.vioserial.port, + info->addr.vioserial.controller); + goto cleanup; + } + + ignore_value(virBitmapSetBit(map, info->addr.vioserial.port)); + + ret =3D 0; + + cleanup: + VIR_FREE(str); + return ret; +} =20 /* virDomainVirtioSerialAddrSetCreateFromDomain * @@ -1487,6 +1546,38 @@ virDomainVirtioSerialAddrNextFromController(virDomai= nVirtioSerialAddrSetPtr addr return 0; } =20 +static int ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) +virDomainVirtioSerialAddrAssign(virDomainDefPtr def, + virDomainVirtioSerialAddrSetPtr addrs, + virDomainDeviceInfoPtr info, + bool allowZero, + bool portOnly) +{ + int ret =3D -1; + virDomainDeviceInfo nfo =3D { 0 }; + virDomainDeviceInfoPtr ptr =3D allowZero ? &nfo : info; + + ptr->type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL; + + if (portOnly) { + if (virDomainVirtioSerialAddrNextFromController(addrs, + &ptr->addr.vioseri= al) < 0) + goto cleanup; + } else { + if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, + allowZero) < 0) + goto cleanup; + } + + if (virDomainVirtioSerialAddrReserve(NULL, NULL, ptr, addrs) < 0) + goto cleanup; + + ret =3D 0; + + cleanup: + return ret; +} + /* virDomainVirtioSerialAddrAutoAssign * * reserve a virtio serial address of the device (if it has one) @@ -1528,38 +1619,6 @@ virDomainVirtioSerialAddrAutoAssign(virDomainDefPtr = def, } =20 =20 -int -virDomainVirtioSerialAddrAssign(virDomainDefPtr def, - virDomainVirtioSerialAddrSetPtr addrs, - virDomainDeviceInfoPtr info, - bool allowZero, - bool portOnly) -{ - int ret =3D -1; - virDomainDeviceInfo nfo =3D { 0 }; - virDomainDeviceInfoPtr ptr =3D allowZero ? &nfo : info; - - ptr->type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL; - - if (portOnly) { - if (virDomainVirtioSerialAddrNextFromController(addrs, - &ptr->addr.vioseri= al) < 0) - goto cleanup; - } else { - if (virDomainVirtioSerialAddrNext(def, addrs, &ptr->addr.vioserial, - allowZero) < 0) - goto cleanup; - } - - if (virDomainVirtioSerialAddrReserve(NULL, NULL, ptr, addrs) < 0) - goto cleanup; - - ret =3D 0; - - cleanup: - return ret; -} - /* virDomainVirtioSerialAddrIsComplete * * Check if the address is complete, or it needs auto-assignment @@ -1571,66 +1630,6 @@ virDomainVirtioSerialAddrIsComplete(virDomainDeviceI= nfoPtr info) info->addr.vioserial.port !=3D 0; } =20 -/* virDomainVirtioSerialAddrReserve - * - * Reserve the virtio serial address of the device - * - * For use with virDomainDeviceInfoIterate, - * opaque should be the address set - */ -int -virDomainVirtioSerialAddrReserve(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSE= D, - virDomainDeviceInfoPtr info, - void *data) -{ - virDomainVirtioSerialAddrSetPtr addrs =3D data; - char *str =3D NULL; - int ret =3D -1; - virBitmapPtr map =3D NULL; - bool b; - ssize_t i; - - if (!virDomainVirtioSerialAddrIsComplete(info)) - return 0; - - VIR_DEBUG("Reserving virtio serial %u %u", info->addr.vioserial.contro= ller, - info->addr.vioserial.port); - - i =3D virDomainVirtioSerialAddrFindController(addrs, info->addr.vioser= ial.controller); - if (i < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("virtio serial controller %u is missing"), - info->addr.vioserial.controller); - goto cleanup; - } - - map =3D addrs->controllers[i]->ports; - if (virBitmapGetBit(map, info->addr.vioserial.port, &b) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("virtio serial controller %u does not have port %= u"), - info->addr.vioserial.controller, - info->addr.vioserial.port); - goto cleanup; - } - - if (b) { - virReportError(VIR_ERR_XML_ERROR, - _("virtio serial port %u on controller %u is alread= y occupied"), - info->addr.vioserial.port, - info->addr.vioserial.controller); - goto cleanup; - } - - ignore_value(virBitmapSetBit(map, info->addr.vioserial.port)); - - ret =3D 0; - - cleanup: - VIR_FREE(str); - return ret; -} - =20 bool virDomainUSBAddressPortIsValid(unsigned int *port) diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index fc5ddcf6f1..a94d4bda66 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -206,12 +206,6 @@ struct _virDomainVirtioSerialAddrSet { typedef struct _virDomainVirtioSerialAddrSet virDomainVirtioSerialAddrSet; typedef virDomainVirtioSerialAddrSet *virDomainVirtioSerialAddrSetPtr; =20 -virDomainVirtioSerialAddrSetPtr -virDomainVirtioSerialAddrSetCreate(void); -int -virDomainVirtioSerialAddrSetAddControllers(virDomainVirtioSerialAddrSetPtr= addrs, - virDomainDefPtr def) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); void virDomainVirtioSerialAddrSetFree(virDomainVirtioSerialAddrSetPtr addrs); virDomainVirtioSerialAddrSetPtr @@ -232,21 +226,6 @@ virDomainVirtioSerialAddrAutoAssign(virDomainDefPtr de= f, bool allowZero) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 -int -virDomainVirtioSerialAddrAssign(virDomainDefPtr def, - virDomainVirtioSerialAddrSetPtr addrs, - virDomainDeviceInfoPtr info, - bool allowZero, - bool portOnly) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); - -int -virDomainVirtioSerialAddrReserve(virDomainDefPtr def, - virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info, - void *data) - ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); - bool virDomainUSBAddressPortIsValid(unsigned int *port) ATTRIBUTE_NONNULL(1); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index fef38d29fa..0f82f3c38a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -133,13 +133,9 @@ virDomainUSBAddressSetAddControllers; virDomainUSBAddressSetAddHub; virDomainUSBAddressSetCreate; virDomainUSBAddressSetFree; -virDomainVirtioSerialAddrAssign; virDomainVirtioSerialAddrAutoAssign; virDomainVirtioSerialAddrAutoAssignFromCache; virDomainVirtioSerialAddrIsComplete; -virDomainVirtioSerialAddrReserve; -virDomainVirtioSerialAddrSetAddControllers; -virDomainVirtioSerialAddrSetCreate; virDomainVirtioSerialAddrSetCreateFromDomain; virDomainVirtioSerialAddrSetFree; =20 --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list