- CIM - libvirt List Archives

[PATCH] Updated Copyright Statements and common schema look and feel
by Heidi Eckhart 14 Nov '07

14 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1194867556 -3600 # Node ID 20b83bfd514faa824c5565cdf8703ada146e9e56 # 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 20b83bfd514f schema/AllocationCapabilities.mof --- a/schema/AllocationCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/AllocationCapabilities.mof Mon Nov 12 12:39:16 2007 +0100 @@ -1,4 +1,5 @@ // Copyright IBM Corp. 2007 + class Xen_AllocationCapabilities : CIM_AllocationCapabilities { }; diff -r be03306b6557 -r 20b83bfd514f schema/AllocationCapabilities.registration --- a/schema/AllocationCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/AllocationCapabilities.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ComputerSystem.mof --- a/schema/ComputerSystem.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystem.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ComputerSystem.registration --- a/schema/ComputerSystem.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystem.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ComputerSystemIndication.mof --- a/schema/ComputerSystemIndication.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystemIndication.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ComputerSystemIndication.registration --- a/schema/ComputerSystemIndication.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ComputerSystemIndication.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/DiskPool.mof --- a/schema/DiskPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/DiskPool.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/DiskPool.registration --- a/schema/DiskPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/DiskPool.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ElementAllocatedFromPool.mof --- a/schema/ElementAllocatedFromPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementAllocatedFromPool.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ElementAllocatedFromPool.registration --- a/schema/ElementAllocatedFromPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementAllocatedFromPool.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ElementCapabilities.mof --- a/schema/ElementCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementCapabilities.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ElementCapabilities.registration --- a/schema/ElementCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementCapabilities.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ElementConformsToProfile.mof --- a/schema/ElementConformsToProfile.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementConformsToProfile.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ElementConformsToProfile.registration --- a/schema/ElementConformsToProfile.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ElementConformsToProfile.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/EnabledLogicalElementCapabilities.mof --- a/schema/EnabledLogicalElementCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/EnabledLogicalElementCapabilities.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/EnabledLogicalElementCapabilities.registration --- a/schema/EnabledLogicalElementCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/EnabledLogicalElementCapabilities.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/HostSystem.mof --- a/schema/HostSystem.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostSystem.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/HostSystem.registration --- a/schema/HostSystem.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostSystem.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/HostedDependency.mof --- a/schema/HostedDependency.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedDependency.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/HostedDependency.registration --- a/schema/HostedDependency.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedDependency.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/HostedResourcePool.mof --- a/schema/HostedResourcePool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedResourcePool.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/HostedResourcePool.registration --- a/schema/HostedResourcePool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedResourcePool.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/HostedService.mof --- a/schema/HostedService.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedService.mof Mon Nov 12 12:39:16 2007 +0100 @@ -1,6 +1,11 @@ // Copyright IBM Corp. 2007 -class Xen_HostedService : CIM_HostedService { + +[Association] +class Xen_HostedService : CIM_HostedService +{ }; -class KVM_HostedService : CIM_HostedService { +[Association] +class KVM_HostedService : CIM_HostedService +{ }; diff -r be03306b6557 -r 20b83bfd514f schema/HostedService.registration --- a/schema/HostedService.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/HostedService.registration Mon Nov 12 12:39:16 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 -# Classname Namespace ProviderName ProviderModule ProviderTypes ... +# Classname Namespace ProviderName ProviderModule ProviderTypes Xen_HostedService root/virt Xen_HostedServiceProvider Virt_HostedService association KVM_HostedService root/virt KVM_HostedServiceProvider Virt_HostedService association diff -r be03306b6557 -r 20b83bfd514f schema/LogicalDisk.mof --- a/schema/LogicalDisk.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/LogicalDisk.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/LogicalDisk.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/Memory.mof --- a/schema/Memory.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Memory.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/Memory.registration --- a/schema/Memory.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Memory.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/MemoryPool.mof --- a/schema/MemoryPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/MemoryPool.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/MemoryPool.registration --- a/schema/MemoryPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/MemoryPool.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/NetPool.mof --- a/schema/NetPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetPool.mof Mon Nov 12 12:39:16 2007 +0100 @@ -1,7 +1,9 @@ // Copyright IBM Corp. 2007 + class Xen_NetworkPool : CIM_ResourcePool { }; + class KVM_NetworkPool : CIM_ResourcePool { }; diff -r be03306b6557 -r 20b83bfd514f schema/NetPool.registration --- a/schema/NetPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetPool.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/NetworkPort.mof --- a/schema/NetworkPort.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetworkPort.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/NetworkPort.registration --- a/schema/NetworkPort.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/NetworkPort.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/Processor.mof --- a/schema/Processor.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Processor.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/Processor.registration --- a/schema/Processor.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/Processor.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ProcessorPool.mof --- a/schema/ProcessorPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ProcessorPool.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ProcessorPool.registration --- a/schema/ProcessorPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ProcessorPool.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/RegisteredProfile.mof --- a/schema/RegisteredProfile.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/RegisteredProfile.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/RegisteredProfile.registration --- a/schema/RegisteredProfile.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/RegisteredProfile.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourceAllocationFromPool.mof --- a/schema/ResourceAllocationFromPool.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationFromPool.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourceAllocationFromPool.registration --- a/schema/ResourceAllocationFromPool.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationFromPool.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourceAllocationSettingData.mof --- a/schema/ResourceAllocationSettingData.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationSettingData.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourceAllocationSettingData.registration --- a/schema/ResourceAllocationSettingData.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourceAllocationSettingData.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourcePoolConfigurationCapabilities.mof --- a/schema/ResourcePoolConfigurationCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationCapabilities.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourcePoolConfigurationCapabilities.registration --- a/schema/ResourcePoolConfigurationCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationCapabilities.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourcePoolConfigurationService.mof --- a/schema/ResourcePoolConfigurationService.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationService.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/ResourcePoolConfigurationService.registration --- a/schema/ResourcePoolConfigurationService.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/ResourcePoolConfigurationService.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/SettingsDefineCapabilities.mof --- a/schema/SettingsDefineCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineCapabilities.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/SettingsDefineCapabilities.registration --- a/schema/SettingsDefineCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineCapabilities.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/SettingsDefineState.mof --- a/schema/SettingsDefineState.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineState.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/SettingsDefineState.registration --- a/schema/SettingsDefineState.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SettingsDefineState.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/SystemDevice.mof --- a/schema/SystemDevice.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SystemDevice.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/SystemDevice.registration --- a/schema/SystemDevice.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/SystemDevice.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/VSSD.mof --- a/schema/VSSD.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSD.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/VSSD.registration --- a/schema/VSSD.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSD.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/VSSDComponent.mof --- a/schema/VSSDComponent.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSDComponent.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/VSSDComponent.registration --- a/schema/VSSDComponent.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VSSDComponent.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/VirtualSystemManagementCapabilities.mof --- a/schema/VirtualSystemManagementCapabilities.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementCapabilities.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/VirtualSystemManagementCapabilities.registration --- a/schema/VirtualSystemManagementCapabilities.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementCapabilities.registration Mon Nov 12 12:39:16 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 20b83bfd514f schema/VirtualSystemManagementService.mof --- a/schema/VirtualSystemManagementService.mof Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementService.mof Mon Nov 12 12:39:16 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 20b83bfd514f schema/VirtualSystemManagementService.registration --- a/schema/VirtualSystemManagementService.registration Mon Nov 12 12:16:21 2007 +0100 +++ b/schema/VirtualSystemManagementService.registration Mon Nov 12 12:39:16 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

