- CIM - libvirt List Archives

[PATCH] Registration of ElementConformsToProfile for two namespaces causes errors with Pegasus
by Heidi Eckhart 01 Nov '07

01 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1193744530 -3600 # Node ID c94a9d6b36d9bd39e85c16805cdc8e525dd585cd # Parent bf5ad6924b99903d68d019a7c5faaa2f5a5d1ef9 Registration of ElementConformsToProfile for two namespaces causes errors with Pegasus diff -r bf5ad6924b99 -r c94a9d6b36d9 schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Mon Oct 29 15:39:52 2007 -0400 +++ b/schema/ElementConformsToProfile.registration Tue Oct 30 12:42:10 2007 +0100 @@ -1,7 +1,7 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association +#Xen_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association +#KVM_ElementConformsToProfile root/ibmsd Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association

3 3

[PATCH] Make RASD not dependent on ResourceType key
by Dan Smith 31 Oct '07

31 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193767892 25200 # Node ID babb2ffdc4c2c3f11a3281af4fb33cc3257127f8 # Parent e385d591fa6f8bbe135434117a16039d5693f5b4 Make RASD not dependent on ResourceType key I have tested DefineSystem() and some of the ResourcePool associations. (replaced the AllocationCapabilities changes) (removed the SettingsDefineCapabilities changes) Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r e385d591fa6f -r babb2ffdc4c2 schema/KVM_ResourceAllocationSettingData.mof --- a/schema/KVM_ResourceAllocationSettingData.mof Tue Oct 30 09:39:29 2007 -0700 +++ b/schema/KVM_ResourceAllocationSettingData.mof Tue Oct 30 11:11:32 2007 -0700 @@ -1,9 +1,4 @@ // Copyright IBM Corp. 2007 class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - [Key, - Description ("The type of allocated resource"), - Override ("ResourceType")] - uint16 ResourceType; - }; diff -r e385d591fa6f -r babb2ffdc4c2 schema/Xen_ResourceAllocationSettingData.mof --- a/schema/Xen_ResourceAllocationSettingData.mof Tue Oct 30 09:39:29 2007 -0700 +++ b/schema/Xen_ResourceAllocationSettingData.mof Tue Oct 30 11:11:32 2007 -0700 @@ -1,9 +1,4 @@ // Copyright IBM Corp. 2007 class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - [Key, - Description ("The type of allocated resource"), - Override ("ResourceType")] - uint16 ResourceType; - }; diff -r e385d591fa6f -r babb2ffdc4c2 src/Makefile.am --- a/src/Makefile.am Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Makefile.am Tue Oct 30 11:11:32 2007 -0700 @@ -83,8 +83,10 @@ libVirt_ElementCapabilities_la_LIBADD = -lVirt_HostSystem libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c +libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c +libVirt_SettingsDefineCapabilities_la_LIBADD = -lVirt_RASD libVirt_RegisteredProfile_la_SOURCES = Virt_RegisteredProfile.c diff -r e385d591fa6f -r babb2ffdc4c2 src/Virt_AllocationCapabilities.c --- a/src/Virt_AllocationCapabilities.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_AllocationCapabilities.c Tue Oct 30 11:11:32 2007 -0700 @@ -29,6 +29,7 @@ #include "misc_util.h" #include "Virt_AllocationCapabilities.h" +#include "Virt_RASD.h" const static CMPIBroker *_BROKER; @@ -44,8 +45,7 @@ CMPIStatus get_alloc_cap(const CMPIBroke *inst = get_typed_instance(broker, "AllocationCapabilities", NAMESPACE(ref)); - ret = cu_get_u16_path(ref, "ResourceType", &type); - if (ret != 1) { + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { CMSetStatusWithChars(broker, &s, CMPI_RC_ERR_FAILED, "Could not get ResourceType."); goto out; diff -r e385d591fa6f -r babb2ffdc4c2 src/Virt_RASD.c --- a/src/Virt_RASD.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_RASD.c Tue Oct 30 11:11:32 2007 -0700 @@ -205,10 +205,38 @@ static CMPIInstance *get_rasd_instance(c return inst; } +CMPIrc rasd_type_from_classname(const char *cn, uint16_t *type) +{ + char *base = NULL; + CMPIrc rc = CMPI_RC_ERR_FAILED; + + base = class_base_name(cn); + if (base == NULL) + goto out; + + if (STREQ(base, "DiskResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_DISK; + else if (STREQ(base, "NetResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_NET; + else if (STREQ(base, "ProcResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_PROC; + else if (STREQ(base, "MemResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_MEM; + else + goto out; + + rc = CMPI_RC_OK; + + out: + free(base); + + return rc; +} + static CMPIStatus GetInstance(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, - const CMPIObjectPath *reference, + const CMPIObjectPath *ref, const char **properties) { CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -216,7 +244,7 @@ static CMPIStatus GetInstance(CMPIInstan char *id = NULL; uint16_t type; - id = cu_get_str_path(reference, "InstanceID"); + id = cu_get_str_path(ref, "InstanceID"); if (id == NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -224,14 +252,14 @@ static CMPIStatus GetInstance(CMPIInstan goto out; } - if (!cu_get_u16_path(reference, "ResourceType", &type)) { + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Missing or invalid ResourceType"); - goto out; - } - - inst = get_rasd_instance(context, reference, id, type); + "Unable to determine RASD type"); + goto out; + } + + inst = get_rasd_instance(context, ref, id, type); if (inst != NULL) CMReturnInstance(results, inst); diff -r e385d591fa6f -r babb2ffdc4c2 src/Virt_RASD.h --- a/src/Virt_RASD.h Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_RASD.h Tue Oct 30 11:11:32 2007 -0700 @@ -27,6 +27,7 @@ int rasds_for_domain(const CMPIBroker *b const uint16_t type, const char *ns, struct inst_list *_list); +CMPIrc rasd_type_from_classname(const char *cn, uint16_t *type); #endif diff -r e385d591fa6f -r babb2ffdc4c2 src/Virt_ResourceAllocationFromPool.c --- a/src/Virt_ResourceAllocationFromPool.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_ResourceAllocationFromPool.c Tue Oct 30 11:11:32 2007 -0700 @@ -42,7 +42,6 @@ static CMPIStatus rasd_to_pool(const CMP struct inst_list *list) { CMPIStatus s; - int ret; uint16_t type; char *id = NULL; char *poolid = NULL; @@ -52,11 +51,10 @@ static CMPIStatus rasd_to_pool(const CMP inst_list_init(&_list); - ret = cu_get_u16_path(ref, "ResourceType", &type); - if (!ret) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceType"); + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to determine RASD type"); goto out; } @@ -113,8 +111,16 @@ static int filter_by_pool(struct inst_li for (i = 0; i < src->cur; i++) { CMPIInstance *inst = src->list[i]; - - cu_get_u16_prop(inst, "ResourceType", &type); + CMPIObjectPath *op; + + op = CMGetObjectPath(inst, NULL); + if (op == NULL) + continue; + + if (rasd_type_from_classname(CLASSNAME(op), &type) != + CMPI_RC_OK) + continue; + cu_get_str_prop(inst, "InstanceID", &rasd_id); poolid = pool_member_of(_BROKER, type, rasd_id); diff -r e385d591fa6f -r babb2ffdc4c2 src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_SettingsDefineState.c Tue Oct 30 11:11:32 2007 -0700 @@ -162,7 +162,6 @@ static CMPIStatus rasd_to_dev(const CMPI CMPIStatus s; CMPIInstance *dev = NULL; char *id = NULL; - int ret; uint16_t type; ASSOC_MATCH(info->provider_name, CLASSNAME(ref)); @@ -175,8 +174,7 @@ static CMPIStatus rasd_to_dev(const CMPI goto out; } - ret = cu_get_u16_path(ref, "ResourceType", &type); - if (!ret) { + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Missing ResourceType"); diff -r e385d591fa6f -r babb2ffdc4c2 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Oct 30 09:39:29 2007 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Tue Oct 30 11:11:32 2007 -0700 @@ -161,9 +161,15 @@ static int rasd_to_vdev(CMPIInstance *in char *id = NULL; char *name = NULL; char *devid = NULL; - - if (cu_get_u16_prop(inst, "ResourceType", &type) != CMPI_RC_OK) + CMPIObjectPath *op; + + op = CMGetObjectPath(inst, NULL); + if (op == NULL) goto err; + + if (rasd_type_from_classname(CLASSNAME(op), &type) != CMPI_RC_OK) + goto err; + dev->type = (int)type; if (cu_get_str_prop(inst, "InstanceID", &id) != CMPI_RC_OK) @@ -210,7 +216,6 @@ static int classify_resources(struct ins static int classify_resources(struct inst_list *all, struct domain *domain) { - int ret; int i; uint16_t type; @@ -223,8 +228,14 @@ static int classify_resources(struct ins domain->dev_net = calloc(all->cur, sizeof(struct virt_device)); for (i = 0; i < all->cur; i++) { - ret = cu_get_u16_prop(all->list[i], "ResourceType", &type); - if (ret != CMPI_RC_OK) + CMPIObjectPath *op; + + op = CMGetObjectPath(all->list[i], NULL); + if (op == NULL) + return 0; + + if (rasd_type_from_classname(CLASSNAME(op), &type) != + CMPI_RC_OK) return 0; if (type == CIM_RASD_TYPE_PROC) @@ -692,6 +703,7 @@ static CMPIStatus _update_resources_for( struct domain *dominfo = NULL; uint16_t type; char *xml = NULL; + CMPIObjectPath *op; if (!get_dominfo(dom, &dominfo)) { cu_statusf(_BROKER, &s, @@ -700,10 +712,18 @@ static CMPIStatus _update_resources_for( goto out; } - if (cu_get_u16_prop(rasd, "ResourceType", &type) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceType"); + op = CMGetObjectPath(rasd, NULL); + if (op == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get RASD path"); + goto out; + } + + if (rasd_type_from_classname(CLASSNAME(op), &type) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to determine RASD type"); goto out; }

