[Libvirt-cim] [PATCH] (#2) Fix return value of ModifySystemSettings

Dan Smith danms at us.ibm.com
Wed Sep 24 17:36:08 UTC 2008


# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1222277765 25200
# Node ID 61a72b41f401bbba89b6c503bf4629400fcce60f
# Parent  06e1fa131671f9d0ecd76a89c927864a887f0b0d
(#2) Fix return value of ModifySystemSettings

Changes:
 - Fix silly compile error

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

diff -r 06e1fa131671 -r 61a72b41f401 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c	Wed Sep 24 09:30:41 2008 -0700
+++ b/src/Virt_VirtualSystemManagementService.c	Wed Sep 24 10:36:05 2008 -0700
@@ -1210,17 +1210,27 @@
                                       CMPIArgs *argsout)
 {
         CMPIInstance *inst;
+        CMPIStatus s;
+        uint32_t rc;
 
         if (cu_get_inst_arg(argsin, "SystemSettings", &inst) != CMPI_RC_OK) {
-                CMPIStatus s;
 
                 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 *,




More information about the Libvirt-cim mailing list