conf: move virHostdevIs functions

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>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cef49df3f891f744f1e6c348fe85d9a77b313af4..fc1e936bd0d1a29625ef7100aa0acd403b827ad6 100644 (file)
--- 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 cdc4d2570025640c7cfcd174566f473eeb41c63a..c126a907292e05c6f979ada3eb6501a139192da8 100644 (file)
--- 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 907cef239041253b2db861a31223875951188b59..05e1bc875b537a65038f371f8646881905f765da 100644 (file)
--- 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 f8f798920676ffbab0daf23c707ea269a0242f29..6565cebe570f8cd83cc6446c9e0703973eb9c3d7 100644 (file)
--- 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 ae84ed3d209eb2b7e99d9ca4e36883ee1a7e6342..811bda40ed68be2cd76fbb7f1e09f626d9c07d4f 100644 (file)
--- 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,