# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1245111972 25200 # Node ID dff67e06596528ece42c01eff9e0afbcc2a8a422 # Parent 416b44d9a9d4045587226707938610b732ff27ec Change DevicePath attribute to DevicePaths This is because logical storage pools can take more than one device path Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 416b44d9a9d4 -r dff67e065965 libxkutil/pool_parsing.c --- a/libxkutil/pool_parsing.c Fri Jun 19 11:38:35 2009 -0700 +++ b/libxkutil/pool_parsing.c Mon Jun 15 17:26:12 2009 -0700 @@ -53,10 +53,16 @@ } static void cleanup_disk_pool(struct disk_pool pool) { + uint16_t i; + free(pool.path); - free(pool.device_path); free(pool.host); free(pool.src_dir); + + for (i = 0; i < pool.device_paths_ct; i++) + free(pool.device_paths[i]); + + free(pool.device_paths); } void cleanup_virt_pool(struct virt_pool **pool) diff -r 416b44d9a9d4 -r dff67e065965 libxkutil/pool_parsing.h --- a/libxkutil/pool_parsing.h Fri Jun 19 11:38:35 2009 -0700 +++ b/libxkutil/pool_parsing.h Mon Jun 15 17:26:12 2009 -0700 @@ -45,7 +45,8 @@ DISK_POOL_ISCSI, DISK_POOL_LOGICAL} pool_type; char *path; - char *device_path; + char **device_paths; + uint16_t device_paths_ct; char *host; char *src_dir; }; diff -r 416b44d9a9d4 -r dff67e065965 schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Fri Jun 19 11:38:35 2009 -0700 +++ b/schema/ResourceAllocationSettingData.mof Mon Jun 15 17:26:12 2009 -0700 @@ -229,7 +229,7 @@ "Disk, ISCSI, Logical"}] uint16 Type; string Path; - string DevicePath; + string DevicePaths[]; string Host; string SourceDirectory; }; @@ -245,7 +245,7 @@ "Disk, ISCSI, Logical"}] uint16 Type; string Path; - string DevicePath; + string DevicePaths[]; string Host; string SourceDirectory; }; @@ -261,7 +261,7 @@ "Disk, ISCSI, Logical"}] uint16 Type; string Path; - string DevicePath; + string DevicePaths[]; string Host; string SourceDirectory; };