[libvirt] [PATCH] conf: fix parsing 'cmd_per_lun' and 'max_sectors'

[Michal Privoznik]

On 14.08.2014 09:55, Wang Rui wrote:
> From: Mo yuxiang <moyuxiang at huawei.com>
>
> commit d9504941 introduces two new attributes "cmd_per_lun" and
> "max_sectors" same with the names QEMU uses for virtio-scsi.
> But the case of parsing them is not exact. Change to parse
> them if controller has "driver" element.
>
> Signed-off-by: Mo yuxiang <moyuxiang at huawei.com>
> ---
>   src/conf/domain_conf.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 934f6cb..5c762fa 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -6295,10 +6295,11 @@ virDomainControllerDefParseXML(xmlNodePtr node,
>       cur = node->children;
>       while (cur != NULL) {
>           if (cur->type == XML_ELEMENT_NODE) {
> -            if (xmlStrEqual(cur->name, BAD_CAST "driver"))
> +            if (xmlStrEqual(cur->name, BAD_CAST "driver")) {
>                   queues = virXMLPropString(cur, "queues");
>                   cmd_per_lun = virXMLPropString(cur, "cmd_per_lun");
>                   max_sectors = virXMLPropString(cur, "max_sectors");
> +            }
>           }
>           cur = cur->next;
>       }
>

ACKed and pushed. Unfortunately, the 1.2.7 release is broken so I'm 
pushing this into 1.2.7 maint branch too.

Michal