- Devel - libvirt List Archives

[PATCH v3] nodedev: ignore EINVAL from libudev in udevEventHandleThread
by christian.ehrhardt＠canonical.com 13 Oct '22

13 Oct '22

From: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Certain udev entries might be of a size that makes libudev emit EINVAL which right now leads to udevEventHandleThread exiting. Due to no more handling events other elements of libvirt will start pushing for events to be consumed which never happens causing a busy loop burning a cpu without any gain. After evaluation of the root cause of the example case discussed in in #245 and a test run ignoring EINVAL it was considered safe to add EINVAL to the ignored errnos to not exit udevEventHandleThread giving it more resilience. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/245 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/node_device/node_device_udev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 07c10f0d88..21fbcc2dca 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1863,10 +1863,12 @@ udevEventHandleThread(void *opaque G_GNUC_UNUSED) } /* POSIX allows both EAGAIN and EWOULDBLOCK to be used - * interchangeably when the read would block or timeout was fired + * interchangeably when the read would block or timeout was fired. + * EINVAL might happen on too large udev entries, ignore those for + * the robustness of udevEventHandleThread. */ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR - if (errno != EAGAIN && errno != EWOULDBLOCK) { + if (errno != EAGAIN && errno != EWOULDBLOCK && errno != EINVAL) { VIR_WARNINGS_RESET virReportSystemError(errno, "%s", _("failed to receive device from udev " -- 2.38.0

1 0

[PATCH v2] nodedev: ignore EINVAL from libudev in udevEventHandleThread
by christian.ehrhardt＠canonical.com 13 Oct '22

13 Oct '22

From: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Certiain udev entries might be of a size that makes libudev emit EINVAL which right now leads to udevEventHandleThread exiting. Due to no more handling events other elements of libvirt will start pushing for events to be consumed which never happens causing a busy loop burning a cpu without any gain. After evaluation of the root cause of the example case discussed in in #245 and a test run ignoring EINVAL it was considered safe to add EINVAL to the ignored errnos to not exit udevEventHandleThread giving it more resilience. Fixes: https://gitlab.com/libvirt/libvirt/-/issues/245 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/node_device/node_device_udev.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 07c10f0d88..21fbcc2dca 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1863,10 +1863,12 @@ udevEventHandleThread(void *opaque G_GNUC_UNUSED) } /* POSIX allows both EAGAIN and EWOULDBLOCK to be used - * interchangeably when the read would block or timeout was fired + * interchangeably when the read would block or timeout was fired. + * EINVAL might happen on too large udev entries, ignore those for + * the robustness of udevEventHandleThread. */ VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR - if (errno != EAGAIN && errno != EWOULDBLOCK) { + if (errno != EAGAIN && errno != EWOULDBLOCK && errno != EINVAL) { VIR_WARNINGS_RESET virReportSystemError(errno, "%s", _("failed to receive device from udev " -- 2.38.0

1 0

[PATCH] ci: Install python RPMs from libvirt/libvirt-python CI artifacts
by Peter Krempa 13 Oct '22

13 Oct '22

