[Libvirt-cim] [PATCH 5/7] Changes to 2/3 to support more fields

[Boris Fiuczynski]

On 03/13/2014 11:27 PM, John Ferlan wrote:
> Signed-off-by: John Ferlan <jferlan at redhat.com>
> ---
>   schema/ResourceAllocationSettingData.mof          | 48 +++++++++++++++-------
>   schema/ResourceAllocationSettingData.registration |  2 -
>   src/Virt_ElementSettingData.c                     |  1 +
>   src/Virt_RASD.c                                   | 49 +++++++++++++++++++----
>   src/Virt_SettingsDefineState.c                    |  1 +
>   src/Virt_VSSDComponent.c                          |  1 +
>   6 files changed, 78 insertions(+), 24 deletions(-)
>
> diff --git a/schema/ResourceAllocationSettingData.mof b/schema/ResourceAllocationSettingData.mof
> index 5c76a1c..bec49b8 100644
> --- a/schema/ResourceAllocationSettingData.mof
> +++ b/schema/ResourceAllocationSettingData.mof
> @@ -322,31 +322,49 @@ class LXC_InputResourceAllocationSettingData : LXC_ResourceAllocationSettingData
>         string BusType;
>   };
>
> -[Description ("Xen virtual controller device"),
> - Provider("cmpi::Virt_RASD")
> -]
>   class Xen_ControllerResourceAllocationSettingData : Xen_ResourceAllocationSettingData
>   {
> -      string Type;
> -      string Model;
>   };
If you do not register the class why do you leave the class defined?
>
> -[Description ("KVM virtual controller device"),
> +[Description ("KVM virtual controller device. It is identified by: "
> +              "CIM_ResourceAllocationSettingData.ResourceType=1 ('Other'), "
> +              "CIM_ResourceAllocationSettingData.OtherResourceType='controller'"
> +              " and CIM_ResourceAllocationSettingData.ResourceSubType set to "
> +              "one of 'ide', 'fdc', 'scsi', 'sata', 'ccid', 'virtio-serial', "
> +              "or 'pci'."),
>    Provider("cmpi::Virt_RASD")
>   ]
>   class KVM_ControllerResourceAllocationSettingData : KVM_ResourceAllocationSettingData
>   {
> -      string Type;
> -      string Model;
> -};
> +      [Description ("Order in which the bus controller is encountered. "
> +                    "The order is controller type scoped.")]
> +      uint64 Index;
>
> -[Description ("LXC virtual controller device"),
> - Provider("cmpi::Virt_RASD")
> -]
> -class LXC_ControllerResourceAllocationSettingData : LXC_ResourceAllocationSettingData
> -{
> -      string Type;
> +      [Description ("Optional string providing a specific model "
> +                    "information based on the controller type.")]
>         string Model;
> +
> +      [Description ("The 'virtio-serial' controller uses the Ports and "
> +                    "Vectors to control how many devices can be connected "
> +                    "through the controller.")]
> +      sint64 Ports;
> +      sint64 Vectors;
Why are you using signed 64-bit integers and not unsigned ones? I do not 
think that negative numbers are making sense!
> +
> +      [Description ("")]
that is very brief :-) ("Number of queues for the controller.")
> +      uint64 Queues;
> +
> +      [Description ("Device master property names")]
> +      string MasterProperties[];
> +
> +      [Description ("Device master property values")]
> +      string MasterValues[];
> +
> +      [Description ("For controllers that are themselves devices on a "
> +                    "PCI or USB bus an optional element to specify the "
"PCI or USB" should be removed to remain generic or you simply write the 
description as above for Master...
       [Description ("Device address property names")]
...
       [Description ("Device address property values")]
> +                    "exact relationship of the controller to its master "
> +                    "bus. Stored in the property and value arrays.")]
> +      string AddressProperties[];
> +      string AddressValues[];
>   };
>
>   [Description ("Xen virtual network pool settings"),
> diff --git a/schema/ResourceAllocationSettingData.registration b/schema/ResourceAllocationSettingData.registration
> index 1142376..da0b7d9 100644
> --- a/schema/ResourceAllocationSettingData.registration
> +++ b/schema/ResourceAllocationSettingData.registration
> @@ -7,7 +7,6 @@ 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
> @@ -22,4 +21,3 @@ 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_ElementSettingData.c b/src/Virt_ElementSettingData.c
> index c088e49..1fa81f2 100644
> --- a/src/Virt_ElementSettingData.c
> +++ b/src/Virt_ElementSettingData.c
> @@ -137,6 +137,7 @@ static char* resource_allocation_setting_data[] = {
>           "KVM_GraphicsResourceAllocationSettingData",
>           "KVM_ConsoleResourceAllocationSettingData",
>           "KVM_InputResourceAllocationSettingData",
> +        "KVM_ControllerResourceAllocationSettingData",
>           "LXC_DiskResourceAllocationSettingData",
>           "LXC_MemResourceAllocationSettingData",
>           "LXC_NetResourceAllocationSettingData",


-- 
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