2 5

[PATCH] Fix RPM dependency in libvirt-cim
by Dan Smith 13 Nov '07

13 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194992297 28800 # Node ID d2bcdde08df6080caa9ae8d152d516d232fb6345 # Parent 1828b3b30fe476fbae1bf31d99c999ba548911f5 Fix RPM dependency in libvirt-cim Having the sblim-cmpi-devel package installed actually breaks our binary because the sblim broker function table (and many others, probably) does not match what Pegasus uses, making binaries incompatible (which is very disturbing). I was getting a very strange indication trigger crash on F8 because the invokeMethod broker function pointer was off-by-one. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 1828b3b30fe4 -r d2bcdde08df6 libvirt-cim.spec.in --- a/libvirt-cim.spec.in Tue Nov 13 11:39:22 2007 -0800 +++ b/libvirt-cim.spec.in Tue Nov 13 14:18:17 2007 -0800 @@ -11,11 +11,12 @@ URL: http://libvirt.org/CIM/ URL: http://libvirt.org/CIM/ Requires: libxml2 Requires: libvirt >= 0.2.3 -BuildRequires: sblim-cmpi-devel +BuildRequires: tog-pegasus-devel BuildRequires: libvirt-devel >= 0.2.3 BuildRequires: e2fsprogs-devel BuildRequires: libxml2-devel BuildRequires: libcmpiutil-devel +BuildConflicts: sblim-cmpi-devel %description Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC

