From nobody Sun Feb 8 11:21:58 2026 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 --- 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