conf: Refactor helpers to retrieve actual storage type

Now that the storage source definition is uniform convert the helpers to
retrieve the actual storage type to a single one.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1be942d1f47a9dd52f7dfb0d995af6cc5aec7e60..1c4f9d2a22f02c93f73a6690d07161b56feb4ca2 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1215,16 +1215,6 @@ virDomainDiskSetType(virDomainDiskDefPtr def, int type)
 }
 
 
-int
-virDomainDiskGetActualType(virDomainDiskDefPtr def)
-{
-    if (def->src.type == VIR_STORAGE_TYPE_VOLUME && def->src.srcpool)
-        return def->src.srcpool->actualtype;
-
-    return def->src.type;
-}
-
-
 const char *
 virDomainDiskGetSource(virDomainDiskDefPtr def)
 {

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index addf65415c04bf85b88f99584215577616253b93..2ff0bc4cf4f4d4aae3ee269df6a2af7626da019b 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2132,7 +2132,6 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def);
 void virDomainLeaseDefFree(virDomainLeaseDefPtr def);
 int virDomainDiskGetType(virDomainDiskDefPtr def);
 void virDomainDiskSetType(virDomainDiskDefPtr def, int type);
-int virDomainDiskGetActualType(virDomainDiskDefPtr def);
 const char *virDomainDiskGetSource(virDomainDiskDefPtr def);
 int virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src)
     ATTRIBUTE_RETURN_CHECK;

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 852a2860b6354c543fee810186db93415590bc28..070e50d0b2d8dc2ef064730c70ebc74079f3d7a6 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -1290,10 +1290,3 @@ virDomainSnapshotRedefinePrep(virDomainPtr domain,
  cleanup:
     return ret;
 }
-
-
-int
-virDomainSnapshotDiskGetActualType(virDomainSnapshotDiskDefPtr def)
-{
-    return def->src.type;
-}

diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h
index 1444d77b32b568a4abbcb22d217b95cdebbcb850..5f74b62edc7d2968a3b872eb3eea270f72bf3773 100644 (file)
--- a/src/conf/snapshot_conf.h
+++ b/src/conf/snapshot_conf.h
@@ -183,8 +183,6 @@ int virDomainSnapshotRedefinePrep(virDomainPtr domain,
                                   bool *update_current,
                                   unsigned int flags);
 
-int virDomainSnapshotDiskGetActualType(virDomainSnapshotDiskDefPtr def);
-
 VIR_ENUM_DECL(virDomainSnapshotLocation)
 VIR_ENUM_DECL(virDomainSnapshotState)
 

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 55aa586642d590b01bc0006e72c433a3dd7b9b7d..9c189dc2a9fc1d016194ec68f96fbb5e6faf44ec 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -197,7 +197,6 @@ virDomainDiskErrorPolicyTypeToString;
 virDomainDiskFindByBusAndDst;
 virDomainDiskGeometryTransTypeFromString;
 virDomainDiskGeometryTransTypeToString;
-virDomainDiskGetActualType;
 virDomainDiskGetDriver;
 virDomainDiskGetFormat;
 virDomainDiskGetSource;
@@ -663,7 +662,6 @@ virDomainSnapshotDefFormat;
 virDomainSnapshotDefFree;
 virDomainSnapshotDefIsExternal;
 virDomainSnapshotDefParseString;
-virDomainSnapshotDiskGetActualType;
 virDomainSnapshotDropParent;
 virDomainSnapshotFindByName;
 virDomainSnapshotForEach;
@@ -1843,6 +1841,7 @@ virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
 virStorageSourceAuthClear;
 virStorageSourceClear;
