# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1246397611 25200 # Node ID fb4f5e6e30cf8316165fa8307bc3fd184ff231fd # Parent 7e1613aaff99b7ff536a9bd0277345bf2d62f4f1 Schema changes and pool_parsing changes needed to add SCSI pool support For SCSI pools (pools using a host bus adapter) will need to specify the AdapterName attribute. The PortName and NodeName attributes are optional. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 7e1613aaff99 -r fb4f5e6e30cf libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Wed Jun 24 11:46:08 2009 -0700 +++ b/libxkutil/pool_parsing.c Tue Jun 30 14:33:31 2009 -0700 @@ -58,6 +58,9 @@ free(pool.path); free(pool.host); free(pool.src_dir); + free(pool.adapter); + free(pool.port_name); + free(pool.node_name); for (i = 0; i < pool.device_paths_ct; i++) free(pool.device_paths[i]); diff -r 7e1613aaff99 -r fb4f5e6e30cf libxkutil/pool_parsing.h --- a/libxkutil/pool_parsing.h Wed Jun 24 11:46:08 2009 -0700 +++ b/libxkutil/pool_parsing.h Tue Jun 30 14:33:31 2009 -0700 @@ -43,12 +43,16 @@ DISK_POOL_NETFS, DISK_POOL_DISK, DISK_POOL_ISCSI, - DISK_POOL_LOGICAL} pool_type; + DISK_POOL_LOGICAL, + DISK_POOL_SCSI} pool_type; char *path; char **device_paths; uint16_t device_paths_ct; char *host; char *src_dir; + char *adapter; + char *port_name; + char *node_name; }; struct virt_pool { diff -r 7e1613aaff99 -r fb4f5e6e30cf schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Wed Jun 24 11:46:08 2009 -0700 +++ b/schema/ResourceAllocationSettingData.mof Tue Jun 30 14:33:31 2009 -0700 @@ -230,14 +230,17 @@ class Xen_DiskPoolResourceAllocationSettingData : Xen_ResourceAllocationSettingData { [Description ("Storage pool type"), - ValueMap {"0", "1", "2", "3", "4", "5", "6"}, + ValueMap {"0", "1", "2", "3", "4", "5", "6", "7"}, Values {"Unknown", "Directory, File System, Network File System, " - "Disk, ISCSI, Logical"}] + "Disk, ISCSI, Logical, SCSI Host Bus Adapter"}] uint16 Type; string Path; string DevicePaths[]; string Host; string SourceDirectory; + string AdapterName; + string PortName; + string NodeName; }; [Description ("KVM virtual disk pool settings"), @@ -246,14 +249,17 @@ class KVM_DiskPoolResourceAllocationSettingData : KVM_ResourceAllocationSettingData { [Description ("Storage pool type"), - ValueMap {"0", "1", "2", "3", "4", "5", "6"}, + ValueMap {"0", "1", "2", "3", "4", "5", "6", "7"}, Values {"Unknown", "Directory, File System, Network File System, " - "Disk, ISCSI, Logical"}] + "Disk, ISCSI, Logical, SCSI Host Bus Adapter"}] uint16 Type; string Path; string DevicePaths[]; string Host; string SourceDirectory; + string AdapterName; + string PortName; + string NodeName; }; [Description ("LXC virtual disk pool settings"), @@ -262,13 +268,16 @@ class LXC_DiskPoolResourceAllocationSettingData : LXC_ResourceAllocationSettingData { [Description ("Storage pool type"), - ValueMap {"0", "1", "2", "3", "4", "5", "6"}, + ValueMap {"0", "1", "2", "3", "4", "5", "6", "7"}, Values {"Unknown", "Directory, File System, Network File System, " - "Disk, ISCSI, Logical"}] + "Disk, ISCSI, Logical, SCSI Host Bus Adapter"}] uint16 Type; string Path; string DevicePaths[]; string Host; string SourceDirectory; + string AdapterName; + string PortName; + string NodeName; };