[libvirt PATCH 0/4] Do not depend on conf/ in util/
Ján Tomko (4): syntax-check: inclusion rule for src/hypervisor conf: move virHostdevIs functions virhostdev: move to src/hypervisor virclosecallbacks: move to src/hypervisor build-aux/syntax-check.mk | 5 +- po/POTFILES.in | 4 +- src/bhyve/Makefile.inc.am | 1 + src/conf/domain_conf.c | 44 ++++++++++- src/conf/domain_conf.h | 10 +++ src/hypervisor/Makefile.inc.am | 4 + src/{util => hypervisor}/virclosecallbacks.c | 0 src/{util => hypervisor}/virclosecallbacks.h | 0 src/{util => hypervisor}/virhostdev.c | 43 ---------- src/{util => hypervisor}/virhostdev.h | 9 --- src/libvirt_private.syms | 83 ++++++++++---------- src/libxl/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 4 - tests/Makefile.am | 1 + 14 files changed, 105 insertions(+), 104 deletions(-) rename src/{util => hypervisor}/virclosecallbacks.c (100%) rename src/{util => hypervisor}/virclosecallbacks.h (100%) rename src/{util => hypervisor}/virhostdev.c (98%) rename src/{util => hypervisor}/virhostdev.h (97%) -- 2.24.1
Allow it to be included by anything above mid_dirs. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- 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="($$dir|conf|util)";; \ cpu/| network/| node_device/| rpc/| security/| storage/) \ safe="($$dir|util|conf|storage)";; \ - *) safe="($$dir|$(mid_dirs)|util)";; \ + *) safe="($$dir|$(mid_dirs)|hypervisor|util)";; \ esac; \ in_vc_files="src/$$dir" \ prohibit='^# *include .$(cross_dirs_re)' \ -- 2.24.1
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án Tomko <jtomko@redhat.com> --- 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 virDomainBlockIoTuneInfo *a, a->read_iops_sec_max_length == b->read_iops_sec_max_length && a->write_iops_sec_max_length == 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 == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == 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 == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV; +} + + +/** + * virHostdevIsVFIODevice: + * @hostdev: host device to check + * + * Returns true if @hostdev is a PCI device with VFIO backend, false otherwise. + */ +bool +virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev) +{ + return hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && + hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && + hostdev->source.subsys.u.pci.backend == 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 virDomainBlockIoTuneInfo *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; # conf/domain_nwfilter.h @@ -2168,9 +2171,6 @@ virHostCPUStatsAssign; # 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 *hostdev) } -/** - * virHostdevIsSCSIDevice: - * @hostdev: host device to check - * - * Returns true if @hostdev is a SCSI device, false otherwise. - */ -bool -virHostdevIsSCSIDevice(const virDomainHostdevDef *hostdev) -{ - return hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == 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 == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV; -} - - -/** - * virHostdevIsVFIODevice: - * @hostdev: host device to check - * - * Returns true if @hostdev is a PCI device with VFIO backend, false otherwise. - */ -bool -virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev) -{ - return hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && - hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && - hostdev->source.subsys.u.pci.backend == 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 mgr, 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); /* functions used by NodeDevDetach/Reattach/Reset */ int virHostdevPCINodeDeviceDetach(virHostdevManagerPtr mgr, -- 2.24.1
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> --- build-aux/syntax-check.mk | 2 +- po/POTFILES.in | 2 +- src/hypervisor/Makefile.inc.am | 2 + src/{util => hypervisor}/virhostdev.c | 0 src/{util => 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 => hypervisor}/virhostdev.c (100%) rename src/{util => 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 = \ ^(tests/(.*mock|virfilewrapper)\.c|tools/nss/libvirt_nss\.c)$$ 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 = \ ^(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 = \ hypervisor/domain_cgroup.c \ hypervisor/domain_driver.h \ hypervisor/domain_driver.c \ + hypervisor/virhostdev.h \ + hypervisor/virhostdev.c \ $(NULL) noinst_LTLIBRARIES += 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; +# 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; -# 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 = \ -I$(builddir)/access \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ + -I$(srcdir)/hypervisor \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_libxl_impl_la_LDFLAGS = $(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 = \ 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 = \ -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) -- 2.24.1
On 2/23/20 3:16 PM, Ján Tomko wrote:
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> --- build-aux/syntax-check.mk | 2 +- po/POTFILES.in | 2 +- src/hypervisor/Makefile.inc.am | 2 + src/{util => hypervisor}/virhostdev.c | 0 src/{util => 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 => hypervisor}/virhostdev.c (100%) rename src/{util => hypervisor}/virhostdev.h (100%)
Missed aa-helper: diff --git a/src/security/Makefile.inc.am b/src/security/Makefile.inc.am index 823d80c5dd..5f2f4c8e2d 100644 --- a/src/security/Makefile.inc.am +++ b/src/security/Makefile.inc.am @@ -100,6 +100,7 @@ virt_aa_helper_LDADD += libvirt_probes.lo endif WITH_DTRACE_PROBES virt_aa_helper_CFLAGS = \ -I$(srcdir)/conf \ + -I$(top_srcdir)/src/hypervisor \ -I$(srcdir)/security \ $(AM_CFLAGS) \ $(PIE_CFLAGS) \ Michal
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> --- build-aux/syntax-check.mk | 3 --- po/POTFILES.in | 2 +- src/bhyve/Makefile.inc.am | 1 + src/hypervisor/Makefile.inc.am | 2 ++ src/{util => hypervisor}/virclosecallbacks.c | 0 src/{util => 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 => hypervisor}/virclosecallbacks.c (100%) rename src/{util => 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 = \ 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 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 = \ -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 3bd775a4a5..bc48ab1266 100644 --- 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 85b1eca72f..3b7c0d8043 100644 --- 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 a340fdeffb..ddb3b43c5f 100644 --- 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 \ -- 2.24.1
On 2/23/20 3:16 PM, Ján Tomko wrote:
Ján Tomko (4): syntax-check: inclusion rule for src/hypervisor conf: move virHostdevIs functions virhostdev: move to src/hypervisor virclosecallbacks: move to src/hypervisor
build-aux/syntax-check.mk | 5 +- po/POTFILES.in | 4 +- src/bhyve/Makefile.inc.am | 1 + src/conf/domain_conf.c | 44 ++++++++++- src/conf/domain_conf.h | 10 +++ src/hypervisor/Makefile.inc.am | 4 + src/{util => hypervisor}/virclosecallbacks.c | 0 src/{util => hypervisor}/virclosecallbacks.h | 0 src/{util => hypervisor}/virhostdev.c | 43 ---------- src/{util => hypervisor}/virhostdev.h | 9 --- src/libvirt_private.syms | 83 ++++++++++---------- src/libxl/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 4 - tests/Makefile.am | 1 + 14 files changed, 105 insertions(+), 104 deletions(-) rename src/{util => hypervisor}/virclosecallbacks.c (100%) rename src/{util => hypervisor}/virclosecallbacks.h (100%) rename src/{util => hypervisor}/virhostdev.c (98%) rename src/{util => hypervisor}/virhostdev.h (97%)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Ján Tomko -
Michal Privoznik