[Libvirt-cim] [PATCH] (#2) Make isMigratable return true if it makes it all the way through the checks,

Dan Smith danms at us.ibm.com
Wed Mar 26 17:47:29 UTC 2008


# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1206553643 25200
# Node ID 055180f1b8538a497dac8272a02ff63c626f3190
# Parent  c2b027700cb7a3075a9b9f56acd6d52cbd1f6fdf
(#2) Make isMigratable return true if it makes it all the way through the checks,
false otherwise.  These should be independent of the return code and the
status, which the patch fixes.

Changes:
 - Removed stupidity

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

diff -r c2b027700cb7 -r 055180f1b853 src/Virt_VSMigrationService.c
--- a/src/Virt_VSMigrationService.c	Tue Mar 25 13:45:01 2008 -0700
+++ b/src/Virt_VSMigrationService.c	Wed Mar 26 10:47:23 2008 -0700
@@ -543,7 +543,7 @@ static CMPIStatus vs_migratable(const CM
         CMPIStatus s;
         virConnectPtr conn = NULL;
         virConnectPtr dconn = NULL;
-        uint32_t retcode = 1;
+        uint32_t retcode = CIM_SVPC_RETURN_COMPLETED;
         CMPIBoolean isMigratable = 0;
         uint16_t type;
         virDomainPtr dom = NULL;
@@ -598,14 +598,13 @@ static CMPIStatus vs_migratable(const CM
                 goto out;
         }
 
-        retcode = CIM_SVPC_RETURN_COMPLETED;
+        isMigratable = 1;
         cu_statusf(_BROKER, &s,
                    CMPI_RC_OK,
                    "");
  out:
         CMReturnData(results, (CMPIValue *)&retcode, CMPI_uint32);
 
-        isMigratable = (retcode == 0);
         CMAddArg(argsout, "IsMigratable",
                  (CMPIValue *)&isMigratable, CMPI_boolean);
 




More information about the Libvirt-cim mailing list