[Libvirt-cim] [PATCH] Fix return value of ModifySystemSettings

24 Sep 2008

# HG changeset patch
# User Dan Smith <danms@us.ibm.com>
# Date 1222190876 25200
# Node ID 29d96fbb316175f6d1590929752a7e688f00fc8e
# Parent  16cdfa1774d4b9fa65e6e835a9f5fc5a37d52051
Fix return value of ModifySystemSettings

Signed-off-by: Dan Smith <danms@us.ibm.com>

diff -r 16cdfa1774d4 -r 29d96fbb3161 src/Virt_VirtualSystemManagementService.c

--- a/src/Virt_VirtualSystemManagementService.c	Tue Sep 23 07:10:47 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Tue Sep 23 10:27:56 2008 -0700
@@ -1210,6 +1210,7 @@
                                       CMPIArgs *argsout)
 {
         CMPIInstance *inst;
+        uint32_t rc;
 
         if (cu_get_inst_arg(argsin, "SystemSettings", &inst) != CMPI_RC_OK) {
                 CMPIStatus s;
@@ -1217,10 +1218,19 @@
                 cu_statusf(_BROKER, &s,
                            CMPI_RC_ERR_FAILED,
                            "Missing SystemSettings");
-                return s;
+                goto out;
         }
 
-        return update_system_settings(context, reference, inst);
+        s = update_system_settings(context, reference, inst);
+ out:
+        if (s.rc == CMPI_RC_OK)
+                rc = CIM_SVPC_RETURN_COMPLETED;
+        else
+                rc = CIM_SVPC_RETURN_FAILED;
+
+        CMReturnData(results, &rc, CMPI_uint32);
+
+        return s;
 }
 
 typedef CMPIStatus (*resmod_fn)(struct domain *,

    