openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virhostdev: move to src/hypervisor 

This module depends on domain_conf and is used directly by various
hypervisor drivers.

Move it to src/hypervisor.

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 17:52:59 +01:00
parent 4ccc69707e
commit a504a3c377
10 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/syntax-check.mk
View File

@ -2119,7 +2119,7 @@ exclude_file_name_regexp--sc_prohibit_readdir = \
^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$ ^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$
exclude_file_name_regexp--sc_prohibit_cross_inclusion = \ exclude_file_name_regexp--sc_prohibit_cross_inclusion = \
^(src/util/virclosecallbacks\.h|src/util/virhostdev\.h)$$ ^(src/util/virclosecallbacks\.h)$$
exclude_file_name_regexp--sc_prohibit_dirent_d_type = \ exclude_file_name_regexp--sc_prohibit_dirent_d_type = \
^(src/util/vircgroup.c)$ ^(src/util/vircgroup.c)$

2
po/POTFILES.in
View File

@ -80,6 +80,7 @@
@SRCDIR@/src/hyperv/hyperv_wmi.c @SRCDIR@/src/hyperv/hyperv_wmi.c
@SRCDIR@/src/hypervisor/domain_cgroup.c @SRCDIR@/src/hypervisor/domain_cgroup.c
@SRCDIR@/src/hypervisor/domain_driver.c @SRCDIR@/src/hypervisor/domain_driver.c
@SRCDIR@/src/hypervisor/virhostdev.c
@SRCDIR@/src/interface/interface_backend_netcf.c @SRCDIR@/src/interface/interface_backend_netcf.c
@SRCDIR@/src/interface/interface_backend_udev.c @SRCDIR@/src/interface/interface_backend_udev.c
@SRCDIR@/src/internal.h @SRCDIR@/src/internal.h
@ -250,7 +251,6 @@
@SRCDIR@/src/util/virhash.c @SRCDIR@/src/util/virhash.c
@SRCDIR@/src/util/virhook.c @SRCDIR@/src/util/virhook.c
@SRCDIR@/src/util/virhostcpu.c @SRCDIR@/src/util/virhostcpu.c
@SRCDIR@/src/util/virhostdev.c
@SRCDIR@/src/util/virhostmem.c @SRCDIR@/src/util/virhostmem.c
@SRCDIR@/src/util/virhostuptime.c @SRCDIR@/src/util/virhostuptime.c
@SRCDIR@/src/util/viridentity.c @SRCDIR@/src/util/viridentity.c

2
src/hypervisor/Makefile.inc.am
View File

@ -5,6 +5,8 @@ HYPERVISOR_SOURCES = \
hypervisor/domain_cgroup.c \ hypervisor/domain_cgroup.c \
hypervisor/domain_driver.h \ hypervisor/domain_driver.h \
hypervisor/domain_driver.c \ hypervisor/domain_driver.c \
hypervisor/virhostdev.h \
hypervisor/virhostdev.c \
$(NULL) $(NULL)
noinst_LTLIBRARIES += libvirt_hypervisor.la noinst_LTLIBRARIES += libvirt_hypervisor.la

0
src/util/virhostdev.c → src/hypervisor/virhostdev.c
View File

0
src/util/virhostdev.h → src/hypervisor/virhostdev.h
View File

60
src/libvirt_private.syms
View File

@ -1406,6 +1406,36 @@ virDomainDriverParseBlkioDeviceStr;
virDomainDriverSetupPersistentDefBlkioParams; virDomainDriverSetupPersistentDefBlkioParams;
# 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 # libvirt_internal.h
virConnectSupportsFeature; virConnectSupportsFeature;
virDomainMigrateBegin3; virDomainMigrateBegin3;
@ -2169,36 +2199,6 @@ virHostCPUHasBitmap;
virHostCPUStatsAssign; virHostCPUStatsAssign;
# 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 # util/virhostmem.h
virHostMemAllocPages; virHostMemAllocPages;
virHostMemGetCellsFree; virHostMemGetCellsFree;

1
src/libxl/Makefile.inc.am
View File

@ -46,6 +46,7 @@ libvirt_driver_libxl_impl_la_CFLAGS = \
-I$(builddir)/access \ -I$(builddir)/access \
-I$(srcdir)/conf \ -I$(srcdir)/conf \
-I$(srcdir)/secret \ -I$(srcdir)/secret \
-I$(srcdir)/hypervisor \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(NULL) $(NULL)
libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)

1
src/security/Makefile.inc.am
View File

@ -100,6 +100,7 @@ virt_aa_helper_LDADD += libvirt_probes.lo
endif WITH_DTRACE_PROBES endif WITH_DTRACE_PROBES
virt_aa_helper_CFLAGS = \ virt_aa_helper_CFLAGS = \
-I$(srcdir)/conf \ -I$(srcdir)/conf \
-I$(top_srcdir)/src/hypervisor \
-I$(srcdir)/security \ -I$(srcdir)/security \
$(AM_CFLAGS) \ $(AM_CFLAGS) \
$(PIE_CFLAGS) \ $(PIE_CFLAGS) \

2
src/util/Makefile.inc.am
View File

@ -92,8 +92,6 @@ UTIL_SOURCES = \
util/virhostcpu.c \ util/virhostcpu.c \
util/virhostcpu.h \ util/virhostcpu.h \
util/virhostcpupriv.h \ util/virhostcpupriv.h \
util/virhostdev.c \
util/virhostdev.h \
util/virhostmem.c \ util/virhostmem.c \
util/virhostmem.h \ util/virhostmem.h \
util/virhostuptime.c \ util/virhostuptime.c \

1
tests/Makefile.am
View File

@ -22,6 +22,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src -I$(top_srcdir)/src \ -I$(top_builddir)/src -I$(top_srcdir)/src \
-I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/util \
-I$(top_srcdir)/src/conf \ -I$(top_srcdir)/src/conf \
-I$(top_srcdir)/src/hypervisor \
-I$(top_builddir)/src/rpc \ -I$(top_builddir)/src/rpc \
$(NULL) $(NULL)