2 2

[PATCH] Make RASD not dependent on ResourceType key
by Dan Smith 31 Oct '07

31 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193761666 25200 # Node ID 02556a928bf33c5f796009ae4ad2fb1cd37d6283 # Parent 6f68b7da0f6bfa6f1c709f56b2879c62e8831639 Make RASD not dependent on ResourceType key I have tested DefineSystem() and some of the ResourcePool associations. (removed the AllocationCapabilities changes) Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 6f68b7da0f6b -r 02556a928bf3 schema/KVM_ResourceAllocationSettingData.mof --- a/schema/KVM_ResourceAllocationSettingData.mof Tue Oct 30 09:25:06 2007 -0700 +++ b/schema/KVM_ResourceAllocationSettingData.mof Tue Oct 30 09:27:46 2007 -0700 @@ -1,9 +1,4 @@ // Copyright IBM Corp. 2007 class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - [Key, - Description ("The type of allocated resource"), - Override ("ResourceType")] - uint16 ResourceType; - }; diff -r 6f68b7da0f6b -r 02556a928bf3 schema/Xen_ResourceAllocationSettingData.mof --- a/schema/Xen_ResourceAllocationSettingData.mof Tue Oct 30 09:25:06 2007 -0700 +++ b/schema/Xen_ResourceAllocationSettingData.mof Tue Oct 30 09:27:46 2007 -0700 @@ -1,9 +1,4 @@ // Copyright IBM Corp. 2007 class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - [Key, - Description ("The type of allocated resource"), - Override ("ResourceType")] - uint16 ResourceType; - }; diff -r 6f68b7da0f6b -r 02556a928bf3 src/Makefile.am --- a/src/Makefile.am Tue Oct 30 09:25:06 2007 -0700 +++ b/src/Makefile.am Tue Oct 30 09:27:46 2007 -0700 @@ -83,8 +83,10 @@ libVirt_ElementCapabilities_la_LIBADD = -lVirt_HostSystem libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c +libVirt_AllocationCapabilities_la_LIBADD = -lVirt_RASD libVirt_SettingsDefineCapabilities_la_SOURCES = Virt_SettingsDefineCapabilities.c +libVirt_SettingsDefineCapabilities_la_LIBADD = -lVirt_RASD libVirt_RegisteredProfile_la_SOURCES = Virt_RegisteredProfile.c diff -r 6f68b7da0f6b -r 02556a928bf3 src/Virt_RASD.c --- a/src/Virt_RASD.c Tue Oct 30 09:25:06 2007 -0700 +++ b/src/Virt_RASD.c Tue Oct 30 09:27:46 2007 -0700 @@ -205,10 +205,38 @@ static CMPIInstance *get_rasd_instance(c return inst; } +CMPIrc rasd_type_from_classname(const char *cn, uint16_t *type) +{ + char *base = NULL; + CMPIrc rc = CMPI_RC_ERR_FAILED; + + base = class_base_name(cn); + if (base == NULL) + goto out; + + if (STREQ(base, "DiskResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_DISK; + else if (STREQ(base, "NetResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_NET; + else if (STREQ(base, "ProcResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_PROC; + else if (STREQ(base, "MemResourceAllocationSettingData")) + *type = CIM_RASD_TYPE_MEM; + else + goto out; + + rc = CMPI_RC_OK; + + out: + free(base); + + return rc; +} + static CMPIStatus GetInstance(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, - const CMPIObjectPath *reference, + const CMPIObjectPath *ref, const char **properties) { CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -216,7 +244,7 @@ static CMPIStatus GetInstance(CMPIInstan char *id = NULL; uint16_t type; - id = cu_get_str_path(reference, "InstanceID"); + id = cu_get_str_path(ref, "InstanceID"); if (id == NULL) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -224,14 +252,14 @@ static CMPIStatus GetInstance(CMPIInstan goto out; } - if (!cu_get_u16_path(reference, "ResourceType", &type)) { + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, - "Missing or invalid ResourceType"); - goto out; - } - - inst = get_rasd_instance(context, reference, id, type); + "Unable to determine RASD type"); + goto out; + } + + inst = get_rasd_instance(context, ref, id, type); if (inst != NULL) CMReturnInstance(results, inst); diff -r 6f68b7da0f6b -r 02556a928bf3 src/Virt_RASD.h --- a/src/Virt_RASD.h Tue Oct 30 09:25:06 2007 -0700 +++ b/src/Virt_RASD.h Tue Oct 30 09:27:46 2007 -0700 @@ -27,6 +27,7 @@ int rasds_for_domain(const CMPIBroker *b const uint16_t type, const char *ns, struct inst_list *_list); +CMPIrc rasd_type_from_classname(const char *cn, uint16_t *type); #endif diff -r 6f68b7da0f6b -r 02556a928bf3 src/Virt_ResourceAllocationFromPool.c --- a/src/Virt_ResourceAllocationFromPool.c Tue Oct 30 09:25:06 2007 -0700 +++ b/src/Virt_ResourceAllocationFromPool.c Tue Oct 30 09:27:46 2007 -0700 @@ -42,7 +42,6 @@ static CMPIStatus rasd_to_pool(const CMP struct inst_list *list) { CMPIStatus s; - int ret; uint16_t type; char *id = NULL; char *poolid = NULL; @@ -52,11 +51,10 @@ static CMPIStatus rasd_to_pool(const CMP inst_list_init(&_list); - ret = cu_get_u16_path(ref, "ResourceType", &type); - if (!ret) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceType"); + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to determine RASD type"); goto out; } @@ -113,8 +111,16 @@ static int filter_by_pool(struct inst_li for (i = 0; i < src->cur; i++) { CMPIInstance *inst = src->list[i]; - - cu_get_u16_prop(inst, "ResourceType", &type); + CMPIObjectPath *op; + + op = CMGetObjectPath(inst, NULL); + if (op == NULL) + continue; + + if (rasd_type_from_classname(CLASSNAME(op), &type) != + CMPI_RC_OK) + continue; + cu_get_str_prop(inst, "InstanceID", &rasd_id); poolid = pool_member_of(_BROKER, type, rasd_id); diff -r 6f68b7da0f6b -r 02556a928bf3 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Oct 30 09:25:06 2007 -0700 +++ b/src/Virt_SettingsDefineCapabilities.c Tue Oct 30 09:27:46 2007 -0700 @@ -37,6 +37,7 @@ #include "svpc_types.h" #include "Virt_SettingsDefineCapabilities.h" +#include "Virt_RASD.h" const static CMPIBroker *_BROKER; @@ -315,13 +316,11 @@ static CMPIStatus alloc_cap_to_rasd(cons struct inst_list *list) { CMPIStatus s = {CMPI_RC_OK}; - int ret; uint16_t type; CU_DEBUG("Getting ResourceType.\n"); - ret = cu_get_u16_path(ref, "ResourceType", &type); - if (ret != 1) { + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, "Could not get ResourceType."); goto out; diff -r 6f68b7da0f6b -r 02556a928bf3 src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Tue Oct 30 09:25:06 2007 -0700 +++ b/src/Virt_SettingsDefineState.c Tue Oct 30 09:27:46 2007 -0700 @@ -162,7 +162,6 @@ static CMPIStatus rasd_to_dev(const CMPI CMPIStatus s; CMPIInstance *dev = NULL; char *id = NULL; - int ret; uint16_t type; ASSOC_MATCH(info->provider_name, CLASSNAME(ref)); @@ -175,8 +174,7 @@ static CMPIStatus rasd_to_dev(const CMPI goto out; } - ret = cu_get_u16_path(ref, "ResourceType", &type); - if (!ret) { + if (rasd_type_from_classname(CLASSNAME(ref), &type) != CMPI_RC_OK) { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Missing ResourceType"); diff -r 6f68b7da0f6b -r 02556a928bf3 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Tue Oct 30 09:25:06 2007 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Tue Oct 30 09:27:46 2007 -0700 @@ -158,9 +158,15 @@ static int rasd_to_vdev(CMPIInstance *in char *id = NULL; char *name = NULL; char *devid = NULL; - - if (cu_get_u16_prop(inst, "ResourceType", &type) != CMPI_RC_OK) + CMPIObjectPath *op; + + op = CMGetObjectPath(inst, NULL); + if (op == NULL) goto err; + + if (rasd_type_from_classname(CLASSNAME(op), &type) != CMPI_RC_OK) + goto err; + dev->type = (int)type; if (cu_get_str_prop(inst, "InstanceID", &id) != CMPI_RC_OK) @@ -207,7 +213,6 @@ static int classify_resources(struct ins static int classify_resources(struct inst_list *all, struct domain *domain) { - int ret; int i; uint16_t type; @@ -220,8 +225,14 @@ static int classify_resources(struct ins domain->dev_net = calloc(all->cur, sizeof(struct virt_device)); for (i = 0; i < all->cur; i++) { - ret = cu_get_u16_prop(all->list[i], "ResourceType", &type); - if (ret != CMPI_RC_OK) + CMPIObjectPath *op; + + op = CMGetObjectPath(all->list[i], NULL); + if (op == NULL) + return 0; + + if (rasd_type_from_classname(CLASSNAME(op), &type) != + CMPI_RC_OK) return 0; if (type == CIM_RASD_TYPE_PROC) @@ -682,6 +693,7 @@ static CMPIStatus _update_resources_for( struct domain *dominfo = NULL; uint16_t type; char *xml = NULL; + CMPIObjectPath *op; if (!get_dominfo(dom, &dominfo)) { cu_statusf(_BROKER, &s, @@ -690,10 +702,18 @@ static CMPIStatus _update_resources_for( goto out; } - if (cu_get_u16_prop(rasd, "ResourceType", &type) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing ResourceType"); + op = CMGetObjectPath(rasd, NULL); + if (op == NULL) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get RASD path"); + goto out; + } + + if (rasd_type_from_classname(CLASSNAME(op), &type) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to determine RASD type"); goto out; }

