- CIM - libvirt List Archives

[PATCH] Make cu_compare_ref() also compare the actual classname of the ref and inst
by Dan Smith 13 Nov '07

13 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194548973 28800 # Node ID a55a0f630c034ac5ed76211b8459ae1e4fdc56ae # Parent 41c761dba6a6268da6fdb9a89c1cc6f959870aac Make cu_compare_ref() also compare the actual classname of the ref and inst ...and change STREQ to STREQC, per Heidi's suggestion. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 41c761dba6a6 -r a55a0f630c03 instance_util.c --- a/instance_util.c Thu Nov 08 10:28:41 2007 -0800 +++ b/instance_util.c Thu Nov 08 11:09:33 2007 -0800 @@ -78,7 +78,7 @@ static bool _compare_data(const CMPIData const char *as = CMGetCharPtr(a->value.string); const char *bs = CMGetCharPtr(b->value.string); - return STREQ(as, bs); + return STREQC(as, bs); } else if (a->type & CMPI_INTEGER) { return memcmp(&a->value, &b->value, sizeof(a->value)) == 0; } @@ -86,6 +86,29 @@ static bool _compare_data(const CMPIData CU_DEBUG("Unhandled CMPI type: `%i'", a->type); return false; +} + +static bool _compare_classname(const CMPIObjectPath *ref, + const CMPIInstance *inst) +{ + const char *ref_cn; + const char *inst_cn; + CMPIObjectPath *op; + CMPIStatus s; + + op = CMGetObjectPath(inst, &s); + if ((op == NULL) || (s.rc != CMPI_RC_OK)) + return false; + + ref_cn = CLASSNAME(ref); + if (ref_cn == NULL) + return false; + + inst_cn = CLASSNAME(op); + if (inst_cn == NULL) + return false; + + return STREQC(inst_cn, ref_cn); } const char *cu_compare_ref(const CMPIObjectPath *ref, @@ -101,6 +124,9 @@ const char *cu_compare_ref(const CMPIObj CU_DEBUG("Unable to get key count"); return NULL; } + + if (!_compare_classname(ref, inst)) + return "CreationClassName"; for (i = 0; i < count; i++) { CMPIData kd, pd;

3 3

[PATCH] This fixes a potential crash if _get_domain() is unable to properly parse the dom XML
by Kaitlin Rupert 12 Nov '07

12 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1194918780 28800 # Node ID 8b6965d9e9479dab28337480e1f84812d2c880f2 # Parent 4ceb57b4430b0455ef7cb68f57a8ec6ad01abeca This fixes a potential crash if _get_domain() is unable to properly parse the dom XML. Also fixes an issue in VSSD - if get_domaininfo() returns 0 (an error), then instance_from_dom() needs to set ret properly so that an empty instance won't be created. Previous patch had a memory leak - fixed this issue. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 4ceb57b4430b -r 8b6965d9e947 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Mon Nov 12 13:54:53 2007 -0800 +++ b/libxkutil/device_parsing.c Mon Nov 12 17:53:00 2007 -0800 @@ -575,16 +575,24 @@ int get_dominfo(virDomainPtr dom, struct xml = virDomainGetXMLDesc(dom, 0); if (!xml) { free(*dominfo); + *dominfo = NULL; return 0; } ret = _get_dominfo(xml, *dominfo); - free(xml); + if (!ret) { + free(*dominfo); + *dominfo = NULL; + goto out; + } (*dominfo)->dev_mem_ct = get_mem_devices(dom, &(*dominfo)->dev_mem); (*dominfo)->dev_net_ct = get_net_devices(dom, &(*dominfo)->dev_net); (*dominfo)->dev_disk_ct = get_disk_devices(dom, &(*dominfo)->dev_disk); (*dominfo)->dev_vcpu_ct = get_vcpu_devices(dom, &(*dominfo)->dev_vcpu); + +out: + free(xml); return ret; } diff -r 4ceb57b4430b -r 8b6965d9e947 src/Virt_VSSD.c --- a/src/Virt_VSSD.c Mon Nov 12 13:54:53 2007 -0800 +++ b/src/Virt_VSSD.c Mon Nov 12 17:53:00 2007 -0800 @@ -45,7 +45,8 @@ static int instance_from_dom(virDomainPt CMPIObjectPath *op; struct domain *dominfo = NULL; - if (!get_dominfo(dom, &dominfo)) + ret = get_dominfo(dom, &dominfo); + if (!ret) goto out; op = CMGetObjectPath(inst, NULL);

2 1

[PATCH] This fixes a potential crash if _get_domain() is unable to properly parse the dom XML
by Kaitlin Rupert 12 Nov '07