2 2

[PATCH] Fix RPM dependency in libcmpiutil
by Dan Smith 13 Nov '07

13 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194992334 28800 # Node ID 6222dfe01952e34740bb157220f9b33d3a342d29 # Parent c3f816e3ab5ff2a17500d8b48ec601ade58da988 Fix RPM dependency in libcmpiutil Having the sblim-cmpi-devel package installed actually breaks our binary because the sblim broker function table (and many others, probably) does not match what Pegasus uses, making binaries incompatible (which is very disturbing). I was getting a very strange indication trigger crash on F8 because the invokeMethod broker function pointer was off-by-one. Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r c3f816e3ab5f -r 6222dfe01952 libcmpiutil.spec.in --- a/libcmpiutil.spec.in Tue Nov 13 15:33:06 2007 -0500 +++ b/libcmpiutil.spec.in Tue Nov 13 14:18:54 2007 -0800 @@ -9,9 +9,10 @@ Source: libcmpiutil-%{version}.tar.gz Source: libcmpiutil-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://libvirt.org/CIM/ -BuildRequires: sblim-cmpi-devel +BuildRequires: tog-pegasus-devel BuildRequires: flex BuildRequires: bison +BuildConflicts: sblim-cmpi-devel %description Libcmpiutil is a library of utility functions for CMPI providers. @@ -23,7 +24,7 @@ instance properties to standardizing met %package devel Summary: Libraries, includes, etc. to use the CMPI utility library Group: Development/Libraries -Requires: sblim-cmpi-devel +Requires: tog-pegasus-devel Requires: pkgconfig %description devel

1 0

[PATCH] [CU] Remove extra newline characters at end of CU_DEBUG calls
by Jay Gagnon 13 Nov '07

