November 2007 - CIM - Libvirt List Archives

[PATCH 0 of 2] Dynamic memory ballooning

by Dan Smith

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

16 years, 10 months

2
3
0 / 0

[PATCH] Update VSMS to pass a namespace when parsing EO method arguments

by Dan Smith

# 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);

16 years, 10 months

2
1
0 / 0

[PATCH] Make the EO parser not depend on root/ibmsd namespace

by Dan Smith

# 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); /**

16 years, 10 months

2
1
0 / 0

[PATCH 0 of 6] SettingsDefineCapabilities, all of it

by Jay Gagnon

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.

16 years, 10 months

4
32
0 / 0

[PATCH] Register association ElementCapabilities to root/virt namespace

by Heidi Eckhart

# 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

16 years, 10 months

2
1
0 / 0

[PATCH] Updated Copyright Statements and common schema look and feel

by Heidi Eckhart

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1194867348 -3600 # Node ID 2519c5f9656c58a6034cf17395deb379dbae4c9c # Parent be03306b6557177c68d4fb936cd8e38a234daff7 Updated Copyright Statements and common schema look and feel Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r be03306b6557 -r 2519c5f9656c schema/AllocationCapabilities.mof --- a/schema/AllocationCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/AllocationCapabilities.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,5 @@ // Copyright IBM Corp. 2007 + class Xen_AllocationCapabilities : CIM_AllocationCapabilities { }; diff -r be03306b6557 -r 2519c5f9656c schema/AllocationCapabilities.registration --- a/schema/AllocationCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/AllocationCapabilities.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance KVM_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance diff -r be03306b6557 -r 2519c5f9656c schema/ComputerSystem.mof --- a/schema/ComputerSystem.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystem.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,35 +1,26 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_ComputerSystem -// ================================================================== [Description ( "A class derived from CIM_ComputerSystem to represent " - "the Xen virtual machines/domains running on the system.")] + "the Xen virtual machines/domains running on the system.") +] class Xen_ComputerSystem : CIM_ComputerSystem { + [Description("UUID assigned to this DomU.")] string UUID; - [Description("Change domain state")] - uint32 RequestStateChange( - uint16 RequestedState, - datetime TimeoutPeriod - ); - }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_ComputerSystem -// ================================================================== [Description ( "A class derived from CIM_ComputerSystem to represent " - "the KVM virtual machines running on the system.")] + "the KVM virtual machines running on the system.") +] class KVM_ComputerSystem : CIM_ComputerSystem { + [Description("UUID assigned to this virtual machine.")] string UUID; + }; diff -r be03306b6557 -r 2519c5f9656c schema/ComputerSystem.registration --- a/schema/ComputerSystem.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystem.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance method -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance diff -r be03306b6557 -r 2519c5f9656c schema/ComputerSystemIndication.mof --- a/schema/ComputerSystemIndication.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystemIndication.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,5 @@ // Copyright IBM Corp. 2007 + [Description ("Xen_ComputerSystem created")] class Xen_ComputerSystemCreatedIndication : CIM_InstCreation { @@ -9,7 +10,6 @@ class Xen_ComputerSystemDeletedIndicatio { }; - [Description ("KVM_ComputerSystem lifecycle")] class KVM_ComputerSystemCreatedIndication : CIM_InstCreation { diff -r be03306b6557 -r 2519c5f9656c schema/ComputerSystemIndication.registration --- a/schema/ComputerSystemIndication.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystemIndication.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method Xen_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method diff -r be03306b6557 -r 2519c5f9656c schema/DiskPool.mof --- a/schema/DiskPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/DiskPool.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,6 +1,9 @@ class Xen_DiskPool : CIM_ResourcePool +// Copyright IBM Corp. 2007 + class Xen_DiskPool : CIM_ResourcePool { }; + class KVM_DiskPool : CIM_ResourcePool { }; diff -r be03306b6557 -r 2519c5f9656c schema/DiskPool.registration --- a/schema/DiskPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/DiskPool.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,2 +1,4 @@ Xen_DiskPool root/virt Virt_DevicePoolPr +# Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance KVM_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r be03306b6557 -r 2519c5f9656c schema/ElementAllocatedFromPool.mof --- a/schema/ElementAllocatedFromPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementAllocatedFromPool.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,7 +1,11 @@ // Copyright IBM Corp. 2007 + [Association] -class Xen_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { +class Xen_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool +{ }; + [Association] -class KVM_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool { +class KVM_ElementAllocatedFromPool : CIM_ElementAllocatedFromPool +{ }; diff -r be03306b6557 -r 2519c5f9656c schema/ElementAllocatedFromPool.registration --- a/schema/ElementAllocatedFromPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementAllocatedFromPool.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ElementAllocatedFromPool root/virt Xen_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association -KVM_ElementAllocatedFromPool root/virt KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association \ No newline at end of file +KVM_ElementAllocatedFromPool root/virt KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association diff -r be03306b6557 -r 2519c5f9656c schema/ElementCapabilities.mof --- a/schema/ElementCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementCapabilities.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_ElementCapabilities -// ================================================================== [Association, Description ( - "A class to associate a ManagedElement with its Capabilities." -)] + "A class to associate a ManagedElement with its Capabilities.") +] class Xen_ElementCapabilities : CIM_ElementCapabilities { }; -// ================================================================== -// KVM_ElementCapabilities -// ================================================================== [Association, Description ( - "A class to associate a ManagedElement with its Capabilities." -)] + "A class to associate a ManagedElement with its Capabilities.") +] class KVM_ElementCapabilities : CIM_ElementCapabilities { }; diff -r be03306b6557 -r 2519c5f9656c schema/ElementCapabilities.registration --- a/schema/ElementCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementCapabilities.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ElementCapabilities root/virt Xen_ElementCapabilitiesProvider Virt_ElementCapabilities association KVM_ElementCapabilities root/virt KVM_ElementCapabilitiesProvider Virt_ElementCapabilities association diff -r be03306b6557 -r 2519c5f9656c schema/ElementConformsToProfile.mof --- a/schema/ElementConformsToProfile.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementConformsToProfile.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_ElementConformsToProfile -// ================================================================== [Association, Description ( - "A class to associate a ManagedElement with its RegisteredProfile." -)] + "A class to associate a ManagedElement with its RegisteredProfile.") +] class Xen_ElementConformsToProfile : CIM_ElementConformsToProfile { }; -// ================================================================== -// KVM_ElementConformsToProfile -// ================================================================== [Association, Description ( - "A class to associate a ManagedElement with its RegisteredProfile." -)] + "A class to associate a ManagedElement with its RegisteredProfile.") +] class KVM_ElementConformsToProfile : CIM_ElementConformsToProfile { }; diff -r be03306b6557 -r 2519c5f9656c schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementConformsToProfile.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,7 +1,6 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes #Xen_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association Xen_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association -# Classname Namespace ProviderName ProviderModule ProviderTypes ... #KVM_ElementConformsToProfile root/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association diff -r be03306b6557 -r 2519c5f9656c schema/EnabledLogicalElementCapabilities.mof --- a/schema/EnabledLogicalElementCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/EnabledLogicalElementCapabilities.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_EnabledLogicalElementCapabilities -// ================================================================== [Description ( "A class derived from CIM_Capabilities to represent " - "the changes that can be made to a started Xen virtual system")] + "the changes that can be made to a started Xen virtual system") +] class Xen_EnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_EnabledLogicalElementCapabilities -// ================================================================== [Description ( "A class derived from CIM_Capabilities to represent " - "the changes that can be made to a started KVM virtual system")] + "the changes that can be made to a started KVM virtual system") +] class KVM_EnabledLogicalElementCapabilities : CIM_EnabledLogicalElementCapabilities { }; diff -r be03306b6557 -r 2519c5f9656c schema/EnabledLogicalElementCapabilities.registration --- a/schema/EnabledLogicalElementCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/EnabledLogicalElementCapabilities.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance diff -r be03306b6557 -r 2519c5f9656c schema/HostSystem.mof --- a/schema/HostSystem.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostSystem.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_HostSystem -// ================================================================== [Description ( "A class derived from CIM_ComputerSystem to represent " - "the Xen host system")] + "the Xen host system.") +] class Xen_HostSystem : CIM_ComputerSystem { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_HostSystem -// ================================================================== [Description ( "A class derived from CIM_ComputerSystem to represent " - "the KVM host system.")] + "the KVM host system.") +] class KVM_HostSystem : CIM_ComputerSystem { }; diff -r be03306b6557 -r 2519c5f9656c schema/HostSystem.registration --- a/schema/HostSystem.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostSystem.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance diff -r be03306b6557 -r 2519c5f9656c schema/HostedDependency.mof --- a/schema/HostedDependency.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedDependency.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,19 +1,19 @@ // Copyright IBM Corp. 2007 -// ================================================================== -// Xen_HostedDependency -// ================================================================== - [Association, Version ( "2.8.0" ), - UMLPackagePath ( "CIM::Core::CoreElements" ), Description ( - "HostedDependency defines a ManagedElement in the context of " - "another ManagedElement in which it resides.")] -class Xen_HostedDependency : CIM_HostedDependency { -}; -// ================================================================== -// KVM_HostedDependency -// ================================================================== - [Association, Version ( "2.8.0" ), - UMLPackagePath ( "CIM::Core::CoreElements" ), Description ( - "HostedDependency defines a ManagedElement in the context of " - "another ManagedElement in which it resides.")] -class KVM_HostedDependency : CIM_HostedDependency { -}; + +[Association, + Description ( + "HostedDependency defines a ManagedElement in the context of " + "another ManagedElement in which it resides.") +] +class Xen_HostedDependency : CIM_HostedDependency +{ +}; + +[Association, + Description ( + "HostedDependency defines a ManagedElement in the context of " + "another ManagedElement in which it resides.") +] +class KVM_HostedDependency : CIM_HostedDependency +{ +}; diff -r be03306b6557 -r 2519c5f9656c schema/HostedDependency.registration --- a/schema/HostedDependency.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedDependency.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association diff -r be03306b6557 -r 2519c5f9656c schema/HostedResourcePool.mof --- a/schema/HostedResourcePool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedResourcePool.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,16 +1,17 @@ // Copyright IBM Corp. 2007 + [Association, Description ( - "Associates a host system to its resource pools" -)] + "Associates a host system to its resource pools") +] class Xen_HostedResourcePool : CIM_HostedResourcePool { }; [Association, Description ( - "Associates a host system to its resource pools" -)] + "Associates a host system to its resource pools") +] class KVM_HostedResourcePool : CIM_HostedResourcePool { }; \ No newline at end of file diff -r be03306b6557 -r 2519c5f9656c schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedResourcePool.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association KVM_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file diff -r be03306b6557 -r 2519c5f9656c schema/LogicalDisk.mof --- a/schema/LogicalDisk.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/LogicalDisk.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_LogicalDisk -// ================================================================== [Description ( "A class derived from CIM_LogicalDisk to represent " - "the Xen virtual disks on the system.")] + "the Xen virtual disks on the system.") +] class Xen_LogicalDisk : CIM_LogicalDisk { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_LogicalDisk -// ================================================================== [Description ( "A class derived from CIM_LogicalDisk to represent " - "the KVM virtual disks on the system.")] + "the KVM virtual disks on the system.") +] class KVM_LogicalDisk : CIM_LogicalDisk { }; diff -r be03306b6557 -r 2519c5f9656c schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/LogicalDisk.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance diff -r be03306b6557 -r 2519c5f9656c schema/Memory.mof --- a/schema/Memory.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Memory.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,24 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// Xen_Memory -// ================================================================== +// Copyright IBM Corp. 2007 [Description ( "A class derived from CIM_Memory to represent " - "the Xen virtual memory.")] + "the Xen virtual memory.") +] class Xen_Memory : CIM_Memory { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_Memory -// ================================================================== [Description ( "A class derived from CIM_Memory to represent " - "the KVM virtual memory.")] + "the KVM virtual memory.") +] class KVM_Memory : CIM_Memory { }; diff -r be03306b6557 -r 2519c5f9656c schema/Memory.registration --- a/schema/Memory.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Memory.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_Memory root/virt Virt_DeviceProvider Virt_Device instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_Memory root/virt Virt_DeviceProvider Virt_Device instance diff -r be03306b6557 -r 2519c5f9656c schema/MemoryPool.mof --- a/schema/MemoryPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/MemoryPool.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,17 +1,9 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_MemoryPool -// ================================================================== class Xen_MemoryPool : CIM_ResourcePool { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_MemoryPool -// ================================================================== class KVM_MemoryPool : CIM_ResourcePool { }; diff -r be03306b6557 -r 2519c5f9656c schema/MemoryPool.registration --- a/schema/MemoryPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/MemoryPool.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r be03306b6557 -r 2519c5f9656c schema/NetPool.mof --- a/schema/NetPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetPool.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,7 +1,9 @@ // Copyright IBM Corp. 2007 + class Xen_NetworkPool : CIM_ResourcePool { }; + class KVM_NetworkPool : CIM_ResourcePool { }; diff -r be03306b6557 -r 2519c5f9656c schema/NetPool.registration --- a/schema/NetPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetPool.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance KVM_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file diff -r be03306b6557 -r 2519c5f9656c schema/NetworkPort.mof --- a/schema/NetworkPort.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetworkPort.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_NetworkPort -// ================================================================== [Description ( "A class derived from CIM_NetworkPort to represent " - "the Xen virtual network interfaces on the system.")] + "the Xen virtual network interfaces on the system.") +] class Xen_NetworkPort : CIM_NetworkPort { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_NetworkPort -// ================================================================== [Description ( "A class derived from CIM_NetworkPort to represent " - "the KVM virtual network interfaces on the system.")] + "the KVM virtual network interfaces on the system.") +] class KVM_NetworkPort : CIM_NetworkPort { }; diff -r be03306b6557 -r 2519c5f9656c schema/NetworkPort.registration --- a/schema/NetworkPort.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetworkPort.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance diff -r be03306b6557 -r 2519c5f9656c schema/Processor.mof --- a/schema/Processor.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Processor.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_Processor -// ================================================================== [Description ( "A class derived from CIM_Processor to represent " - "the Xen virtual processors.")] + "the Xen virtual processors.") +] class Xen_Processor : CIM_Processor { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_Processor -// ================================================================== [Description ( "A class derived from CIM_Processor to represent " - "the KVM virtual processors.")] + "the KVM virtual processors.") +] class KVM_Processor : CIM_Processor { }; diff -r be03306b6557 -r 2519c5f9656c schema/Processor.registration --- a/schema/Processor.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Processor.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_Processor root/virt Virt_DeviceProvider Virt_Device instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_Processor root/virt Virt_DeviceProvider Virt_Device instance diff -r be03306b6557 -r 2519c5f9656c schema/ProcessorPool.mof --- a/schema/ProcessorPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ProcessorPool.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,17 +1,9 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_ProcessorPool -// ================================================================== class Xen_ProcessorPool : CIM_ResourcePool { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_ProcessorPool -// ================================================================== class KVM_ProcessorPool : CIM_ResourcePool { }; diff -r be03306b6557 -r 2519c5f9656c schema/ProcessorPool.registration --- a/schema/ProcessorPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ProcessorPool.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r be03306b6557 -r 2519c5f9656c schema/RegisteredProfile.mof --- a/schema/RegisteredProfile.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/RegisteredProfile.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,21 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_RegisteredProfile -// ================================================================== [Description ( "A class derived from CIM_RegisteredProfile to represent " - "an advertised conformant profile.")] + "an advertised conformant profile.") +] class Xen_RegisteredProfile : CIM_RegisteredProfile { }; -// ================================================================== -// KVM_RegisteredProfile -// ================================================================== [Description ( "A class derived from CIM_RegisteredProfile to represent " - "an advertised conformant profile.")] + "an advertised conformant profile.") +] class KVM_RegisteredProfile : CIM_RegisteredProfile { }; diff -r be03306b6557 -r 2519c5f9656c schema/RegisteredProfile.registration --- a/schema/RegisteredProfile.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/RegisteredProfile.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_RegisteredProfile root/interop Virt_RegisteredProfileProvider Virt_RegisteredProfile instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_RegisteredProfile root/interop Virt_RegisteredProfileProvider Virt_RegisteredProfile instance diff -r be03306b6557 -r 2519c5f9656c schema/ResourceAllocationFromPool.mof --- a/schema/ResourceAllocationFromPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationFromPool.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,6 +1,11 @@ // Copyright IBM Corp. 2007 -class Xen_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool { + +[Association] +class Xen_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool +{ }; -class KVM_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool { +[Association] +class KVM_ResourceAllocationFromPool : CIM_ResourceAllocationFromPool +{ }; diff -r be03306b6557 -r 2519c5f9656c schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationFromPool.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourceAllocationFromPool root/virt Xen_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association KVM_ResourceAllocationFromPool root/virt KVM_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file diff -r be03306b6557 -r 2519c5f9656c schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationSettingData.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,14 +1,16 @@ // Copyright IBM Corp. 2007 -class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { +class Xen_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData +{ }; -class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData { - +class KVM_ResourceAllocationSettingData : CIM_ResourceAllocationSettingData +{ }; [Description ("Xen virtual disk configuration")] -class Xen_DiskResourceAllocationSettingData : Xen_ResourceAllocationSettingData{ +class Xen_DiskResourceAllocationSettingData : Xen_ResourceAllocationSettingData +{ [Description ("Device as seen by the guest")] string VirtualDevice; @@ -16,7 +18,8 @@ class Xen_DiskResourceAllocationSettingD }; [Description ("KVM virtual disk configuration")] -class KVM_DiskResourceAllocationSettingData : KVM_ResourceAllocationSettingData{ +class KVM_DiskResourceAllocationSettingData : KVM_ResourceAllocationSettingData +{ [Description ("Device as seen by the guest")] string VirtualDevice; @@ -24,7 +27,8 @@ class KVM_DiskResourceAllocationSettingD }; [Description ("Xen virtual network configuration")] -class Xen_NetResourceAllocationSettingData : Xen_ResourceAllocationSettingData { +class Xen_NetResourceAllocationSettingData : Xen_ResourceAllocationSettingData +{ [Description ("Interface type")] string NetworkType; @@ -32,7 +36,8 @@ class Xen_NetResourceAllocationSettingDa }; [Description ("KVM virtual network configuration")] -class KVM_NetResourceAllocationSettingData : KVM_ResourceAllocationSettingData { +class KVM_NetResourceAllocationSettingData : KVM_ResourceAllocationSettingData +{ [Description ("Interface type")] string NetworkType; @@ -40,13 +45,21 @@ class KVM_NetResourceAllocationSettingDa }; [Description ("Xen virtual processor")] -class Xen_ProcResourceAllocationSettingData : Xen_ResourceAllocationSettingData {}; +class Xen_ProcResourceAllocationSettingData : Xen_ResourceAllocationSettingData +{ +}; [Description ("KVM virtual processor")] -class KVM_ProcResourceAllocationSettingData : KVM_ResourceAllocationSettingData {}; +class KVM_ProcResourceAllocationSettingData : KVM_ResourceAllocationSettingData +{ +}; [Description ("Xen virtual memory")] -class Xen_MemResourceAllocationSettingData : Xen_ResourceAllocationSettingData {}; +class Xen_MemResourceAllocationSettingData : Xen_ResourceAllocationSettingData +{ +}; [Description ("KVM virtual memory")] -class KVM_MemResourceAllocationSettingData : KVM_ResourceAllocationSettingData {}; +class KVM_MemResourceAllocationSettingData : KVM_ResourceAllocationSettingData +{ +}; diff -r be03306b6557 -r 2519c5f9656c schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationSettingData.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,5 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_DiskResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance Xen_NetResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance Xen_ProcResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance diff -r be03306b6557 -r 2519c5f9656c schema/ResourcePoolConfigurationCapabilities.mof --- a/schema/ResourcePoolConfigurationCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationCapabilities.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,7 +1,9 @@ // Copyright IBM Corp. 2007 -class Xen_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities { +class Xen_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities +{ }; -class KVM_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities { +class KVM_ResourcePoolConfigurationCapabilities : CIM_ResourcePoolConfigurationCapabilities +{ }; diff -r be03306b6557 -r 2519c5f9656c schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file diff -r be03306b6557 -r 2519c5f9656c schema/ResourcePoolConfigurationService.mof --- a/schema/ResourcePoolConfigurationService.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationService.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,8 +1,9 @@ // Copyright IBM Corp. 2007 -class Xen_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService { +class Xen_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService +{ }; -class KVM_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService { - -}; \ No newline at end of file +class KVM_ResourcePoolConfigurationService : CIM_ResourcePoolConfigurationService +{ +}; diff -r be03306b6557 -r 2519c5f9656c schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationService.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method \ No newline at end of file diff -r be03306b6557 -r 2519c5f9656c schema/SettingsDefineCapabilities.mof --- a/schema/SettingsDefineCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineCapabilities.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,8 +1,11 @@ // Copyright IBM Corp. 2007 + +[Association] class Xen_SettingsDefineCapabilities : CIM_SettingsDefineCapabilities { }; +[Association] class KVM_SettingsDefineCapabilities : CIM_SettingsDefineCapabilities { }; diff -r be03306b6557 -r 2519c5f9656c schema/SettingsDefineCapabilities.registration --- a/schema/SettingsDefineCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineCapabilities.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_SettingsDefineCapabilities root/virt Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association -KVM_SettingsDefineCapabilities root/virt KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +# Classname Namespace ProviderName ProviderModule ProviderTypes +Xen_SettingsDefineCapabilities root/virt Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +KVM_SettingsDefineCapabilities root/virt KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association diff -r be03306b6557 -r 2519c5f9656c schema/SettingsDefineState.mof --- a/schema/SettingsDefineState.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineState.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,6 +1,11 @@ // Copyright IBM Corp. 2007 -class Xen_SettingsDefineState : CIM_SettingsDefineState { + +[Association] +class Xen_SettingsDefineState : CIM_SettingsDefineState +{ }; -class KVM_SettingsDefineState : CIM_SettingsDefineState { +[Association] +class KVM_SettingsDefineState : CIM_SettingsDefineState +{ }; \ No newline at end of file diff -r be03306b6557 -r 2519c5f9656c schema/SettingsDefineState.registration --- a/schema/SettingsDefineState.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineState.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_SettingsDefineState root/virt Xen_SettingsDefineStateProvider Virt_SettingsDefineState association KVM_SettingsDefineState root/virt KVM_SettingsDefineStateProvider Virt_SettingsDefineState association diff -r be03306b6557 -r 2519c5f9656c schema/SystemDevice.mof --- a/schema/SystemDevice.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SystemDevice.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,44 +1,32 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ******************************************************************* -// Associations -// ******************************************************************* - -// ================================================================== -// Xen_SystemDevice -// ================================================================== [Association, Description ( - "A class to associate a Xen_ComputerSystem with its devices" -)] + "A class to associate a Xen_ComputerSystem with its devices." ) +] class Xen_SystemDevice : CIM_SystemDevice { + [Override ( "GroupComponent" )] Xen_ComputerSystem REF GroupComponent; [Override ( "PartComponent" )] CIM_LogicalDevice REF PartComponent; + }; -// Copyright 2007 IBM. All rights reserved. - -// ******************************************************************* -// Associations -// ******************************************************************* - -// ================================================================== -// KVM_SystemDevice -// ================================================================== [Association, Description ( - "A class to associate a KVM_ComputerSystem with its devices" -)] + "A class to associate a KVM_ComputerSystem with its devices." ) +] class KVM_SystemDevice : CIM_SystemDevice { + [Override ( "GroupComponent" )] KVM_ComputerSystem REF GroupComponent; [Override ( "PartComponent" )] CIM_LogicalDevice REF PartComponent; + }; diff -r be03306b6557 -r 2519c5f9656c schema/SystemDevice.registration --- a/schema/SystemDevice.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SystemDevice.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_SystemDevice root/virt Xen_SystemDeviceProvider Virt_SystemDevice association KVM_SystemDevice root/virt KVM_SystemDeviceProvider Virt_SystemDevice association diff -r be03306b6557 -r 2519c5f9656c schema/VSSD.mof --- a/schema/VSSD.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSD.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,16 +1,21 @@ // Copyright IBM Corp. 2007 + [Description ( "A class derived from CIM_VirtualSystemSettingData to represent " - "the config of Xen virtual machines/domains running on the system.")] + "the config of Xen virtual machines/domains running on the system.") +] class Xen_VirtualSystemSettingData : CIM_VirtualSystemSettingData { + string Bootloader; string BootloaderArgs; + }; [Description ( "A class derived from CIM_VirtualSystemSettingData to represent " - "the config of KVM virtual machines/domains running on the system.")] + "the config of KVM virtual machines/domains running on the system.") +] class KVM_VirtualSystemSettingData : CIM_VirtualSystemSettingData { }; diff -r be03306b6557 -r 2519c5f9656c schema/VSSD.registration --- a/schema/VSSD.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSD.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance KVM_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance diff -r be03306b6557 -r 2519c5f9656c schema/VSSDComponent.mof --- a/schema/VSSDComponent.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSDComponent.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,6 +1,11 @@ // Copyright IBM Corp. 2007 -class Xen_VirtualSystemSettingDataComponent : CIM_Component { + +[Association] +class Xen_VirtualSystemSettingDataComponent : CIM_Component +{ }; -class KVM_VirtualSystemSettingDataComponent : CIM_Component { +[Association] +class KVM_VirtualSystemSettingDataComponent : CIM_Component +{ }; diff -r be03306b6557 -r 2519c5f9656c schema/VSSDComponent.registration --- a/schema/VSSDComponent.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSDComponent.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemSettingDataComponent root/virt Xen_VSSDComponentProvider Virt_VSSDComponent association KVM_VirtualSystemSettingDataComponent root/virt KVM_VSSDComponentProvider Virt_VSSDComponent association diff -r be03306b6557 -r 2519c5f9656c schema/VirtualSystemManagementCapabilities.mof --- a/schema/VirtualSystemManagementCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementCapabilities.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,23 +1,17 @@ -// Copyright 2007 IBM. All rights reserved. +// Copyright IBM Corp. 2007 -// ================================================================== -// Xen_VirtualSystemManagementCapabilities -// ================================================================== [Description ( "A class derived from CIM_Capabilities to represent " - "the management capabilities of a Xen virtual system")] + "the management capabilities of a Xen virtual system") +] class Xen_VirtualSystemManagementCapabilities : CIM_VirtualSystemManagementCapabilities { }; -// Copyright 2007 IBM. All rights reserved. - -// ================================================================== -// KVM_VirtualSystemManagementCapabilities -// ================================================================== [Description ( "A class derived from CIM_Capabilities to represent " - "the management capabilities of a KVM virtual system.")] + "the management capabilities of a KVM virtual system.") +] class KVM_VirtualSystemManagementCapabilities : CIM_VirtualSystemManagementCapabilities { }; diff -r be03306b6557 -r 2519c5f9656c schema/VirtualSystemManagementCapabilities.registration --- a/schema/VirtualSystemManagementCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementCapabilities.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,5 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance -# Classname Namespace ProviderName ProviderModule ProviderTypes ... KVM_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance diff -r be03306b6557 -r 2519c5f9656c schema/VirtualSystemManagementService.mof --- a/schema/VirtualSystemManagementService.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementService.mof Mon Nov 12 12:35:48 2007 +0100 @@ -1,6 +1,9 @@ // Copyright IBM Corp. 2007 -class Xen_VirtualSystemManagementService : CIM_VirtualSystemManagementService { + +class Xen_VirtualSystemManagementService : CIM_VirtualSystemManagementService +{ }; -class KVM_VirtualSystemManagementService : CIM_VirtualSystemManagementService { +class KVM_VirtualSystemManagementService : CIM_VirtualSystemManagementService +{ }; diff -r be03306b6557 -r 2519c5f9656c schema/VirtualSystemManagementService.registration --- a/schema/VirtualSystemManagementService.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementService.registration Mon Nov 12 12:35:48 2007 +0100 @@ -1,3 +1,4 @@ # Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance KVM_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance

16 years, 10 months

1
0
0 / 0

[PATCH] Fix stdi_trigger_indication for Pegasus

by Dan Smith

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194491086 28800 # Node ID c84928927faf099a7de17ee15321ad7f2574e979 # Parent 926009fc62a0080bcf93aaddf098b074ce71a096 Fix stdi_trigger_indication for Pegasus This fixes (for me) the DefineSystem crash on Pegasus. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 926009fc62a0 -r c84928927faf std_indication.c --- a/std_indication.c Wed Nov 07 08:40:48 2007 -0800 +++ b/std_indication.c Wed Nov 07 19:04:46 2007 -0800 @@ -92,10 +92,30 @@ CMPIStatus stdi_trigger_indication(const CMPIObjectPath *op; CMPIStatus s; const char *method = "TriggerIndications"; + CMPIArgs *in; + CMPIArgs *out; + + in = CMNewArgs(broker, &s); + if (s.rc != CMPI_RC_OK) + return s; + + out = CMNewArgs(broker, &s); + if (s.rc != CMPI_RC_OK) + return s; op = CMNewObjectPath(broker, ns, type, &s); - CBInvokeMethod(broker, context, op, method, NULL, NULL, &s); + if ((op == NULL) || (s.rc != CMPI_RC_OK)) { + CU_DEBUG("Unable to create path for indication %s", + type); + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Unable to create path for indication %s", + type); + goto out; + } + CBInvokeMethod(broker, context, op, method, in, out, &s); + out: return s; } @@ -108,21 +128,26 @@ CMPIStatus stdi_raise_indication(const C CMPIObjectPath *op; CMPIStatus s; const char *method = "RaiseIndication"; - CMPIArgs *args; + CMPIArgs *argsin; + CMPIArgs *argsout; op = CMNewObjectPath(broker, ns, type, &s); if (s.rc != CMPI_RC_OK) return s; - args = CMNewArgs(broker, &s); + argsin = CMNewArgs(broker, &s); if (s.rc != CMPI_RC_OK) return s; - s = CMAddArg(args, "Indication", &ind, CMPI_instance); + argsout = CMNewArgs(broker, &s); if (s.rc != CMPI_RC_OK) return s; - CBInvokeMethod(broker, context, op, method, args, NULL, &s); + s = CMAddArg(argsin, "Indication", &ind, CMPI_instance); + if (s.rc != CMPI_RC_OK) + return s; + + CBInvokeMethod(broker, context, op, method, argsin, argsout, &s); return s; }