+virStorageSourceGetActualType;
 virStorageSourcePoolDefFree;
 virStorageSourcePoolModeTypeFromString;
 virStorageSourcePoolModeTypeToString;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 379c0940b4ad55f0d953bd07258d8dc0b1b16ff8..8b58d5e68a51ea591e51349f7dd15427b62e70aa 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3863,7 +3863,7 @@ qemuDomainDiskGetSourceString(virConnectPtr conn,
                               virDomainDiskDefPtr disk,
                               char **source)
 {
-    int actualType = virDomainDiskGetActualType(disk);
+    int actualType = virStorageSourceGetActualType(&disk->src);
     char *secret = NULL;
     int ret = -1;
 
@@ -3893,7 +3893,7 @@ qemuDomainDiskGetSourceString(virConnectPtr conn,
             goto cleanup;
     }
 
-    ret = qemuGetDriveSourceString(virDomainDiskGetActualType(disk),
+    ret = qemuGetDriveSourceString(actualType,
                                    disk->src.path,
                                    disk->src.protocol,
                                    disk->src.nhosts,
@@ -3921,7 +3921,7 @@ qemuBuildDriveStr(virConnectPtr conn,
     int idx = virDiskNameToIndex(disk->dst);
     int busid = -1, unitid = -1;
     char *source = NULL;
-    int actualType = virDomainDiskGetActualType(disk);
+    int actualType = virStorageSourceGetActualType(&disk->src);
 
     if (idx < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4bb48196418e144e2939e7c0210762f0048341e8..5b0e48499822fb56d8a9b87b11cd957588151974 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12005,7 +12005,7 @@ qemuDomainSnapshotDiskGetSourceString(virDomainSnapshotDiskDefPtr disk,
 {
     *source = NULL;
 
-    return qemuGetDriveSourceString(virDomainSnapshotDiskGetActualType(disk),
+    return qemuGetDriveSourceString(virStorageSourceGetActualType(&disk->src),
                                     disk->src.path,
                                     disk->src.protocol,
                                     disk->src.nhosts,
@@ -12326,7 +12326,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn,
 static int
 qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)
 {
-    int actualType = virDomainDiskGetActualType(disk);
+    int actualType = virStorageSourceGetActualType(&disk->src);
 
     switch ((enum virStorageType) actualType) {
     case VIR_STORAGE_TYPE_BLOCK:
@@ -12371,7 +12371,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)
 static int
 qemuDomainSnapshotPrepareDiskExternalBackingActive(virDomainDiskDefPtr disk)
 {
-    int actualType = virDomainDiskGetActualType(disk);
+    int actualType = virStorageSourceGetActualType(&disk->src);
 
     if (actualType == VIR_STORAGE_TYPE_BLOCK &&
         disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
@@ -12388,7 +12388,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingActive(virDomainDiskDefPtr disk)
 static int
 qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr disk)
 {
-    int actualType = virDomainSnapshotDiskGetActualType(disk);
+    int actualType = virStorageSourceGetActualType(&disk->src);
 
     switch ((enum virStorageType) actualType) {
     case VIR_STORAGE_TYPE_BLOCK:
@@ -12436,7 +12436,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d
 static int
 qemuDomainSnapshotPrepareDiskExternalOverlayInactive(virDomainSnapshotDiskDefPtr disk)
 {
-    int actualType = virDomainSnapshotDiskGetActualType(disk);
+    int actualType = virStorageSourceGetActualType(&disk->src);
 
     switch ((enum virStorageType) actualType) {
     case VIR_STORAGE_TYPE_BLOCK:
@@ -12534,7 +12534,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn,
     if (qemuTranslateDiskSourcePool(conn, disk) < 0)
         return -1;
 
-    actualType = virDomainDiskGetActualType(disk);
+    actualType = virStorageSourceGetActualType(&disk->src);
 
     switch ((enum virStorageType) actualType) {
     case VIR_STORAGE_TYPE_BLOCK:

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index ddd282eb4979f3501b01d376a66e5a37346045d7..d58d98655eb5156bc4b6cc80a2a527fdd8070e84 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -2813,7 +2813,7 @@ virStorageFileInitInternal(int type,
 virStorageFilePtr
 virStorageFileInitFromDiskDef(virDomainDiskDefPtr disk)
 {
-    return virStorageFileInitInternal(virDomainDiskGetActualType(disk),
+    return virStorageFileInitInternal(virStorageSourceGetActualType(&disk->src),
                                       disk->src.path,
                                       disk->src.protocol,
                                       disk->src.nhosts,
@@ -2824,7 +2824,7 @@ virStorageFileInitFromDiskDef(virDomainDiskDefPtr disk)
 virStorageFilePtr
 virStorageFileInitFromSnapshotDef(virDomainSnapshotDiskDefPtr disk)
 {
-    return virStorageFileInitInternal(virDomainSnapshotDiskGetActualType(disk),
+    return virStorageFileInitInternal(virStorageSourceGetActualType(&disk->src),
                                       disk->src.path,
                                       disk->src.protocol,
                                       disk->src.nhosts,

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 9a23ec7fcadc078b417c86c06a7dd20cde833f34..f11e165af496298a918daf88b85b17f58beade75 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1577,6 +1577,16 @@ virStorageSourceAuthClear(virStorageSourcePtr def)
 }
 
 
+int
+virStorageSourceGetActualType(virStorageSourcePtr def)
+{
+    if (def->type == VIR_STORAGE_TYPE_VOLUME && def->srcpool)
+        return def->srcpool->actualtype;
+
+    return def->type;
+}
+
+
 void
 virStorageSourceClear(virStorageSourcePtr def)
 {

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 83ec2bda79a6d3aa044e2cbee1cedd825e804905..22198a832997ebe84165cd7d2326030817e79b72 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -298,5 +298,6 @@ virStorageNetHostDefPtr virStorageNetHostDefCopy(size_t nhosts,
 void virStorageSourceAuthClear(virStorageSourcePtr def);
 void virStorageSourcePoolDefFree(virStorageSourcePoolDefPtr def);
 void virStorageSourceClear(virStorageSourcePtr def);
+int virStorageSourceGetActualType(virStorageSourcePtr def);
 
 #endif /* __VIR_STORAGE_FILE_H__ */