13 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1194985986 18000 # Node ID 221011f9d887aade09533310e0e3fae5c51e71ef # Parent 6f09834081cf603e73b82376f738e4384206ffc9 [CU] Remove extra newline characters at end of CU_DEBUG calls. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r 6f09834081cf -r 221011f9d887 std_association.c --- a/std_association.c Mon Nov 12 11:03:04 2007 -0800 +++ b/std_association.c Tue Nov 13 15:33:06 2007 -0500 @@ -139,22 +139,22 @@ static CMPIStatus do_assoc(struct std_as inst_list_init(&list); - CU_DEBUG("Getting handler...\n"); + CU_DEBUG("Getting handler..."); handler = std_assoc_get_handler(ctx, ref); if (handler == NULL) { - CU_DEBUG("No handler found.\n"); + CU_DEBUG("No handler found."); cu_statusf(ctx->brkr, &s, CMPI_RC_ERR_FAILED, "Unable to handle this association"); goto out; } - CU_DEBUG("OK.\n\tsource: '%s'\n\ttarget: '%s'\n\tassoc_class: '%s'\n", + CU_DEBUG("OK.\n\tsource: '%s'\n\ttarget: '%s'\n\tassoc_class: '%s'", handler->source_class, handler->target_class, handler->assoc_class); - CU_DEBUG("Calling match_class: \n\tinfo->result_class: '%s'\n", + CU_DEBUG("Calling match_class: \n\tinfo->result_class: '%s'", info->result_class); rc = match_class(ctx->brkr, @@ -162,42 +162,41 @@ static CMPIStatus do_assoc(struct std_as info->result_class, handler->target_class); if (!rc) { - CU_DEBUG("Match_class failed.\n"); + CU_DEBUG("Match_class failed."); 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", + CU_DEBUG("Match_class succeeded."); + + CU_DEBUG("Calling match_class: \n\tinfo->assoc_class: '%s'", 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_DEBUG("Match_class failed."); 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"); - CU_DEBUG("Calling handler->handler...\n"); + CU_DEBUG("Match_class succeeded, calling handler->handler..."); s = handler->handler(ref, info, &list); if (s.rc != CMPI_RC_OK) { - CU_DEBUG("\thandler did not return CMPI_RC_OK.\n"); + CU_DEBUG("Handler did not return CMPI_RC_OK."); goto out; } else { - CU_DEBUG("\thandler returned CMPI_RC_OK.\n"); + CU_DEBUG("Handler returned CMPI_RC_OK."); } if (list.list == NULL) { - CU_DEBUG("\tlist is empty.\n"); + CU_DEBUG("List is empty."); goto out; } @@ -206,15 +205,15 @@ static CMPIStatus do_assoc(struct std_as info->result_class, ctx->brkr); if (s.rc != CMPI_RC_OK) { - CU_DEBUG("\tfilter_results did not return CMPI_RC_OK.\n"); + CU_DEBUG("filter_results did not return CMPI_RC_OK."); goto out; } if (list.list == NULL) { - CU_DEBUG("\tlist is empty.\n"); + CU_DEBUG("List is empty."); goto out; } else { - CU_DEBUG("\treturned %u instance(s).\n", list.cur); + CU_DEBUG("Returned %u instance(s).", list.cur); } if (names_only) @@ -225,7 +224,6 @@ static CMPIStatus do_assoc(struct std_as out: inst_list_free(&list); - CU_DEBUG("Returning.\n"); return s; }

2 2

[PATCH] Fix build of ElementCapabilities
by Dan Smith 13 Nov '07

13 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194981559 28800 # Node ID a596cc07e24c715faebb498b744637ce7467897c # Parent aad2a74321d54e26b5b2c89dc8df0e95bd1860f8 Fix build of ElementCapabilities Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r aad2a74321d5 -r a596cc07e24c src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Tue Nov 13 11:14:14 2007 -0500 +++ b/src/Virt_ElementCapabilities.c Tue Nov 13 11:19:19 2007 -0800 @@ -161,9 +161,9 @@ static CMPIStatus cap_to_cs(const CMPIOb } if (!parse_fq_devid(inst_id, &host, &device)) { - cu_status(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Could not get system name."); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Could not get system name."); goto error1; }

2 1

[PATCH] Remove extra newline characters at end of CU_DEBUG calls
by Jay Gagnon 13 Nov '07

