[libvirt] [PATCH] virNodeDevCapPCIDevParseXML: Initialize numa_node variable

[Martin Kletzander]

On Thu, Jun 12, 2014 at 11:27:31AM +0200, Michal Privoznik wrote:
>With one of my recent patches (1c70277) libvirt's capable of
>reporting NUMA node locality for PCI devices. The node ID is
>stored in pci_dev.numa_node variable. However, since zero is
>valid NUMA node ID, the default is -1 as it is in kernel too.
>So, if the PCI device is not tied to any specific NUMA node, the
>default is then NOT printed into XML. Therefore, when parsing
>node device XML, the <node/> element is optional. But currently,
>if it's not there, we must set sane default, otherwise after
>parsing the in memory representation doesn't match the XML. We

s/the in/in the/

>are already doing this in other place: udevProcessPCI().
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/conf/node_device_conf.c | 2 ++
> 1 file changed, 2 insertions(+)
>
>diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
>index 6153aa1..12e40e6 100644
>--- a/src/conf/node_device_conf.c
>+++ b/src/conf/node_device_conf.c
>@@ -1145,6 +1145,8 @@ virNodeDevCapPCIDevParseXML(xmlXPathContextPtr ctxt,
>         }
>     }
>
>+    /* The default value is -1 since zero is valid NUMA node number */
>+    data->pci_dev.numa_node = -1;
>     if (virNodeDevCapsDefParseIntOptional("number(./numa[1]/@node)", ctxt,
>                                           &data->pci_dev.numa_node, def,
>                                           _("invalid NUMA node ID supplied for '%s'")) < 0)

ACK,

Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20140612/a06b3aae/attachment-0001.sig>