1 0

[PATCH] add RPM packaging for libvirt-cim, and cleanups
by Daniel Veillard 31 Oct '07

31 Oct '07

# HG changeset patch # User Daniel Veillard <veillard(a)redhat.com> # Date 1193656844 -3600 # Node ID 5b601a0035127544c54feaf086fb7065f873e9f9 # Parent aaad430ea766d9a3bc0be035e595d8da17ee2122 RPM Packaging changes and associated cleanups: - Augment some Makefiles variables with missing files - add a spec file template - extend the configure script to generate the spec file - add a 'make rpm' target - fix src/Makefile.am to use late binding of providerdir variable Signed-off-by: Daniel Veillard <veillard(a)redhat.com> There is still one thing missing I guess in the spec file: the registration step, which I think should be run as a post-install script. The spec file saves the provider-register.sh and register_base.sh scripts in /usr/share/libvirt-cim/ so they are available at that point, but I don't understand how to best call them, so it will need some attention by someone who knows how that process should work. Daniel diff -r aaad430ea766 -r 5b601a003512 Makefile.am --- a/Makefile.am Fri Oct 26 13:34:26 2007 -0700 +++ b/Makefile.am Mon Oct 29 12:20:44 2007 +0100 @@ -74,9 +74,11 @@ EXTRA_BASE_MOFS = \ schema/KVM_ResourceAllocationSettingData.mof pkgdata_DATA = $(MOFS) $(REGS) -pkgdata_SCRIPTS = provider-register.sh +pkgdata_SCRIPTS = provider-register.sh register_base.sh -EXTRA_DIST = schema $(pkgdata_DATA) $(pkgdata_SCRIPTS) +EXTRA_DIST = schema $(pkgdata_DATA) $(pkgdata_SCRIPTS) \ + libvirt-cim.spec.in libvirt-cim.spec \ + doc/CodingStyle doc/SubmittingPatches # Un/Register the providers and class definitions from/to the current CIMOM. # @CIMSERVER@ is set by the configure script @@ -88,3 +90,6 @@ preuninstall: preuninstall: sh provider-register.sh -d -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) sh provider-register.sh -d -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) + +rpm: clean + @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) diff -r aaad430ea766 -r 5b601a003512 configure.ac --- a/configure.ac Fri Oct 26 13:34:26 2007 -0700 +++ b/configure.ac Mon Oct 29 12:20:44 2007 +0100 @@ -180,7 +180,7 @@ echo "---------------------------------- echo "----------------------------------------------------------" # Generate configure scripts for the Makefile -AC_OUTPUT +AC_OUTPUT(libvirt-cim.spec) echo "You may now run make" diff -r aaad430ea766 -r 5b601a003512 libvirt-cim.spec.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libvirt-cim.spec.in Mon Oct 29 12:20:44 2007 +0100 @@ -0,0 +1,65 @@ +# -*- rpm-spec -*- + +Summary: A CIM provider for libvirt +Name: libvirt-cim +Version: @PACKAGE_VERSION@ +Release: 1%{?dist}%{?extra_release} +License: LGPL +Group: Development/Libraries +Source: libvirt-cim-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://libvirt.org/CIM/ +Requires: libxml2 +Requires: libvirt >= 0.2.3 +BuildRequires: sblim-cmpi-devel +BuildRequires: libvirt-devel >= 0.2.3 +BuildRequires: e2fsprogs-devel +BuildRequires: libxml2-devel +BuildRequires: libcmpiutil-devel + +%description +Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC +virtualization model. The goal is to support most of the features +exported by libvirt itself, enabling management of multiple +platforms with a single provider. + +%prep +%setup -q + +%build +%configure --disable-werror +make + +%install +rm -fr %{buildroot} + +%makeinstall PROVIDERDIR=%{buildroot}%{_libdir}/cmpi +cp provider-register.sh register_base.sh %{buildroot}%{_datadir}/libvirt-cim/ +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.a + +%clean +rm -fr %{buildroot} + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +%files +%defattr(-, root, root) + +%doc README doc/CodingStyle doc/SubmittingPatches +%doc provider-register.sh register_base.sh +%{_libdir}/lib*.so* +%{_libdir}/cmpi/lib*.so* +%{_datadir}/libvirt-cim/*.sh +%{_datadir}/libvirt-cim/*.mof +%{_datadir}/libvirt-cim/*.registration + +%changelog +* Fri Oct 26 2007 Daniel Veillard <veillard(a)redhat.com> - 0.1-1 +- created diff -r aaad430ea766 -r 5b601a003512 libxkutil/Makefile.am --- a/libxkutil/Makefile.am Fri Oct 26 13:34:26 2007 -0700 +++ b/libxkutil/Makefile.am Mon Oct 29 12:20:44 2007 +0100 @@ -4,7 +4,7 @@ SUBDIRS = tests CFLAGS += $(CFLAGS_STRICT) -noinst_HEADERS = cs_util.h misc_util.h device_parsing.h hostres.h +noinst_HEADERS = cs_util.h misc_util.h device_parsing.h hostres.h xmlgen.h lib_LTLIBRARIES = libxkutil.la diff -r aaad430ea766 -r 5b601a003512 src/Makefile.am --- a/src/Makefile.am Fri Oct 26 13:34:26 2007 -0700 +++ b/src/Makefile.am Mon Oct 29 12:20:44 2007 +0100 @@ -1,7 +1,20 @@ # Copyright IBM Corp. 2007 SUBDIRS = tests -noinst_HEADERS = Virt_ElementConformsToProfile.h profiles.h +noinst_HEADERS = profiles.h svpc_types.h \ + Virt_AllocationCapabilities.h \ + Virt_ComputerSystem.h \ + Virt_ComputerSystemIndication.h \ + Virt_Device.h \ + Virt_DevicePool.h \ + Virt_ElementConformsToProfile.h \ + Virt_EnabledLogicalElementCapabilities.h \ + Virt_HostSystem.h \ + Virt_RASD.h \ + Virt_RegisteredProfile.h \ + Virt_SettingsDefineCapabilities.h \ + Virt_VirtualSystemManagementCapabilities.h \ + Virt_VSSD.h XKUADD = $(top_builddir)/libxkutil/libxkutil.la @@ -9,7 +22,7 @@ CFLAGS += -I$(top_builddir)/libxkutil $( AM_LDFLAGS = $(XKUADD) -providerdir = @PROVIDERDIR@ +providerdir = $(PROVIDERDIR) provider_LTLIBRARIES = libVirt_ComputerSystem.la \ libVirt_Device.la \ -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