13 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1194980442 18000 # Node ID cd4498fc44de514aed4232f5ee1a9a4828d8e3b1 # Parent 5f84fd6c5cdefb2dfe41e4d8ec6ca750d3e69faa Remove extra newline characters at end of CU_DEBUG calls. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r 5f84fd6c5cde -r cd4498fc44de std_association.c --- a/std_association.c Thu Nov 08 11:21:50 2007 -0800 +++ b/std_association.c Tue Nov 13 14:00:42 2007 -0500 @@ -139,22 +139,22 @@ static CMPIStatus do_assoc(struct std_as inst_list_init(&list); - CU_DEBUG("Getting handler...\n"); + CU_DEBUG("Getting handler..."); handler = std_assoc_get_handler(ctx, ref); if (handler == NULL) { - CU_DEBUG("No handler found.\n"); + CU_DEBUG("No handler found."); cu_statusf(ctx->brkr, &s, CMPI_RC_ERR_FAILED, "Unable to handle this association"); goto out; } - CU_DEBUG("OK.\n\tsource: '%s'\n\ttarget: '%s'\n\tassoc_class: '%s'\n", + CU_DEBUG("OK.\n\tsource: '%s'\n\ttarget: '%s'\n\tassoc_class: '%s'", handler->source_class, handler->target_class, handler->assoc_class); - CU_DEBUG("Calling match_class: \n\tinfo->result_class: '%s'\n", + CU_DEBUG("Calling match_class: \tinfo->result_class: '%s'", info->result_class); rc = match_class(ctx->brkr, @@ -162,35 +162,35 @@ static CMPIStatus do_assoc(struct std_as info->result_class, handler->target_class); if (!rc) { - CU_DEBUG("Match_class failed.\n"); - goto out; - } - CU_DEBUG("Match_class succeeded.\n"); - - CU_DEBUG("Calling match_class: \n\tinfo->assoc_class: '%s'\n", + CU_DEBUG("Match_class failed."); + goto out; + } + CU_DEBUG("Match_class succeeded."); + + CU_DEBUG("Calling match_class: \tinfo->assoc_class: '%s'", info->result_class); rc = match_class(ctx->brkr, NAMESPACE(ref), info->assoc_class, handler->assoc_class); if (!rc) { - CU_DEBUG("Match_class failed.\n"); - goto out; - } - CU_DEBUG("Match_class succeeded.\n"); - CU_DEBUG("Calling handler->handler...\n"); + CU_DEBUG("Match_class failed."); + goto out; + } + CU_DEBUG("Match_class succeeded."); + CU_DEBUG("Calling handler->handler..."); s = handler->handler(ref, info, &list); if (s.rc != CMPI_RC_OK) { - CU_DEBUG("\thandler did not return CMPI_RC_OK.\n"); + CU_DEBUG("Handler did not return CMPI_RC_OK."); goto out; } else { - CU_DEBUG("\thandler returned CMPI_RC_OK.\n"); + CU_DEBUG("Handler returned CMPI_RC_OK."); } if (list.list == NULL) { - CU_DEBUG("\tlist is empty.\n"); + CU_DEBUG("List is empty."); goto out; } @@ -199,15 +199,15 @@ static CMPIStatus do_assoc(struct std_as info->result_class, ctx->brkr); if (s.rc != CMPI_RC_OK) { - CU_DEBUG("\tfilter_results did not return CMPI_RC_OK.\n"); + CU_DEBUG("filter_results did not return CMPI_RC_OK."); goto out; } if (list.list == NULL) { - CU_DEBUG("\tlist is empty.\n"); + CU_DEBUG("list is empty."); goto out; } else { - CU_DEBUG("\treturned %u instance(s).\n", list.cur); + CU_DEBUG("returned %u instance(s).", list.cur); } if (names_only) @@ -218,7 +218,6 @@ static CMPIStatus do_assoc(struct std_as out: inst_list_free(&list); - CU_DEBUG("Returning.\n"); return s; }

3 4

[PATCH] Remove newline characters from CU_DEBUG calls now that the newline is automatic. Also remove a few debug messages that are no longer necessary and clutter output
by Jay Gagnon 13 Nov '07

13 Nov '07

