[Libvirt-cim] [PATCH 7 of 7] AllocationCapabilities: adopt new DevicePool enum interface

Heidi Eckhart heidieck at linux.vnet.ibm.com
Wed Mar 5 09:49:14 UTC 2008


# HG changeset patch
# User Heidi Eckhart <heidieck at linux.vnet.ibm.com>
# Date 1204710379 -3600
# Node ID eeb2c60ee909c70927f230735f8e1fc763d3eed3
# Parent  2e9dc85abc269153ec38d1970b3e706168711f6c
AllocationCapabilities: adopt new DevicePool enum interface

- adopted new DevicePool enum_pools() interface
- updated NOT_FOUND error message to be consistent with others

Signed-off-by: Heidi Eckhart <heidieck at linux.vnet.ibm.com>

diff -r 2e9dc85abc26 -r eeb2c60ee909 src/Virt_AllocationCapabilities.c
--- a/src/Virt_AllocationCapabilities.c	Wed Mar 05 10:46:17 2008 +0100
+++ b/src/Virt_AllocationCapabilities.c	Wed Mar 05 10:46:19 2008 +0100
@@ -33,6 +33,7 @@
 
 #include "Virt_AllocationCapabilities.h"
 #include "Virt_DevicePool.h"
+#include "svpc_types.h"
 
 const static CMPIBroker *_BROKER;
 
@@ -95,11 +96,11 @@ CMPIStatus enum_alloc_cap_instances(cons
                 if (id) 
                         cu_statusf(broker, &s,
                                    CMPI_RC_ERR_NOT_FOUND,
-                                   "Requested Object could not be found.");
-                goto out;
-        }
-
-        s = get_all_pools(broker, conn, NAMESPACE(ref), &device_pool_list);
+                                   "Instance not found.");
+                goto out;
+        }
+
+        s = enum_pools(broker, ref, CIM_POOL_TYPE_ALL, &device_pool_list);
         if (s.rc != CMPI_RC_OK) {
                 cu_statusf(broker, &s,
                            CMPI_RC_ERR_FAILED,
@@ -135,7 +136,7 @@ CMPIStatus enum_alloc_cap_instances(cons
         if (id && !inst_id) {
             cu_statusf(broker, &s,
                        CMPI_RC_ERR_NOT_FOUND,
-                       "Requested Object could not be found.");
+                       "Instance not found.");
             goto out; 
         }
         




More information about the Libvirt-cim mailing list