From nobody Thu May 2 13:47:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582467412; cv=none; d=zohomail.com; s=zohoarc; b=j4KZIpVV3a3JHE4qr/g0DpAGmacztr/+WPlw7oG0KoyKgc1LfjRDNIJd2Rfo53jYEbhTSH8O4e/uhWkSU15hOb+bbQZatkW7HnFDdOet8ssc68hk+ggB2nLVj/HwXe91ehD+cOvhBgGqY3ScwjXdLYwu/edrY27vpN24acIE4f4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582467412; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=S2krc/XNzXBPM+3akXTXsKbpjDFfDG+h6oB4YrNIusU=; b=PZKVI3X7ENCpPo4nGGQs1XgNjZ4MLVcwz4cGl4sdIbhicNfzNNe3FDw6ameJhdmS0vej+6tHCKCMvCzDeTUY6Yh6VQ+njClH9W5AQBQ1v+Yi57umB/8w5aHI7Y5EL6HcU0hWsK4l36m4UYpk2fX5mzjWk0TPGbk7fP+1KZPQVHk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 158246741277772.41505843046048; Sun, 23 Feb 2020 06:16:52 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102-3N_ctQQFMAO4zCg_NiY5Mg-1; Sun, 23 Feb 2020 09:16:48 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC881800D53; Sun, 23 Feb 2020 14:16:43 +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 7DF355C105; Sun, 23 Feb 2020 14:16:43 +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 6A542860D6; Sun, 23 Feb 2020 14:16:41 +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 01NEGeAO006750 for ; Sun, 23 Feb 2020 09:16:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0962F90776; Sun, 23 Feb 2020 14:16:40 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-20.brq.redhat.com [10.40.200.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4126090769 for ; Sun, 23 Feb 2020 14:16:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582467411; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=S2krc/XNzXBPM+3akXTXsKbpjDFfDG+h6oB4YrNIusU=; b=YY3amE1SA194pwfh35oVTb9SAZe6UgMDEuGmzAr/2D5MF3+iFaOUwffiQ3kVaDjErWqQoz DLlgd5kzYHLHaKppPEau5jSxRlqR1YyW3r2WAp++jC3+/xGKeJZnAmQ8jneoLc0rOlTINl QrAYVcL+7TuP2+54/K7UhddNrTwTNy4= X-MC-Unique: 3N_ctQQFMAO4zCg_NiY5Mg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] syntax-check: inclusion rule for src/hypervisor Date: Sun, 23 Feb 2020 15:16:31 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Allow it to be included by anything above mid_dirs. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 70bf8c9d89..ba1874d347 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -856,7 +856,7 @@ sc_prohibit_cross_inclusion: access/ | conf/) safe=3D"($$dir|conf|util)";; \ cpu/| network/| node_device/| rpc/| security/| storage/) \ safe=3D"($$dir|util|conf|storage)";; \ - *) safe=3D"($$dir|$(mid_dirs)|util)";; \ + *) safe=3D"($$dir|$(mid_dirs)|hypervisor|util)";; \ esac; \ in_vc_files=3D"src/$$dir" \ prohibit=3D'^# *include .$(cross_dirs_re)' \ --=20 2.24.1 From nobody Thu May 2 13:47:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582467423; cv=none; d=zohomail.com; s=zohoarc; b=X17GPR+13IT31I+LH+OHCDs0L9BGqe2Sy7TjPG0dODiK//F11ao430K62LgLbj+2GOGzbGKx6qi4S+1hd2qxJGwiGEKYl7Jvu6UuSsq86dLpN1ll7CJJ2z9Osd3+bxn6PGOx78OxYqMqQ/WKjpZNHkhO2wHgkTOIWfwjQq1dZBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582467423; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UJiOVwZCjIxvoAyNOGZM4Zdx1SLMt34OUmLLhrGDlMk=; b=AT+D8vUu29D+flbeWoV/ppxt52s83/U/8mRCX+OPqBgWcp54ubqWZOjauNuEWXr4qna5zf50wQuQSPcbXVkafaJfEd8cysJEslj02fK6jr88S0y1KoqGpTOcbyjfF9aJJ9tpslPDnDVZReBLQzAswHDjVsWT4Xhnd/XlGkMSMGo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1582467423349879.3413977806298; Sun, 23 Feb 2020 06:17:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-352-gONzKHEIOj-ouu4Q2jKB4g-1; Sun, 23 Feb 2020 09:16:58 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 01A728017CC; Sun, 23 Feb 2020 14:16:53 +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 BEE1D909EA; Sun, 23 Feb 2020 14:16:52 +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 6F6DC18089D6; Sun, 23 Feb 2020 14:16:52 +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 01NEGfVU006760 for ; Sun, 23 Feb 2020 09:16:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7394690769; Sun, 23 Feb 2020 14:16:41 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-20.brq.redhat.com [10.40.200.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id A097E9079A for ; Sun, 23 Feb 2020 14:16:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582467421; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=UJiOVwZCjIxvoAyNOGZM4Zdx1SLMt34OUmLLhrGDlMk=; b=LEkdcWrqVCAql30jkxcucRh68byjt1vmVdC1DVGyOwh/78wkIJ4f9/ob0lTbnsAEFsslvd Fb57uca5CzGzdx2B2Nk7zFvuxCp4rK9iH2MBgUaQ2Ze3FYHdQcAwti42mnRmf4enN9dsDi ylqi5UUZ32k3YPsRe+/CDilfNwg+qW8= X-MC-Unique: gONzKHEIOj-ouu4Q2jKB4g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] conf: move virHostdevIs functions Date: Sun, 23 Feb 2020 15:16:32 +0100 Message-Id: <4e843e514cff90af2050bc699cb4e7f5731e205f.1582467387.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , 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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Currently they live in util/virhostdev. However the virhostdev module is wrongly placed in util, which is below conf/ in our hierarchy. Move the functions that are actually used in conf/ to conf/ and remove the include of virhostdev.h from domain_conf. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 44 +++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 10 +++++++++ src/libvirt_private.syms | 6 +++--- src/util/virhostdev.c | 43 --------------------------------------- src/util/virhostdev.h | 9 -------- 5 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cef49df3f8..fc1e936bd0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -58,7 +58,6 @@ #include "virnetdevtap.h" #include "virnetdevmacvlan.h" #include "virarptable.h" -#include "virhostdev.h" #include "virmdev.h" #include "virdomainsnapshotobjlist.h" #include "virdomaincheckpointobjlist.h" @@ -32034,3 +32033,46 @@ virDomainBlockIoTuneInfoEqual(const virDomainBlock= IoTuneInfo *a, a->read_iops_sec_max_length =3D=3D b->read_iops_sec_max_length && a->write_iops_sec_max_length =3D=3D b->write_iops_sec_max_length; } + + +/** + * virHostdevIsSCSIDevice: + * @hostdev: host device to check + * + * Returns true if @hostdev is a SCSI device, false otherwise. + */ +bool +virHostdevIsSCSIDevice(const virDomainHostdevDef *hostdev) +{ + return hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= SCSI; +} + + +/** + * virHostdevIsMdevDevice: + * @hostdev: host device to check + * + * Returns true if @hostdev is a Mediated device, false otherwise. + */ +bool +virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev) +{ + return hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= MDEV; +} + + +/** + * virHostdevIsVFIODevice: + * @hostdev: host device to check + * + * Returns true if @hostdev is a PCI device with VFIO backend, false other= wise. + */ +bool +virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev) +{ + return hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= PCI && + hostdev->source.subsys.u.pci.backend =3D=3D VIR_DOMAIN_HOSTDEV_PCI= _BACKEND_VFIO; +} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cdc4d25700..c126a90729 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3743,3 +3743,13 @@ virDomainBlockIoTuneInfoCopy(const virDomainBlockIoT= uneInfo *src, bool virDomainBlockIoTuneInfoEqual(const virDomainBlockIoTuneInfo *a, const virDomainBlockIoTuneInfo *b); + +bool +virHostdevIsSCSIDevice(const virDomainHostdevDef *hostdev) + ATTRIBUTE_NONNULL(1); +bool +virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev) + ATTRIBUTE_NONNULL(1); +bool +virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev) + ATTRIBUTE_NONNULL(1); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 907cef2390..05e1bc875b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -715,6 +715,9 @@ virDomainEventWatchdogNewFromDom; virDomainEventWatchdogNewFromObj; virDomainQemuMonitorEventNew; virDomainQemuMonitorEventStateRegisterID; +virHostdevIsMdevDevice; +virHostdevIsSCSIDevice; +virHostdevIsVFIODevice; =20 =20 # conf/domain_nwfilter.h @@ -2168,9 +2171,6 @@ virHostCPUStatsAssign; =20 # util/virhostdev.h virHostdevFindUSBDevice; -virHostdevIsMdevDevice; -virHostdevIsSCSIDevice; -virHostdevIsVFIODevice; virHostdevManagerGetDefault; virHostdevPCINodeDeviceDetach; virHostdevPCINodeDeviceReAttach; diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index f8f7989206..6565cebe57 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -359,49 +359,6 @@ virHostdevIsPCINetDevice(const virDomainHostdevDef *ho= stdev) } =20 =20 -/** - * virHostdevIsSCSIDevice: - * @hostdev: host device to check - * - * Returns true if @hostdev is a SCSI device, false otherwise. - */ -bool -virHostdevIsSCSIDevice(const virDomainHostdevDef *hostdev) -{ - return hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= SCSI; -} - - -/** - * virHostdevIsMdevDevice: - * @hostdev: host device to check - * - * Returns true if @hostdev is a Mediated device, false otherwise. - */ -bool -virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev) -{ - return hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= MDEV; -} - - -/** - * virHostdevIsVFIODevice: - * @hostdev: host device to check - * - * Returns true if @hostdev is a PCI device with VFIO backend, false other= wise. - */ -bool -virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev) -{ - return hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type =3D=3D VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_= PCI && - hostdev->source.subsys.u.pci.backend =3D=3D VIR_DOMAIN_HOSTDEV_PCI= _BACKEND_VFIO; -} - - static int virHostdevNetConfigVirtPortProfile(const char *linkdev, int vf, const virNetDevVPortProfile *virtPort, diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h index ae84ed3d20..811bda40ed 100644 --- a/src/util/virhostdev.h +++ b/src/util/virhostdev.h @@ -191,15 +191,6 @@ virHostdevReAttachDomainDevices(virHostdevManagerPtr m= gr, unsigned int flags, const char *oldStateDir) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -bool -virHostdevIsSCSIDevice(const virDomainHostdevDef *hostdev) - ATTRIBUTE_NONNULL(1); -bool -virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev) - ATTRIBUTE_NONNULL(1); -bool -virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev) - ATTRIBUTE_NONNULL(1); =20 /* functions used by NodeDevDetach/Reattach/Reset */ int virHostdevPCINodeDeviceDetach(virHostdevManagerPtr mgr, --=20 2.24.1 From nobody Thu May 2 13:47:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582467414; cv=none; d=zohomail.com; s=zohoarc; b=O/9NxN9Qx7DBMbHnZh0xGmoFdwhjKbbv711lR/3OCkpVZC1GazwJd6dr9+TK2Tfhm0kZabh91H+zaM5YQxC9FiBjaDyrtutePHwi8QkDHdzyAj8XINJy65HwSeZ8MY32B+RXVnMARqYQ4+TcGZaevg7bo8m89dGMgJYN7Y94VaU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582467414; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qf6O2gGst/j0FiisdRgvVBB/yTcHkk+1Chc3rdZOlhA=; b=YzeQmTbKtdw5HnHK1Gy/EiazVvz7m4VuOu4FDpuAz/VRvI5W60u/jJCE1kdALmiQDScFVtcqDnazm/nBZz3ourOGa5i8TtvyVM/Xb9tkFuDtLiQySRVoNN9FeH3iuKllyFhsTvQFJKArdONUHU2xn8ap+iFvnCzSHgbm0VRreBw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1582467414067318.71591867324; Sun, 23 Feb 2020 06:16:54 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-298-Ub9xjTLRNYut-rv-iUf69g-1; Sun, 23 Feb 2020 09:16:50 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9AF8B801E5C; Sun, 23 Feb 2020 14:16:44 +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 7497290769; Sun, 23 Feb 2020 14:16:44 +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 2FC6518089CF; Sun, 23 Feb 2020 14:16:44 +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 01NEGge5006771 for ; Sun, 23 Feb 2020 09:16:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 92B329078A; Sun, 23 Feb 2020 14:16:42 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-20.brq.redhat.com [10.40.200.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id E21BD90769 for ; Sun, 23 Feb 2020 14:16:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582467413; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=qf6O2gGst/j0FiisdRgvVBB/yTcHkk+1Chc3rdZOlhA=; b=gKyLwWXjLVjXoF1Hc1E+zfWQrj+/XnnTIcmjjhwXbhkwlWyQyrIWe66flKwhnQ0NQQ3Gbt 7oleXDvgBof+X3qUYfpvLDpe4J6tf1yhuTZ0EFu1sQ1kmR1Y/uw8cxUKaoXVrN5s3r0b+r a2XDRaHIs0R+ExXSJwckEz+Frepi+xw= X-MC-Unique: Ub9xjTLRNYut-rv-iUf69g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] virhostdev: move to src/hypervisor Date: Sun, 23 Feb 2020 15:16:33 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , 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-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This module depends on domain_conf and is used directly by various hypervisor drivers. Move it to src/hypervisor. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 2 +- po/POTFILES.in | 2 +- src/hypervisor/Makefile.inc.am | 2 + src/{util =3D> hypervisor}/virhostdev.c | 0 src/{util =3D> hypervisor}/virhostdev.h | 0 src/libvirt_private.syms | 60 +++++++++++++-------------- src/libxl/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 2 - tests/Makefile.am | 1 + 9 files changed, 36 insertions(+), 34 deletions(-) rename src/{util =3D> hypervisor}/virhostdev.c (100%) rename src/{util =3D> hypervisor}/virhostdev.h (100%) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index ba1874d347..7d521c1295 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -2119,7 +2119,7 @@ exclude_file_name_regexp--sc_prohibit_readdir =3D \ ^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$ =20 exclude_file_name_regexp--sc_prohibit_cross_inclusion =3D \ - ^(src/util/virclosecallbacks\.h|src/util/virhostdev\.h)$$ + ^(src/util/virclosecallbacks\.h)$$ =20 exclude_file_name_regexp--sc_prohibit_dirent_d_type =3D \ ^(src/util/vircgroup.c)$ diff --git a/po/POTFILES.in b/po/POTFILES.in index 1675c45206..975de75037 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -80,6 +80,7 @@ @SRCDIR@/src/hyperv/hyperv_wmi.c @SRCDIR@/src/hypervisor/domain_cgroup.c @SRCDIR@/src/hypervisor/domain_driver.c +@SRCDIR@/src/hypervisor/virhostdev.c @SRCDIR@/src/interface/interface_backend_netcf.c @SRCDIR@/src/interface/interface_backend_udev.c @SRCDIR@/src/internal.h @@ -250,7 +251,6 @@ @SRCDIR@/src/util/virhash.c @SRCDIR@/src/util/virhook.c @SRCDIR@/src/util/virhostcpu.c -@SRCDIR@/src/util/virhostdev.c @SRCDIR@/src/util/virhostmem.c @SRCDIR@/src/util/virhostuptime.c @SRCDIR@/src/util/viridentity.c diff --git a/src/hypervisor/Makefile.inc.am b/src/hypervisor/Makefile.inc.am index 02cf2c7cb1..3bd775a4a5 100644 --- a/src/hypervisor/Makefile.inc.am +++ b/src/hypervisor/Makefile.inc.am @@ -5,6 +5,8 @@ HYPERVISOR_SOURCES =3D \ hypervisor/domain_cgroup.c \ hypervisor/domain_driver.h \ hypervisor/domain_driver.c \ + hypervisor/virhostdev.h \ + hypervisor/virhostdev.c \ $(NULL) =20 noinst_LTLIBRARIES +=3D libvirt_hypervisor.la diff --git a/src/util/virhostdev.c b/src/hypervisor/virhostdev.c similarity index 100% rename from src/util/virhostdev.c rename to src/hypervisor/virhostdev.c diff --git a/src/util/virhostdev.h b/src/hypervisor/virhostdev.h similarity index 100% rename from src/util/virhostdev.h rename to src/hypervisor/virhostdev.h diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 05e1bc875b..85b1eca72f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1406,6 +1406,36 @@ virDomainDriverParseBlkioDeviceStr; virDomainDriverSetupPersistentDefBlkioParams; =20 =20 +# hypervisor/virhostdev.h +virHostdevFindUSBDevice; +virHostdevManagerGetDefault; +virHostdevPCINodeDeviceDetach; +virHostdevPCINodeDeviceReAttach; +virHostdevPCINodeDeviceReset; +virHostdevPrepareDomainDevices; +virHostdevPrepareMediatedDevices; +virHostdevPrepareNVMeDevices; +virHostdevPrepareOneNVMeDevice; +virHostdevPreparePCIDevices; +virHostdevPrepareSCSIDevices; +virHostdevPrepareSCSIVHostDevices; +virHostdevPrepareUSBDevices; +virHostdevReAttachDomainDevices; +virHostdevReAttachMediatedDevices; +virHostdevReAttachNVMeDevices; +virHostdevReAttachOneNVMeDevice; +virHostdevReAttachPCIDevices; +virHostdevReAttachSCSIDevices; +virHostdevReAttachSCSIVHostDevices; +virHostdevReAttachUSBDevices; +virHostdevUpdateActiveDomainDevices; +virHostdevUpdateActiveMediatedDevices; +virHostdevUpdateActiveNVMeDevices; +virHostdevUpdateActivePCIDevices; +virHostdevUpdateActiveSCSIDevices; +virHostdevUpdateActiveUSBDevices; + + # libvirt_internal.h virConnectSupportsFeature; virDomainMigrateBegin3; @@ -2169,36 +2199,6 @@ virHostCPUHasBitmap; virHostCPUStatsAssign; =20 =20 -# util/virhostdev.h -virHostdevFindUSBDevice; -virHostdevManagerGetDefault; -virHostdevPCINodeDeviceDetach; -virHostdevPCINodeDeviceReAttach; -virHostdevPCINodeDeviceReset; -virHostdevPrepareDomainDevices; -virHostdevPrepareMediatedDevices; -virHostdevPrepareNVMeDevices; -virHostdevPrepareOneNVMeDevice; -virHostdevPreparePCIDevices; -virHostdevPrepareSCSIDevices; -virHostdevPrepareSCSIVHostDevices; -virHostdevPrepareUSBDevices; -virHostdevReAttachDomainDevices; -virHostdevReAttachMediatedDevices; -virHostdevReAttachNVMeDevices; -virHostdevReAttachOneNVMeDevice; -virHostdevReAttachPCIDevices; -virHostdevReAttachSCSIDevices; -virHostdevReAttachSCSIVHostDevices; -virHostdevReAttachUSBDevices; -virHostdevUpdateActiveDomainDevices; -virHostdevUpdateActiveMediatedDevices; -virHostdevUpdateActiveNVMeDevices; -virHostdevUpdateActivePCIDevices; -virHostdevUpdateActiveSCSIDevices; -virHostdevUpdateActiveUSBDevices; - - # util/virhostmem.h virHostMemAllocPages; virHostMemGetCellsFree; diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index 4dc1b9d039..ff6a2b0f69 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -46,6 +46,7 @@ libvirt_driver_libxl_impl_la_CFLAGS =3D \ -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ + -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_libxl_impl_la_LDFLAGS =3D $(AM_LDFLAGS) diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index fbe67090d3..a340fdeffb 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -92,8 +92,6 @@ UTIL_SOURCES =3D \ util/virhostcpu.c \ util/virhostcpu.h \ util/virhostcpupriv.h \ - util/virhostdev.c \ - util/virhostdev.h \ util/virhostmem.c \ util/virhostmem.h \ util/virhostuptime.c \ diff --git a/tests/Makefile.am b/tests/Makefile.am index ed5255b62d..bfb8e34378 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -22,6 +22,7 @@ AM_CPPFLAGS =3D \ -I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/conf \ + -I$(top_srcdir)/src/hypervisor \ -I$(top_builddir)/src/rpc \ $(NULL) =20 --=20 2.24.1 From nobody Thu May 2 13:47:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582467423; cv=none; d=zohomail.com; s=zohoarc; b=UDbUlZmogiLVokZpq9UxIX0t1oam2N/UucsvTJMs4W02ELzUJ6tnnpOhJoCHutoQ3L5Wd3GZsK/v973rW/bulbUHE0A1QbgoSPxBWRupQCgHFXEMExibGFQ3hfUs3BpKiXD/c7NvQvbTzl0X6rAGtCW13qIVtdkQ5YAQjfSf2Fk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582467423; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pxbevV4vMrNx5yYAHdivwb+Z03HF2H58LbIUPLc+G6o=; b=CQZ1Yi7QOY08m4jrhU+a1rZaQwRNlHNFEqs20yGrCEd2VLa1RMa2o2Qx8IMYXDI7001irbkuxn2lbiEmM+7EIOK23HwsfGKbtDAleoP10zSJ+gkP6paKbfyLbJ4ak/ihHSU2NBDwaxbQTxdD1brIxMRqEog8Tj/cpUM17SB9hoc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1582467423186111.01102886906529; Sun, 23 Feb 2020 06:17:03 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-101-ETDUG_oeNBKtSZi79_ilCQ-1; Sun, 23 Feb 2020 09:16:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A613107B7D9; Sun, 23 Feb 2020 14:16:53 +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 7682060499; Sun, 23 Feb 2020 14:16:53 +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 185A2860E1; Sun, 23 Feb 2020 14:16:53 +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 01NEGhj0006780 for ; Sun, 23 Feb 2020 09:16:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id B0DB090769; Sun, 23 Feb 2020 14:16:43 +0000 (UTC) Received: from lpt.redhat.com (ovpn-200-20.brq.redhat.com [10.40.200.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04B809079E for ; Sun, 23 Feb 2020 14:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582467421; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=pxbevV4vMrNx5yYAHdivwb+Z03HF2H58LbIUPLc+G6o=; b=fjU8euBvE77QE8UMZC3rZXvPTAiGDNxhJM284Llo2IdRKNl71aNJyWFcjNjp6Ey85uxVLc Fm5Ht4Q7VE67v+vIxHwHpwejh+T+1OiVSIgoPteuzlW3htLNXYC5nq4AN6d4ggNr1BKwKO UPQ7Zc2Hnii2GkX9gABpziqxBP1T2Wk= X-MC-Unique: ETDUG_oeNBKtSZi79_ilCQ-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] virclosecallbacks: move to src/hypervisor Date: Sun, 23 Feb 2020 15:16:34 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Just like virhostdev, this depends on domain_conf and it's shared by multiple hypervisor drivers. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 3 --- po/POTFILES.in | 2 +- src/bhyve/Makefile.inc.am | 1 + src/hypervisor/Makefile.inc.am | 2 ++ src/{util =3D> hypervisor}/virclosecallbacks.c | 0 src/{util =3D> hypervisor}/virclosecallbacks.h | 0 src/libvirt_private.syms | 17 +++++++++-------- src/util/Makefile.inc.am | 2 -- 8 files changed, 13 insertions(+), 14 deletions(-) rename src/{util =3D> hypervisor}/virclosecallbacks.c (100%) rename src/{util =3D> hypervisor}/virclosecallbacks.h (100%) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 7d521c1295..b829c8a18b 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -2118,9 +2118,6 @@ exclude_file_name_regexp--sc_prohibit_pthread_create = =3D \ exclude_file_name_regexp--sc_prohibit_readdir =3D \ ^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$ =20 -exclude_file_name_regexp--sc_prohibit_cross_inclusion =3D \ - ^(src/util/virclosecallbacks\.h)$$ - exclude_file_name_regexp--sc_prohibit_dirent_d_type =3D \ ^(src/util/vircgroup.c)$ =20 diff --git a/po/POTFILES.in b/po/POTFILES.in index 975de75037..fe361204bb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -80,6 +80,7 @@ @SRCDIR@/src/hyperv/hyperv_wmi.c @SRCDIR@/src/hypervisor/domain_cgroup.c @SRCDIR@/src/hypervisor/domain_driver.c +@SRCDIR@/src/hypervisor/virclosecallbacks.c @SRCDIR@/src/hypervisor/virhostdev.c @SRCDIR@/src/interface/interface_backend_netcf.c @SRCDIR@/src/interface/interface_backend_udev.c @@ -232,7 +233,6 @@ @SRCDIR@/src/util/vircgroupv1.c @SRCDIR@/src/util/vircgroupv2.c @SRCDIR@/src/util/vircgroupv2devices.c -@SRCDIR@/src/util/virclosecallbacks.c @SRCDIR@/src/util/vircommand.c @SRCDIR@/src/util/virconf.c @SRCDIR@/src/util/vircrypto.c diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index 6be2437f23..2536d12ab3 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -43,6 +43,7 @@ libvirt_driver_bhyve_impl_la_CFLAGS =3D \ -I$(srcdir)/access \ -I$(builddir)/access \ -I$(srcdir)/conf \ + -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_bhyve_impl_la_LDFLAGS =3D $(AM_LDFLAGS) diff --git a/src/hypervisor/Makefile.inc.am b/src/hypervisor/Makefile.inc.am index 3bd775a4a5..bc48ab1266 100644 --- a/src/hypervisor/Makefile.inc.am +++ b/src/hypervisor/Makefile.inc.am @@ -5,6 +5,8 @@ HYPERVISOR_SOURCES =3D \ hypervisor/domain_cgroup.c \ hypervisor/domain_driver.h \ hypervisor/domain_driver.c \ + hypervisor/virclosecallbacks.h \ + hypervisor/virclosecallbacks.c \ hypervisor/virhostdev.h \ hypervisor/virhostdev.c \ $(NULL) diff --git a/src/util/virclosecallbacks.c b/src/hypervisor/virclosecallback= s.c similarity index 100% rename from src/util/virclosecallbacks.c rename to src/hypervisor/virclosecallbacks.c diff --git a/src/util/virclosecallbacks.h b/src/hypervisor/virclosecallback= s.h similarity index 100% rename from src/util/virclosecallbacks.h rename to src/hypervisor/virclosecallbacks.h diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 85b1eca72f..3b7c0d8043 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1406,6 +1406,15 @@ virDomainDriverParseBlkioDeviceStr; virDomainDriverSetupPersistentDefBlkioParams; =20 =20 +# hypervisor/virclosecallbacks.h +virCloseCallbacksGet; +virCloseCallbacksGetConn; +virCloseCallbacksNew; +virCloseCallbacksRun; +virCloseCallbacksSet; +virCloseCallbacksUnset; + + # hypervisor/virhostdev.h virHostdevFindUSBDevice; virHostdevManagerGetDefault; @@ -1798,14 +1807,6 @@ virCgroupV2DevicesGetPerms; virCgroupV2DevicesPrepareProg; virCgroupV2DevicesRemoveProg; =20 -# util/virclosecallbacks.h -virCloseCallbacksGet; -virCloseCallbacksGetConn; -virCloseCallbacksNew; -virCloseCallbacksRun; -virCloseCallbacksSet; -virCloseCallbacksUnset; - # util/vircommand.h virCommandAbort; virCommandAddArg; diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index a340fdeffb..ddb3b43c5f 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -35,8 +35,6 @@ UTIL_SOURCES =3D \ util/vircgroupv2.h \ util/vircgroupv2devices.c \ util/vircgroupv2devices.h \ - util/virclosecallbacks.c \ - util/virclosecallbacks.h \ util/vircommand.c \ util/vircommand.h \ util/vircommandpriv.h \ --=20 2.24.1