On Thu, Feb 20, 2025 at 10:01:24 +0100, Peter Krempa wrote:
> 'virBitmapFormat' always returns a string; remove pointless checks.
>
> Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
> ---
> src/ch/ch_driver.c | 3 +--
> src/conf/capabilities.c | 9 +--------
> src/conf/domain_conf.c | 27 +++++++--------------------
> src/conf/numa_conf.c | 18 ++++++------------
> src/conf/virnetworkobj.c | 3 ---
> src/hypervisor/domain_cgroup.c | 6 ++----
> src/libxl/libxl_driver.c | 3 +--
> src/libxl/xen_common.c | 6 ++----
> src/qemu/qemu_command.c | 3 +--
> src/qemu/qemu_domain.c | 10 ++++------
> src/qemu/qemu_driver.c | 21 ++++++---------------
> src/util/vircgroup.c | 5 +----
> src/vz/vz_sdk.c | 3 +--
> 13 files changed, 33 insertions(+), 84 deletions(-)
[...]
> @@ -298,10 +297,9 @@ virDomainNumatuneFormatXML(virBuffer *buf,
> virBufferAsprintf(buf, "<memory mode='%s' ", tmp);
>
> if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC) {
> - if (!(nodeset = virBitmapFormat(numatune->memory.nodeset)))
> - return -1;
> + char *nodeset = virBitmapFormat(numatune->memory.nodeset);
This is supposed to be 'g_autofree char *' ...
> +
> virBufferAsprintf(buf, "nodeset='%s'/>\n", nodeset);
> - VIR_FREE(nodeset);
> } else if (numatune->memory.placement) {
> tmp = virDomainNumatunePlacementTypeToString(numatune->memory.placement);
> virBufferAsprintf(buf, "placement='%s'/>\n", tmp);
> @@ -310,19 +308,18 @@ virDomainNumatuneFormatXML(virBuffer *buf,
>
> for (i = 0; i < numatune->nmem_nodes; i++) {
> virDomainNumaNode *mem_node = &numatune->mem_nodes[i];
> + g_autofree char *nodeset = NULL;
... just like here.
>
> if (!mem_node->nodeset)
> continue;
Consider the above fixed in my branch.
