- Devel - libvirt List Archives

[libvirt PATCH v2] ci: refresh with latest lcitool manifest
by Erik Skultety 01 Jun '23

01 Jun '23

Main lcitool changes: - added Alpine 3.17 and 3.18 targets - dropped Alpine 3.15 and 3.16 Note that we're not actively testing all Alpine targets due to CI quota, so only 3.17 is used as a replacement for 3.15 in this patch. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ci/buildenv/{alpine-315.sh => alpine-317.sh} | 1 + .../{alpine-315.Dockerfile => alpine-317.Dockerfile} | 3 ++- ci/gitlab/builds.yml | 12 ++++++------ ci/gitlab/container-templates.yml | 2 +- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) rename ci/buildenv/{alpine-315.sh => alpine-317.sh} (99%) rename ci/containers/{alpine-315.Dockerfile => alpine-317.Dockerfile} (97%) diff --git a/ci/buildenv/alpine-315.sh b/ci/buildenv/alpine-317.sh similarity index 99% rename from ci/buildenv/alpine-315.sh rename to ci/buildenv/alpine-317.sh index 975914a7c2..e3f36ff8c6 100644 --- a/ci/buildenv/alpine-315.sh +++ b/ci/buildenv/alpine-317.sh @@ -60,6 +60,7 @@ function install_buildenv() { python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/containers/alpine-315.Dockerfile b/ci/containers/alpine-317.Dockerfile similarity index 97% rename from ci/containers/alpine-315.Dockerfile rename to ci/containers/alpine-317.Dockerfile index bad7e87c2b..162ae5671b 100644 --- a/ci/containers/alpine-315.Dockerfile +++ b/ci/containers/alpine-317.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.15 +FROM docker.io/library/alpine:3.17 RUN apk update && \ apk upgrade && \ @@ -61,6 +61,7 @@ RUN apk update && \ python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 96f8d3fb43..8910a19c79 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -51,22 +51,22 @@ x86_64-almalinux-8-clang-local-env: RPM: skip -x86_64-alpine-315-prebuilt-env: +x86_64-alpine-317-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-alpine-315-container + - job: x86_64-alpine-317-container optional: true allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 -x86_64-alpine-315-local-env: +x86_64-alpine-317-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: docker.io/library/alpine:3.15 - NAME: alpine-315 + IMAGE: docker.io/library/alpine:3.17 + NAME: alpine-317 x86_64-alpine-edge-prebuilt-env: diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templates.yml index edb4aba676..adc8a1a312 100644 --- a/ci/gitlab/container-templates.yml +++ b/ci/gitlab/container-templates.yml @@ -14,7 +14,7 @@ # Note: never publish from merge requests since they have non-committed code # .container_job: - image: docker:stable + image: docker:latest stage: containers interruptible: false needs: [] diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 3be84a2106..671483813e 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-8-container: NAME: almalinux-8 -x86_64-alpine-315-container: +x86_64-alpine-317-container: extends: .container_job allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 x86_64-alpine-edge-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 85d699bfae..4504068a64 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-315: x86_64 + alpine-317: x86_64 alpine-edge: jobs: -- 2.40.1

2 1

[PATCH 0/4] docs: Move 'golang' metadata headers into rST files and further XSL cleanups
by Peter Krempa 01 Jun '23

01 Jun '23

Pipeline: https://gitlab.com/pipo.sk/libvirt/-/jobs/4385932520 Impacted HTML files from pipeline: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4385932520/artifacts/website/lib… https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4385932520/artifacts/website/lib… https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4385932520/artifacts/website/go/… https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4385932520/artifacts/website/go/… Peter Krempa (4): docs: newapi: Remove unused 'docomponents' template docs: page.xsl: Drop passhrough of <script> elements into header docs: go: Add 'go-import' metadata via rST docs: Use '--exit-status=' option for 'rst2html5' docs/go/libvirt.rst | 3 +++ docs/go/libvirtxml.rst | 3 +++ docs/libvirt-go-xml.rst | 3 +++ docs/libvirt-go.rst | 3 +++ docs/meson.build | 2 +- docs/newapi.xsl | 18 ------------------ docs/page.xsl | 14 ++------------ 7 files changed, 15 insertions(+), 31 deletions(-) -- 2.40.1

2 6

[PATCH] qemu: add unmap stats to all domain stats
by Oleg Vasilev 01 Jun '23

01 Jun '23