3 2

[PATCH] Fix VSMS instance code to refuse to return an instance if ref is invalid
by Dan Smith 30 Oct '07

30 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193689589 25200 # Node ID a9008606ede19590b358580f3bc2732f9c92c23c # Parent bf5ad6924b99903d68d019a7c5faaa2f5a5d1ef9 Fix VSMS instance code to refuse to return an instance if ref is invalid Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r bf5ad6924b99 -r a9008606ede1 src/Makefile.am --- a/src/Makefile.am Mon Oct 29 15:39:52 2007 -0400 +++ b/src/Makefile.am Mon Oct 29 13:26:29 2007 -0700 @@ -56,7 +56,7 @@ libVirt_ComputerSystemIndication_la_LIBA libVirt_ComputerSystemIndication_la_LIBADD = -lVirt_ComputerSystem -lpthread -lrt libVirt_VirtualSystemManagementService_la_SOURCES = Virt_VirtualSystemManagementService.c -libVirt_VirtualSystemManagementService_la_LIBADD = -lVirt_ComputerSystem -lVirt_ComputerSystemIndication -lVirt_RASD +libVirt_VirtualSystemManagementService_la_LIBADD = -lVirt_ComputerSystem -lVirt_ComputerSystemIndication -lVirt_RASD -lVirt_HostSystem libVirt_VirtualSystemManagementCapabilities_la_SOURCES = Virt_VirtualSystemManagementCapabilities.c diff -r bf5ad6924b99 -r a9008606ede1 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Oct 29 15:39:52 2007 -0400 +++ b/src/Virt_VirtualSystemManagementService.c Mon Oct 29 13:26:29 2007 -0700 @@ -44,6 +44,7 @@ #include "Virt_ComputerSystem.h" #include "Virt_ComputerSystemIndication.h" #include "Virt_RASD.h" +#include "Virt_HostSystem.h" #include "svpc_types.h" const static CMPIBroker *_BROKER; @@ -896,18 +897,24 @@ STDIM_MethodMIStub(, Virt_VirtualSystemM STDIM_MethodMIStub(, Virt_VirtualSystemManagementService, _BROKER, CMNoHook, my_handlers); - -static CMPIStatus return_vsms(const CMPIObjectPath *reference, - const CMPIResult *results, - int name_only) +static CMPIStatus _get_vsms(const CMPIObjectPath *reference, + CMPIInstance **_inst, + int name_only) { CMPIStatus s; CMPIInstance *inst; + CMPIInstance *host; + char *val = NULL; + + s = get_host_cs(_BROKER, reference, &host); + if (s.rc != CMPI_RC_OK) + goto out; inst = get_typed_instance(_BROKER, "VirtualSystemManagementService", NAMESPACE(reference)); if (inst == NULL) { + CU_DEBUG("Failed to get typed instance"); cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, "Failed to create instance"); @@ -916,6 +923,46 @@ static CMPIStatus return_vsms(const CMPI CMSetProperty(inst, "Name", (CMPIValue *)"Management Service", CMPI_chars); + + if (cu_get_str_prop(host, "Name", &val) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get name of System"); + goto out; + } + + CMSetProperty(inst, "SystemName", + (CMPIValue *)val, CMPI_chars); + free(val); + + if (cu_get_str_prop(host, "CreationClassName", &val) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unable to get creation class of system"); + goto out; + } + + CMSetProperty(inst, "SystemCreationClassName", + (CMPIValue *)val, CMPI_chars); + free(val); + + CMSetStatus(&s, CMPI_RC_OK); + + *_inst = inst; + out: + return s; +} + +static CMPIStatus return_vsms(const CMPIObjectPath *reference, + const CMPIResult *results, + int name_only) +{ + CMPIInstance *inst; + CMPIStatus s; + + s = _get_vsms(reference, &inst, name_only); + if (s.rc != CMPI_RC_OK) + goto out; if (name_only) cu_return_instance_name(results, inst); @@ -923,7 +970,6 @@ static CMPIStatus return_vsms(const CMPI CMReturnInstance(results, inst); CMSetStatus(&s, CMPI_RC_OK); - out: return s; } @@ -946,13 +992,58 @@ static CMPIStatus EnumInstances(CMPIInst return return_vsms(reference, results, 0); } +static int compare_prop(const CMPIObjectPath *ref, + const CMPIInstance *inst, + const char *name, + int mandatory) +{ + char *prop = NULL; + char *key = NULL; + int rc = 0; + + key = cu_get_str_path(ref, name); + if (key == NULL) { + rc = !mandatory; + goto out; + } + + if (cu_get_str_prop(inst, name, &prop) != CMPI_RC_OK) + goto out; + + rc = STREQ(key, prop); + out: + free(prop); + free(key); + + return rc; +} + static CMPIStatus GetInstance(CMPIInstanceMI *self, const CMPIContext *context, const CMPIResult *results, - const CMPIObjectPath *reference, + const CMPIObjectPath *ref, const char **properties) { - return return_vsms(reference, results, 0); + CMPIInstance *inst; + CMPIStatus s; + + s = _get_vsms(ref, &inst, 0); + if (s.rc != CMPI_RC_OK) + return s; + + if (!compare_prop(ref, inst, "CreationClassName", 0) || + !compare_prop(ref, inst, "SystemName", 0) || + !compare_prop(ref, inst, "Name", 1) || + !compare_prop(ref, inst, "SystemCreationClassName", 0)) + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "No such instance"); + else { + CMSetStatus(&s, CMPI_RC_OK); + CMReturnInstance(results, inst); + } + + return s; } DEFAULT_CI();

