From nobody Wed May 14 03:32:28 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; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=126.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1530609622622819.1045839503743; Tue, 3 Jul 2018 02:20:22 -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 12DAFC049D7F; Tue, 3 Jul 2018 09:20:21 +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 C3A76611A0; Tue, 3 Jul 2018 09:20:20 +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 6B5AF18037F0; Tue, 3 Jul 2018 09:20:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w639KIXq015806 for ; Tue, 3 Jul 2018 05:20:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 754BB611A1; Tue, 3 Jul 2018 09:20:18 +0000 (UTC) Received: from mx1.redhat.com (ext-mx14.extmail.prod.ext.phx2.redhat.com [10.5.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8C83260A98; Tue, 3 Jul 2018 09:20:13 +0000 (UTC) Received: from m50-110.126.com (m50-110.126.com [123.125.50.110]) by mx1.redhat.com (Postfix) with ESMTP id F0749308FB8E; Tue, 3 Jul 2018 09:20:09 +0000 (UTC) Received: from localhost.localdomain (unknown [210.13.242.135]) by smtp4 (Coremail) with SMTP id jdKowAAHaferPztbAQ+EAQ--.1051S10; Tue, 03 Jul 2018 17:20:07 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=xhRZz3jhF8RCSFixgg 9AM+SuKKVgSdL8YUeWvt+DOUs=; b=fWhW+Rs6oR/jsgbi+iR0I+BUBcVCp6A/B1 tK9+fERdb+VWOtrki8wmt6rFYc1ACeT0jCTZjktAp0rZJAO9RRvqMT6/Ucub3to9 jmgra1fkDU4OESDTfbiXmiSS8rWvIx5PYuiGhCthGTD5rOq3X3U4JOnFf7kpyPiH O/mTGm3rk= From: dubo163 To: libvir-list@redhat.com Date: Tue, 3 Jul 2018 05:19:19 -0400 Message-Id: <1530609577-9195-8-git-send-email-dubo163@126.com> In-Reply-To: <1530609577-9195-1-git-send-email-dubo163@126.com> References: <1530609577-9195-1-git-send-email-dubo163@126.com> X-CM-TRANSID: jdKowAAHaferPztbAQ+EAQ--.1051S10 X-Coremail-Antispam: 1Uf129KBjvJXoWxuF43tFWkArWfGw48Wry3urg_yoW5Cr1UpF 13KrsrArWFqr4xG3WkCa1UWr4jyry5tF1xXrsa9w1Fgr15ur93tw1fuw1S9FW7tr9rGFZ8 Cr1Iva4Uu3ZrGFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07j5rc-UUUUU= X-Originating-IP: [210.13.242.135] X-CM-SenderInfo: 5gxe0iiwt6ij2wof0z/1tbiegd4MFpD5BOp7wAAsd X-Greylist: Sender passed SPF test, ACL 227 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 03 Jul 2018 09:20:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 03 Jul 2018 09:20:12 +0000 (UTC) for IP:'123.125.50.110' DOMAIN:'m50-110.126.com' HELO:'m50-110.126.com' FROM:'dubo163@126.com' RCPT:'' X-RedHat-Spam-Score: 5.305 ***** (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_ANBREP_L3, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L3, SPF_PASS) 123.125.50.110 m50-110.126.com 123.125.50.110 m50-110.126.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.43 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Anya Harter Subject: [libvirt] [PATCH 07/25] domain_addr: delete virDomainVirtioSerialAddrRelease 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.31]); Tue, 03 Jul 2018 09:20:21 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Anya Harter the last use of this function was deleted in commit 19a148b7c8353d5c214bed699f8fe983317baf93 Signed-off-by: Anya Harter --- src/conf/domain_addr.c | 44 -------------------------------------------- src/conf/domain_addr.h | 5 ----- src/libvirt_private.syms | 1 - 3 files changed, 50 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5589935..fd66a74 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1607,50 +1607,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def= ATTRIBUTE_UNUSED, return ret; } =20 -/* virDomainVirtioSerialAddrRelease - * - * Release the virtio serial address of the device - */ -int -virDomainVirtioSerialAddrRelease(virDomainVirtioSerialAddrSetPtr addrs, - virDomainDeviceInfoPtr info) -{ - virBitmapPtr map; - char *str =3D NULL; - int ret =3D -1; - ssize_t i; - - if (info->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL || - info->addr.vioserial.port =3D=3D 0) - return 0; - - VIR_DEBUG("Releasing 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 (virBitmapClearBit(map, info->addr.vioserial.port) < 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; - } - - 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 cbf04bf..2764070 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -258,11 +258,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def, void *data) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); =20 -int -virDomainVirtioSerialAddrRelease(virDomainVirtioSerialAddrSetPtr addrs, - virDomainDeviceInfoPtr info) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); - bool virDomainUSBAddressPortIsValid(unsigned int *port) ATTRIBUTE_NONNULL(1); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cd2e428..b87e813 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -139,7 +139,6 @@ virDomainVirtioSerialAddrAssign; virDomainVirtioSerialAddrAutoAssign; virDomainVirtioSerialAddrAutoAssignFromCache; virDomainVirtioSerialAddrIsComplete; -virDomainVirtioSerialAddrRelease; virDomainVirtioSerialAddrReserve; virDomainVirtioSerialAddrSetAddControllers; virDomainVirtioSerialAddrSetCreate; --=20 1.8.3.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list