# HG changeset patch # User Jay Gagnon <grendel(a)linux.vnet.ibm.com> # Date 1194979853 18000 # Node ID 49c65d339cc56abfc9dc3e09c6f894ea88fc169e # Parent aad2a74321d54e26b5b2c89dc8df0e95bd1860f8 Remove newline characters from CU_DEBUG calls now that the newline is automatic. Also remove a few debug messages that are no longer necessary and clutter output. Signed-off-by: Jay Gagnon <grendel(a)linux.vnet.ibm.com> diff -r aad2a74321d5 -r 49c65d339cc5 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Nov 13 11:14:14 2007 -0500 +++ b/src/Virt_SettingsDefineCapabilities.c Tue Nov 13 13:50:53 2007 -0500 @@ -55,12 +55,10 @@ static bool rasd_prop_copy_value(struct { bool rc = true; - CU_DEBUG("Copying '%s'.\n", src.field); + CU_DEBUG("Copying '%s'.", src.field); if (src.type & CMPI_string) { - CU_DEBUG("String type.\n"); dest->value = (CMPIValue *)strdup((char *)src.value); } else if (src.type & CMPI_INTEGER) { - CU_DEBUG("Integer type.\n"); dest->value = malloc(sizeof(CMPIValue)); memcpy(dest->value, src.value, sizeof(CMPIValue)); } else { @@ -78,7 +76,6 @@ static bool dup_rasd_prop_list(struct sd *dest = NULL; for (i = 0, count = 1; src[i].field != NULL; i++, count++) { - CU_DEBUG("count: %d, i: %d. reallocing.\n", count, i); *dest = realloc(*dest, count * sizeof(struct sdc_rasd_prop)); (*dest)[i].field = strdup(src[i].field); ret = rasd_prop_copy_value(src[i], &(*dest)[i]); @@ -86,7 +83,6 @@ static bool dup_rasd_prop_list(struct sd } /* Make sure to terminate the list. */ - CU_DEBUG("Terminating list. count: %d, i: %d\n", count, i); *dest = realloc(*dest, count * sizeof(struct sdc_rasd_prop)); (*dest)[i] = (struct sdc_rasd_prop)PROP_END; @@ -668,16 +664,15 @@ static CMPIInstance *sdc_rasd_inst(const CMSetProperty(inst, "ResourceType", &resource_type, CMPI_uint16); for (i = 0; prop_list[i].field != NULL; i++) { - CU_DEBUG("Setting property '%s'.\n", prop_list[i].field); + CU_DEBUG("Setting property '%s'.", prop_list[i].field); CMSetProperty(inst, prop_list[i].field, prop_list[i].value, prop_list[i].type); - CU_DEBUG("Set.\n"); - } - - CU_DEBUG("freeing prop_list.\n"); + } + + CU_DEBUG("freeing prop_list."); free_rasd_prop_list(prop_list); out: - CU_DEBUG("Returning inst.\n"); + CU_DEBUG("Returning inst."); return inst; } @@ -704,17 +699,17 @@ static CMPIStatus sdc_rasds_for_type(con CU_DEBUG("Problem getting inst."); goto out; } - CU_DEBUG("Got inst.\n"); + CU_DEBUG("Got inst."); if (inst != NULL) { inst_list_add(list, inst); - CU_DEBUG("Added inst.\n"); + CU_DEBUG("Added inst."); } else { - CU_DEBUG("Inst is null, not added.\n"); + CU_DEBUG("Inst is null, not added."); } } } else { - CU_DEBUG("Unsupported type.\n"); + CU_DEBUG("Unsupported type."); CMSetStatusWithChars(_BROKER, &s, CMPI_RC_ERR_FAILED, "Unsupported device type."); } @@ -731,7 +726,7 @@ static CMPIStatus alloc_cap_to_rasd(cons int ret; uint16_t type; - CU_DEBUG("Getting ResourceType.\n"); + CU_DEBUG("Getting ResourceType."); ret = cu_get_u16_path(ref, "ResourceType", &type); if (ret != 1) { @@ -740,7 +735,7 @@ static CMPIStatus alloc_cap_to_rasd(cons goto out; } - CU_DEBUG("ResourceType: %hi.\n", type); + CU_DEBUG("ResourceType: %hi.", type); s = sdc_rasds_for_type(ref, list, type);

3 5

[PATCH 0 of 6] Take two of huge SettingsDefineCapabilities set
by Jay Gagnon 13 Nov '07

13 Nov '07

Changes from the last set are: reformatted cu_statusf calls SDC_DISK_INC as a define use of libvirt call for proc_max breakout for net_max so each hypervisor can have its own function call alloc_to_pool returning unsupported instead of nothing

2 12

[PATCH] Change cu_compare_ref() to be a little lighter-weight
by Dan Smith 13 Nov '07

13 Nov '07

