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>
This commit is contained in:
Ján Tomko 2020-02-22 18:16:19 +01:00
parent a504a3c377
commit 25c29ac2f5
8 changed files with 13 additions and 14 deletions

View File

@ -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)$

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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;

View File

@ -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 \