conf: rename and move virStoragePoolSourceInitiatorAttr

This structure will be reused by domain disk images as well.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 858623783ddd47f519f2035f757fc40a59be3cec..4d7abbbc98ab4e9bde136856c3297b03fc84bf63 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -140,11 +140,6 @@ struct _virStoragePoolSourceDeviceExtent {
     int type; /* virStorageFreeType */
 };
 
-typedef struct _virStoragePoolSourceInitiatorAttr virStoragePoolSourceInitiatorAttr;
-struct _virStoragePoolSourceInitiatorAttr {
-    char *iqn; /* Initiator IQN */
-};
-
 /*
  * Pools can be backed by one or more devices, and some
  * allow us to track free space on underlying devices.
@@ -189,7 +184,7 @@ struct _virStoragePoolSource {
     char *name;
 
     /* Initiator IQN */
-    virStoragePoolSourceInitiatorAttr initiator;
+    virStorageSourceInitiatorDef initiator;
 
     /* Authentication information */
     virStorageAuthDefPtr auth;

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index c2c40edf683f03b263bc61c02acd919ad2e390c3..d9e27a4a5fffb0d9a6f9f2856bccd4111dd20a8f 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -226,6 +226,12 @@ struct _virStoragePRDef {
     char *mgralias;
 };
 
+typedef struct _virStorageSourceInitiatorDef virStorageSourceInitiatorDef;
+typedef virStorageSourceInitiatorDef *virStorageSourceInitiatorDefPtr;
+struct _virStorageSourceInitiatorDef {
+    char *iqn; /* Initiator IQN */
+};
+
 typedef struct _virStorageDriverData virStorageDriverData;
 typedef virStorageDriverData *virStorageDriverDataPtr;