[Libvirt-cim] [PATCH 4 of 6] HRP: adopt DevicePool interface change
# HG changeset patch
# User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
# Date 1204892339 -3600
# Node ID c903f8ad74ff8484666ca965e03ec42b40ab15ce
# Parent 4da19a424fba43ed9683fcb10721f3b9ac566f95
HRP: adopt DevicePool interface change
- adopted changes to DevicePool interface
Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com>
diff -r 4da19a424fba -r c903f8ad74ff src/Virt_HostedResourcePool.c
--- a/src/Virt_HostedResourcePool.c Fri Mar 07 13:18:59 2008 +0100
+++ b/src/Virt_HostedResourcePool.c Fri Mar 07 13:18:59 2008 +0100
@@ -34,6 +34,7 @@
#include "Virt_HostSystem.h"
#include "Virt_DevicePool.h"
+#include "svpc_types.h"
static const CMPIBroker *_BROKER;
@@ -47,8 +48,8 @@ static CMPIStatus pool_to_sys(const CMPI
if (!match_hypervisor_prefix(ref, info))
goto out;
- s = get_pool_inst(_BROKER, ref, &inst);
- if ((s.rc != CMPI_RC_OK) || (inst == NULL))
+ s = get_pool_by_ref(_BROKER, ref, &inst);
+ if (s.rc != CMPI_RC_OK)
goto out;
s = get_host(_BROKER, ref, &inst, false);
@@ -67,8 +68,6 @@ static CMPIStatus sys_to_pool(const CMPI
{
CMPIStatus s = {CMPI_RC_OK, NULL};
CMPIInstance *inst = NULL;
- int i;
- virConnectPtr conn;
if (!match_hypervisor_prefix(ref, info))
goto out;
@@ -77,16 +76,7 @@ static CMPIStatus sys_to_pool(const CMPI
if (s.rc != CMPI_RC_OK)
goto out;
- conn = connect_by_classname(_BROKER, CLASSNAME(ref), &s);
- if (conn == NULL)
- goto out;
-
- for (i = 0; device_pool_names[i]; i++)
- get_pool_by_type(_BROKER,
- conn,
- device_pool_names[i],
- NAMESPACE(ref),
- list);
+ s = enum_pools(_BROKER, ref, CIM_RES_TYPE_ALL, list);
out:
return s;