2 5

Automatic reply to list not working?
by Zhengang Li 30 Oct '07

30 Oct '07

It seems that the email from the list only adds the "libvirt-cim(a)redhat.com" in the CC field. Replying to an email sending from the list automatically goes to the original author instead of the list itself. Is this an intended configuration in the mailing-list setup? -- - Zhengang

2 1

[PATCH] Make the location of the disk pool config file a compile-time option. No checks are done at the moment, mostly due to my lack of m4 skills. Suggestions are welcome or we can do the check in the provider itself
by Jay Gagnon 30 Oct '07

30 Oct '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1193686792 14400 # Node ID 4667bc86331dbde59f7ddbde9766d7025385eaec # Parent f2966180a03a8604d32159b12e44db18ca429a91 Make the location of the disk pool config file a compile-time option. No checks are done at the moment, mostly due to my lack of m4 skills. Suggestions are welcome or we can do the check in the provider itself. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r f2966180a03a -r 4667bc86331d acinclude.m4 --- a/acinclude.m4 Sat Oct 27 10:16:03 2007 -0700 +++ b/acinclude.m4 Mon Oct 29 15:39:52 2007 -0400 @@ -463,3 +463,12 @@ AC_DEFUN([DEFINE_MAXMEM], AC_DEFINE_UNQUOTED([MAX_MEM], $1, [Max memory for a guest.]) ] ) + +# +# Define disk pool config. +# +AC_DEFUN([DEFINE_DISK_CONFIG], + [ + AC_DEFINE_UNQUOTED([DISK_POOL_CONFIG], "$1", [Disk pool config filepath.]) + ] +) \ No newline at end of file diff -r f2966180a03a -r 4667bc86331d configure.ac --- a/configure.ac Sat Oct 27 10:16:03 2007 -0700 +++ b/configure.ac Mon Oct 29 15:39:52 2007 -0400 @@ -35,6 +35,11 @@ AC_ARG_VAR([TESTSUITEDIR],[the directory AC_ARG_VAR([TESTSUITEDIR],[the directory where the SBLIM testsuite is installed. ]) +AC_ARG_WITH([diskconfig], + [ --with-diskconfig=PATH Set config file for disk pool. (default=/tmp/diskpool.conf)], + [DEFINE_DISK_CONFIG($with_diskconfig)], + [DEFINE_DISK_CONFIG(/tmp/diskpool.conf)] +) AC_ARG_WITH([maxmem], [ --with-maxmem=FOO Set max memory (MB) for a guest.], [DEFINE_MAXMEM($with_maxmem)], diff -r f2966180a03a -r 4667bc86331d src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Sat Oct 27 10:16:03 2007 -0700 +++ b/src/Virt_DevicePool.c Mon Oct 29 15:39:52 2007 -0400 @@ -32,6 +32,8 @@ #include <cmpift.h> #include <cmpimacs.h> +#include "config.h" + #include "misc_util.h" #include "hostres.h" #include "device_parsing.h" @@ -42,8 +44,6 @@ #include "svpc_types.h" static const CMPIBroker *_BROKER; - -#define DISK_POOL_CONFIG "/tmp/diskpool.conf" char *device_pool_names[] = {"ProcessorPool", "MemoryPool", NULL};