12 Nov '07

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1194912941 28800 # Node ID f2966070990024afbad3ee79dd5f276b0310aa2e # Parent 4ceb57b4430b0455ef7cb68f57a8ec6ad01abeca This fixes a potential crash if _get_domain() is unable to properly parse the dom XML. Also fixes an issue in VSSD - if get_domaininfo() returns 0 (an error), then instance_from_dom() needs to set ret properly so that an empty instance won't be created. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 4ceb57b4430b -r f29660709900 libxkutil/device_parsing.c --- a/libxkutil/device_parsing.c Mon Nov 12 13:54:53 2007 -0800 +++ b/libxkutil/device_parsing.c Mon Nov 12 16:15:41 2007 -0800 @@ -575,10 +575,17 @@ int get_dominfo(virDomainPtr dom, struct xml = virDomainGetXMLDesc(dom, 0); if (!xml) { free(*dominfo); + *dominfo = NULL; return 0; } ret = _get_dominfo(xml, *dominfo); + if (!ret) { + free(*dominfo); + *dominfo = NULL; + return 0; + } + free(xml); (*dominfo)->dev_mem_ct = get_mem_devices(dom, &(*dominfo)->dev_mem); diff -r 4ceb57b4430b -r f29660709900 src/Virt_VSSD.c --- a/src/Virt_VSSD.c Mon Nov 12 13:54:53 2007 -0800 +++ b/src/Virt_VSSD.c Mon Nov 12 16:15:41 2007 -0800 @@ -45,7 +45,8 @@ static int instance_from_dom(virDomainPt CMPIObjectPath *op; struct domain *dominfo = NULL; - if (!get_dominfo(dom, &dominfo)) + ret = get_dominfo(dom, &dominfo); + if (!ret) goto out; op = CMGetObjectPath(inst, NULL);

2 3

[PATCH] Fix crash if create_system() returns a NULL instance
by Dan Smith 12 Nov '07

12 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194905315 28800 # Node ID c3aebc961483f72f6a60795b5902499cd4422a9e # Parent 44fb749aa036b3ccaeed3862a302a3848cea3822 Fix crash if create_system() returns a NULL instance Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 44fb749aa036 -r c3aebc961483 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Nov 12 14:06:19 2007 -0800 +++ b/src/Virt_VirtualSystemManagementService.c Mon Nov 12 14:08:35 2007 -0800 @@ -388,6 +388,8 @@ static CMPIStatus define_system(CMPIMeth goto out; sys = create_system(vssd, &res, reference, &s); + if (sys == NULL) + goto out; inst_list_free(&res);

2 1

[PATCH] Handle the case where bootloader (and _args) is not specified
by Dan Smith 12 Nov '07

12 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194905179 28800 # Node ID 44fb749aa036b3ccaeed3862a302a3848cea3822 # Parent 4ceb57b4430b0455ef7cb68f57a8ec6ad01abeca Handle the case where bootloader (and _args) is not specified Otherwise, there is an error starting the domain because the bootloader is not executable. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 4ceb57b4430b -r 44fb749aa036 libxkutil/xmlgen.c --- a/libxkutil/xmlgen.c Mon Nov 12 13:54:53 2007 -0800 +++ b/libxkutil/xmlgen.c Mon Nov 12 14:06:19 2007 -0800 @@ -244,21 +244,29 @@ static char *system_xml(struct domain *d static char *system_xml(struct domain *domain) { int ret; - char *xml; + char *bl = NULL; + char *bl_args = NULL; + char *xml; + + bl = tagify("bootloader", domain->bootloader, NULL, 0); + bl_args = tagify("bootloader_args", domain->bootloader_args, NULL, 0); ret = asprintf(&xml, "<name>%s</name>\n" - "<bootloader>%s</bootloader>\n" - "<bootloader_args>%s</bootloader_args>\n" + "%s\n" + "%s\n" "<on_poweroff>%s</on_poweroff>\n" "<on_crash>%s</on_crash>\n", domain->name, - domain->bootloader, - domain->bootloader_args, + bl, + bl_args, vssd_recovery_action_str(domain->on_poweroff), vssd_recovery_action_str(domain->on_crash)); if (ret == -1) xml = NULL; + + free(bl); + free(bl_args); return xml; }

2 1

[PATCH 0 of 2] Dynamic memory ballooning
by Dan Smith 12 Nov '07

12 Nov '07

This set adds dynamic memory ballooning when a client does a ModifyResourceSettings on the Memory RASD.

2 3