16 years, 10 months

3
2
0 / 0

[PATCH] Change installed namespace to root/virt

by Dan Smith

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194624608 28800 # Node ID 581a0f3fb078ccb003378d6d5974f5fe4636f123 # Parent 08753448b529043c78b24ebb019485761d8c6d4c Change installed namespace to root/virt - Made namespace a configure option for the source build - Made Makefile postinstall use namespace variable - Updated for HostedService recent addition This one deserves some serious testing, although I was pleasantly surprised at how few instances of the namespace we had hard-coded. We could probably Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 08753448b529 -r 581a0f3fb078 Makefile.am --- a/Makefile.am Thu Nov 08 19:19:50 2007 -0800 +++ b/Makefile.am Fri Nov 09 08:10:08 2007 -0800 @@ -83,11 +83,11 @@ EXTRA_DIST = schema $(pkgdata_DATA) $(pk # Un/Register the providers and class definitions from/to the current CIMOM. # @CIMSERVER@ is set by the configure script postinstall: - sh provider-register.sh -v -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) + sh provider-register.sh -v -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS) sh provider-register.sh -v -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) preuninstall: - sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/ibmsd -r $(REGS) -m $(MOFS) + sh provider-register.sh -v -d -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS) sh provider-register.sh -v -d -t @CIMSERVER@ -n /root/interop -r $(INTEROP_REGS) -m $(INTEROP_MOFS) rpm: clean diff -r 08753448b529 -r 581a0f3fb078 configure.ac --- a/configure.ac Thu Nov 08 19:19:50 2007 -0800 +++ b/configure.ac Fri Nov 09 08:10:08 2007 -0800 @@ -34,6 +34,14 @@ AC_ARG_VAR([LIBVIRTDIR],[the directory w AC_ARG_VAR([LIBVIRTDIR],[the directory where the libvirt package is installed.]) AC_ARG_VAR([TESTSUITEDIR],[the directory where the SBLIM testsuite is installed. ]) + +AC_ARG_WITH([namespace], + AC_HELP_STRING([--with-namespace=ns], + [CIM namespace to use, default root/virt]), + [test "x$withval" != "x" && CIM_VIRT_NS="$withval"], + [CIM_VIRT_NS="root/virt"]) +AC_SUBST(CIM_VIRT_NS) +AC_DEFINE_UNQUOTED(CIM_VIRT_NS, "$CIM_VIRT_NS", [Namespace for provider source]) AC_ARG_WITH([diskconfig], [ --with-diskconfig=PATH Set config file for disk pool. (default=/tmp/diskpool.conf)], diff -r 08753448b529 -r 581a0f3fb078 doc/libvirt-cim.html --- a/doc/libvirt-cim.html Thu Nov 08 19:19:50 2007 -0800 +++ b/doc/libvirt-cim.html Fri Nov 09 08:10:08 2007 -0800 @@ -73,9 +73,9 @@ $ mkdir cim216 $ cd cim216 $ unzip $PATH_TO_ZIPFILE - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd cimv216.mof - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd qualifiers.mof - $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/ibmsd qualifiers_optional.mof + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt cimv216.mof + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers.mof + $ sudo cimmofl -uc -aEV -R$PEGASUS_REPO -n /root/virt qualifiers_optional.mof </code> <h4>To install the schema in SFCB:</h4> diff -r 08753448b529 -r 581a0f3fb078 schema/AllocationCapabilities.registration --- a/schema/AllocationCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/AllocationCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_AllocationCapabilities root/ibmsd Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance -KVM_AllocationCapabilities root/ibmsd Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance +Xen_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance +KVM_AllocationCapabilities root/virt Virt_AllocationCapabilitiesProvider Virt_AllocationCapabilities instance diff -r 08753448b529 -r 581a0f3fb078 schema/ComputerSystem.registration --- a/schema/ComputerSystem.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ComputerSystem.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ComputerSystem root/ibmsd Virt_ComputerSystemProvider Virt_ComputerSystem instance method +Xen_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance method # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_ComputerSystem root/ibmsd Virt_ComputerSystemProvider Virt_ComputerSystem instance +KVM_ComputerSystem root/virt Virt_ComputerSystemProvider Virt_ComputerSystem instance diff -r 08753448b529 -r 581a0f3fb078 schema/ComputerSystemIndication.registration --- a/schema/ComputerSystemIndication.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ComputerSystemIndication.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 -Xen_ComputerSystemCreatedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -Xen_ComputerSystemDeletedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -KVM_ComputerSystemCreatedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method -KVM_ComputerSystemDeletedIndication root/ibmsd Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +Xen_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +Xen_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +KVM_ComputerSystemCreatedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method +KVM_ComputerSystemDeletedIndication root/virt Virt_ComputerSystemIndicationProvider Virt_ComputerSystemIndication indication method diff -r 08753448b529 -r 581a0f3fb078 schema/DiskPool.registration --- a/schema/DiskPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/DiskPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,2 +1,2 @@ Xen_DiskPool root/ibmsd Virt_DevicePoolP -Xen_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance -KVM_DiskPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +KVM_DiskPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 08753448b529 -r 581a0f3fb078 schema/ElementAllocatedFromPool.registration --- a/schema/ElementAllocatedFromPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ElementAllocatedFromPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ElementAllocatedFromPool root/ibmsd Xen_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association -KVM_ElementAllocatedFromPool root/ibmsd KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association \ No newline at end of file +Xen_ElementAllocatedFromPool root/virt Xen_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association +KVM_ElementAllocatedFromPool root/virt KVM_ElementAllocatedFromPoolProvider Virt_ElementAllocatedFromPool association \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ElementConformsToProfile.registration Fri Nov 09 08:10:08 2007 -0800 @@ -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/virt 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/virt Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association KVM_ElementConformsToProfile root/interop Virt_ElementConformsToProfileProvider Virt_ElementConformsToProfile association diff -r 08753448b529 -r 581a0f3fb078 schema/EnabledLogicalElementCapabilities.registration --- a/schema/EnabledLogicalElementCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/EnabledLogicalElementCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_EnabledLogicalElementCapabilities root/ibmsd Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance +Xen_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_EnabledLogicalElementCapabilities root/ibmsd Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance +KVM_EnabledLogicalElementCapabilities root/virt Virt_EnabledLogicalElementCapabilitiesProvider Virt_EnabledLogicalElementCapabilities instance diff -r 08753448b529 -r 581a0f3fb078 schema/HostSystem.registration --- a/schema/HostSystem.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostSystem.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostSystem root/ibmsd Virt_HostSystemProvider Virt_HostSystem instance +Xen_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_HostSystem root/ibmsd Virt_HostSystemProvider Virt_HostSystem instance +KVM_HostSystem root/virt Virt_HostSystemProvider Virt_HostSystem instance diff -r 08753448b529 -r 581a0f3fb078 schema/HostedDependency.registration --- a/schema/HostedDependency.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostedDependency.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostedDependency root/ibmsd Virt_HostedDependencyProvider Virt_HostedDependency association +Xen_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_HostedDependency root/ibmsd Virt_HostedDependencyProvider Virt_HostedDependency association +KVM_HostedDependency root/virt Virt_HostedDependencyProvider Virt_HostedDependency association diff -r 08753448b529 -r 581a0f3fb078 schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostedResourcePool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_HostedResourcePool root/ibmsd Virt_HostedResourcePoolProvider Virt_HostedResourcePool association -KVM_HostedResourcePool root/ibmsd Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file +Xen_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association +KVM_HostedResourcePool root/virt Virt_HostedResourcePoolProvider Virt_HostedResourcePool association \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/HostedService.registration --- a/schema/HostedService.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/HostedService.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_HostedService root/ibmsd Xen_HostedServiceProvider Virt_HostedService association -KVM_HostedService root/ibmsd KVM_HostedServiceProvider Virt_HostedService association +Xen_HostedService root/virt Xen_HostedServiceProvider Virt_HostedService association +KVM_HostedService root/virt KVM_HostedServiceProvider Virt_HostedService association diff -r 08753448b529 -r 581a0f3fb078 schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/LogicalDisk.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_LogicalDisk root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_LogicalDisk root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/Memory.registration --- a/schema/Memory.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/Memory.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_Memory root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_Memory root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_Memory root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_Memory root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/MemoryPool.registration --- a/schema/MemoryPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/MemoryPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_MemoryPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_MemoryPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +KVM_MemoryPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 08753448b529 -r 581a0f3fb078 schema/NetPool.registration --- a/schema/NetPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/NetPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_NetworkPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance -KVM_NetworkPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file +Xen_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance +KVM_NetworkPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/NetworkPort.registration --- a/schema/NetworkPort.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/NetworkPort.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_NetworkPort root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_NetworkPort root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/Processor.registration --- a/schema/Processor.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/Processor.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_Processor root/ibmsd Virt_DeviceProvider Virt_Device instance +Xen_Processor root/virt Virt_DeviceProvider Virt_Device instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_Processor root/ibmsd Virt_DeviceProvider Virt_Device instance +KVM_Processor root/virt Virt_DeviceProvider Virt_Device instance diff -r 08753448b529 -r 581a0f3fb078 schema/ProcessorPool.registration --- a/schema/ProcessorPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ProcessorPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_ProcessorPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +Xen_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_ProcessorPool root/ibmsd Virt_DevicePoolProvider Virt_DevicePool instance +KVM_ProcessorPool root/virt Virt_DevicePoolProvider Virt_DevicePool instance diff -r 08753448b529 -r 581a0f3fb078 schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourceAllocationFromPool.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourceAllocationFromPool root/ibmsd Xen_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association -KVM_ResourceAllocationFromPool root/ibmsd KVM_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file +Xen_ResourceAllocationFromPool root/virt Xen_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association +KVM_ResourceAllocationFromPool root/virt KVM_ResourceAllocationFromPoolProvider Virt_ResourceAllocationFromPool association \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourceAllocationSettingData.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 -Xen_DiskResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_NetResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_ProcResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance -Xen_MemResourceAllocationSettingData root/ibmsd Virt_RASDProvider Virt_RASD instance +Xen_DiskResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_NetResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_ProcResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance +Xen_MemResourceAllocationSettingData root/virt Virt_RASDProvider Virt_RASD instance diff -r 08753448b529 -r 581a0f3fb078 schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourcePoolConfigurationCapabilities root/ibmsd Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance -KVM_ResourcePoolConfigurationCapabilities root/ibmsd Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file +Xen_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance +KVM_ResourcePoolConfigurationCapabilities root/virt Virt_ResourcePoolConfigurationCapabilitiesProvider Virt_ResourcePoolConfigurationCapabilities instance \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/ResourcePoolConfigurationService.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_ResourcePoolConfigurationService root/ibmsd Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method -KVM_ResourcePoolConfigurationService root/ibmsd Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method \ No newline at end of file +Xen_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method +KVM_ResourcePoolConfigurationService root/virt Virt_ResourcePoolConfigurationServiceProvider Virt_ResourcePoolConfigurationService instance method \ No newline at end of file diff -r 08753448b529 -r 581a0f3fb078 schema/SettingsDefineCapabilities.registration --- a/schema/SettingsDefineCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/SettingsDefineCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_SettingsDefineCapabilities root/ibmsd Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association -KVM_SettingsDefineCapabilities root/ibmsd KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +Xen_SettingsDefineCapabilities root/virt Xen_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association +KVM_SettingsDefineCapabilities root/virt KVM_SettingsDefineCapabilitiesProvider Virt_SettingsDefineCapabilities association diff -r 08753448b529 -r 581a0f3fb078 schema/SettingsDefineState.registration --- a/schema/SettingsDefineState.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/SettingsDefineState.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_SettingsDefineState root/ibmsd Xen_SettingsDefineStateProvider Virt_SettingsDefineState association -KVM_SettingsDefineState root/ibmsd KVM_SettingsDefineStateProvider Virt_SettingsDefineState association +Xen_SettingsDefineState root/virt Xen_SettingsDefineStateProvider Virt_SettingsDefineState association +KVM_SettingsDefineState root/virt KVM_SettingsDefineStateProvider Virt_SettingsDefineState association diff -r 08753448b529 -r 581a0f3fb078 schema/SystemDevice.registration --- a/schema/SystemDevice.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/SystemDevice.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_SystemDevice root/ibmsd Xen_SystemDeviceProvider Virt_SystemDevice association -KVM_SystemDevice root/ibmsd KVM_SystemDeviceProvider Virt_SystemDevice association +Xen_SystemDevice root/virt Xen_SystemDeviceProvider Virt_SystemDevice association +KVM_SystemDevice root/virt KVM_SystemDeviceProvider Virt_SystemDevice association diff -r 08753448b529 -r 581a0f3fb078 schema/VSSD.registration --- a/schema/VSSD.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VSSD.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemSettingData root/ibmsd Virt_VSSDProvider Virt_VSSD instance -KVM_VirtualSystemSettingData root/ibmsd Virt_VSSDProvider Virt_VSSD instance +Xen_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance +KVM_VirtualSystemSettingData root/virt Virt_VSSDProvider Virt_VSSD instance diff -r 08753448b529 -r 581a0f3fb078 schema/VSSDComponent.registration --- a/schema/VSSDComponent.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VSSDComponent.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemSettingDataComponent root/ibmsd Xen_VSSDComponentProvider Virt_VSSDComponent association -KVM_VirtualSystemSettingDataComponent root/ibmsd KVM_VSSDComponentProvider Virt_VSSDComponent association +Xen_VirtualSystemSettingDataComponent root/virt Xen_VSSDComponentProvider Virt_VSSDComponent association +KVM_VirtualSystemSettingDataComponent root/virt KVM_VSSDComponentProvider Virt_VSSDComponent association diff -r 08753448b529 -r 581a0f3fb078 schema/VirtualSystemManagementCapabilities.registration --- a/schema/VirtualSystemManagementCapabilities.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VirtualSystemManagementCapabilities.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,5 +1,5 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes ... -Xen_VirtualSystemManagementCapabilities root/ibmsd Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance +Xen_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance # Classname Namespace ProviderName ProviderModule ProviderTypes ... -KVM_VirtualSystemManagementCapabilities root/ibmsd Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance +KVM_VirtualSystemManagementCapabilities root/virt Virt_VirtualSystemManagementCapabilitiesProvider Virt_VirtualSystemManagementCapabilities instance diff -r 08753448b529 -r 581a0f3fb078 schema/VirtualSystemManagementService.registration --- a/schema/VirtualSystemManagementService.registration Thu Nov 08 19:19:50 2007 -0800 +++ b/schema/VirtualSystemManagementService.registration Fri Nov 09 08:10:08 2007 -0800 @@ -1,3 +1,3 @@ # Copyright IBM Corp. 2007 -Xen_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance -KVM_VirtualSystemManagementService root/ibmsd Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +Xen_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance +KVM_VirtualSystemManagementService root/virt Virt_VirtualSystemManagementService Virt_VirtualSystemManagementService method instance diff -r 08753448b529 -r 581a0f3fb078 src/Virt_ComputerSystemIndication.c --- a/src/Virt_ComputerSystemIndication.c Thu Nov 08 19:19:50 2007 -0800 +++ b/src/Virt_ComputerSystemIndication.c Fri Nov 09 08:10:08 2007 -0800 @@ -142,7 +142,7 @@ static bool async_ind(CMPIContext *conte CMPIStatus s; const char *type_name; char *type_cn = NULL; - const char *ns = "root/ibmsd"; + const char *ns = CIM_VIRT_NS; /* FIXME: Hmm, need to get the namespace a better way */ diff -r 08753448b529 -r 581a0f3fb078 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Thu Nov 08 19:19:50 2007 -0800 +++ b/src/Virt_ElementConformsToProfile.c Fri Nov 09 08:10:08 2007 -0800 @@ -34,6 +34,8 @@ #include "profiles.h" #include "std_association.h" +#include "config.h" + #include "Virt_RegisteredProfile.h" /* Associate an XXX_RegisteredProfile to the proper XXX_ManagedElement. @@ -64,7 +66,7 @@ static CMPIStatus elem_instances(const C goto out; } - op = CMNewObjectPath(_BROKER, "/root/ibmsd", classname, &s); + op = CMNewObjectPath(_BROKER, CIM_VIRT_NS, classname, &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) goto error;