After addition of the new libvirt-client-qemu sub-package which is using python bindings (thus creating a circular dependency between the libvirt and libvirt-python projects) the integration jobs fail with: Error: Problem: conflicting requests - nothing provides python3-libvirt >= 8.9.0-1.el9 needed by libvirt-client-qemu-8.9.0-1.el9.x86_64 The libvirt-python project now provides the RPMs in artifacts: https://gitlab.com/libvirt/libvirt-python/-/merge_requests/96 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- ci/integration-template.yml | 2 +- ci/integration.yml | 40 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 3347bb03ed..acb51a0b27 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -25,7 +25,7 @@ .install-deps: &install-deps - - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* + - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* libvirt-python-rpms/* - sudo pip3 install --prefix=/usr avocado-framework diff --git a/ci/integration.yml b/ci/integration.yml index 19d227faad..b79d2e0f40 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -20,6 +20,10 @@ centos-stream-8-tests-prebuilt-env: job: x86_64-centos-stream-8-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-8-prebuilt-env + ref: master + artifacts: true centos-stream-8-tests-local-env: extends: @@ -31,6 +35,10 @@ centos-stream-8-tests-local-env: job: x86_64-centos-stream-8-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-8-prebuilt-env + ref: master + artifacts: true .centos-stream-9-tests: @@ -52,6 +60,10 @@ centos-stream-9-tests-prebuilt-env: job: x86_64-centos-stream-9-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-9-prebuilt-env + ref: master + artifacts: true centos-stream-9-tests-local-env: extends: @@ -63,6 +75,10 @@ centos-stream-9-tests-local-env: job: x86_64-centos-stream-9-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-centos-stream-9-prebuilt-env + ref: master + artifacts: true .fedora-35-tests: @@ -84,6 +100,10 @@ fedora-35-tests-prebuilt-env: job: x86_64-fedora-35-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-35-prebuilt-env + ref: master + artifacts: true fedora-35-tests-local-env: extends: @@ -95,6 +115,10 @@ fedora-35-tests-local-env: job: x86_64-fedora-35-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-35-prebuilt-env + ref: master + artifacts: true .fedora-36-tests: @@ -116,6 +140,10 @@ fedora-36-tests-prebuilt-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true fedora-36-tests-local-env: extends: @@ -127,6 +155,10 @@ fedora-36-tests-local-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true .fedora-36-upstream-qemu-tests: @@ -148,6 +180,10 @@ fedora-36-upstream-qemu-tests-prebuilt-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true fedora-36-upstream-qemu-tests-local-env: extends: @@ -159,3 +195,7 @@ fedora-36-upstream-qemu-tests-local-env: job: x86_64-fedora-36-prebuilt-env ref: master artifacts: true + - project: libvirt/libvirt-python + job: x86_64-fedora-36-prebuilt-env + ref: master + artifacts: true -- 2.37.3

3 7

[PATCH 0/7] qemu: support updating device's bootindex
by Jiang Jiacheng 12 Oct '22

12 Oct '22

Support updating device's(support cdrom, disk and network) bootindex online in virDomainUpdateDeviceFlags. The new bootindex will take effect after guest rebooting. Enable bootindex can be set to -1, it means cancel the device's bootindex. To use this feature, we need to get the device's xml first and modify the boot order in the xml, then use 'virsh update-device <domain> <xml> --flag' to update the bootindex. Note that the flag should be --config or --persistent if the vm is running. Jiang Jiacheng (7): qemu: Introduce qemuDomainChangeBootIndex API qemu: Introduce qemuCheckBootIndex and qemuChangeDiskBootIndex API qemu: Support update disk's bootindex qemu: Support update net's bootindex qemu: Support set bootindex to -1 qemu: Support add bootindex = -1 to boothash qemu: Reserve bootindex = -1 in virDomainDeviceDefCopy src/conf/device_conf.h | 4 +-- src/conf/domain_conf.c | 38 +++++++++++++++----- src/conf/domain_conf.h | 4 +++ src/conf/domain_postparse.c | 8 ++++- src/qemu/qemu_command.c | 38 ++++++++++---------- src/qemu/qemu_conf.c | 69 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 12 +++++++ src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 32 +++++++++++++++++ src/qemu/qemu_hotplug.c | 17 ++++++--- src/qemu/qemu_monitor.c | 12 +++++++ src/qemu/qemu_monitor.h | 6 ++++ src/qemu/qemu_monitor_json.c | 22 ++++++++++++ src/qemu/qemu_monitor_json.h | 6 ++++ src/qemu/qemu_process.c | 8 ++--- src/qemu/qemu_validate.c | 6 ++-- 16 files changed, 242 insertions(+), 43 deletions(-) -- 2.33.0

2 10

[PATCH] spec: change gettext requires to gettext-runtime for F37
by Cole Robinson 12 Oct '22

12 Oct '22

From: Jens Petersen <petersen(a)redhat.com> See https://fedoraproject.org/wiki/Changes/GettextRuntimeSubpackage Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5408aa3154..d946a8da48 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -471,7 +471,11 @@ Requires: dbus # For uid creation during pre Requires(pre): shadow-utils # Needed by /usr/libexec/libvirt-guests.sh script. +%if 0%{?fedora} >= 37 +Requires: gettext-runtime +%else Requires: gettext +%endif # Ensure smooth upgrades Obsoletes: libvirt-admin < 7.3.0 -- 2.37.3