2 1

[PATCH] Add some useful debug messages to VSMS to assist in debugging DefineSystem
by Dan Smith 30 Oct '07

30 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193683554 25200 # Node ID 4a1d173152a3c4ceffe3cde01424a6576ea0ae20 # Parent 000f480e2956d631525f5151f611b3e8b41bbe8e Add some useful debug messages to VSMS to assist in debugging DefineSystem Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 000f480e2956 -r 4a1d173152a3 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Oct 29 09:13:57 2007 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Oct 29 11:45:54 2007 -0700 @@ -85,11 +85,14 @@ static CMPIStatus define_system_parse_ar int ret; sys_str = cu_get_str_arg(argsin, "SystemSettings"); - if (sys_str == NULL) - goto out; + if (sys_str == NULL) { + CU_DEBUG("No SystemSettings string argument"); + goto out; + } ret = cu_parse_embedded_instance(sys_str, _BROKER, sys); if (ret) { + CU_DEBUG("Unable to parse SystemSettings instance"); CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, "SystemSettings parse error"); @@ -98,7 +101,7 @@ static CMPIStatus define_system_parse_ar res_arr = cu_get_array_arg(argsin, "ResourceSettings"); if (res_arr == NULL) { - printf("Failed to get array arg\n"); + CU_DEBUG("Failed to get array arg"); goto out; } @@ -227,12 +230,16 @@ static int classify_resources(struct ins CMPIObjectPath *op; op = CMGetObjectPath(all->list[i], NULL); - if (op == NULL) + if (op == NULL) { + CU_DEBUG("No path for RASD"); return 0; + } if (rasd_type_from_classname(CLASSNAME(op), &type) != - CMPI_RC_OK) + CMPI_RC_OK) { + CU_DEBUG("No type for class %s", CLASSNAME(op)) return 0; + } if (type == CIM_RASD_TYPE_PROC) rasd_to_vdev(all->list[i], @@ -261,11 +268,14 @@ static CMPIInstance *connect_and_create( CMPIInstance *inst; conn = connect_by_classname(_BROKER, CLASSNAME(ref), s); - if (conn == NULL) + if (conn == NULL) { + CU_DEBUG("libvirt connection failed"); return NULL; + } dom = virDomainDefineXML(conn, xml); if (dom == NULL) { + CU_DEBUG("Failed to define domain from XML"); CMSetStatusWithChars(_BROKER, s, CMPI_RC_ERR_FAILED, "Failed to create domain"); @@ -274,10 +284,12 @@ static CMPIInstance *connect_and_create( name = virDomainGetName(dom); inst = instance_from_name(_BROKER, conn, (char *)name, ref); - if (inst == NULL) + if (inst == NULL) { + CU_DEBUG("Failed to get new instance"); CMSetStatusWithChars(_BROKER, s, CMPI_RC_ERR_FAILED, "Failed to lookup resulting system"); + } virConnectClose(conn); @@ -301,6 +313,7 @@ static CMPIInstance *create_system(CMPII } if (!classify_resources(resources, domain)) { + CU_DEBUG("Failed to classify resources"); cu_statusf(_BROKER, s, CMPI_RC_ERR_FAILED, "ResourceSettings Error"); @@ -308,6 +321,7 @@ static CMPIInstance *create_system(CMPII } if (!vssd_to_domain(vssd, domain)) { + CU_DEBUG("Failed to create domain from VSSD"); cu_statusf(_BROKER, s, CMPI_RC_ERR_FAILED, "SystemSettings Error"); @@ -315,7 +329,7 @@ static CMPIInstance *create_system(CMPII } xml = system_to_xml(domain); - printf("\nSystem XML:\n%s\n", xml); + CU_DEBUG("System XML:\n%s", xml); inst = connect_and_create(xml, ref, s); @@ -357,7 +371,7 @@ static CMPIStatus define_system(CMPIMeth inst_list_init(&res); - printf("Parsing args\n"); + CU_DEBUG("DefineSystem"); s = define_system_parse_args(argsin, &vssd, &res); if (s.rc != CMPI_RC_OK)

