[libvirt] [PATCH 3/9] conf: rename and move virStoragePoolSourceInitiatorAttr
This structure will be reused by domain disk images as well.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/storage_conf.h | 7 +------
src/util/virstoragefile.h | 6 ++++++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 858623783d..4d7abbbc98 100644
--- 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 c2c40edf68..d9e27a4a5f 100644
--- 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;
--
2.17.1