# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1198182619 -3600 # Node ID 9379cc0f82c0c0e78a80c1cb721486928b93af66 # Parent 165b9b102ac9c2650eda92b18a39991585b33755 LogicalDisk, Memory, NetworkPort, Processor: OpenWbem support - rename provider from DeviceProvider to Device - update registration file with new providername - add "Provider" qualifier to mof Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/LogicalDisk.mof --- a/schema/LogicalDisk.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/LogicalDisk.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_LogicalDisk to represent " - "the Xen virtual disks on the system.") + "the Xen virtual disks on the system."), + Provider("cmpi::Virt_Device") ] class Xen_LogicalDisk : CIM_LogicalDisk { @@ -10,7 +11,8 @@ class Xen_LogicalDisk : CIM_LogicalDisk [Description ( "A class derived from CIM_LogicalDisk to represent " - "the KVM virtual disks on the system.") + "the KVM virtual disks on the system."), + Provider("cmpi::Virt_Device") ] class KVM_LogicalDisk : CIM_LogicalDisk { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/LogicalDisk.registration --- a/schema/LogicalDisk.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/LogicalDisk.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance -KVM_LogicalDisk root/virt Virt_DeviceProvider Virt_Device instance +Xen_LogicalDisk root/virt Virt_Device Virt_Device instance +KVM_LogicalDisk root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Memory.mof --- a/schema/Memory.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Memory.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_Memory to represent " - "the Xen virtual memory.") + "the Xen virtual memory."), + Provider("cmpi::Virt_Device") ] class Xen_Memory : CIM_Memory { @@ -10,7 +11,8 @@ class Xen_Memory : CIM_Memory [Description ( "A class derived from CIM_Memory to represent " - "the KVM virtual memory.") + "the KVM virtual memory."), + Provider("cmpi::Virt_Device") ] class KVM_Memory : CIM_Memory { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Memory.registration --- a/schema/Memory.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Memory.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_Memory root/virt Virt_DeviceProvider Virt_Device instance -KVM_Memory root/virt Virt_DeviceProvider Virt_Device instance +Xen_Memory root/virt Virt_Device Virt_Device instance +KVM_Memory root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/NetworkPort.mof --- a/schema/NetworkPort.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/NetworkPort.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [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."), + Provider("cmpi::Virt_Device") ] class Xen_NetworkPort : CIM_NetworkPort { @@ -10,7 +11,8 @@ class Xen_NetworkPort : CIM_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."), + Provider("cmpi::Virt_Device") ] class KVM_NetworkPort : CIM_NetworkPort { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/NetworkPort.registration --- a/schema/NetworkPort.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/NetworkPort.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance -KVM_NetworkPort root/virt Virt_DeviceProvider Virt_Device instance +Xen_NetworkPort root/virt Virt_Device Virt_Device instance +KVM_NetworkPort root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Processor.mof --- a/schema/Processor.mof Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Processor.mof Thu Dec 20 21:30:19 2007 +0100 @@ -2,7 +2,8 @@ [Description ( "A class derived from CIM_Processor to represent " - "the Xen virtual processors.") + "the Xen virtual processors."), + Provider("cmpi::Virt_Device") ] class Xen_Processor : CIM_Processor { @@ -10,7 +11,8 @@ class Xen_Processor : CIM_Processor [Description ( "A class derived from CIM_Processor to represent " - "the KVM virtual processors.") + "the KVM virtual processors."), + Provider("cmpi::Virt_Device") ] class KVM_Processor : CIM_Processor { diff -r 165b9b102ac9 -r 9379cc0f82c0 schema/Processor.registration --- a/schema/Processor.registration Thu Dec 20 21:30:18 2007 +0100 +++ b/schema/Processor.registration Thu Dec 20 21:30:19 2007 +0100 @@ -1,4 +1,4 @@ # Copyright IBM Corp. 2007 # Classname Namespace ProviderName ProviderModule ProviderTypes -Xen_Processor root/virt Virt_DeviceProvider Virt_Device instance -KVM_Processor root/virt Virt_DeviceProvider Virt_Device instance +Xen_Processor root/virt Virt_Device Virt_Device instance +KVM_Processor root/virt Virt_Device Virt_Device instance diff -r 165b9b102ac9 -r 9379cc0f82c0 src/Virt_Device.c --- a/src/Virt_Device.c Thu Dec 20 21:30:18 2007 +0100 +++ b/src/Virt_Device.c Thu Dec 20 21:30:19 2007 +0100 @@ -546,7 +546,10 @@ DEFAULT_EQ(); DEFAULT_EQ(); DEFAULT_INST_CLEANUP(); -STD_InstanceMIStub(, Virt_DeviceProvider, _BROKER, libvirt_cim_init()); +STD_InstanceMIStub(, + Virt_Device, + _BROKER, + libvirt_cim_init()); /* * Local Variables: