[libvirt] [PATCH v3 3/4] qemu: Keep numad hint after reboot

[Martin Kletzander]

On Thu, Aug 13, 2015 at 02:49:34PM +0200, Ján Tomko wrote:
>s/reboot/daemon restart/ ?
>

Yes, exactly!

>On Thu, Aug 13, 2015 at 10:18:33AM +0200, Martin Kletzander wrote:
>> The numad hint stored in priv->autoNodeset is information that gets lost
>> during daemon restart.  And because we would like to use that
>> information in the future, we also need to save it in the status XML.
>> For the sake of tests, we need to initialize nnumaCell_max to some
>> value, so that the restoration doesn't fail in our test suite.  There is
>> no need to fill in the actual numa cell data since the recalculating
>> function virCapabilitiesGetCpusForNodemask() will not fail, it will just
>> skip filling the data in the bitmap which we don't use in tests anyway.
>>
>> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>> ---
>>  src/qemu/qemu_domain.c  | 32 +++++++++++++++++++++++++++++++-
>>  tests/qemuxml2xmltest.c |  3 ++-
>>  tests/testutilsqemu.c   |  2 ++
>>  3 files changed, 35 insertions(+), 2 deletions(-)
>
>> @@ -805,15 +817,33 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
>>      }
>>      VIR_FREE(nodes);
>>
>> +    if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
>> +        goto error;
>> +
>> +    if ((tmp = virXPathString("string(./numad/@nodeset)", ctxt))) {
>> +        if (virBitmapParse(tmp, 0, &priv->autoNodeset,
>> +                           caps->host.nnumaCell_max) < 0)
>> +            goto error;
>> +
>> +        if (!(priv->autoCpuset = virCapabilitiesGetCpusForNodemask(caps,
>> +                                                                   priv->autoNodeset)))
>> +            goto error;
>> +    }
>> +    virObjectUnref(caps);
>> +    caps = NULL;
>
>This assignment seems redundant.
>

I was thinking about the future when someone adds few lines after this
and will try to use 'caps'.  Feel free to remove it with follow-up
trivial patch if you don't like it.

>Jan
>
>> +    VIR_FREE(tmp);
>> +
>>      return 0;
>>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150813/28adcc5e/attachment-0001.sig>