Re: [Libvirt-cim] [PATCH 2/3] RASD: Schema and Provider Support for Controller RASDs

On 03/03/2014 08:38 AM, Xu Wang wrote: The class CIM_ResourceAllocationSettingData has an attribute ResourceSubType. I think there is no need to introduce this new attribute here. I think that there should at least be some minimum documentation of the attributes in the mof as well. e.g. [Description ("Order in which the bus controller is encountered. " "The order is controller type scoped.")] uint64 Index; As already said in patch 1/3 I think that you need to add the index. > + > +[Description ("LXC virtual controller device"), > + Provider("cmpi::Virt_RASD") > +] > +class LXC_ControllerResourceAllocationSettingData : LXC_ResourceAllocationSettingData > +{ > + string Type; > + > [Description ("Xen virtual network pool settings"), > Provider("cmpi::Virt_RASD") > ] > diff --git a/schema/ResourceAllocationSettingData.registration b/schema/ResourceAllocationSettingData.registration > index b969bfe..1142376 100644 > --- a/schema/ResourceAllocationSettingData.registration > +++ b/schema/ResourceAllocationSettingData.registration > @@ -7,6 +7,7 @@ Xen_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > Xen_GraphicsResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > Xen_InputResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > Xen_ConsoleResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > +Xen_ControllerResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > KVM_DiskResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > KVM_NetResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > KVM_ProcResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > @@ -14,9 +15,11 @@ KVM_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > KVM_GraphicsResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > KVM_InputResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > KVM_ConsoleResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > +KVM_ControllerResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > LXC_MemResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > LXC_DiskResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > LXC_ProcResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > LXC_GraphicsResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > LXC_InputResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > LXC_ConsoleResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > +LXC_ControllerResourceAllocationSettingData root/virt Virt_RASD Virt_RASD instance > diff --git a/src/Virt_RASD.c b/src/Virt_RASD.c > index abfb09f..594fe83 100644 > --- a/src/Virt_RASD.c > +++ b/src/Virt_RASD.c > @@ -915,6 +915,20 @@ static CMPIStatus set_input_rasd_params(const struct virt_device *dev, > return s; > } > > +static CMPIStatus set_controller_rasd_params(const struct virt_device *dev, > + CMPIInstance *inst) > +{ > + CMPIStatus s = {CMPI_RC_OK, NULL}; > + > + CMSetProperty(inst, "Type", > + (CMPIValue *)dev->dev.controller.type, CMPI_chars); > + > + CMSetProperty(inst, "Model", > + (CMPIValue *)dev->dev.controller.model, CMPI_chars); > + > + return s; > +} > + > CMPIInstance *rasd_from_vdev(const CMPIBroker *broker, > struct virt_device *dev, > const char *host, > @@ -949,6 +963,9 @@ CMPIInstance *rasd_from_vdev(const CMPIBroker *broker, > } else if (dev->type == CIM_RES_TYPE_INPUT) { > type = CIM_RES_TYPE_INPUT; > base = "InputResourceAllocationSettingData"; > + } else if (dev->type == CIM_RES_TYPE_CONTROLLER) { > + type = CIM_RES_TYPE_CONTROLLER; Setting the attribute ResourceType to CIM_RES_TYPE_OTHER since there is no value in the DMTF defined space that would fit a generic controller. By setting it to "Other" or "1" you should specify attributes OtherResourceType and ResourceSubType. I suggest to set OtherResourceType to "Controller" and as mentioned above set the ResourceSubType according to the controller type specified. You need to set these in method set_controller_rasd_params. -- Mit freundlichen Grüßen/Kind regards Boris Fiuczynski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martina Köderitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294