virclosecallbacks: move to src/hypervisor

Just like virhostdev, this depends on domain_conf and
it's shared by multiple hypervisor drivers.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 7d521c1295f30255f9b8f833e53cadebedf3723d..b829c8a18b9e11fb5542ebdcfaea494026ffab64 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -2118,9 +2118,6 @@ exclude_file_name_regexp--sc_prohibit_pthread_create = \
 exclude_file_name_regexp--sc_prohibit_readdir = \
   ^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$
 
-exclude_file_name_regexp--sc_prohibit_cross_inclusion = \
-  ^(src/util/virclosecallbacks\.h)$$
-
 exclude_file_name_regexp--sc_prohibit_dirent_d_type = \
   ^(src/util/vircgroup.c)$
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 975de75037a9aecd661c5683e04bf6d69ca0558f..fe361204bb98d343419851290c6f55d55ec63dc8 100644 (file)
--- 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 6be2437f23e57774eef1ceca78dce7b213df87eb..2536d12ab35ee63e27e9adc1abc0745c8d0cf77d 100644 (file)
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -43,6 +43,7 @@ libvirt_driver_bhyve_impl_la_CFLAGS = \
        -I$(srcdir)/access \
        -I$(builddir)/access \
        -I$(srcdir)/conf \
+       -I$(srcdir)/hypervisor \
        $(AM_CFLAGS) \
        $(NULL)
 libvirt_driver_bhyve_impl_la_LDFLAGS = $(AM_LDFLAGS)

diff --git a/src/hypervisor/Makefile.inc.am b/src/hypervisor/Makefile.inc.am
index 3bd775a4a59fdb9c5a7a7ca8e10878c29f27b235..bc48ab126619c552a99dd4e53d2a5a8e07f42cef 100644 (file)
--- a/src/hypervisor/Makefile.inc.am
+++ b/src/hypervisor/Makefile.inc.am
@@ -5,6 +5,8 @@ HYPERVISOR_SOURCES = \
        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/virclosecallbacks.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/virclosecallbacks.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 85b1eca72f3c8ed5b82a8e504197e351e7a2920b..3b7c0d8043cc2cce448bcaf6079c1e7ce51d44ad 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1406,6 +1406,15 @@ virDomainDriverParseBlkioDeviceStr;
 virDomainDriverSetupPersistentDefBlkioParams;
 
 
+# hypervisor/virclosecallbacks.h
+virCloseCallbacksGet;
+virCloseCallbacksGetConn;
+virCloseCallbacksNew;
+virCloseCallbacksRun;
+virCloseCallbacksSet;
+virCloseCallbacksUnset;
+
+
 # hypervisor/virhostdev.h
 virHostdevFindUSBDevice;
 virHostdevManagerGetDefault;
@@ -1798,14 +1807,6 @@ virCgroupV2DevicesGetPerms;
 virCgroupV2DevicesPrepareProg;
 virCgroupV2DevicesRemoveProg;
 
-# 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 a340fdeffb5e0734bce87def05a744a51b807368..ddb3b43c5f3fe380dc1c1e9d0af805794cbbd19a 100644 (file)
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -35,8 +35,6 @@ UTIL_SOURCES = \
        util/vircgroupv2.h \
        util/vircgroupv2devices.c \
        util/vircgroupv2devices.h \
-       util/virclosecallbacks.c \
-       util/virclosecallbacks.h \
        util/vircommand.c \
        util/vircommand.h \
        util/vircommandpriv.h \