From: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> Unmap stats are useful for debugging how efficient qemu is in freeing host disk space. Signed-off-by: Oleg Vasilev <oleg.vasilev(a)virtuozzo.com> --- src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5ee15bab7a..6725bddff9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -17451,6 +17451,9 @@ qemuDomainGetStatsBlockExportFrontend(const char *frontendname, virTypedParamListAddULLong(par, en->wr_req, "block.%zu.wr.reqs", idx) < 0 || virTypedParamListAddULLong(par, en->wr_bytes, "block.%zu.wr.bytes", idx) < 0 || virTypedParamListAddULLong(par, en->wr_total_times, "block.%zu.wr.times", idx) < 0 || + virTypedParamListAddULLong(par, en->unmap_req, "block.%zu.un.reqs", idx) < 0 || + virTypedParamListAddULLong(par, en->unmap_bytes, "block.%zu.un.bytes", idx) < 0 || + virTypedParamListAddULLong(par, en->unmap_total_times, "block.%zu.un.times", idx) < 0 || virTypedParamListAddULLong(par, en->flush_req, "block.%zu.fl.reqs", idx) < 0 || virTypedParamListAddULLong(par, en->flush_total_times, "block.%zu.fl.times", idx) < 0) return -1; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 72db0c0838..0c34319ea2 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -667,6 +667,9 @@ struct _qemuBlockStats { unsigned long long wr_total_times; unsigned long long flush_req; unsigned long long flush_total_times; + unsigned long long unmap_req; + unsigned long long unmap_bytes; + unsigned long long unmap_total_times; unsigned long long capacity; unsigned long long physical; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index b2c0b20a11..c0fe4a7554 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2280,6 +2280,9 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValue *dev, QEMU_MONITOR_BLOCK_STAT_GET("wr_total_time_ns", bstats->wr_total_times, false); QEMU_MONITOR_BLOCK_STAT_GET("flush_operations", bstats->flush_req, false); QEMU_MONITOR_BLOCK_STAT_GET("flush_total_time_ns", bstats->flush_total_times, false); + QEMU_MONITOR_BLOCK_STAT_GET("unmap_operations", bstats->unmap_req, false); + QEMU_MONITOR_BLOCK_STAT_GET("unmap_bytes", bstats->unmap_bytes, false); + QEMU_MONITOR_BLOCK_STAT_GET("unmap_total_time_ns", bstats->unmap_total_times, false); #undef QEMU_MONITOR_BLOCK_STAT_GET if ((parent = virJSONValueObjectGetObject(dev, "parent")) && -- 2.40.1

2 1

[libvirt PATCHv3 for 9.4.0] conf: node_device: use separate variables for parsing integers
by Ján Tomko 01 Jun '23

01 Jun '23

In virNodeDeviceGetSCSIHostCaps, there is a pattern of reusing a tmp value and stealing the pointer. But in two case it is not stolen. Use separate variables for them to avoid mixing autofree with manual free() calls. This fixes the memory leak of the "max_npiv_vports" string. (The other gets freed anyway because it was the last use of "tmp" in the function") Fixes: 8a0cb5f73ade3900546718eabe70cb064c6bd22c Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- v3: fix "declaration after statement" warning src/conf/node_device_conf.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index fcee9c027c..172223225f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2857,29 +2857,32 @@ virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHost *scsi_host) } if (virVHBAIsVportCapable(NULL, scsi_host->host)) { + g_autofree char *max_vports = NULL; + g_autofree char *vports = NULL; + scsi_host->flags |= VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS; - if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, + if (!(max_vports = virVHBAGetConfig(NULL, scsi_host->host, "max_npiv_vports"))) { VIR_WARN("Failed to read max_npiv_vports for host%d", scsi_host->host); goto cleanup; } - if (virStrToLong_i(tmp, NULL, 10, &scsi_host->max_vports) < 0) { - VIR_WARN("Failed to parse value of max_npiv_vports '%s'", tmp); + if (virStrToLong_i(max_vports, NULL, 10, &scsi_host->max_vports) < 0) { + VIR_WARN("Failed to parse value of max_npiv_vports '%s'", max_vports); goto cleanup; } - if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, + if (!(vports = virVHBAGetConfig(NULL, scsi_host->host, "npiv_vports_inuse"))) { VIR_WARN("Failed to read npiv_vports_inuse for host%d", scsi_host->host); goto cleanup; } - if (virStrToLong_i(tmp, NULL, 10, &scsi_host->vports) < 0) { - VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", tmp); + if (virStrToLong_i(vports, NULL, 10, &scsi_host->vports) < 0) { + VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", vports); goto cleanup; } } -- 2.40.1

2 1

[PATCH v6 00/11] tracing: remove dynamic vcpu state
by Alex Bennée 31 May '23

31 May '23

Hi Stefan, The references dynamic vcpu tracing support was removed when the original TCG trace points where removed. However there was still a legacy of dynamic trace state to track this in cpu.h and extra hash variables to track TBs. While the removed vcpu tracepoints are not in generated code (or helpers) they still bring in a bunch of machinery to manage the state so I've pulled them out. We keep and rename one (cpu_reset) to a static trace points which dump vcpu->index as it is useful to f4bug. v6 new patch to shuffle deprecated, added rth's rb, qapi doc cleanups Please queue into your tree. Alex Bennée (11): *-user: remove the guest_user_syscall tracepoints trace-events: remove the remaining vcpu trace events trace: remove vcpu_id from the TraceEvent structure scripts/qapi: document the tool that generated the file docs/deprecated: move QMP events bellow QMP command section qapi: make the vcpu parameters deprecated for 8.1 trace: remove code that depends on setting vcpu trace: remove control-vcpu.h tcg: remove the final vestiges of dstate hw/9pfs: use qemu_xxhash4 accel/tcg: include cs_base in our hash calculations docs/about/deprecated.rst | 25 +++++--- qapi/trace.json | 40 ++++++------- accel/tcg/tb-hash.h | 6 +- include/exec/exec-all.h | 3 - include/hw/core/cpu.h | 5 -- include/qemu/xxhash.h | 23 +++++-- include/user/syscall-trace.h | 4 -- trace/control-internal.h | 10 ---- trace/control-vcpu.h | 63 -------------------- trace/control.h | 48 --------------- trace/event-internal.h | 2 - accel/tcg/cpu-exec.c | 7 +-- accel/tcg/tb-maint.c | 5 +- accel/tcg/translate-all.c | 6 -- bsd-user/freebsd/os-syscall.c | 2 - hw/9pfs/9p.c | 5 +- hw/core/cpu-common.c | 6 +- stubs/trace-control.c | 13 ---- trace/control-target.c | 109 +++------------------------------- trace/control.c | 28 --------- trace/qmp.c | 76 +++--------------------- trace/trace-hmp-cmds.c | 18 +----- util/qsp.c | 2 +- hw/core/trace-events | 3 + scripts/qapi/gen.py | 9 ++- scripts/tracetool/format/c.py | 6 -- scripts/tracetool/format/h.py | 16 +---- trace-events | 50 ---------------- 28 files changed, 94 insertions(+), 496 deletions(-) delete mode 100644 trace/control-vcpu.h -- 2.39.2

3 14

[PULL 00/11] Tracing patches
by Stefan Hajnoczi 31 May '23

31 May '23

The following changes since commit 51bdb0b57a2d9e84d6915fbae7b5d76c8820cf3c: Merge tag 'pull-tcg-20230530' of https://gitlab.com/rth7680/qemu into staging (2023-05-30 13:25:18 -0700) are available in the Git repository at: https://gitlab.com/stefanha/qemu.git tags/tracing-pull-request for you to fetch changes up to 2e7eda52e5ea2f066b37ecd9fdb5983851eabbbf: accel/tcg: include cs_base in our hash calculations (2023-05-31 13:21:53 -0400) ---------------------------------------------------------------- Pull request ---------------------------------------------------------------- Alex Bennée (11): *-user: remove the guest_user_syscall tracepoints trace-events: remove the remaining vcpu trace events trace: remove vcpu_id from the TraceEvent structure scripts/qapi: document the tool that generated the file docs/deprecated: move QMP events bellow QMP command section qapi: make the vcpu parameters deprecated for 8.1 trace: remove code that depends on setting vcpu trace: remove control-vcpu.h tcg: remove the final vestiges of dstate hw/9pfs: use qemu_xxhash4 accel/tcg: include cs_base in our hash calculations docs/about/deprecated.rst | 25 +++++--- qapi/trace.json | 40 ++++++------- accel/tcg/tb-hash.h | 6 +- include/exec/exec-all.h | 3 - include/hw/core/cpu.h | 5 -- include/qemu/xxhash.h | 23 +++++-- include/user/syscall-trace.h | 4 -- trace/control-internal.h | 10 ---- trace/control-vcpu.h | 63 -------------------- trace/control.h | 48 --------------- trace/event-internal.h | 2 - accel/tcg/cpu-exec.c | 7 +-- accel/tcg/tb-maint.c | 5 +- accel/tcg/translate-all.c | 6 -- bsd-user/freebsd/os-syscall.c | 2 - hw/9pfs/9p.c | 5 +- hw/core/cpu-common.c | 6 +- stubs/trace-control.c | 13 ---- trace/control-target.c | 109 +++------------------------------- trace/control.c | 28 --------- trace/qmp.c | 76 +++--------------------- trace/trace-hmp-cmds.c | 18 +----- util/qsp.c | 2 +- hw/core/trace-events | 3 + scripts/qapi/gen.py | 9 ++- scripts/tracetool/format/c.py | 6 -- scripts/tracetool/format/h.py | 16 +---- trace-events | 50 ---------------- 28 files changed, 94 insertions(+), 496 deletions(-) delete mode 100644 trace/control-vcpu.h -- 2.40.1

1 11

[PATCH for 9.4.0] include: Fix 'Since' for new VIR_MIGRATE_PARAM_COMPRESSION_* macros
by Michal Privoznik 31 May '23

31 May '23

In v9.3.0-98-g150ae3e62b two new macros were introduced: VIR_MIGRATE_PARAM_COMPRESSION_ZLIB_LEVEL and VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL. But both list 9.1.0 as the version they were introduced in (this is because the patch was sent in that release time frame). Change the version to the current release. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- include/libvirt/libvirt-domain.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 20467849a4..a1902546bb 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1329,7 +1329,7 @@ typedef enum { * VIR_TYPED_PARAM_INT. Accepted values are in range 0-9. 0 is no compression, * 1 is maximum speed and 9 is maximum compression. * - * Since: 9.1.0 + * Since: 9.4.0 */ # define VIR_MIGRATE_PARAM_COMPRESSION_ZLIB_LEVEL "compression.zlib.level" @@ -1340,7 +1340,7 @@ typedef enum { * VIR_TYPED_PARAM_INT. Accepted values are in range 0-20. 0 is no compression, * 1 is maximum speed and 20 is maximum compression. * - * Since: 9.1.0 + * Since: 9.4.0 */ # define VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL "compression.zstd.level" -- 2.39.3

2 1

[libvirt PATCH] ci: refresh with latest lcitool manifest
by Erik Skultety 31 May '23

31 May '23

Adds Alpine 3.17 and 3.18 targets. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ci/buildenv/{alpine-315.sh => alpine-317.sh} | 1 + .../{alpine-315.Dockerfile => alpine-317.Dockerfile} | 3 ++- ci/gitlab/builds.yml | 12 ++++++------ ci/gitlab/container-templates.yml | 2 +- ci/gitlab/containers.yml | 4 ++-- ci/manifest.yml | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) rename ci/buildenv/{alpine-315.sh => alpine-317.sh} (99%) rename ci/containers/{alpine-315.Dockerfile => alpine-317.Dockerfile} (97%) diff --git a/ci/buildenv/alpine-315.sh b/ci/buildenv/alpine-317.sh similarity index 99% rename from ci/buildenv/alpine-315.sh rename to ci/buildenv/alpine-317.sh index 975914a7c2..e3f36ff8c6 100644 --- a/ci/buildenv/alpine-315.sh +++ b/ci/buildenv/alpine-317.sh @@ -60,6 +60,7 @@ function install_buildenv() { python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/containers/alpine-315.Dockerfile b/ci/containers/alpine-317.Dockerfile similarity index 97% rename from ci/containers/alpine-315.Dockerfile rename to ci/containers/alpine-317.Dockerfile index bad7e87c2b..162ae5671b 100644 --- a/ci/containers/alpine-315.Dockerfile +++ b/ci/containers/alpine-317.Dockerfile @@ -4,7 +4,7 @@ # # https://gitlab.com/libvirt/libvirt-ci -FROM docker.io/library/alpine:3.15 +FROM docker.io/library/alpine:3.17 RUN apk update && \ apk upgrade && \ @@ -61,6 +61,7 @@ RUN apk update && \ python3 \ qemu-img \ readline-dev \ + rpcgen \ samurai \ sed \ util-linux-dev \ diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 96f8d3fb43..8910a19c79 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -51,22 +51,22 @@ x86_64-almalinux-8-clang-local-env: RPM: skip -x86_64-alpine-315-prebuilt-env: +x86_64-alpine-317-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-alpine-315-container + - job: x86_64-alpine-317-container optional: true allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 -x86_64-alpine-315-local-env: +x86_64-alpine-317-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: docker.io/library/alpine:3.15 - NAME: alpine-315 + IMAGE: docker.io/library/alpine:3.17 + NAME: alpine-317 x86_64-alpine-edge-prebuilt-env: diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templates.yml index edb4aba676..adc8a1a312 100644 --- a/ci/gitlab/container-templates.yml +++ b/ci/gitlab/container-templates.yml @@ -14,7 +14,7 @@ # Note: never publish from merge requests since they have non-committed code # .container_job: - image: docker:stable + image: docker:latest stage: containers interruptible: false needs: [] diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 3be84a2106..671483813e 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-8-container: NAME: almalinux-8 -x86_64-alpine-315-container: +x86_64-alpine-317-container: extends: .container_job allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 x86_64-alpine-edge-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 85d699bfae..4504068a64 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-315: x86_64 + alpine-317: x86_64 alpine-edge: jobs: -- 2.40.1

2 1

[PATCH python] virDomainMigrate3Params: Add missing params
by Han Han 31 May '23

31 May '23

Add these missing migrate params: - VIR_MIGRATE_PARAM_DISKS_URI, since libvirt v6.8.0(49186372db) - VIR_MIGRATE_PARAM_TLS_DESTINATION, since libvirt v6.0.0(1b8af37213e) - VIR_MIGRATE_PARAM_COMPRESSION_ZLIB_LEVEL and VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL, since libvirt v9.4.0(150ae3e62b9) Signed-off-by: Han Han <hhan(a)redhat.com> --- libvirt-override.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libvirt-override.c b/libvirt-override.c index 0c198cb..8a86174 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -8154,6 +8154,18 @@ static virPyTypedParamsHint virPyDomainMigrate3Params[] = { # ifdef VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS { VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, VIR_TYPED_PARAM_INT }, # endif +# ifdef VIR_MIGRATE_PARAM_DISKS_URI + { VIR_MIGRATE_PARAM_DISKS_URI, VIR_TYPED_PARAM_STRING }, +#endif +#ifdef VIR_MIGRATE_PARAM_TLS_DESTINATION + { VIR_MIGRATE_PARAM_TLS_DESTINATION, VIR_TYPED_PARAM_STRING }, +#endif +#ifdef VIR_MIGRATE_PARAM_COMPRESSION_ZLIB_LEVEL + { VIR_MIGRATE_PARAM_COMPRESSION_ZLIB_LEVEL, VIR_TYPED_PARAM_INT }, +#endif +#ifdef VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL + { VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL, VIR_TYPED_PARAM_INT }, +#endif }; -- 2.40.1

2 1

[libvirt PATCHv2] conf: node_device: use separate variables for parsing integers
by Ján Tomko 31 May '23

31 May '23

In virNodeDeviceGetSCSIHostCaps, there is a pattern of reusing a tmp value and stealing the pointer. But in two case it is not stolen. Use separate variables for them to avoid mixing autofree with manual free() calls. Fixes: 8a0cb5f73ade3900546718eabe70cb064c6bd22c Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- v2: also replace the variable name in the error message and fix one more case src/conf/node_device_conf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index fcee9c027c..48a47f0f86 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2858,28 +2858,30 @@ virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHost *scsi_host) if (virVHBAIsVportCapable(NULL, scsi_host->host)) { scsi_host->flags |= VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS; + g_autofree char *max_vports = NULL; + g_autofree char *vports = NULL; - if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, + if (!(max_vports = virVHBAGetConfig(NULL, scsi_host->host, "max_npiv_vports"))) { VIR_WARN("Failed to read max_npiv_vports for host%d", scsi_host->host); goto cleanup; } - if (virStrToLong_i(tmp, NULL, 10, &scsi_host->max_vports) < 0) { - VIR_WARN("Failed to parse value of max_npiv_vports '%s'", tmp); + if (virStrToLong_i(max_vports, NULL, 10, &scsi_host->max_vports) < 0) { + VIR_WARN("Failed to parse value of max_npiv_vports '%s'", max_vports); goto cleanup; } - if (!(tmp = virVHBAGetConfig(NULL, scsi_host->host, + if (!(vports = virVHBAGetConfig(NULL, scsi_host->host, "npiv_vports_inuse"))) { VIR_WARN("Failed to read npiv_vports_inuse for host%d", scsi_host->host); goto cleanup; } - if (virStrToLong_i(tmp, NULL, 10, &scsi_host->vports) < 0) { - VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", tmp); + if (virStrToLong_i(vports, NULL, 10, &scsi_host->vports) < 0) { + VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", vports); goto cleanup; } } -- 2.40.1

1 0