1 0

[PATCH] Add disk resource pools
by Dan Smith 30 Oct '07

30 Oct '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1193505363 25200 # Node ID 06e694e6367634fab4ebc1c1a9927cee790d31c4 # Parent f9d3ced9a8b4eb54d46997ba8f96f8105998d625 Add disk resource pools This patch parses a disk pool config file, which allows you to specify a pool name and path. The path is assumed to be a directory of image files. The Capacity and Reserved properties are reported with statvfs (although the free/reserved calculation isn't working yet). The config is hard-coded to /tmp/diskpool.conf currently, but needs to be a compile-time option. This should be a good start though. Updated to fix a similar compile warning on Fedora 7 Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r f9d3ced9a8b4 -r 06e694e63676 Makefile.am --- a/Makefile.am Sat Oct 27 10:07:46 2007 -0700 +++ b/Makefile.am Sat Oct 27 10:16:03 2007 -0700 @@ -19,6 +19,7 @@ MOFS = \ schema/MemoryPool.mof \ schema/ElementCapabilities.mof \ schema/ProcessorPool.mof \ + schema/DiskPool.mof \ schema/HostedResourcePool.mof \ schema/ElementConformsToProfile.mof \ schema/ComputerSystemIndication.mof \ @@ -54,6 +55,7 @@ REGS = \ schema/MemoryPool.registration \ schema/ElementCapabilities.registration \ schema/ProcessorPool.registration \ + schema/DiskPool.registration \ schema/HostedResourcePool.registration \ schema/ComputerSystemIndication.registration \ schema/ResourceAllocationSettingData.registration \ diff -r f9d3ced9a8b4 -r 06e694e63676 schema/DiskPool.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/DiskPool.mof Sat Oct 27 10:16:03 2007 -0700 @@ -0,0 +1,7 @@ +class Xen_DiskPool : CIM_ResourcePool +{ +}; +class KVM_DiskPool : CIM_ResourcePool +{ +}; + diff -r f9d3ced9a8b4 -r 06e694e63676 schema/DiskPool.registration --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/DiskPool.registration Sat Oct 27 10:16:03 2007 -0700 @@ -0,0 +1,2 @@ +Xen_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +KVM_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance diff -r f9d3ced9a8b4 -r 06e694e63676 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Sat Oct 27 10:07:46 2007 -0700 +++ b/src/Virt_DevicePool.c Sat Oct 27 10:16:03 2007 -0700 @@ -19,10 +19,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define __USE_FILE_OFFSET64 + #include <stdio.h> #include <stdbool.h> #include <stdlib.h> #include <string.h> +#include <sys/statvfs.h> +#include <inttypes.h> #include <cmpidt.h> #include <cmpift.h> @@ -39,7 +43,151 @@ static const CMPIBroker *_BROKER; +#define DISK_POOL_CONFIG "/tmp/diskpool.conf" + char *device_pool_names[] = {"ProcessorPool", "MemoryPool", NULL}; + +struct disk_pool { + char *tag; + char *path; +}; + +static int parse_diskpool_line(struct disk_pool *pool, + const char *line) +{ + int ret; + + ret = sscanf(line, "%as %as", &pool->tag, &pool->path); + if (ret != 2) { + free(pool->tag); + free(pool->path); + } + + return (ret == 2); +} + +static int get_diskpool_config(struct disk_pool **_pools) +{ + const char *path = DISK_POOL_CONFIG; + FILE *config; + char *line = NULL; + size_t len = 0; + int count = 0; + struct disk_pool *pools = NULL; + + config = fopen(path, "r"); + if (config == NULL) { + CU_DEBUG("Failed to open %s: %m", path); + return 0; + } + + while (getline(&line, &len, config) > 0) { + pools = realloc(pools, + (count + 1) * (sizeof(*pools))); + if (pools == NULL) { + CU_DEBUG("Failed to alloc new pool"); + goto out; + } + + if (parse_diskpool_line(&pools[count], line)) + count++; + } + + out: + free(line); + *_pools = pools; + fclose(config); + + return count; +} + +static void free_diskpool(struct disk_pool *pools, int count) +{ + int i; + + if (pools == NULL) + return; + + for (i = 0; i < count; i++) { + free(pools[i].tag); + free(pools[i].path); + } + + free(pools); +} + +static char *_diskpool_member_of(const char *file) +{ + struct disk_pool *pools = NULL; + int count; + int i; + char *pool = NULL; + + count = get_diskpool_config(&pools); + if (count == 0) + return NULL; + + for (i = 0; i < count; i++) { + if (STARTS_WITH(file, pools[i].path)) { + int ret; + + ret = asprintf(&pool, "DiskPool/%s", pools[i].tag); + if (ret == -1) + pool = NULL; + break; + } + } + + free_diskpool(pools, count); + + return pool; +} + +static char *diskpool_member_of(const CMPIBroker *broker, char *rasd_id) +{ + char *host = NULL; + char *dev = NULL; + int ret; + virConnectPtr conn = NULL; + virDomainPtr dom = NULL; + int count = 0; + struct virt_device *devs = NULL; + int i; + char *pool = NULL; + CMPIStatus s; + + ret = parse_fq_devid(rasd_id, &host, &dev); + if (!ret) + goto out; + + conn = lv_connect(broker, &s); + if (conn == NULL) + goto out; + + dom = virDomainLookupByName(conn, host); + if (dom == NULL) + goto out; + + count = get_disk_devices(dom, &devs); + + for (i = 0; i < count; i++) { + if (STREQ((devs[i].dev.disk.virtual_dev), dev)) { + pool = _diskpool_member_of(devs[i].dev.disk.source); + break; + } + } + + out: + if (count > 0) + cleanup_virt_devices(&devs, count); + + free(host); + free(dev); + virConnectClose(conn); + virDomainFree(dom); + + return pool; +} static char *netpool_member_of(const CMPIBroker *broker, char *rasd_id) { @@ -100,6 +248,8 @@ char *pool_member_of(const CMPIBroker *b poolid = strdup("MemoryPool/0"); else if (type == CIM_RASD_TYPE_NET) poolid = netpool_member_of(broker, id); + else if (type == CIM_RASD_TYPE_DISK) + poolid = diskpool_member_of(broker, id); else return NULL; @@ -296,6 +446,96 @@ static CMPIStatus netpool_instance(virCo return s; } +static CMPIInstance *diskpool_from_path(const char *path, + const char *id, + const char *ns, + const CMPIBroker *broker) +{ + CMPIInstance *inst; + char *poolid = NULL; + const uint16_t type = CIM_RASD_TYPE_DISK; + struct statvfs vfs; + uint64_t cap; + uint64_t res; + + inst = get_typed_instance(broker, "DiskPool", ns); + + if (asprintf(&poolid, "DiskPool/%s", id) == -1) + return NULL; + + CMSetProperty(inst, "InstanceID", + (CMPIValue *)poolid, CMPI_chars); + + CMSetProperty(inst, "ResourceType", + (CMPIValue *)&type, CMPI_uint16); + + CMSetProperty(inst, "AllocationUnits", + (CMPIValue *)"Megabytes", CMPI_chars); + + if (statvfs(path, &vfs) != 0) { + CU_DEBUG("Failed to statvfs(%s): %m", path); + goto out; + } + + cap = (uint64_t) vfs.f_frsize * vfs.f_blocks; + res = cap - (uint64_t)(vfs.f_frsize * vfs.f_bfree); + + cap >>= 20; + res >>= 20; + + CMSetProperty(inst, "Capacity", + (CMPIValue *)&cap, CMPI_uint64); + + CMSetProperty(inst, "Reserved", + (CMPIValue *)&res, CMPI_uint64); + + out: + free(poolid); + + return inst; +} + +static CMPIStatus diskpool_instance(virConnectPtr conn, + struct inst_list *list, + const char *ns, + const char *id, + const CMPIBroker *broker) +{ + CMPIStatus s; + struct disk_pool *pools = NULL; + int count = 0; + int i; + + count = get_diskpool_config(&pools); + if ((id == NULL) && (count == 0)) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "No such pool `%s'", id); + goto out; + } + + for (i = 0; i < count; i++) { + CMPIInstance *pool; + + if ((id != NULL) && (!STREQ(id, pools[i].tag))) + continue; + /* Either this matches id, or we're matching all */ + + pool = diskpool_from_path(pools[i].path, + pools[i].tag, + ns, + broker); + if (pool != NULL) + inst_list_add(list, pool); + } + + CMSetStatus(&s, CMPI_RC_OK); + out: + free_diskpool(pools, count); + + return s; +} + static CMPIStatus _get_pool(const CMPIBroker *broker, virConnectPtr conn, const char *type, @@ -309,6 +549,8 @@ static CMPIStatus _get_pool(const CMPIBr return procpool_instance(conn, list, ns, id, broker); else if (STARTS_WITH(type, "NetworkPool")) return netpool_instance(conn, list, ns, id, broker); + else if (STARTS_WITH(type, "DiskPool")) + return diskpool_instance(conn, list, ns, id, broker); return (CMPIStatus){CMPI_RC_ERR_NOT_FOUND, NULL}; }

