[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 5/8] conf: Kill now unused virDomainDiskSourceIsBlockType



---
 src/conf/domain_conf.c   | 52 ------------------------------------------------
 src/conf/domain_conf.h   |  3 ---
 src/libvirt_private.syms |  1 -
 3 files changed, 56 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 23ff887..48a220f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -24004,58 +24004,6 @@ virDomainDefFindDevice(virDomainDefPtr def,
     return 0;
 }

-/**
- * virDomainDiskSourceIsBlockType:
- *
- * Check if the disk *source* is of block type. This just tries
- * to check from the type of disk def, not to probe the underlying
- * storage.
- *
- * Return true if its source is block type, or false otherwise.
- */
-bool
-virDomainDiskSourceIsBlockType(virStorageSourcePtr src,
-                               bool report)
-{
-    if (!src->path) {
-        if (report)
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("source path not found for device='lun' "
-                             "using type='%d'"), src->type);
-        return false;
-    }
-
-    if (src->type == VIR_STORAGE_TYPE_BLOCK)
-        return true;
-
-    /* For volume types, check the srcpool.
-     * If it's a block type source pool, then it's possible
-     */
-    if (src->type == VIR_STORAGE_TYPE_VOLUME &&
-        src->srcpool &&
-        src->srcpool->voltype == VIR_STORAGE_VOL_BLOCK) {
-        /* We don't think the volume accessed by remote URI is
-         * block type source, since we can't/shouldn't manage it
-         * (e.g. set sgio=filtered|unfiltered for it) in libvirt.
-         */
-         if (src->srcpool->pooltype == VIR_STORAGE_POOL_ISCSI &&
-             src->srcpool->mode == VIR_STORAGE_SOURCE_POOL_MODE_DIRECT) {
-             if (report)
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                _("disk device='lun' for iSCSI is not "
-                                  "supported with mode='direct'."));
-             return false;
-         }
-
-        return true;
-    }
-    if (report)
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("disk device='lun' is only valid for block "
-                         "type disk source"));
-    return false;
-}
-

 char *
 virDomainObjGetMetadata(virDomainObjPtr vm,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b9fe109..bd97153 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3115,9 +3115,6 @@ int virDomainDefFindDevice(virDomainDefPtr def,
                            virDomainDeviceDefPtr dev,
                            bool reportError);

-bool virDomainDiskSourceIsBlockType(virStorageSourcePtr src, bool report)
-    ATTRIBUTE_NONNULL(1);
-
 void virDomainChrSourceDefClear(virDomainChrSourceDefPtr def);

 char *virDomainObjGetMetadata(virDomainObjPtr vm,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 73c9fdb..8e4fdf2 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -289,7 +289,6 @@ virDomainDiskSetDriver;
 virDomainDiskSetFormat;
 virDomainDiskSetSource;
 virDomainDiskSetType;
-virDomainDiskSourceIsBlockType;
 virDomainFSDefFree;
 virDomainFSIndexByName;
 virDomainFSInsert;
-- 
2.8.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]