2 1

[PATCH 0/3] fix some issue in concurrency scenarios
by Jiang Jiacheng 12 Oct '22

12 Oct '22

Jiang Jiacheng (3): qemu: Init address before qemuProcessShutdownOrReboot during reconnect process qemu: get the stackManager lock before getting nested lock qemu: back up the path in qemuMonitorOpen src/qemu/qemu_conf.c | 6 +++++- src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_monitor.c | 5 ++++- src/qemu/qemu_process.c | 10 +++++----- 4 files changed, 17 insertions(+), 7 deletions(-) -- 2.33.0

2 7

[PATCH] Fix race condition when detaching a device
by Pierre LIBEAU 12 Oct '22

12 Oct '22

Qemu reply to libvirt "DeviceNotFound" and libvirt didn't clean on the side the live configuration. qemuMonitorDelDevice() return -2 to qemuDomainDeleteDevice() and during this action in qemuDomainDetachDeviceLive() the remove is never call. Ref #359 Signed-off-by: Pierre LIBEAU <pierre.libeau(a)corp.ovh.com> --- src/qemu/qemu_hotplug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9b508dc8f0..52a14a4476 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -93,6 +93,8 @@ qemuDomainResetDeviceRemoval(virDomainObj *vm); * * Returns: 0 on success, * -1 otherwise. + * -2 device does not exist in qemu, but it still + * exists in libvirt */ static int qemuDomainDeleteDevice(virDomainObj *vm, @@ -124,7 +126,6 @@ qemuDomainDeleteDevice(virDomainObj *vm, * domain XML is queried right after detach API the * device would still be there. */ VIR_DEBUG("Detaching of device %s failed and no event arrived", alias); - rc = 0; } } @@ -6055,7 +6056,11 @@ qemuDomainDetachDeviceLive(virDomainObj *vm, if (!async) qemuDomainMarkDeviceForRemoval(vm, info); - if (qemuDomainDeleteDevice(vm, info->alias) < 0) { + int rc; + rc = qemuDomainDeleteDevice(vm, info->alias); + if (rc < 0) { + if (rc == -2) + ret = qemuDomainRemoveDevice(driver, vm, &detach); if (virDomainObjIsActive(vm)) qemuDomainRemoveAuditDevice(vm, &detach, false); goto cleanup; -- 2.37.3

3 2

[PATCH v3] cpu_map: Introduce Neoverse N1/N2/V1
by Zhenyu Zhang 12 Oct '22

12 Oct '22

