[Libvirt-cim] [PATCH 06 of 27] Fix uses of get_typed_*() in RASD
# HG changeset patch
# User Dan Smith <danms(a)us.ibm.com>
# Date 1195498008 28800
# Node ID 5de7d5dad0a016a8bcd1ae6ad443726d880ecda3
# Parent 2f6d7ab90c35f7a7be3555c945e412f098ad51e6
Fix uses of get_typed_*() in RASD
Signed-off-by: Dan Smith <danms(a)us.ibm.com>
diff -r 2f6d7ab90c35 -r 5de7d5dad0a0 src/Virt_RASD.c
--- a/src/Virt_RASD.c Mon Nov 19 10:44:04 2007 -0800
+++ b/src/Virt_RASD.c Mon Nov 19 10:46:48 2007 -0800
@@ -105,7 +105,7 @@ static CMPIInstance *rasd_from_vdev(cons
static CMPIInstance *rasd_from_vdev(const CMPIBroker *broker,
struct virt_device *dev,
const char *host,
- const char *ns)
+ const CMPIObjectPath *ref)
{
CMPIInstance *inst;
uint16_t type;
@@ -128,7 +128,10 @@ static CMPIInstance *rasd_from_vdev(cons
return NULL;
}
- inst = get_typed_instance(broker, base, ns);
+ inst = get_typed_instance(broker,
+ CLASSNAME(ref),
+ base,
+ NAMESPACE(ref));
if (inst == NULL)
return inst;
@@ -197,7 +200,7 @@ static CMPIInstance *get_rasd_instance(c
dev = find_dev(conn, type, host, devid);
if (dev)
- inst = rasd_from_vdev(_BROKER, dev, host, NAMESPACE(ref));
+ inst = rasd_from_vdev(_BROKER, dev, host, ref);
out:
virConnectClose(conn);
@@ -284,10 +287,8 @@ int rasds_for_domain(const CMPIBroker *b
int i;
virConnectPtr conn;
CMPIStatus s;
- const char *ns = NAMESPACE(ref);
- const char *cn = CLASSNAME(ref);
-
- conn = connect_by_classname(broker, cn, &s);
+
+ conn = connect_by_classname(broker, CLASSNAME(ref), &s);
if (conn == NULL)
return 0;
@@ -296,7 +297,7 @@ int rasds_for_domain(const CMPIBroker *b
for (i = 0; i < count; i++) {
CMPIInstance *inst;
- inst = rasd_from_vdev(broker, &list[i], name, ns);
+ inst = rasd_from_vdev(broker, &list[i], name, ref);
if (inst != NULL)
inst_list_add(_list, inst);
}