[PATCH] Update VSMS to pass a namespace when parsing EO method arguments
by Dan Smith 12 Nov '07

12 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194894466 28800 # Node ID c7572e9cdf49a37b96375e799c7b9818ae36fd1d # Parent 9fd4142d9739977cc3b49e3373461373a57365ec Update VSMS to pass a namespace when parsing EO method arguments Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 9fd4142d9739 -r c7572e9cdf49 src/Virt_VirtualSystemManagementService.c --- a/src/Virt_VirtualSystemManagementService.c Mon Nov 12 12:16:21 2007 +0100 +++ b/src/Virt_VirtualSystemManagementService.c Mon Nov 12 11:07:46 2007 -0800 @@ -51,6 +51,7 @@ const static CMPIBroker *_BROKER; const static CMPIBroker *_BROKER; static int parse_str_inst_array(CMPIArray *array, + const char *ns, struct inst_list *list) { int count; @@ -67,8 +68,9 @@ static int parse_str_inst_array(CMPIArra /* FIXME: Check for string here */ ret = cu_parse_embedded_instance(CMGetCharPtr(item.value.string), - _BROKER, - &inst); + _BROKER, + ns, + &inst); if (ret == 0) inst_list_add(list, inst); @@ -79,6 +81,7 @@ static int parse_str_inst_array(CMPIArra static CMPIStatus define_system_parse_args(const CMPIArgs *argsin, CMPIInstance **sys, + const char *ns, struct inst_list *res) { CMPIStatus s = {CMPI_RC_ERR_FAILED, NULL}; @@ -92,7 +95,10 @@ static CMPIStatus define_system_parse_ar goto out; } - ret = cu_parse_embedded_instance(sys_str, _BROKER, sys); + ret = cu_parse_embedded_instance(sys_str, + _BROKER, + ns, + sys); if (ret) { CU_DEBUG("Unable to parse SystemSettings instance"); CMSetStatusWithChars(_BROKER, &s, @@ -107,7 +113,7 @@ static CMPIStatus define_system_parse_ar goto out; } - ret = parse_str_inst_array(res_arr, res); + ret = parse_str_inst_array(res_arr, ns, res); CMSetStatus(&s, CMPI_RC_OK); @@ -371,7 +377,7 @@ static CMPIStatus define_system(CMPIMeth CU_DEBUG("DefineSystem"); - s = define_system_parse_args(argsin, &vssd, &res); + s = define_system_parse_args(argsin, &vssd, NAMESPACE(reference), &res); if (s.rc != CMPI_RC_OK) goto out; @@ -527,7 +533,10 @@ static CMPIStatus mod_system_settings(CM return s; } - if (cu_parse_embedded_instance(inst_str, _BROKER, &inst)) { + if (cu_parse_embedded_instance(inst_str, + _BROKER, + NAMESPACE(reference), + &inst)) { CMPIStatus s; cu_statusf(_BROKER, &s, @@ -889,7 +898,7 @@ static CMPIStatus update_resource_settin goto out; } - parse_str_inst_array(array, &list); + parse_str_inst_array(array, NAMESPACE(ref), &list); s = _update_resource_settings(ref, &list, func);

2 1

[PATCH] Make the EO parser not depend on root/ibmsd namespace
by Dan Smith 12 Nov '07