Add Neoverse N1/N2/V1 as a supported cpu model. Signed-off-by: Zhenyu Zhang <zhenyzha(a)redhat.com> v2: https://listman.redhat.com/archives/libvir-list/2022-September/234512.html v1: https://listman.redhat.com/archives/libvir-list/2022-September/234294.html Changelog ========= v3: * Remove the Ampere vendor from arm_vendors (Martin) * Change Neoverse N1/N2/V1 vendor from Ampere to ARM (Martin) v2: * Introduce Neoverse N1/N2/V1 (Martin) * Corrected ampere vendor value (Martin) --- src/cpu_map/arm_Neoverse-N1.xml | 6 ++++++ src/cpu_map/arm_Neoverse-N2.xml | 6 ++++++ src/cpu_map/arm_Neoverse-V1.xml | 6 ++++++ src/cpu_map/index.xml | 3 +++ src/cpu_map/meson.build | 3 +++ 5 files changed, 24 insertions(+) create mode 100644 src/cpu_map/arm_Neoverse-N1.xml create mode 100644 src/cpu_map/arm_Neoverse-N2.xml create mode 100644 src/cpu_map/arm_Neoverse-V1.xml diff --git a/src/cpu_map/arm_Neoverse-N1.xml b/src/cpu_map/arm_Neoverse-N1.xml new file mode 100644 index 0000000000..b83b8af8cc --- /dev/null +++ b/src/cpu_map/arm_Neoverse-N1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N1'> + <vendor name='ARM'/> + <pvr value='0xd0c'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_Neoverse-N2.xml b/src/cpu_map/arm_Neoverse-N2.xml new file mode 100644 index 0000000000..cba2c6ca16 --- /dev/null +++ b/src/cpu_map/arm_Neoverse-N2.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-N2'> + <vendor name='ARM'/> + <pvr value='0xd49'/> + </model> +</cpus> diff --git a/src/cpu_map/arm_Neoverse-V1.xml b/src/cpu_map/arm_Neoverse-V1.xml new file mode 100644 index 0000000000..a449322952 --- /dev/null +++ b/src/cpu_map/arm_Neoverse-V1.xml @@ -0,0 +1,6 @@ +<cpus> + <model name='Neoverse-V1'> + <vendor name='ARM'/> + <pvr value='0xd40'/> + </model> +</cpus> diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index d533a28865..deae92552f 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -97,6 +97,9 @@ <include filename='arm_cortex-a53.xml'/> <include filename='arm_cortex-a57.xml'/> <include filename='arm_cortex-a72.xml'/> + <include filename='arm_Neoverse-N1.xml'/> + <include filename='arm_Neoverse-N2.xml'/> + <include filename='arm_Neoverse-V1.xml'/>  <include filename='arm_Falkor.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 99264289e2..55c3703006 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -7,6 +7,9 @@ cpumap_data = [ 'arm_FT-2000plus.xml', 'arm_features.xml', 'arm_Kunpeng-920.xml', + 'arm_Neoverse-N1.xml', + 'arm_Neoverse-N2.xml', + 'arm_Neoverse-V1.xml', 'arm_Tengyun-S2500.xml', 'arm_ThunderX299xx.xml', 'arm_vendors.xml', -- 2.31.1

2 1

[RFC 0/1] Check for pid re-use before killing domain process
by manish.mishra 11 Oct '22

11 Oct '22

Libvirt stores pid of domain(e.g Qemu) process when a domain process is started and same pid is used while destroying domain process. There is always a race possible that before libvirt tries to kill domain process, actual domain process is already dead and same pid is used for another process. In that case libvirt may kill an innocent process. With this patch we store start time of domain process when domain is started and we match stime again while killing domain process if it does not match we can assume domain process is already dead. This patch series tries to create a generic interface which can be used for non-domain processes too, even though initial patch series handles pid re-use for domain process only. Proposed changes: 1. While creating a daemon process through virExec, create a file which stores start time of the process, along with the pid file. A Separate file for start time is created instead of storing start time too in *.pid file so that existing external user of <domain-id>*.pid file does not break. 2. Persist stime in domstatus in domain xml. 3. In virProcessKill before sending signal to process also verify start time of process. For sending signal to process pidfd_send_signal is used avoid any race between verifying start time and sending signal. Following steps are taken while killing a process. 3.1 Open a pid-fd for given pid with pidfd_open. 3.2 Verify start time of pid with stored start time. If start time does not match, assume process is already dead. 3.3 Send signal to pid-fd with pidfd_send_signal. Even if pid was re-used just after verifying star time, signal will be sent to a pidfd instance which was created before verifying timestamp. manish.mishra (1): Check for pid re-use before killing qemu process src/conf/domain_conf.c | 14 ++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 7 ++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_process.c | 49 ++++++-- src/util/vircommand.c | 37 ++++++ src/util/vircommand.h | 3 + src/util/virpidfile.c | 113 +++++++++++++----- src/util/virpidfile.h | 17 +++ src/util/virprocess.c | 73 ++++++++++- src/util/virprocess.h | 8 ++ .../qemustatusxml2xmldata/backup-pull-in.xml | 2 +- .../blockjob-blockdev-in.xml | 2 +- .../blockjob-mirror-in.xml | 2 +- .../migration-in-params-in.xml | 2 +- .../migration-out-nbd-bitmaps-in.xml | 2 +- .../migration-out-nbd-in.xml | 2 +- .../migration-out-nbd-out.xml | 2 +- .../migration-out-nbd-tls-in.xml | 2 +- .../migration-out-nbd-tls-out.xml | 2 +- .../migration-out-params-in.xml | 2 +- tests/qemustatusxml2xmldata/modern-in.xml | 2 +- tests/qemustatusxml2xmldata/upgrade-in.xml | 2 +- tests/qemustatusxml2xmldata/upgrade-out.xml | 2 +- .../qemustatusxml2xmldata/vcpus-multi-in.xml | 2 +- 25 files changed, 295 insertions(+), 56 deletions(-) -- 2.22.3