2 2

cu_parse_embedded_instance() different results on sfcb & pegasus
by Zhengang Li 29 Oct '07

29 Oct '07

The VSMS.defineSystem method on pegasus currently blocks on the this difference: After cu_parse_embedded_instance(), I can get a correct value on those integer type property (e.g. ResourceType) with a sfcb CIMOM. But I failed to get any value from a pegasus CIMOM. Try the following patch: diff -r 0868c5ff8fd7 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Thu Oct 25 09:39:46 2007 -0700 +++ b/src/Virt_VirtualSystemManagementService.c Mon Oct 29 17:42:52 2007 +0800 @@ -56,8 +56,21 @@ static int parse_str_inst_array(CMPIArra _BROKER, &inst); - if (ret == 0) + if (ret == 0) { + int tret = 0; + char * mystr = NULL; + uint16_t myint = 0; + tret = cu_get_str_prop(inst, "InstanceID", &mystr); + if (tret == 0) { + printf("InstanceID = %s\n", mystr); + free(mystr); + } + tret = cu_get_u16_prop(inst, "ResourceType", &myint); + if (tret == 0) { + printf("ResourceType = %d\n", myint); + } inst_list_add(list, inst); + } } return 1; The actual code that breaks lives in the function classify_resources(), I added the patch above to the function parse_str_inst_array(), right after a successful cu_parse_embedded_instance(). On sfcb, you'll see both lines (InstanceID & ResourceType). But on pegasus, only the InstanceID lines. I turned on the EODEBUG macro. Messages from libcmpiutil told me that the integer types are set as SINT64 type. The lexer & parser also take all the integer types as sint64 type. Is that the cause? -- - Zhengang

2 1