16 years, 10 months

3
3
0 / 0

[PATCH] Some minor std_association fixes

by Kaitlin Rupert

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1194651524 28800 # Node ID 22c4e9b498fb52f5fce98a71702c4610a42b6f18 # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa Some minor std_association fixes. Change result_list to tmp_list since the list is freed before filter_results() returns. The CU_DEBUG() call before the match_class() call on info->assoc_class has a typo. The string text prints info->assoc_class, but the value passed in for info->assoc_class is info->result_class. Return an error if match_class() fails. This needs to be done in both do_assoc() and do_ref() Resent patch due to poor grammar in the match_class() for assoc_class error message. Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 5f84fd6c5cde -r 22c4e9b498fb std_association.c --- a/std_association.c Thu Nov 08 11:21:50 2007 -0800 +++ b/std_association.c Fri Nov 09 15:38:44 2007 -0800 @@ -80,16 +80,16 @@ static CMPIStatus filter_results(struct const char *filter_class, const CMPIBroker *broker) { - struct inst_list result_list; + struct inst_list tmp_list; CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIObjectPath *op; int i; - result_list = *list; + tmp_list = *list; inst_list_init(list); - for (i = 0; result_list.list[i] != NULL; i++) { - op = CMGetObjectPath(result_list.list[i], &s); + for (i = 0; tmp_list.list[i] != NULL; i++) { + op = CMGetObjectPath(tmp_list.list[i], &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) goto out; @@ -100,11 +100,11 @@ static CMPIStatus filter_results(struct if (!match_op(broker, op, filter_class)) continue; - inst_list_add(list, result_list.list[i]); + inst_list_add(list, tmp_list.list[i]); } out: - inst_list_free(&result_list); + inst_list_free(&tmp_list); return s; } @@ -163,18 +163,25 @@ static CMPIStatus do_assoc(struct std_as handler->target_class); if (!rc) { CU_DEBUG("Match_class failed.\n"); + cu_statusf(ctx->brkr, &s, + CMPI_RC_ERR_FAILED, + "Result class is not valid for this association"); goto out; } CU_DEBUG("Match_class succeeded.\n"); CU_DEBUG("Calling match_class: \n\tinfo->assoc_class: '%s'\n", - info->result_class); + info->assoc_class); rc = match_class(ctx->brkr, NAMESPACE(ref), info->assoc_class, handler->assoc_class); if (!rc) { CU_DEBUG("Match_class failed.\n"); + cu_statusf(ctx->brkr, &s, + CMPI_RC_ERR_FAILED, + "Association class given is not valid for" + "this association"); goto out; } CU_DEBUG("Match_class succeeded.\n"); @@ -248,8 +255,13 @@ static CMPIStatus do_ref(struct std_asso NAMESPACE(ref), info->result_class, handler->assoc_class); - if (!rc) - goto out; + if (!rc) { + cu_statusf(ctx->brkr, &s, + CMPI_RC_ERR_FAILED, + "Result class is not valid for this association"); + goto out; + } + s = handler->handler(ref, info, &list); if ((s.rc != CMPI_RC_OK) || (list.list == NULL))