3 6

[PATCH] capabilities: use g_autofree in capabilities.c
by Jiang Jiacheng 11 Oct '22

11 Oct '22

Use g_autofree in capabilities.c for some pointers still using manual cleanup, and remove unnecessary cleanup. Signed-off-by: Jiang Jiacheng <jiangjiacheng(a)huawei.com> --- src/conf/capabilities.c | 44 +++++++++++++---------------------------- 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 1a7ebf4a13..e56049687b 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1489,15 +1489,14 @@ virCapabilitiesGetNUMADistances(int node, virNumaDistance **distancesRet, int *ndistancesRet) { - virNumaDistance *tmp = NULL; + g_autofree virNumaDistance *tmp = NULL; int tmp_size = 0; - int ret = -1; - int *distances = NULL; + g_autofree int *distances = NULL; int ndistances = 0; size_t i; if (virNumaGetDistances(node, &distances, &ndistances) < 0) - goto cleanup; + return -1; if (!distances) { *distancesRet = NULL; @@ -1521,11 +1520,8 @@ virCapabilitiesGetNUMADistances(int node, *ndistancesRet = tmp_size; *distancesRet = g_steal_pointer(&tmp); tmp_size = 0; - ret = 0; - cleanup: - VIR_FREE(distances); - VIR_FREE(tmp); - return ret; + + return 0; } static int @@ -1533,13 +1529,12 @@ virCapabilitiesGetNUMAPagesInfo(int node, virCapsHostNUMACellPageInfo **pageinfo, int *npageinfo) { - int ret = -1; - unsigned int *pages_size = NULL; - unsigned long long *pages_avail = NULL; + g_autofree unsigned int *pages_size = NULL; + g_autofree unsigned long long *pages_avail = NULL; size_t npages, i; if (virNumaGetPages(node, &pages_size, &pages_avail, NULL, &npages) < 0) - goto cleanup; + return -1; *pageinfo = g_new0(virCapsHostNUMACellPageInfo, npages); *npageinfo = npages; @@ -1549,12 +1544,7 @@ virCapabilitiesGetNUMAPagesInfo(int node, (*pageinfo)[i].avail = pages_avail[i]; } - ret = 0; - - cleanup: - VIR_FREE(pages_avail); - VIR_FREE(pages_size); - return ret; + return 0; } @@ -1685,7 +1675,7 @@ static int virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps) { virNodeInfo nodeinfo; - virCapsHostNUMACellCPU *cpus; + g_autofree virCapsHostNUMACellCPU *cpus; int ncpus; int n, s, c, t; int id, cid; @@ -1741,7 +1731,6 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps) error: for (; cid >= 0; cid--) virBitmapFree(cpus[cid].siblings); - VIR_FREE(cpus); return -1; } @@ -1925,7 +1914,7 @@ static int virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) { int n; - virCapsHostNUMACellCPU *cpus = NULL; + g_autofree virCapsHostNUMACellCPU *cpus = NULL; int ret = -1; int ncpus = 0; int max_node; @@ -1989,7 +1978,6 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMA *caps) cleanup: virCapabilitiesClearHostNUMACellCPUTopology(cpus, ncpus); - VIR_FREE(cpus); return ret; } @@ -2034,22 +2022,18 @@ virCapabilitiesHostNUMANewHost(void) int virCapabilitiesInitPages(virCaps *caps) { - int ret = -1; - unsigned int *pages_size = NULL; + g_autofree unsigned int *pages_size = NULL; size_t npages; if (virNumaGetPages(-1 /* Magic constant for overall info */, &pages_size, NULL, NULL, &npages) < 0) - goto cleanup; + return -1; caps->host.pagesSize = g_steal_pointer(&pages_size); caps->host.nPagesSize = npages; npages = 0; - ret = 0; - cleanup: - VIR_FREE(pages_size); - return ret; + return 0; } -- 2.33.0

2 2