# HG changeset patch # User Dan Smith <danms(a)us.ibm.com> # Date 1194453648 28800 # Node ID 926009fc62a0080bcf93aaddf098b074ce71a096 # Parent 404c4803b1b542676c4d283226a7cc3b7f3ab58d Change cu_compare_ref() to be a little lighter-weight Now, we just check the keys that were provided by the client (or the CIMOM if that ever starts to happen). We will have already checked the required keys to actually do the lookup in the provider, which serves the "required" key purpose. Changes to libvirt-cim to follow shortly... Signed-off-by: Dan Smith <danms(a)us.ibm.com> diff -r 404c4803b1b5 -r 926009fc62a0 instance_util.c --- a/instance_util.c Fri Nov 02 15:29:38 2007 -0700 +++ b/instance_util.c Wed Nov 07 08:40:48 2007 -0800 @@ -88,38 +88,48 @@ static bool _compare_data(const CMPIData return false; } -const struct cu_property *cu_compare_ref(const CMPIObjectPath *ref, - const CMPIInstance *inst, - const struct cu_property *props) +const char *cu_compare_ref(const CMPIObjectPath *ref, + const CMPIInstance *inst) { - const struct cu_property *p = NULL; int i; CMPIStatus s; + int count; + const char *prop = NULL; - for (i = 0; props[i].name != NULL; i++) { + count = CMGetKeyCount(ref, &s); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Unable to get key count"); + return NULL; + } + + for (i = 0; i < count; i++) { CMPIData kd, pd; + CMPIString *str; - p = &props[i]; - - kd = CMGetKey(ref, p->name, &s); + kd = CMGetKeyAt(ref, i, &str, &s); if (s.rc != CMPI_RC_OK) { - if (p->required) - goto out; - else - continue; + CU_DEBUG("Failed to get key %i", i); + goto out; } - pd = CMGetProperty(inst, p->name, &s); - if (s.rc != CMPI_RC_OK) + prop = CMGetCharPtr(str); + CU_DEBUG("Comparing key `%s'", prop); + + pd = CMGetProperty(inst, prop, &s); + if (s.rc != CMPI_RC_OK) { + CU_DEBUG("Failed to get property `%s'", prop); goto out; + } - if (!_compare_data(&kd, &pd)) + if (!_compare_data(&kd, &pd)) { + CU_DEBUG("No data match for `%s'", prop); goto out; + } } - p = NULL; + prop = NULL; out: - return p; + return prop; } /* diff -r 404c4803b1b5 -r 926009fc62a0 libcmpiutil.h --- a/libcmpiutil.h Fri Nov 02 15:29:38 2007 -0700 +++ b/libcmpiutil.h Wed Nov 07 08:40:48 2007 -0800 @@ -337,26 +337,17 @@ void inst_list_free(struct inst_list *li */ int inst_list_add(struct inst_list *list, CMPIInstance *inst); -struct cu_property { - const char *name; - bool required; -}; - /** * Compare key values in a reference to properties in an instance, - * making sure they are identical. If props identifies a particular - * key as not required, then absence in the object path will not - * result in failure of this test. + * making sure they are identical. * * @param ref The ObjectPath to examine * @param inst The Instance to compare - * @param props A NULL-terminated list of properties to compare - * @returns A pointer to the property structure of the first - * non-matching property, or NULL if all match - */ -const struct cu_property *cu_compare_ref(const CMPIObjectPath *ref, - const CMPIInstance *inst, - const struct cu_property *props); + * @returns A pointer to the name of the first non-matching property, + * or NULL if all match + */ +const char *cu_compare_ref(const CMPIObjectPath *ref, + const CMPIInstance *inst); #define DEFAULT_EIN(pn) \ static CMPIStatus pn##EnumInstanceNames(CMPIInstanceMI *self, \

3 3

[PATCH] GetInstance does not return NOT_FOUND in case of Xen classname on KVM system (and reverse)
by Heidi Eckhart 13 Nov '07

13 Nov '07

# HG changeset patch # User Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> # Date 1194957414 -3600 # Node ID a561761306d40f4394cb519784c5b474a268db7d # Parent b201578d4ade863822cb06c1e52d839f51250d87 GetInstance does not return NOT_FOUND in case of Xen classname on KVM system (and reverse) Signed-off-by: Heidi Eckhart <heidieck(a)linux.vnet.ibm.com> diff -r b201578d4ade -r a561761306d4 src/Virt_ComputerSystem.c --- a/src/Virt_ComputerSystem.c Tue Nov 13 09:37:25 2007 +0100 +++ b/src/Virt_ComputerSystem.c Tue Nov 13 13:36:54 2007 +0100 @@ -381,6 +381,11 @@ static CMPIStatus get_domain(const CMPIO virConnectPtr conn = NULL; const char *prop = NULL; + if (!provider_is_responsible(_BROKER, reference, &s)) { + CMSetStatus(&s, CMPI_RC_ERR_NOT_FOUND); + return s; + } + conn = lv_connect(_BROKER, &s); if (conn == NULL) return s;

2 1