16 years, 10 months

2
1
0 / 0

[PATCH] Some minor std_association fixes

by Kaitlin Rupert

# HG changeset patch # User Kaitlin Rupert <karupert(a)us.ibm.com> # Date 1194649591 28800 # Node ID 11f579d7363d783dab97b0d59b2fd5d2eedb7034 # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa Some minor std_association fixes. Change result_list to tmp_list since the list is freed before filter_results() returns. The CU_DEBUG() call before the match_class() call on info->assoc_class has a typo. The string text prints info->assoc_class, but the value passed in for info->assoc_class is info->result_class. Return an error if match_class() fails. This needs to be done in both do_assoc() and do_ref() Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com> diff -r 5f84fd6c5cde -r 11f579d7363d std_association.c --- a/std_association.c Thu Nov 08 11:21:50 2007 -0800 +++ b/std_association.c Fri Nov 09 15:06:31 2007 -0800 @@ -80,16 +80,16 @@ static CMPIStatus filter_results(struct const char *filter_class, const CMPIBroker *broker) { - struct inst_list result_list; + struct inst_list tmp_list; CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIObjectPath *op; int i; - result_list = *list; + tmp_list = *list; inst_list_init(list); - for (i = 0; result_list.list[i] != NULL; i++) { - op = CMGetObjectPath(result_list.list[i], &s); + for (i = 0; tmp_list.list[i] != NULL; i++) { + op = CMGetObjectPath(tmp_list.list[i], &s); if ((s.rc != CMPI_RC_OK) || CMIsNullObject(op)) goto out; @@ -100,11 +100,11 @@ static CMPIStatus filter_results(struct if (!match_op(broker, op, filter_class)) continue; - inst_list_add(list, result_list.list[i]); + inst_list_add(list, tmp_list.list[i]); } out: - inst_list_free(&result_list); + inst_list_free(&tmp_list); return s; } @@ -163,18 +163,24 @@ static CMPIStatus do_assoc(struct std_as handler->target_class); if (!rc) { CU_DEBUG("Match_class failed.\n"); + cu_statusf(ctx->brkr, &s, + CMPI_RC_ERR_FAILED, + "Result class is not valid for this association"); goto out; } CU_DEBUG("Match_class succeeded.\n"); CU_DEBUG("Calling match_class: \n\tinfo->assoc_class: '%s'\n", - info->result_class); + info->assoc_class); rc = match_class(ctx->brkr, NAMESPACE(ref), info->assoc_class, handler->assoc_class); if (!rc) { CU_DEBUG("Match_class failed.\n"); + cu_statusf(ctx->brkr, &s, + CMPI_RC_ERR_FAILED, + "Association class given does not this association"); goto out; } CU_DEBUG("Match_class succeeded.\n"); @@ -248,8 +254,13 @@ static CMPIStatus do_ref(struct std_asso NAMESPACE(ref), info->result_class, handler->assoc_class); - if (!rc) - goto out; + if (!rc) { + cu_statusf(ctx->brkr, &s, + CMPI_RC_ERR_FAILED, + "Result class is not valid for this association"); + goto out; + } + s = handler->handler(ref, info, &list); if ((s.rc != CMPI_RC_OK) || (list.list == NULL))

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

CIM November 2007