From: John Ferlan <jferlan@redhat.com>
Date: Fri, 10 Mar 2017 16:21:12 +0000 (-0500)
Subject: conf: Split up virStoragePoolSourceAdapter
X-Git-Tag: v3.2.0-rc1~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c286868b1d80df562e0fad274a832134dbca69f;p=thirdparty%2Flibvirt.git

conf: Split up virStoragePoolSourceAdapter

Create typedef'd substructures and rework typedef to utilize.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index c3a88d2848..d913feb8ed 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -179,27 +179,35 @@ typedef enum {
 } virStoragePoolSourceAdapterType;
 VIR_ENUM_DECL(virStoragePoolSourceAdapter)
 
+typedef struct _virStorageAdapterSCSIHost virStorageAdapterSCSIHost;
+typedef virStorageAdapterSCSIHost *virStorageAdapterSCSIHostPtr;
+struct _virStorageAdapterSCSIHost {
+    char *name;
+    virPCIDeviceAddress parentaddr; /* host address */
+    int unique_id;
+    bool has_parent;
+};
+
+typedef struct _virStorageAdapterFCHost virStorageAdapterFCHost;
+typedef virStorageAdapterFCHost *virStorageAdapterFCHostPtr;
+struct _virStorageAdapterFCHost {
+    char *parent;
+    char *parent_wwnn;
+    char *parent_wwpn;
+    char *parent_fabric_wwn;
+    char *wwnn;
+    char *wwpn;
+    int managed;        /* enum virTristateSwitch */
+};
+
 typedef struct _virStoragePoolSourceAdapter virStoragePoolSourceAdapter;
 typedef virStoragePoolSourceAdapter *virStoragePoolSourceAdapterPtr;
 struct _virStoragePoolSourceAdapter {
     int type; /* virStoragePoolSourceAdapterType */
 
     union {
-        struct {
-            char *name;
-            virPCIDeviceAddress parentaddr; /* host address */
-            int unique_id;
-            bool has_parent;
-        } scsi_host;
-        struct {
-            char *parent;
-            char *parent_wwnn;
-            char *parent_wwpn;
-            char *parent_fabric_wwn;
-            char *wwnn;
-            char *wwpn;
-            int managed;        /* enum virTristateSwitch */
-        } fchost;
+        virStorageAdapterSCSIHost scsi_host;
+        virStorageAdapterFCHost fchost;
     } data;
 };