[Libvirt-cim] [PATCH 2 of 3] Add support to fetch data from BootDevices property to the internal data structure
# HG changeset patch
# User Richard Maciel <rmaciel(a)linux.vnet.ibm.com>
# Date 1243891183 10800
# Node ID db7956e2e1028b553e9e722751eff3b8bea6ee38
# Parent dc7ef55a1fe9870280e369096a4ed267e3eaa4ec
Add support to fetch data from BootDevices property to the internal data structure
#2:
- Code style changes
Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com>
diff -r dc7ef55a1fe9 -r db7956e2e102 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c Mon Jun 01 18:19:38 2009 -0300
+++ b/src/Virt_VirtualSystemManagementService.c Mon Jun 01 18:19:43 2009 -0300
@@ -197,6 +197,68 @@
return kvm;
}
+static int bootord_vssd_to_domain(CMPIInstance *inst,
+ struct domain *domain)
+{
+ int ret;
+ CMPICount i;
+ CMPICount bl_size;
+ CMPIArray *bootlist;
+ CMPIStatus s;
+ CMPIData boot_elem;
+ char **tmp_str_arr;
+
+ for (i = 0; i < domain->os_info.fv.bootlist_ct; i++)
+ free(domain->os_info.fv.bootlist[i]);
+
+ ret = cu_get_array_prop(inst, "BootDevices", &bootlist);
+
+ if (ret != CMPI_RC_OK)
+ CU_DEBUG("Failed to get BootDevices property");
+
+
+ bl_size = CMGetArrayCount(bootlist, &s);
+ if (s.rc != CMPI_RC_OK) {
+ CU_DEBUG("Invalid BootDevice array size");
+ return 0;
+ }
+
+ tmp_str_arr = (char **)realloc(domain->os_info.fv.bootlist,
+ bl_size * sizeof(char *));
+
+ if (tmp_str_arr == NULL) {
+ CU_DEBUG("Could not alloc BootDevices array");
+ return 0;
+ }
+
+ for (i = 0; i < bl_size; i++) {
+ const char *str;
+
+ boot_elem = CMGetArrayElementAt(bootlist,
+ i,
+ NULL);
+
+ if (CMIsNullValue(boot_elem)) {
+ CU_DEBUG("Null BootDevice");
+ return 0;
+ }
+
+ str = CMGetCharPtr(boot_elem.value.string);
+
+ if (str == NULL) {
+ CU_DEBUG("Could not extract char pointer from "
+ "CMPIArray");
+ return 0;
+ }
+
+ tmp_str_arr[i] = strdup(str);
+ }
+ domain->os_info.fv.bootlist_ct = bl_size;
+ domain->os_info.fv.bootlist = tmp_str_arr;
+
+ return 1;
+}
+
static int fv_vssd_to_domain(CMPIInstance *inst,
struct domain *domain,
const char *pfx)
@@ -216,12 +278,9 @@
return 0;
}
- ret = cu_get_str_prop(inst, "BootDevice", &val);
- if (ret != CMPI_RC_OK)
- val = "hd";
-
- free(domain->os_info.fv.boot);
- domain->os_info.fv.boot = strdup(val);
+ ret = bootord_vssd_to_domain(inst, domain);
+ if (ret != 1)
+ return 0;
ret = cu_get_str_prop(inst, "Emulator", &val);
if (ret != CMPI_RC_OK)