12 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194894184 28800 # Node ID 6f09834081cf603e73b82376f738e4384206ffc9 # Parent cbed0b1c5f006d83a0a3a12d4f379a5a0173a31e Make the EO parser not depend on root/ibmsd namespace This EO parser needs some serious work. It's not even remotely thread-safe and it's pretty crusty. This doesn't make it any less thread safe than it already was, and it makes us not break things that depend on EO parsing. I'll take a TODO to fix this up a bit sometime in the future. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r cbed0b1c5f00 -r 6f09834081cf eo_parser.c --- a/eo_parser.c Fri Nov 09 15:38:44 2007 -0800 +++ b/eo_parser.c Mon Nov 12 11:03:04 2007 -0800 @@ -35,7 +35,7 @@ #define TEMPLATE "/tmp/tmp_eo_parse.XXXXXX" void eo_parse_restart(FILE *); -int eo_parse_parseinstance(const CMPIBroker *, CMPIInstance **); +int eo_parse_parseinstance(const CMPIBroker *, CMPIInstance **, const char *ns); static int write_temp(char *eo) { @@ -64,6 +64,7 @@ static int write_temp(char *eo) int cu_parse_embedded_instance(const char *eo, const CMPIBroker *broker, + const char *ns, CMPIInstance **instance) { int ret; @@ -77,7 +78,7 @@ int cu_parse_embedded_instance(const cha fp = fdopen(fd, "r"); eo_parse_restart(fp); - ret = eo_parse_parseinstance(broker, instance); + ret = eo_parse_parseinstance(broker, instance, ns); close(fd); #else diff -r cbed0b1c5f00 -r 6f09834081cf eo_util_parser.y --- a/eo_util_parser.y Fri Nov 09 15:38:44 2007 -0800 +++ b/eo_util_parser.y Mon Nov 12 11:03:04 2007 -0800 @@ -22,8 +22,9 @@ void eo_parse_error(char *); #define RC_EOF EOF /* DEFINE ANY GLOBAL VARS HERE */ -static CMPIBroker * _BROKER; +static const CMPIBroker * _BROKER; static CMPIInstance ** _INSTANCE; +static const char * _NAMESPACE; #ifdef EODEBUG #define EOTRACE(fmt, arg...) fprintf(stderr, fmt, ##arg) @@ -31,7 +32,9 @@ static CMPIInstance ** _INSTANCE; #define EOTRACE(fmt, arg...) #endif -int eo_parse_parseinstance(CMPIBroker *broker, CMPIInstance **instance); +int eo_parse_parseinstance(const CMPIBroker *broker, + CMPIInstance **instance, + const char *ns); %} @@ -64,7 +67,7 @@ instance: /* empty */ EOTRACE("classname = %s\n",$3); CMPIObjectPath *op; op = CMNewObjectPath(_BROKER, - "root/ibmsd", + _NAMESPACE, $3, NULL); *_INSTANCE = CMNewInstance(_BROKER, @@ -125,10 +128,13 @@ property: PROPERTYNAME '=' STRING ';' /* USER SUBROUTINE SECTION */ -int eo_parse_parseinstance(CMPIBroker *broker, CMPIInstance **instance) +int eo_parse_parseinstance(const CMPIBroker *broker, + CMPIInstance **instance, + const char *ns) { _BROKER = broker; _INSTANCE = instance; + _NAMESPACE = ns; /* Parse the next instance */ return(eo_parse_parse()); diff -r cbed0b1c5f00 -r 6f09834081cf libcmpiutil.h --- a/libcmpiutil.h Fri Nov 09 15:38:44 2007 -0800 +++ b/libcmpiutil.h Mon Nov 12 11:03:04 2007 -0800 @@ -277,12 +277,14 @@ CMPIType cu_arg_type(const CMPIArgs *arg * * @param eo The embedded instance string * @param broker A pointer to the current broker + * @param ns The namespace for the new instance * @param instance A pointer to an instance pointer to hold the result * @returns nonzero on success * */ int cu_parse_embedded_instance(const char *eo, const CMPIBroker *broker, + const char *ns, CMPIInstance **instance); /**

2 1

[PATCH 0 of 6] SettingsDefineCapabilities, all of it
by Jay Gagnon 12 Nov '07

12 Nov '07

So this is a huge set, and I'm sorry for dumping it all at once, but I kept bouncing between the various patches as I worked on it, so sending any one out earlier probably would have backfired. This brings SettingsDefineCapabilities to a working state, as well as does all the background work. Clients should now be able to follow the chain of associations all the way from a HostSystem instance to a series of RASD instances that tell them the min, max, increment (read: granulatiry), and default values for NetworkPort, Disk, Memory, and Processor. Once this set is processed and approved I have some plans to try and make things a little more compact, as there is a reasonable amount of duplication in some places, and a couple of cases could use some polish, but with this set they should all be working, so it was about time to get it out for review.

4 32

[PATCH] Register association ElementCapabilities to root/virt namespace
by Heidi Eckhart 12 Nov '07

12 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1194866181 -3600 # Node ID be03306b6557177c68d4fb936cd8e38a234daff7 # Parent 3e2881417ccd3898228179694d3a34bcc9a976ce Register association ElementCapabilities to root/virt namespace Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r 3e2881417ccd -r be03306b6557 schema/ElementCapabilities.registration --- a/schema/ElementCapabilities.registration Fri Nov 09 15:57:52 2007 -0800 +++ b/schema/ElementCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ElementCapabilities root/interop Xen_ElementCapabilitiesProvider Virt_ElementCapabilities association -KVM_ElementCapabilities root/interop KVM_ElementCapabilitiesProvider Virt_ElementCapabilities association +Xen_ElementCapabilities root/virt Xen_ElementCapabilitiesProvider Virt_ElementCapabilities association +KVM_ElementCapabilities root/virt KVM_ElementCapabilitiesProvider Virt_ElementCapabilities association

2 1