- 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

Revisiting the virsh hypervisor-cpu-models/definitions commands
by Collin Walling 30 May '23

30 May '23

Daniel, Tim, (and others on the upstream list that'd like to chime in) Harken back to a few months ago when I presented a few patches to introduce the virsh hypervisor-cpu-models command. The proposal was turned down, and I was pointed to a patch-set/discussion that Tim introduced almost a year ago today. From what I was able to gather with respect to Tim's patches, it seems like this is not a direction that x86 wants to pursue, but I still see value in these commands for s390 (and perhaps other architectures that may/currently implement CPU models via the hypervisor). I see value in these commands that shine when including the other hypervisor-cpu-* commands: baseline and comparison. What I'd like to accomplish with this conversation: is there an agreement where these virsh commands may be implemented, or at least some guidance on what should be expected for virsh -> hypervisor CPU model commands going forward? I believe that these commands will assist a user in creating a migration-safe CPU model for a guest in a mixed-generation host environment without having to query details from a remote machine. Say I have two machines, a z14 and a z15. If I wanted to know which CPU model I should define my guest with such that I can guarantee a future migration between the two machines, I would need to run domcapabilities on one machine, then transfer it to the other machine to then perform a baseline. I believe this process could be simplified and remove the need to query a remote machine for its CPU definition. With hypervisor-cpu-models, I can get a list of CPU models and their exact names that I'd like to consider in my mixed environment. Let's say I'm on my z15 machine. I want the name of the appropriate z14 model. I run the hypervisor-cpu-models command and I see that the appropriate model for a z14 is a z14.2-base. Now I can feed that string into hypervisor-cpu-definitions and get a proper XML-formatted CPU model. This XML can be fed into hypervisor-cpu-baseline, and produce a CPU model that can run on both a z14 and z15. I was able to compute a migration-safe CPU model for my mixed environment without having to query a remote machine for their host-model. While this is a rudimentary example, future models may become more complex as certain features are removed or deprecated from CPU models (or make it easier for other architectures that have a non-sequential naming scheme). There may be more complex examples that help support this idea, but the main point is that a user can compute a CPU model from a single libvirt instance instead of having to query details from multiple machines. This is achieved by having a set of hypervisor-cpu-* commands to work with. For reference, here are links to the patches and discussions: - Mine I proposed earlier this year (March 2023): https://listman.redhat.com/archives/libvir-list/2023-March/238981.html And here are Tim's: - Patch Set (June 2022): https://listman.redhat.com/archives/libvir-list/2022-June/232626.html - Follow-up Discussion (July 2022): https://listman.redhat.com/archives/libvir-list/2022-July/232891.html Thanks for your time, - Collin

3 4

[libvirt PATCH] conf: node_device: use separate variable for parsing an integer
by Ján Tomko 30 May '23

30 May '23

In virNodeDeviceGetSCSIHostCaps, there is a pattern of reusing a tmp value and stealing the pointer. But in one case it is not stolen. Use a separate variable for it to avoid mixing autofree with manual free() calls. Fixes: 8a0cb5f73ade3900546718eabe70cb064c6bd22c Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/conf/node_device_conf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index fcee9c027c..2c98844c47 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2858,15 +2858,16 @@ 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; - 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) { + if (virStrToLong_i(max_vports, NULL, 10, &scsi_host->max_vports) < 0) { VIR_WARN("Failed to parse value of max_npiv_vports '%s'", tmp); goto cleanup; } -- 2.40.1

2 1

Entering freeze for libvirt-9.4.0
by Jiri Denemark 30 May '23

30 May '23

I have just tagged v9.4.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://download.libvirt.org/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

1 1

[PATCH] NEWS: Document my contributions for upcoming release
by Michal Privoznik 30 May '23

30 May '23

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- NEWS.rst | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 1b85ef6d37..1ee932db72 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -23,8 +23,45 @@ v9.4.0 (unreleased) * **Improvements** + * Adapt to musl-1.2.4 + + The latest version of musl stop declaring some symbols that libvirt's test + suite used (for redirecting ``stat()`` family of functions), leaving the + tests broken. This is now fixed and the test suite works even with the + latest version of musl. + + * conf: Introduce ``<address/>`` for virtio-mem and virtio-pmem + + To ensure guest ABI stability, libvirt persists address for memory devices, + now including ``virtio-mem`` and ``virtio-pmem``. The address can be also + specified by user. + * **Bug fixes** + * qemu: Account for NVMe disks when calculating memlock limit on hotplug + + When no ``<hard_limit/>`` is set, libvirt still tries to guess a sensible + limit for memlock for domains. But this limit was not calculated properly + on a hotplug of ``<disk type='nvme'/>``. + + * numa: Deny other memory modes than ``restrictive``` if a memnode is ``restrictive`` + + Due to a missing check it was possible to define a domain with incorrect + ``<numatune/>``. For instance it was possible to have a ``<memnode + mode="restrictive"/>`` and ``<memory/>`` of a different mode. This is now + forbidden and if either all ``<memnode/>``-s and ``<memory/>`` have to have + ``restrictive`` mode, or none. + + * qemu: Start emulator thread with more generous ``cpuset.mems`` + + To ensure memory is allocated only from configured NUMA nodes, libvirt sets + up cpuset CGgroup controller, even before QEMU is executed. But this may + prevent QEMU from setting affinity of threads that allocate memory. Since + these threads are spawned from the emulator thread, the initial set up must + be more generous and include union of all host NUMA nodes that are allowed + in the domain definition. Once QEMU has allocated all its memory, the + emulator thread is restricted further, as it otherwise would be. + v9.3.0 (2023-05-02) =================== -- 2.39.3

2 1

[PATCH] conf: Reject invalid device's <seclabel relabel='yes'/> with no <label/>
by Michal Privoznik 30 May '23

30 May '23

We allow (some) domain devices to have a different <seclabel/> than the top level domain one (this is mostly to allow access to a resource for multiple domains). Now, we do couple of sanity checks for such <seclabel/>, e.g. when the <label/> is specified, but '@relabel' is set to no. But what we are missing is the opposite: then '@relabel' is set, but no <label/> was provided. Our schema already denies such combination. Make our parser behave the same. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2160356 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 14 +++++++- .../seclabel-device-relabel-invalid.err | 1 + .../seclabel-device-relabel-invalid.xml | 35 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err create mode 100644 tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e7226c5f99..0edb1bda9d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6910,6 +6910,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn, for (i = 0; i < n; i++) { g_autofree char *model = NULL; g_autofree char *label = NULL; + int relabelSpecified; virTristateBool t; /* get model associated to this override */ @@ -6926,7 +6927,9 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn, seclabels[i]->model = g_steal_pointer(&model); } - if (virXMLPropTristateBool(list[i], "relabel", VIR_XML_PROP_NONE, &t) < 0) + relabelSpecified = virXMLPropTristateBool(list[i], "relabel", + VIR_XML_PROP_NONE, &t); + if (relabelSpecified < 0) goto error; seclabels[i]->relabel = true; @@ -6953,6 +6956,15 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn, NULLSTR(seclabels[i]->model)); goto error; } + + if (relabelSpecified > 0 && + flags & VIR_DOMAIN_DEF_PARSE_INACTIVE && + seclabels[i]->relabel && !seclabels[i]->label) { + virReportError(VIR_ERR_XML_ERROR, + _("Cannot specify relabel if label is missing. model=%1$s"), + NULLSTR(seclabels[i]->model)); + goto error; + } } *nseclabels_rtn = nseclabels; diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err new file mode 100644 index 0000000000..0bcdac9772 --- /dev/null +++ b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.err @@ -0,0 +1 @@ +XML error: Cannot specify relabel if label is missing. model=selinux diff --git a/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml new file mode 100644 index 0000000000..f5e2c418b6 --- /dev/null +++ b/tests/qemuxml2argvdata/seclabel-device-relabel-invalid.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i386</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'> + <seclabel model='dac' relabel='no'/> + <seclabel model='selinux' relabel='yes'/> + </source> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'/> + </devices> + <seclabel type='static' model='selinux' relabel='no'> + <label>system_u:system_r:svirt_custom_t:s0:c192,c392</label> + </seclabel> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2cc9bd074a..d914d8cbea 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1913,6 +1913,7 @@ mymain(void) DO_TEST_NOCAPS("seclabel-dac-none"); DO_TEST_PARSE_ERROR_NOCAPS("seclabel-multiple"); DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-duplicates"); + DO_TEST_PARSE_ERROR_NOCAPS("seclabel-device-relabel-invalid"); DO_TEST_CAPS_LATEST_PPC64("pseries-basic"); DO_TEST_CAPS_LATEST_PPC64("pseries-vio"); -- 2.39.3

2 1

[PATCH] conf: Run virDomainInputDefPostParse() only for VIR_DOMAIN_DEVICE_INPUT
by Michal Privoznik 26 May '23

26 May '23

Due to missed break; statement the virDomainInputDefPostParse() is called not only for VIR_DOMAIN_DEVICE_INPUT but also VIR_DOMAIN_DEVICE_LEASE and VIR_DOMAIN_DEVICE_NET, which can lead to all sort of unpredictable results. Fixes: c4bc4d3b82fbe22e03c986ca896090f481df5c10 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_postparse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c index 7ef478e3e1..c6695b460d 100644 --- a/src/conf/domain_postparse.c +++ b/src/conf/domain_postparse.c @@ -725,12 +725,13 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDef *dev, ret = virDomainFSDefPostParse(dev->data.fs); break; - case VIR_DOMAIN_DEVICE_LEASE: - case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_INPUT: virDomainInputDefPostParse(dev->data.input, def); ret = 0; break; + + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_NET: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_GRAPHICS: -- 2.39.3

2 1

[PATCH v1 0/3] Make virtio-mem and virtio-pmem address stable
by Michal Privoznik 26 May '23

26 May '23

*** BLURB HERE *** Michal Prívozník (3): conf: Introduce <address/> for virtio-mem and virtio-pmem qemu: Fill virtio-mem/virtio-pmem .memaddr at runtime qemu_command: Generate .memaddr for virtio-mem and virtio-pmem docs/formatdomain.rst | 7 ++++++ src/conf/domain_conf.c | 24 ++++++++++++++++++- src/conf/domain_conf.h | 2 ++ src/conf/domain_validate.c | 6 +++++ src/conf/schemas/domaincommon.rng | 7 ++++++ src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 7 ++++-- src/qemu/qemu_monitor_json.c | 12 ++++++++-- ...mory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-mem.xml | 1 + ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 2 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-pmem.xml | 1 + 13 files changed, 66 insertions(+), 8 deletions(-) -- 2.39.2

3 7

[PATCH 0/7] qemu: Don't use deprecated '-no-acpi' and RFC: fix ACPI config for machine types not supporting ACPI
by Peter Krempa 26 May '23

26 May '23

The first part of the series is a straightforward replacement of '-no-acpi' by '-machine acpi=on/off' based on configuration. '-no-acpi' was recently deprecated by qemu thus we must adapt. The second part of this series fixes the use of ACPI (or lack thereof) for ARM machine types which don't support ACPI. We'll break such commandline by adding '-no-acpi' due to historical baggage. The second part is RFC as it's based on a qemu patch I'll be posting along this series. This posting will also illustrate to qemu devs how libvirt itends to use the added information. I'll post the link to the qemu patch once I submit it. Peter Krempa (7): qemu: capabilities: Introduce QEMU_CAPS_MACHINE_ACPI qemu: Use '-machine acpi=on/off' instead of deprecated '-no-acpi' qemu: capabilities: Refactor XML parsing in virQEMUCapsLoadMachines RFC BELOW: qemu: capabilities: Extract whether machine type supports ACPI qemu: capabilities: Introduce virQEMUCapsMachineSupportsACPI XXX: tests: qemucapabilitiesdata: Regenerate with support for 'acpi' in 'query-machines' qemu: command: Don't format '-machine acpi=off' for machine types not supporting ACPI src/qemu/qemu_capabilities.c | 89 ++-- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_capspriv.h | 3 +- src/qemu/qemu_command.c | 51 ++ src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 12 + .../caps_4.2.0.x86_64.xml | 2 +- .../caps_5.0.0.x86_64.xml | 2 +- .../caps_5.1.0.x86_64.xml | 2 +- .../caps_5.2.0.x86_64.xml | 2 +- .../caps_6.0.0.x86_64.xml | 2 +- .../caps_6.1.0.x86_64.xml | 2 +- .../caps_6.2.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 + .../caps_6.2.0.x86_64.xml | 2 +- .../caps_7.0.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 + .../caps_7.0.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 + .../caps_7.1.0.x86_64.xml | 2 +- .../caps_7.2.0.x86_64.xml | 2 +- .../caps_8.0.0.x86_64.replies | 471 ++++++++++++------ .../caps_8.0.0.x86_64.xml | 244 ++++----- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 3 +- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 3 +- .../aarch64-features-sve.aarch64-latest.args | 3 +- .../aarch64-tpm.aarch64-latest.args | 3 +- .../aarch64-virt-graphics.aarch64-latest.args | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 2 +- ...h64-virtio-pci-default.aarch64-latest.args | 3 +- .../audio-alsa-best.x86_64-latest.args | 3 +- .../audio-alsa-full.x86_64-latest.args | 3 +- .../audio-alsa-minimal.x86_64-latest.args | 3 +- .../audio-coreaudio-best.x86_64-latest.args | 3 +- .../audio-coreaudio-full.x86_64-latest.args | 3 +- ...audio-coreaudio-minimal.x86_64-latest.args | 3 +- ...udio-default-nographics.x86_64-latest.args | 3 +- .../audio-default-sdl.x86_64-latest.args | 3 +- .../audio-default-spice.x86_64-latest.args | 3 +- .../audio-default-vnc.x86_64-latest.args | 3 +- .../audio-file-best.x86_64-latest.args | 3 +- .../audio-file-full.x86_64-latest.args | 3 +- .../audio-file-minimal.x86_64-latest.args | 3 +- .../audio-jack-full.x86_64-latest.args | 3 +- .../audio-jack-minimal.x86_64-latest.args | 3 +- .../audio-many-backends.x86_64-latest.args | 3 +- .../audio-none-best.x86_64-latest.args | 3 +- .../audio-none-full.x86_64-latest.args | 3 +- .../audio-none-minimal.x86_64-latest.args | 3 +- .../audio-oss-best.x86_64-latest.args | 3 +- .../audio-oss-full.x86_64-latest.args | 3 +- .../audio-oss-minimal.x86_64-latest.args | 3 +- .../audio-pulseaudio-best.x86_64-latest.args | 3 +- .../audio-pulseaudio-full.x86_64-latest.args | 3 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 3 +- .../audio-sdl-best.x86_64-latest.args | 3 +- .../audio-sdl-full.x86_64-latest.args | 3 +- .../audio-sdl-minimal.x86_64-latest.args | 3 +- .../audio-spice-best.x86_64-latest.args | 3 +- .../audio-spice-full.x86_64-latest.args | 3 +- .../audio-spice-minimal.x86_64-latest.args | 3 +- .../blkdeviotune-group-num.x86_64-latest.args | 3 +- ...blkdeviotune-max-length.x86_64-latest.args | 3 +- .../blkdeviotune-max.x86_64-latest.args | 3 +- .../blkdeviotune.x86_64-latest.args | 3 +- .../boot-cdrom.x86_64-latest.args | 3 +- .../boot-complex.x86_64-latest.args | 3 +- .../boot-floppy-q35.x86_64-latest.args | 3 +- .../boot-floppy.x86_64-latest.args | 3 +- ...boot-menu-disable-drive.x86_64-latest.args | 3 +- .../boot-menu-disable.x86_64-latest.args | 3 +- ...enu-enable-with-timeout.x86_64-latest.args | 3 +- .../boot-menu-enable.x86_64-latest.args | 3 +- .../boot-multi.x86_64-latest.args | 3 +- .../boot-network.x86_64-latest.args | 3 +- .../boot-order.x86_64-latest.args | 3 +- ...l-qemu-vdagent-features.x86_64-latest.args | 3 +- .../channel-qemu-vdagent.x86_64-latest.args | 3 +- .../channel-unix-guestfwd.x86_64-latest.args | 3 +- .../clock-absolute.x86_64-latest.args | 3 +- .../clock-timer-armvtimer.aarch64-latest.args | 3 +- .../console-compat-auto.x86_64-latest.args | 3 +- .../console-compat-chardev.x86_64-latest.args | 3 +- .../console-compat.x86_64-latest.args | 3 +- .../console-virtio-unix.x86_64-latest.args | 3 +- .../controller-usb-order.x86_64-latest.args | 3 +- .../controller-virtio-scsi.x86_64-latest.args | 3 +- ...-Icelake-Server-pconfig.x86_64-latest.args | 3 +- .../cpu-eoi-disabled.x86_64-latest.args | 2 +- .../cpu-eoi-enabled.x86_64-latest.args | 2 +- .../cpu-host-model.x86_64-4.2.0.args | 3 +- .../cpu-host-model.x86_64-5.0.0.args | 3 +- .../cpu-host-model.x86_64-5.1.0.args | 3 +- .../cpu-host-model.x86_64-5.2.0.args | 3 +- .../cpu-host-model.x86_64-6.0.0.args | 3 +- .../cpu-host-model.x86_64-6.1.0.args | 3 +- .../cpu-host-model.x86_64-latest.args | 3 +- .../cpu-translation.x86_64-latest.args | 3 +- .../cputune-cpuset-big-id.x86_64-latest.args | 3 +- .../crypto-builtin.x86_64-latest.args | 3 +- ...ult-video-type-aarch64.aarch64-latest.args | 3 +- ...default-video-type-ppc64.ppc64-latest.args | 2 +- .../devices-acpi-index.x86_64-latest.args | 2 +- .../disk-aio-io_uring.x86_64-latest.args | 3 +- .../disk-aio.x86_64-latest.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- ...-backing-chains-noindex.x86_64-latest.args | 3 +- .../disk-blockio.x86_64-latest.args | 3 +- .../disk-boot-cdrom.x86_64-latest.args | 3 +- .../disk-boot-disk.x86_64-latest.args | 3 +- .../disk-cache.x86_64-latest.args | 3 +- .../disk-cdrom-bus-other.x86_64-latest.args | 3 +- ...m-empty-network-invalid.x86_64-latest.args | 3 +- .../disk-cdrom-network.x86_64-latest.args | 2 +- .../disk-cdrom-tray.x86_64-latest.args | 3 +- .../disk-cdrom.x86_64-latest.args | 3 +- .../disk-copy_on_read.x86_64-latest.args | 3 +- .../disk-detect-zeroes.x86_64-latest.args | 3 +- .../disk-discard.x86_64-latest.args | 3 +- .../disk-error-policy.x86_64-latest.args | 3 +- .../disk-floppy-q35.x86_64-latest.args | 3 +- .../disk-floppy-tray.x86_64-latest.args | 3 +- .../disk-floppy.x86_64-latest.args | 3 +- .../disk-fmt-qcow.x86_64-latest.args | 3 +- .../disk-geometry.x86_64-latest.args | 3 +- .../disk-ide-split.x86_64-latest.args | 3 +- .../disk-ide-wwn.x86_64-latest.args | 3 +- .../disk-ioeventfd.x86_64-latest.args | 3 +- .../disk-metadata-cache.x86_64-latest.args | 3 +- .../disk-network-gluster.x86_64-latest.args | 3 +- .../disk-network-http.x86_64-latest.args | 3 +- .../disk-network-iscsi.x86_64-latest.args | 3 +- .../disk-network-nbd.x86_64-latest.args | 3 +- .../disk-network-nfs.x86_64-latest.args | 3 +- ...-network-rbd-encryption.x86_64-latest.args | 3 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 3 +- .../disk-network-rbd.x86_64-latest.args | 3 +- .../disk-network-sheepdog.x86_64-6.0.0.args | 3 +- ...isk-network-source-auth.x86_64-latest.args | 3 +- ...rk-tlsx509-nbd-hostname.x86_64-latest.args | 3 +- ...disk-network-tlsx509-nbd.x86_64-5.2.0.args | 3 +- ...isk-network-tlsx509-nbd.x86_64-latest.args | 3 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.args | 3 +- .../disk-no-boot.x86_64-latest.args | 3 +- .../disk-nvme.x86_64-latest.args | 3 +- .../disk-order.x86_64-latest.args | 3 +- .../disk-readonly-disk.x86_64-latest.args | 3 +- .../disk-rotation.x86_64-latest.args | 3 +- .../disk-sata-device.x86_64-latest.args | 3 +- .../disk-scsi-device-auto.x86_64-latest.args | 3 +- .../disk-scsi-disk-split.x86_64-latest.args | 3 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 3 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 3 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 3 +- .../disk-scsi.x86_64-latest.args | 3 +- .../disk-serial.x86_64-latest.args | 3 +- .../disk-shared.x86_64-latest.args | 3 +- .../disk-slices.x86_64-latest.args | 3 +- .../disk-snapshot.x86_64-latest.args | 3 +- .../disk-source-fd.x86_64-latest.args | 3 +- .../disk-source-pool-mode.x86_64-latest.args | 3 +- .../disk-source-pool.x86_64-latest.args | 3 +- .../disk-transient.x86_64-latest.args | 3 +- ...sk-usb-device-removable.x86_64-latest.args | 3 +- .../disk-usb-device.x86_64-latest.args | 3 +- .../disk-vhostuser-numa.x86_64-4.2.0.args | 3 +- .../disk-vhostuser-numa.x86_64-latest.args | 3 +- .../disk-vhostuser.x86_64-latest.args | 3 +- .../disk-virtio-queues.x86_64-latest.args | 3 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 3 +- ...irtio-scsi-reservations.x86_64-latest.args | 3 +- .../disk-virtio.x86_64-latest.args | 3 +- .../encrypted-disk-usage.x86_64-latest.args | 3 +- .../encrypted-disk.x86_64-latest.args | 3 +- .../eoi-disabled.x86_64-latest.args | 2 +- .../eoi-enabled.x86_64-latest.args | 2 +- .../event_idx.x86_64-latest.args | 3 +- ...d-memory-numa-topology4.x86_64-latest.args | 3 +- .../fips-enabled.x86_64-5.1.0.args | 3 +- .../fips-enabled.x86_64-latest.args | 3 +- ...are-auto-bios-stateless.x86_64-latest.args | 2 +- .../firmware-auto-bios.x86_64-latest.args | 2 +- ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- ...-auto-efi-loader-secure.x86_64-latest.args | 2 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...are-auto-efi-no-secboot.x86_64-latest.args | 2 +- ...firmware-auto-efi-nvram.x86_64-latest.args | 2 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 2 +- ...ware-auto-efi-stateless.x86_64-latest.args | 2 +- .../firmware-auto-efi.x86_64-latest.args | 2 +- ...manual-bios-rw-implicit.x86_64-latest.args | 2 +- ...firmware-manual-bios-rw.x86_64-latest.args | 2 +- ...e-manual-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...l-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...nual-efi-nvram-template.x86_64-latest.args | 2 +- ...re-manual-efi-stateless.x86_64-latest.args | 2 +- .../floppy-drive-fat.x86_64-latest.args | 3 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 3 +- .../genid-auto.x86_64-latest.args | 2 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 2 +- ...egl-headless-rendernode.x86_64-latest.args | 3 +- .../graphics-egl-headless.x86_64-latest.args | 3 +- ...s-spice-agent-file-xfer.x86_64-latest.args | 3 +- ...aphics-spice-agentmouse.x86_64-latest.args | 3 +- ...s-spice-auto-socket-cfg.x86_64-latest.args | 3 +- ...phics-spice-auto-socket.x86_64-latest.args | 3 +- ...phics-spice-compression.x86_64-latest.args | 3 +- ...hics-spice-egl-headless.x86_64-latest.args | 3 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 3 +- .../graphics-spice-no-args.x86_64-latest.args | 3 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 3 +- .../graphics-spice-sasl.x86_64-latest.args | 3 +- .../graphics-spice-socket.x86_64-latest.args | 3 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- ...raphics-spice-usb-redir.x86_64-latest.args | 3 +- .../graphics-spice.x86_64-latest.args | 3 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 3 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 3 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 3 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 3 +- .../graphics-vnc-none.x86_64-latest.args | 3 +- .../graphics-vnc-policy.x86_64-latest.args | 3 +- .../graphics-vnc-power.x86_64-latest.args | 3 +- ...remove-generated-socket.x86_64-latest.args | 3 +- .../graphics-vnc-sasl.x86_64-latest.args | 3 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 3 +- .../graphics-vnc-socket.x86_64-latest.args | 3 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 3 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 3 +- .../graphics-vnc-tls.x86_64-latest.args | 3 +- .../graphics-vnc-websocket.x86_64-latest.args | 3 +- .../graphics-vnc.x86_64-latest.args | 3 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 3 +- ...play-spice-egl-headless.x86_64-latest.args | 3 +- ...ev-display-spice-opengl.x86_64-latest.args | 3 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 3 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 3 +- ...tdev-pci-address-device.x86_64-latest.args | 3 +- .../hostdev-pci-address.x86_64-latest.args | 3 +- .../hostdev-scsi-lsi.x86_64-latest.args | 3 +- ...dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args | 3 +- ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args | 3 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 3 +- ...usb-address-device-boot.x86_64-latest.args | 3 +- ...tdev-usb-address-device.x86_64-latest.args | 3 +- .../hostdev-usb-address.x86_64-latest.args | 3 +- .../hugepages-default-2M.x86_64-latest.args | 3 +- ...ges-default-system-size.x86_64-latest.args | 3 +- .../hugepages-default.x86_64-latest.args | 3 +- .../hugepages-memaccess.x86_64-latest.args | 3 +- .../hugepages-memaccess2.x86_64-latest.args | 3 +- .../hugepages-memaccess3.x86_64-latest.args | 3 +- .../hugepages-nodeset.x86_64-latest.args | 3 +- ...gepages-numa-default-2M.x86_64-latest.args | 3 +- ...pages-numa-default-dimm.x86_64-latest.args | 3 +- .../hugepages-numa-default.x86_64-latest.args | 3 +- ...pages-numa-nodeset-part.x86_64-latest.args | 3 +- .../hugepages-numa-nodeset.x86_64-latest.args | 3 +- .../hugepages-nvdimm.x86_64-latest.args | 3 +- .../hugepages-shared.x86_64-latest.args | 3 +- .../hyperv-off.x86_64-latest.args | 2 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-passthrough.x86_64-6.1.0.args | 2 +- .../hyperv-passthrough.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 3 +- .../intel-iommu-aw-bits.x86_64-latest.args | 3 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 3 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 3 +- .../intel-iommu-eim.x86_64-latest.args | 3 +- .../intel-iommu.x86_64-latest.args | 3 +- .../iommu-smmuv3.aarch64-latest.args | 3 +- ...othreads-ids-pool-sizes.x86_64-latest.args | 3 +- ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 3 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 3 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- ...nch-security-sev-direct.x86_64-latest.args | 3 +- ...ev-missing-platform-info.x86_64-6.0.0.args | 3 +- .../launch-security-sev.x86_64-6.0.0.args | 3 +- .../luks-disks-source-qcow2.x86_64-5.2.0.args | 3 +- ...luks-disks-source-qcow2.x86_64-latest.args | 3 +- .../luks-disks-source.x86_64-latest.args | 3 +- .../luks-disks.x86_64-latest.args | 3 +- .../machine-smm-off.x86_64-latest.args | 3 +- .../machine-smm-on.x86_64-latest.args | 3 +- ...memory-default-hugepage.x86_64-latest.args | 3 +- .../memfd-memory-numa.x86_64-latest.args | 3 +- ...emory-hotplug-dimm-addr.x86_64-latest.args | 3 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 3 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 3 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 3 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 3 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 3 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 3 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 3 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 3 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 3 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 3 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 3 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 3 +- .../misc-no-reboot.x86_64-5.2.0.args | 3 +- .../misc-no-reboot.x86_64-latest.args | 3 +- .../mlock-off.x86_64-latest.args | 3 +- .../mlock-on.x86_64-latest.args | 3 +- .../name-escape.x86_64-latest.args | 3 +- .../net-user-passt.x86_64-7.2.0.args | 3 +- .../net-user-passt.x86_64-latest.args | 3 +- .../net-user.x86_64-latest.args | 3 +- .../net-vdpa-multiqueue.x86_64-latest.args | 3 +- .../net-vdpa.x86_64-latest.args | 3 +- .../net-vhostuser.x86_64-latest.args | 3 +- .../net-virtio-rss.x86_64-latest.args | 3 +- .../numatune-hmat.x86_64-latest.args | 2 +- ...emnode-restrictive-mode.x86_64-latest.args | 3 +- .../numatune-memnode.x86_64-5.2.0.args | 3 +- .../numatune-memnode.x86_64-latest.args | 3 +- .../numatune-system-memory.x86_64-latest.args | 3 +- .../pages-dimm-discard.x86_64-latest.args | 3 +- ...pages-discard-hugepages.x86_64-latest.args | 3 +- .../pages-discard.x86_64-latest.args | 3 +- .../panic-double.x86_64-latest.args | 2 +- .../panic-no-address.x86_64-latest.args | 3 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 3 +- ...arallel-parport-chardev.x86_64-latest.args | 3 +- .../parallel-tcp-chardev.x86_64-latest.args | 3 +- .../parallel-unix-chardev.x86_64-latest.args | 3 +- ...pi-root-hotplug-disable.x86_64-latest.args | 3 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 3 +- .../pci-serial-dev-chardev.x86_64-latest.args | 3 +- ...e-expander-bus-aarch64.aarch64-latest.args | 3 +- ...cie-root-port-nohotplug.x86_64-latest.args | 3 +- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 2 +- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 2 +- .../ppc64-pseries-graphics.ppc64-latest.args | 2 +- .../ppc64-pseries-headless.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-single.ppc64-latest.args | 2 +- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 2 +- .../pseries-basic.ppc64-latest.args | 2 +- .../pseries-console-virtio.ppc64-latest.args | 2 +- ...eries-cpu-compat-power10.ppc64-latest.args | 2 +- ...series-cpu-compat-power9.ppc64-latest.args | 2 +- .../pseries-cpu-compat.ppc64-latest.args | 2 +- .../pseries-cpu-exact.ppc64-latest.args | 2 +- .../pseries-cpu-le.ppc64-latest.args | 2 +- .../pseries-features.ppc64-latest.args | 2 +- .../pseries-hostdevs-1.ppc64-latest.args | 2 +- .../pseries-hostdevs-2.ppc64-latest.args | 2 +- .../pseries-hostdevs-3.ppc64-latest.args | 2 +- .../pseries-many-buses-1.ppc64-latest.args | 2 +- .../pseries-many-buses-2.ppc64-latest.args | 2 +- .../pseries-many-devices.ppc64-latest.args | 2 +- .../pseries-nvram.ppc64-latest.args | 2 +- .../pseries-panic-missing.ppc64-latest.args | 2 +- ...pseries-panic-no-address.ppc64-latest.args | 2 +- ...ries-phb-default-missing.ppc64-latest.args | 2 +- .../pseries-phb-numa-node.ppc64-latest.args | 2 +- .../pseries-phb-simple.ppc64-latest.args | 2 +- .../pseries-serial-native.ppc64-latest.args | 2 +- .../pseries-serial-pci.ppc64-latest.args | 2 +- .../pseries-serial-usb.ppc64-latest.args | 2 +- .../pseries-usb-default.ppc64-latest.args | 2 +- .../pseries-usb-kbd.ppc64-latest.args | 2 +- .../pseries-usb-multi.ppc64-latest.args | 2 +- ...series-vio-user-assigned.ppc64-latest.args | 2 +- .../pseries-vio.ppc64-latest.args | 2 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- ...pci-no-address-aarch64.aarch64-latest.args | 2 +- .../pvpanic-pci-x86_64.x86_64-latest.args | 3 +- ...q35-default-devices-only.x86_64-4.2.0.args | 3 +- ...35-default-devices-only.x86_64-latest.args | 3 +- .../q35-multifunction.x86_64-4.2.0.args | 3 +- .../q35-multifunction.x86_64-latest.args | 3 +- .../q35-pcie-autoadd.x86_64-4.2.0.args | 3 +- .../q35-pcie-autoadd.x86_64-latest.args | 3 +- .../q35-pcie.x86_64-4.2.0.args | 3 +- .../q35-pcie.x86_64-latest.args | 3 +- .../q35-virt-manager-basic.x86_64-4.2.0.args | 2 +- .../q35-virt-manager-basic.x86_64-latest.args | 2 +- .../qemu-ns.x86_64-latest.args | 3 +- .../serial-debugcon.x86_64-latest.args | 3 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 3 +- .../serial-dev-chardev.x86_64-latest.args | 3 +- .../serial-file-chardev.x86_64-latest.args | 3 +- .../serial-file-log.x86_64-latest.args | 3 +- .../serial-many-chardev.x86_64-latest.args | 3 +- .../serial-pty-chardev.x86_64-latest.args | 3 +- .../serial-spiceport.x86_64-latest.args | 3 +- .../serial-tcp-chardev.x86_64-latest.args | 3 +- ...rial-tcp-telnet-chardev.x86_64-latest.args | 3 +- ...p-tlsx509-chardev-notls.x86_64-latest.args | 3 +- ...-tlsx509-chardev-verify.x86_64-latest.args | 3 +- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 3 +- ...-tlsx509-secret-chardev.x86_64-latest.args | 3 +- .../serial-udp-chardev.x86_64-latest.args | 3 +- .../serial-unix-chardev.x86_64-latest.args | 3 +- .../serial-vc-chardev.x86_64-latest.args | 3 +- .../sgx-epc.x86_64-7.0.0.args | 3 +- ...rtcard-passthrough-unix.x86_64-latest.args | 3 +- .../tpm-emulator-spapr.ppc64-latest.args | 2 +- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 2 +- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 2 +- .../tpm-emulator-tpm2.x86_64-latest.args | 2 +- .../tpm-emulator.x86_64-latest.args | 2 +- .../tpm-external.x86_64-latest.args | 2 +- .../tpm-passthrough-crb.x86_64-latest.args | 2 +- .../tpm-passthrough.x86_64-latest.args | 2 +- .../tseg-explicit-size.x86_64-latest.args | 3 +- .../usb-redir-unix.x86_64-latest.args | 3 +- .../user-aliases-usb.x86_64-latest.args | 2 +- .../user-aliases.x86_64-latest.args | 2 +- .../user-aliases2.x86_64-latest.args | 3 +- ...vhost-user-fs-fd-memory.x86_64-latest.args | 3 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 3 +- .../vhost-user-vga.x86_64-latest.args | 3 +- .../vhost-vsock-auto.x86_64-latest.args | 3 +- .../vhost-vsock.x86_64-latest.args | 3 +- ...eo-bochs-display-device.x86_64-latest.args | 3 +- ...video-qxl-device-vram64.x86_64-latest.args | 3 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 3 +- ...eo-ramfb-display-device.x86_64-latest.args | 3 +- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 3 +- .../virtio-9p-createmode.x86_64-latest.args | 3 +- .../virtio-9p-multidevs.x86_64-latest.args | 3 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-x86_64.x86_64-latest.args | 2 +- .../virtio-lun.x86_64-latest.args | 3 +- ...virtio-non-transitional.x86_64-latest.args | 3 +- ...-options-controller-ats.x86_64-latest.args | 3 +- ...ptions-controller-iommu.x86_64-latest.args | 3 +- ...tions-controller-packed.x86_64-latest.args | 3 +- ...virtio-options-disk-ats.x86_64-latest.args | 3 +- ...rtio-options-disk-iommu.x86_64-latest.args | 3 +- ...tio-options-disk-packed.x86_64-latest.args | 3 +- .../virtio-options-fs-ats.x86_64-latest.args | 3 +- ...virtio-options-fs-iommu.x86_64-latest.args | 3 +- ...irtio-options-fs-packed.x86_64-latest.args | 3 +- ...irtio-options-input-ats.x86_64-latest.args | 3 +- ...tio-options-input-iommu.x86_64-latest.args | 3 +- ...io-options-input-packed.x86_64-latest.args | 3 +- ...-options-memballoon-ats.x86_64-latest.args | 3 +- ...loon-freepage-reporting.x86_64-latest.args | 3 +- ...ptions-memballoon-iommu.x86_64-latest.args | 3 +- ...tions-memballoon-packed.x86_64-latest.args | 3 +- .../virtio-options-net-ats.x86_64-latest.args | 3 +- ...irtio-options-net-iommu.x86_64-latest.args | 3 +- ...rtio-options-net-packed.x86_64-latest.args | 3 +- .../virtio-options-rng-ats.x86_64-latest.args | 3 +- ...irtio-options-rng-iommu.x86_64-latest.args | 3 +- ...rtio-options-rng-packed.x86_64-latest.args | 3 +- ...irtio-options-video-ats.x86_64-latest.args | 3 +- ...tio-options-video-iommu.x86_64-latest.args | 3 +- ...io-options-video-packed.x86_64-latest.args | 3 +- .../virtio-options.x86_64-latest.args | 3 +- .../virtio-rng-builtin.x86_64-5.2.0.args | 3 +- .../virtio-rng-builtin.x86_64-latest.args | 3 +- .../virtio-rng-egd-unix.x86_64-5.2.0.args | 3 +- .../virtio-rng-egd-unix.x86_64-latest.args | 3 +- .../virtio-transitional.x86_64-latest.args | 3 +- .../watchdog-device.x86_64-latest.args | 3 +- .../watchdog-dump.x86_64-latest.args | 3 +- .../watchdog-injectnmi.x86_64-latest.args | 3 +- .../watchdog-q35-multiple.x86_64-latest.args | 3 +- .../watchdog.x86_64-latest.args | 3 +- .../x86-kvm-32-on-64.x86_64-latest.args | 3 +- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 2 +- ...efault-cpu-tcg-features.x86_64-latest.args | 2 +- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 2 +- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 2 +- .../x86_64-pc-graphics.x86_64-latest.args | 2 +- .../x86_64-pc-headless.x86_64-latest.args | 2 +- .../x86_64-q35-graphics.x86_64-latest.args | 2 +- .../x86_64-q35-headless.x86_64-latest.args | 2 +- tests/testutilsqemu.c | 9 +- 485 files changed, 1044 insertions(+), 1145 deletions(-) -- 2.39.2

6 18

[PATCH v5 00/10] tracing: remove dynamic vcpu state
by Alex Bennée 25 May '23

25 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. v5 added f4bug's rb, minor reword of state and rth's suggested tweak for xxhash Please queue into your tree. Alex Bennée (10): *-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 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 | 9 +++ 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 | 8 ++- scripts/tracetool/format/c.py | 6 -- scripts/tracetool/format/h.py | 16 +---- trace-events | 50 ---------------- 28 files changed, 86 insertions(+), 487 deletions(-) delete mode 100644 trace/control-vcpu.h -- 2.39.2

4 15

[libvirt PATCH 1/2] sync_qemu_models_i386.py: Fix complaint from flake8
by Tim Wiederhake 25 May '23

25 May '23

Line was too long. Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com> --- src/cpu_map/sync_qemu_models_i386.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cpu_map/sync_qemu_models_i386.py b/src/cpu_map/sync_qemu_models_i386.py index 37bbe6d09e..4974b30b43 100755 --- a/src/cpu_map/sync_qemu_models_i386.py +++ b/src/cpu_map/sync_qemu_models_i386.py @@ -208,7 +208,8 @@ def read_builtin_x86_defs(filename): """Extract content between begin_mark and end_mark from file `filename` as string, while expanding shorthand macros like "I486_FEATURES".""" - begin_mark = re.compile("^static( const)? X86CPUDefinition builtin_x86_defs\\[\\] = {$") + begin_mark = re.compile( + "^static( const)? X86CPUDefinition builtin_x86_defs\\[\\] = {$") end_mark = "};\n" shorthand = re.compile("^#define ([A-Z0-9_]+_FEATURES) (.*)$") lines = list() -- 2.39.2

2 2

[libvirt PATCH 00/15] Sync cpu features with qemu
by Tim Wiederhake 25 May '23

25 May '23

This brings libvirt in sync qith qemu commit 886c0453cbf10eebd42a9ccf89c3e46eb389c357. Tim Wiederhake (15): cpu_map: Add missing feature "amd-psfd" cpu_map: Add missing feature "amx-fp16" cpu_map: Add missing feature "auto-ibrs" cpu_map: Add missing feature "avx-ifma" cpu_map: Add missing feature "avx-ne-convert" cpu_map: Add missing feature "avx-vnni-int8" cpu_map: Add missing feature "cmpccxadd" cpu_map: Add missing feature "fb-clear" cpu_map: Add missing feature "flush-l1d" cpu_map: Add missing feature "lfence-always-serializing" cpu_map: Add missing feature "no-nested-data-bp" cpu_map: Add missing feature "null-sel-clr-base" cpu_map: Add missing feature "prefetchiti" cpu_map: Add missing feature "stibp-always-on" cpu_map: Add missing feature "vnmi" src/cpu_map/x86_features.xml | 48 +++++++++++++++++++ .../x86_64-cpuid-Atom-P5362-disabled.xml | 2 +- .../x86_64-cpuid-Atom-P5362-guest.xml | 1 + .../x86_64-cpuid-Atom-P5362-host.xml | 1 + .../x86_64-cpuid-Cooperlake-disabled.xml | 2 +- .../x86_64-cpuid-Cooperlake-guest.xml | 1 + .../x86_64-cpuid-Cooperlake-host.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-disabled.xml | 2 +- .../x86_64-cpuid-Core-i7-7600U-guest.xml | 1 + .../x86_64-cpuid-Core-i7-7600U-host.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-disabled.xml | 2 +- .../x86_64-cpuid-Core-i7-8550U-guest.xml | 1 + .../x86_64-cpuid-Core-i7-8550U-host.xml | 1 + .../x86_64-cpuid-Core-i7-8700-disabled.xml | 2 +- .../x86_64-cpuid-Core-i7-8700-guest.xml | 1 + .../x86_64-cpuid-Core-i7-8700-host.xml | 1 + .../x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +- .../x86_64-cpuid-Ice-Lake-Server-guest.xml | 1 + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 1 + .../x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml | 2 +- .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml | 1 + .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-disabled.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-guest.xml | 1 + .../x86_64-cpuid-Xeon-E5-2650-host.xml | 1 + .../x86_64-cpuid-Xeon-E7540-disabled.xml | 1 + .../x86_64-cpuid-Xeon-E7540-guest.xml | 1 + .../x86_64-cpuid-Xeon-E7540-host.xml | 1 + .../x86_64-cpuid-Xeon-Gold-6130-disabled.xml | 2 +- .../x86_64-cpuid-Xeon-Gold-6130-guest.xml | 1 + .../x86_64-cpuid-Xeon-Gold-6130-host.xml | 1 + ...6_64-cpuid-Xeon-Platinum-8268-disabled.xml | 2 +- .../x86_64-cpuid-Xeon-Platinum-8268-guest.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-8268-host.xml | 1 + ...6_64-cpuid-Xeon-Platinum-9242-disabled.xml | 2 +- .../x86_64-cpuid-Xeon-Platinum-9242-guest.xml | 1 + .../x86_64-cpuid-Xeon-Platinum-9242-host.xml | 1 + 37 files changed, 84 insertions(+), 10 deletions(-) -- 2.39.2

2 16

[PATCH 0/3] docs: newapi.xsl: Generate more docs (enums & typedefs)
by Michal Privoznik 25 May '23

25 May '23

*** BLURB HERE *** Michal Prívozník (3): docs: newapi.xsl: Generate docs on generic typedefs docs: newapi.xsl: Generate overall docs for enums too docs: Clarify values reported by virDomainMemoryStats() docs/newapi.xsl | 25 +++++++++++++++++++++++++ include/libvirt/libvirt-domain.h | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) -- 2.39.3

2 6

[libvirt 1/2] cpu_map: Add SapphireRapids CPU model
by Lin Yang 24 May '23

24 May '23

Introduced in QEMU by commit v8.0.0-7eb061b06e. Signed-off-by: Lin Yang <lin.a.yang(a)intel.com> --- src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/x86_SapphireRapids.xml | 116 +++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 src/cpu_map/x86_SapphireRapids.xml diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml index deae92552f..0187016c1c 100644 --- a/src/cpu_map/index.xml +++ b/src/cpu_map/index.xml @@ -56,6 +56,7 @@ <include filename='x86_Icelake-Server-noTSX.xml'/> <include filename='x86_Cooperlake.xml'/> <include filename='x86_Snowridge.xml'/> + <include filename='x86_SapphireRapids.xml'/>  <include filename='x86_athlon.xml'/> diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build index 55c3703006..fa83b23474 100644 --- a/src/cpu_map/meson.build +++ b/src/cpu_map/meson.build @@ -72,6 +72,7 @@ cpumap_data = [ 'x86_qemu64.xml', 'x86_SandyBridge-IBRS.xml', 'x86_SandyBridge.xml', + 'x86_SapphireRapids.xml', 'x86_Skylake-Client-IBRS.xml', 'x86_Skylake-Client-noTSX-IBRS.xml', 'x86_Skylake-Client.xml', diff --git a/src/cpu_map/x86_SapphireRapids.xml b/src/cpu_map/x86_SapphireRapids.xml new file mode 100644 index 0000000000..2297feeeca --- /dev/null +++ b/src/cpu_map/x86_SapphireRapids.xml @@ -0,0 +1,116 @@ +<cpus> + <model name='SapphireRapids'> + <decode host='on' guest='on'/> + <signature family='6' model='143'/> + <vendor name='Intel'/> + <feature name='3dnowprefetch'/> + <feature name='abm'/> + <feature name='adx'/> + <feature name='aes'/> + <feature name='amx-bf16'/> + <feature name='amx-int8'/> + <feature name='amx-tile'/> + <feature name='apic'/> + <feature name='arat'/> + <feature name='arch-capabilities'/> + <feature name='avx'/> + <feature name='avx-vnni'/> + <feature name='avx2'/> + <feature name='avx512-bf16'/> + <feature name='avx512-fp16'/> + <feature name='avx512-vpopcntdq'/> + <feature name='avx512bitalg'/> + <feature name='avx512bw'/> + <feature name='avx512cd'/> + <feature name='avx512dq'/> + <feature name='avx512f'/> + <feature name='avx512ifma'/> + <feature name='avx512vbmi'/> + <feature name='avx512vbmi2'/> + <feature name='avx512vl'/> + <feature name='avx512vnni'/> + <feature name='bmi1'/> + <feature name='bmi2'/> + <feature name='bus-lock-detect'/> + <feature name='clflush'/> + <feature name='clflushopt'/> + <feature name='clwb'/> + <feature name='cmov'/> + <feature name='cx16'/> + <feature name='cx8'/> + <feature name='de'/> + <feature name='erms'/> + <feature name='f16c'/> + <feature name='fma'/> + <feature name='fpu'/> + <feature name='fsgsbase'/> + <feature name='fsrc'/> + <feature name='fsrm'/> + <feature name='fsrs'/> + <feature name='fxsr'/> + <feature name='fzrm'/> + <feature name='gfni'/> + <feature name='hle'/> + <feature name='ibrs-all'/> + <feature name='invpcid'/> + <feature name='la57'/> + <feature name='lahf_lm'/> + <feature name='lm'/> + <feature name='mca'/> + <feature name='mce'/> + <feature name='mds-no'/> + <feature name='mmx'/> + <feature name='movbe'/> + <feature name='msr'/> + <feature name='mtrr'/> + <feature name='nx'/> + <feature name='pae'/> + <feature name='pat'/> + <feature name='pcid'/> + <feature name='pclmuldq'/> + <feature name='pdpe1gb'/> + <feature name='pge'/> + <feature name='pku'/> + <feature name='pni'/> + <feature name='popcnt'/> + <feature name='pschange-mc-no'/> + <feature name='pse'/> + <feature name='pse36'/> + <feature name='rdctl-no'/> + <feature name='rdpid'/> + <feature name='rdrand'/> + <feature name='rdseed'/> + <feature name='rdtscp'/> + <feature name='rtm'/> + <feature name='sep'/> + <feature name='serialize'/> + <feature name='sha-ni'/> + <feature name='skip-l1dfl-vmentry'/> + <feature name='smap'/> + <feature name='smep'/> + <feature name='spec-ctrl'/> + <feature name='ssbd'/> + <feature name='sse'/> + <feature name='sse2'/> + <feature name='sse4.1'/> + <feature name='sse4.2'/> + <feature name='ssse3'/> + <feature name='syscall'/> + <feature name='taa-no'/> + <feature name='tsc'/> + <feature name='tsc-deadline'/> + <feature name='tsx-ldtrk'/> + <feature name='umip'/> + <feature name='vaes'/> + <feature name='vme'/> + <feature name='vpclmulqdq'/> + <feature name='wbnoinvd'/> + <feature name='x2apic'/> + <feature name='xfd'/> + <feature name='xgetbv1'/> + <feature name='xsave'/> + <feature name='xsavec'/> + <feature name='xsaveopt'/> + <feature name='xsaves'/> + </model> +</cpus> -- 2.25.1

2 2

[PATCH v4 00/10] tracing: remove dynamic vcpu state
by Alex Bennée 24 May '23

24 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. v4 addressed Markus's comments on QAPI bits and other fixes during re-base. Please queue into your tree. Alex Bennée (10): *-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 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 | 9 +++ qapi/trace.json | 38 ++++++------ 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 | 17 +----- util/qsp.c | 2 +- hw/core/trace-events | 3 + scripts/qapi/gen.py | 8 ++- scripts/tracetool/format/c.py | 6 -- scripts/tracetool/format/h.py | 16 +---- trace-events | 50 ---------------- 28 files changed, 86 insertions(+), 484 deletions(-) delete mode 100644 trace/control-vcpu.h -- 2.39.2

3 14

[PATCH] hostdev:Introduce vDPA device to hostdev subsystem as a new subtype
by libai 24 May '23

24 May '23

The following is the xml of vdpa device: <devices> <hostdev mode='subsystem' type='vdpa'> <source dev='/dev/vhost-vdpa-0'/> </hostdev> </devices> And the command line passed to QEMU is as follows: -device {"driver":"vhost-vdpa-device-pci","vhostdev":"/dev/vhost-vdpa-0"} This solution is selected according to the previous discussion on the solution of supporting the vDPA device. For details, see the following: https://listman.redhat.com/archives/libvir-list/2023-March/239018.html Signed-off-by: libai <libai12(a)huawei.com> --- src/conf/domain_audit.c | 4 +++ src/conf/domain_conf.c | 47 +++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 6 +++++ src/conf/domain_validate.c | 1 + src/conf/virconftypes.h | 2 ++ src/qemu/qemu_command.c | 19 +++++++++++++ src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_domain.c | 6 +++++ src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_migration.c | 2 ++ src/qemu/qemu_validate.c | 2 ++ src/security/security_dac.c | 2 ++ src/security/security_selinux.c | 2 ++ 13 files changed, 97 insertions(+) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index ae875188bd..6906ce7ade 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -344,6 +344,7 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostdevDef *hostdev, virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHost *hostsrc = &hostdev->source.subsys.u.scsi_host; virDomainHostdevSubsysMediatedDev *mdevsrc = &hostdev->source.subsys.u.mdev; + virDomainHostdevSubsysVDPA *vdpasrc = &hostdev->source.subsys.u.vdpa; virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { @@ -383,6 +384,9 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostdevDef *hostdev, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: address = g_strdup(mdevsrc->uuidstr); break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + address = g_strdup(vdpasrc->devpath); + break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: default: VIR_WARN("Unexpected hostdev type while encoding audit message: %d", diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b03a3ff011..e8f6d1457b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1047,6 +1047,7 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys, "scsi", "scsi_host", "mdev", + "vdpa", ); VIR_ENUM_IMPL(virDomainHostdevSubsysPCIBackend, @@ -2641,6 +2642,9 @@ virDomainHostdevDefClear(virDomainHostdevDef *def) case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitmapFree); break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + VIR_FREE(def->source.subsys.u.vdpa.devpath); + break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: @@ -6160,6 +6164,22 @@ virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDef *def, return 0; } +static int +virDomainHostdevSubsysVDPADefParseXML(xmlNodePtr sourcenode, + virDomainHostdevDef *def) +{ + g_autofree char *devpath = NULL; + virDomainHostdevSubsysVDPA *vdpa = &def->source.subsys.u.vdpa; + + if(!(devpath = virXMLPropString(sourcenode, "dev"))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Missing 'dev' attribute for element <source>")); + return -1; + } + vdpa->devpath = g_steal_pointer(&devpath); + return 0; +} + static int virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -6317,6 +6337,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if (virDomainHostdevSubsysMediatedDevDefParseXML(def, ctxt) < 0) return -1; break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + if (virDomainHostdevSubsysVDPADefParseXML(sourcenode, def) < 0) { + return -1; + } + break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -12979,6 +13004,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xmlopt, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: break; } @@ -14101,6 +14127,13 @@ virDomainHostdevMatchSubsys(virDomainHostdevDef *a, return 0; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: return virDomainHostdevMatchSubsysMediatedDev(a, b); + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + if (STREQ(a->source.subsys.u.vdpa.devpath, + b->source.subsys.u.vdpa.devpath)) { + return 1; + } else { + return 0; + } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: return 0; } @@ -23290,6 +23323,16 @@ virDomainHostdevDefFormatSubsysMdev(virBuffer *buf, virXMLFormatElement(buf, "source", NULL, &sourceChildBuf); } +static void +virDomainHostdevDefFormatSubsysVDPA(virBuffer *buf, + virDomainHostdevDef *def) +{ + g_auto(virBuffer) sourceAttrBuf = VIR_BUFFER_INITIALIZER; + virDomainHostdevSubsysVDPA *vdpasrc = &def->source.subsys.u.vdpa; + virBufferAsprintf(&sourceAttrBuf, " dev='%s'", vdpasrc->devpath); + virXMLFormatElement(buf, "source", &sourceAttrBuf, NULL); +} + static int virDomainHostdevDefFormatSubsys(virBuffer *buf, @@ -23317,6 +23360,10 @@ virDomainHostdevDefFormatSubsys(virBuffer *buf, virDomainHostdevDefFormatSubsysMdev(buf, def); return 0; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + virDomainHostdevDefFormatSubsysVDPA(buf, def); + return 0; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: default: virReportEnumRangeError(virDomainHostdevSubsysType, def->source.subsys.type); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 511067a050..ade8b0edec 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -197,6 +197,7 @@ typedef enum { VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV, + VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA, VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST } virDomainHostdevSubsysType; @@ -289,6 +290,10 @@ struct _virDomainHostdevSubsysMediatedDev { virTristateSwitch ramfb; }; +struct _virDomainHostdevSubsysVDPA { + char *devpath; /* vDPA device path */ +}; + typedef enum { VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_NONE, VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST, @@ -323,6 +328,7 @@ struct _virDomainHostdevSubsys { virDomainHostdevSubsysSCSI scsi; virDomainHostdevSubsysSCSIVHost scsi_host; virDomainHostdevSubsysMediatedDev mdev; + virDomainHostdevSubsysVDPA vdpa; } u; }; diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index e04b85fee4..4af84c4f0c 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -2214,6 +2214,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev) } break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: break; } diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h index e07f967814..1756c54e7a 100644 --- a/src/conf/virconftypes.h +++ b/src/conf/virconftypes.h @@ -120,6 +120,8 @@ typedef struct _virDomainHostdevSubsys virDomainHostdevSubsys; typedef struct _virDomainHostdevSubsysMediatedDev virDomainHostdevSubsysMediatedDev; +typedef struct _virDomainHostdevSubsysVDPA virDomainHostdevSubsysVDPA; + typedef struct _virDomainHostdevSubsysPCI virDomainHostdevSubsysPCI; typedef struct _virDomainHostdevSubsysSCSI virDomainHostdevSubsysSCSI; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4ca93bf3dc..121214f4d5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4958,6 +4958,18 @@ qemuBuildHostdevMediatedDevProps(const virDomainDef *def, return g_steal_pointer(&props); } +virJSONValue * +qemuBuildHostdevVDPADevProps(virDomainHostdevDef *dev) +{ + g_autoptr(virJSONValue) props = NULL; + virDomainHostdevSubsysVDPA *vdpasrc = &dev->source.subsys.u.vdpa; + if (virJSONValueObjectAdd(&props, + "s:driver", "vhost-vdpa-device-pci", + "s:vhostdev", vdpasrc->devpath, + NULL) < 0) + return NULL; + return g_steal_pointer(&props); +} qemuBlockStorageSourceAttachData * qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev, @@ -5154,6 +5166,13 @@ qemuBuildHostdevCommandLine(virCommand *cmd, return -1; break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + if (!(devprops = qemuBuildHostdevVDPADevProps(hostdev))) + return -1; + if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, def, qemuCaps) < 0) + return -1; + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: break; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 5fdb138030..dff18350b5 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -198,6 +198,9 @@ virJSONValue * qemuBuildHostdevMediatedDevProps(const virDomainDef *def, virDomainHostdevDef *dev); +virJSONValue * +qemuBuildHostdevVDPADevProps(virDomainHostdevDef *dev); + virJSONValue * qemuBuildRedirdevDevProps(const virDomainDef *def, virDomainRedirdevDef *dev); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 63b13b6875..0cd485a459 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -10533,6 +10533,8 @@ qemuDomainGetHostdevPath(virDomainHostdevDef *dev, virDomainHostdevSubsysSCSI *scsisrc = &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHost *hostsrc = &dev->source.subsys.u.scsi_host; virDomainHostdevSubsysMediatedDev *mdevsrc = &dev->source.subsys.u.mdev; + virDomainHostdevSubsysVDPA *vdpasrc = &dev->source.subsys.u.vdpa; + g_autoptr(virUSBDevice) usb = NULL; g_autoptr(virSCSIDevice) scsi = NULL; g_autoptr(virSCSIVHostDevice) host = NULL; @@ -10603,6 +10605,10 @@ qemuDomainGetHostdevPath(virDomainHostdevDef *dev, if (!(tmpPath = virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuidstr))) return -1; + perm = VIR_CGROUP_DEVICE_RW; + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + tmpPath = g_strdup(vdpasrc->devpath); perm = VIR_CGROUP_DEVICE_RW; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5072798cb7..7d89899223 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4546,6 +4546,7 @@ qemuDomainRemoveHostDevice(virQEMUDriver *driver, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: qemuDomainRemoveMediatedDevice(driver, vm, hostdev); break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: break; } diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ed41a03851..9220ef1ab1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1295,6 +1295,8 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def) case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + /* The vDPA devices don't support migration for now */ + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("cannot migrate a domain with <hostdev mode='subsystem' type='%1$s'>"), virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type)); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b8d5e9bd74..ea3d4e1a39 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2566,6 +2566,8 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev, break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: return qemuValidateDomainMdevDef(hostdev, def, qemuCaps); + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: + break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: default: virReportEnumRangeError(virDomainHostdevSubsysType, diff --git a/src/security/security_dac.c b/src/security/security_dac.c index c7dc145621..24f3de5d15 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1313,6 +1313,7 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mgr, break; } + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: ret = 0; break; @@ -1469,6 +1470,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager *mgr, break; } + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: ret = 0; break; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index e3e6a6115f..5cb6612fbc 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -2265,6 +2265,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManager *mgr, break; } + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: ret = 0; break; @@ -2493,6 +2494,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManager *mgr, break; } + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA: case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: ret = 0; break; -- 2.33.0

3 2

[PATCH 0/4] conf, qemu: add loader type='none'
by Daniel Henrique Barboza 23 May '23

23 May '23

Hi, Fedora Rawhide for RISC-V requires '-bios none' to properly boot because its kernel is overwriting the default OpenSBI binary QEMU uses, causing the following error: $ sudo ./run tools/virsh start --console riscv-fedora error: Failed to start domain 'riscv-fedora' error: internal error: process exited while connecting to monitor: 2023-03-20T17:31:02.650862Z qemu-system-riscv64: Some ROM regions are overlapping These ROM regions might have been loaded by direct user request or by default. They could be BIOS/firmware images, a guest kernel, initrd or some other file loaded into guest memory. Check whether you intended to load all this guest code, and whether it has been built to load to the correct addresses. Other archs, such as PPC64 pseries, also requires "-bios none" if the user wants QEMU to not load any default firmware. At this moment libvirt doesn't support this option in the official API, meaning we need to go to the <qemu:commandline> route to allow the domain to boot, tainting it. And with a chance of weird interactions with firmware autoselect. These patches add official XML support for '-bios none' for QEMU domains using a XML as follows: <os> <loader type='none'/> (...) </os> The pre-conditions of this format are (1) no loader->path and (2) only manual autoselect. Everything else is already covered by libvirt as corner cases of existing firmware features. Daniel Henrique Barboza (4): conf: add loader type 'none' qemu: handle bios 'none' case in qemuFirmwareFillDomain() qemu, tests: add -bios none command line docs: Document loader 'none' attribute docs/formatdomain.rst | 7 +++++ src/conf/domain_conf.c | 5 +-- src/conf/domain_validate.c | 2 +- src/conf/schemas/domaincommon.rng | 1 + src/qemu/qemu_command.c | 6 ++++ src/qemu/qemu_firmware.c | 10 ++++++ .../firmware-bios-none.riscv64-latest.args | 31 +++++++++++++++++++ tests/qemuxml2argvdata/firmware-bios-none.xml | 18 +++++++++++ tests/qemuxml2argvtest.c | 2 ++ 9 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/firmware-bios-none.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/firmware-bios-none.xml -- 2.39.2

6 33

[PATCH] nodedev: update transient mdevs
by Boris Fiuczynski 23 May '23

23 May '23

Instead of updating defined mdevs only add another update for active devices as well to cover transient mdev devices as well. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2143158 Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/node_device/node_device_driver.c | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 3cac25a10c..a2d0600560 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -1636,6 +1636,24 @@ virMdevctlListDefined(virNodeDeviceDef ***devs, char **errmsg) } +static int +virMdevctlListActive(virNodeDeviceDef ***devs, char **errmsg) +{ + int status; + g_autofree char *output = NULL; + g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(false, &output, errmsg); + + if (virCommandRun(cmd, &status) < 0 || status != 0) { + return -1; + } + + if (!output) + return -1; + + return nodeDeviceParseMdevctlJSON(output, devs); +} + + typedef struct _virMdevctlForEachData virMdevctlForEachData; struct _virMdevctlForEachData { int ndefs; @@ -1699,6 +1717,8 @@ int nodeDeviceUpdateMediatedDevices(void) { g_autofree virNodeDeviceDef **defs = NULL; + g_autofree virNodeDeviceDef **act_defs = NULL; + int act_ndefs = 0; g_autofree char *errmsg = NULL; g_autofree char *mdevctl = NULL; virMdevctlForEachData data = { 0, }; @@ -1725,6 +1745,17 @@ nodeDeviceUpdateMediatedDevices(void) if (nodeDeviceUpdateMediatedDevice(defs[i]) < 0) return -1; + /* Update active/transient mdev devices */ + if ((act_ndefs = virMdevctlListActive(&act_defs, &errmsg)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to query mdevs from mdevctl: %1$s"), errmsg); + return -1; + } + + for (i = 0; i < act_ndefs; i++) + if (nodeDeviceUpdateMediatedDevice(act_defs[i]) < 0) + return -1; + return 0; } -- 2.39.0

2 2

[PATCH 0/4] qemu: Start emulator thread with more generous cpuset.mems
by Michal Privoznik 23 May '23

23 May '23

*** BLURB HERE *** Michal Prívozník (4): qemuProcessSetupPid: Use @numatune variable more qemu: Start emulator thread with more generous cpuset.mems qemu: Start emulator thread with more generous mbind() qemu_hotplug: Temporarily allow emulator thread to access other NUMA nodes during mem hotplug src/qemu/qemu_domain.c | 26 +++++++++++++++++++ src/qemu/qemu_domain.h | 5 ++++ src/qemu/qemu_hotplug.c | 8 ++++++ src/qemu/qemu_process.c | 56 +++++++++++++++++++++++++++-------------- src/qemu/qemu_process.h | 3 +++ 5 files changed, 79 insertions(+), 19 deletions(-) -- 2.39.3

2 8

[libvirt PATCH v2] rpm: Explain BuildRequires on qemu-img
by Andrea Bolognani 22 May '23

22 May '23

It's not used as part of the build process or searched for at build time, and the QEMU driver detects its path at runtime, so one could think that the BuildRequires is unnecessary. But we actually need it to be present at build time in order to run the full test suite. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c542ec3b2b..1f77cd90b7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -310,7 +310,7 @@ BuildRequires: util-linux %if %{with_qemu} # For managing ACLs BuildRequires: libacl-devel -# From QEMU RPMs +# From QEMU RPMs, used by virstoragetest BuildRequires: /usr/bin/qemu-img %endif # For LVM drivers -- 2.40.1

1 1

[PATCH 0/4] Introduce ARM MTE feature
by Michal Privoznik 22 May '23

22 May '23

*** BLURB HERE *** Michal Prívozník (4): conf: Introduce MTE domain feature qemu:: Introduce QEMU_CAPS_MACHINE_VIRT_MTE capability qemu: Validate MTE feature qemu: Generate command line for MTE feature docs/formatdomain.rst | 7 +++++ src/conf/domain_conf.c | 6 ++++- src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 5 ++++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 6 +++++ src/qemu/qemu_validate.c | 26 +++++++++++++------ .../caps_5.2.0_aarch64.xml | 1 + .../caps_6.0.0_aarch64.xml | 1 + .../caps_6.2.0_aarch64.xml | 1 + .../caps_7.0.0_aarch64+hvf.xml | 1 + .../caps_7.0.0_aarch64.xml | 1 + tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.xml | 1 + .../aarch64-gic-v3.aarch64-latest.xml | 1 + 16 files changed, 53 insertions(+), 10 deletions(-) -- 2.39.3

5 14

[PATCH 0/3] numa_conf: Deny other memory modes than 'restrictive' if a memnode is 'restrictive'
by Michal Privoznik 22 May '23

22 May '23

We already check that there's no <memnode mode='restrictive'/> when <memory mode='restrictive'/> is set. But we are missing the opposite check: there's <memory mode='restrictive'/> when there is <memnode mode='restrictive'/>. Michal Prívozník (3): virDomainNumatuneNodeSpecified: Fix const correctness numa_conf: Move memnode mode validation into virDomainNumaDefValidate() numa_conf: Deny other memory modes than 'restrictive' if a memnode is 'restrictive' src/conf/numa_conf.c | 26 ++++++++---- src/conf/numa_conf.h | 2 +- ...strictive-mode-err-mixed.x86_64-latest.err | 1 + ...une-memnode-restrictive-mode-err-mixed.xml | 41 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 5 files changed, 61 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode-err-mixed.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/numatune-memnode-restrictive-mode-err-mixed.xml -- 2.39.3

2 4

Plans for the next release
by Jiri Denemark 22 May '23

22 May '23

We are getting close to the next release of libvirt. To aim for the release on Jun 01 I suggest entering the freeze on Friday May 26 and tagging RC2 on Tuesday May 30. I hope this works for everyone. Jirka

1 0

[libvirt PATCH 0/4] Revert MTE support
by Andrea Bolognani 22 May '23

22 May '23

See the subthread starting at [1] for the rationale. The QEMU commit that (temporarily) reverted KVM support is at [2]. [1] https://listman.redhat.com/archives/libvir-list/2023-May/239911.html [2] https://gitlab.com/qemu-project/qemu/-/commit/d009607d08d22f91ca399b72828c6… Andrea Bolognani (4): Revert "qemu: Generate command line for MTE feature" Revert "qemu: Validate MTE feature" Revert "qemu:: Introduce QEMU_CAPS_MACHINE_VIRT_MTE capability" Revert "conf: Introduce MTE domain feature" docs/formatdomain.rst | 7 ----- src/conf/domain_conf.c | 6 +---- src/conf/domain_conf.h | 1 - src/conf/schemas/domaincommon.rng | 5 ---- src/qemu/qemu_capabilities.c | 2 -- src/qemu/qemu_capabilities.h | 1 - src/qemu/qemu_command.c | 6 ----- src/qemu/qemu_validate.c | 26 ++++++------------- .../caps_5.2.0_aarch64.xml | 1 - .../caps_6.0.0_aarch64.xml | 1 - .../caps_6.2.0_aarch64.xml | 1 - .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.xml | 1 - tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.xml | 1 - .../aarch64-gic-v3.aarch64-latest.xml | 1 - 16 files changed, 10 insertions(+), 53 deletions(-) -- 2.40.1

3 6

[PULL 12/40] hw/cxl: Multi-Region CXL Type-3 Devices (Volatile and Persistent)
by Michael S. Tsirkin 19 May '23

19 May '23

From: Gregory Price <gregory.price(a)memverge.com> This commit enables each CXL Type-3 device to contain one volatile memory region and one persistent region. Two new properties have been added to cxl-type3 device initialization: [volatile-memdev] and [persistent-memdev] The existing [memdev] property has been deprecated and will default the memory region to a persistent memory region (although a user may assign the region to a ram or file backed region). It cannot be used in combination with the new [persistent-memdev] property. Partitioning volatile memory from persistent memory is not yet supported. Volatile memory is mapped at DPA(0x0), while Persistent memory is mapped at DPA(vmem->size), per CXL Spec 8.2.9.8.2.0 - Get Partition Info. Signed-off-by: Gregory Price <gregory.price(a)memverge.com> Reviewed-by: Davidlohr Bueso <dave(a)stgolabs.net> Reviewed-by: Fan Ni <fan.ni(a)samsung.com> Tested-by: Fan Ni <fan.ni(a)samsung.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron(a)huawei.com> Message-Id: <20230421160827.2227-4-Jonathan.Cameron(a)huawei.com> Reviewed-by: Michael S. Tsirkin <mst(a)redhat.com> Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- include/hw/cxl/cxl_device.h | 11 +- hw/cxl/cxl-mailbox-utils.c | 32 ++-- hw/mem/cxl_type3.c | 306 ++++++++++++++++++++++++--------- tests/qtest/bios-tables-test.c | 8 +- tests/qtest/cxl-test.c | 76 ++++++-- docs/about/deprecated.rst | 8 + docs/system/devices/cxl.rst | 49 ++++-- 7 files changed, 371 insertions(+), 119 deletions(-) diff --git a/include/hw/cxl/cxl_device.h b/include/hw/cxl/cxl_device.h index d589f78202..edb9791bab 100644 --- a/include/hw/cxl/cxl_device.h +++ b/include/hw/cxl/cxl_device.h @@ -119,8 +119,10 @@ typedef struct cxl_device_state { uint64_t host_set; } timestamp; - /* memory region for persistent memory, HDM */ + /* memory region size, HDM */ + uint64_t mem_size; uint64_t pmem_size; + uint64_t vmem_size; } CXLDeviceState; /* Initialize the register block for a device */ @@ -245,12 +247,15 @@ struct CXLType3Dev { PCIDevice parent_obj; /* Properties */ - HostMemoryBackend *hostmem; + HostMemoryBackend *hostmem; /* deprecated */ + HostMemoryBackend *hostvmem; + HostMemoryBackend *hostpmem; HostMemoryBackend *lsa; uint64_t sn; /* State */ - AddressSpace hostmem_as; + AddressSpace hostvmem_as; + AddressSpace hostpmem_as; CXLComponentState cxl_cstate; CXLDeviceState cxl_dstate; diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c index 206e04a4b8..ed663cc04a 100644 --- a/hw/cxl/cxl-mailbox-utils.c +++ b/hw/cxl/cxl-mailbox-utils.c @@ -141,7 +141,8 @@ static ret_code cmd_firmware_update_get_info(struct cxl_cmd *cmd, } QEMU_PACKED *fw_info; QEMU_BUILD_BUG_ON(sizeof(*fw_info) != 0x50); - if (cxl_dstate->pmem_size < CXL_CAPACITY_MULTIPLIER) { + if ((cxl_dstate->vmem_size < CXL_CAPACITY_MULTIPLIER) || + (cxl_dstate->pmem_size < CXL_CAPACITY_MULTIPLIER)) { return CXL_MBOX_INTERNAL_ERROR; } @@ -288,21 +289,21 @@ static ret_code cmd_identify_memory_device(struct cxl_cmd *cmd, CXLType3Dev *ct3d = container_of(cxl_dstate, CXLType3Dev, cxl_dstate); CXLType3Class *cvc = CXL_TYPE3_GET_CLASS(ct3d); - uint64_t size = cxl_dstate->pmem_size; - if (!QEMU_IS_ALIGNED(size, CXL_CAPACITY_MULTIPLIER)) { + if ((!QEMU_IS_ALIGNED(cxl_dstate->vmem_size, CXL_CAPACITY_MULTIPLIER)) || + (!QEMU_IS_ALIGNED(cxl_dstate->pmem_size, CXL_CAPACITY_MULTIPLIER))) { return CXL_MBOX_INTERNAL_ERROR; } id = (void *)cmd->payload; memset(id, 0, sizeof(*id)); - /* PMEM only */ snprintf(id->fw_revision, 0x10, "BWFW VERSION %02d", 0); - id->total_capacity = size / CXL_CAPACITY_MULTIPLIER; - id->persistent_capacity = size / CXL_CAPACITY_MULTIPLIER; - id->lsa_size = cvc->get_lsa_size(ct3d); + stq_le_p(&id->total_capacity, cxl_dstate->mem_size / CXL_CAPACITY_MULTIPLIER); + stq_le_p(&id->persistent_capacity, cxl_dstate->pmem_size / CXL_CAPACITY_MULTIPLIER); + stq_le_p(&id->volatile_capacity, cxl_dstate->vmem_size / CXL_CAPACITY_MULTIPLIER); + stl_le_p(&id->lsa_size, cvc->get_lsa_size(ct3d)); *len = sizeof(*id); return CXL_MBOX_SUCCESS; @@ -319,17 +320,20 @@ static ret_code cmd_ccls_get_partition_info(struct cxl_cmd *cmd, uint64_t next_pmem; } QEMU_PACKED *part_info = (void *)cmd->payload; QEMU_BUILD_BUG_ON(sizeof(*part_info) != 0x20); - uint64_t size = cxl_dstate->pmem_size; - if (!QEMU_IS_ALIGNED(size, CXL_CAPACITY_MULTIPLIER)) { + if ((!QEMU_IS_ALIGNED(cxl_dstate->vmem_size, CXL_CAPACITY_MULTIPLIER)) || + (!QEMU_IS_ALIGNED(cxl_dstate->pmem_size, CXL_CAPACITY_MULTIPLIER))) { return CXL_MBOX_INTERNAL_ERROR; } - /* PMEM only */ - part_info->active_vmem = 0; - part_info->next_vmem = 0; - part_info->active_pmem = size / CXL_CAPACITY_MULTIPLIER; - part_info->next_pmem = 0; + stq_le_p(&part_info->active_vmem, cxl_dstate->vmem_size / CXL_CAPACITY_MULTIPLIER); + /* + * When both next_vmem and next_pmem are 0, there is no pending change to + * partitioning. + */ + stq_le_p(&part_info->next_vmem, 0); + stq_le_p(&part_info->active_pmem, cxl_dstate->pmem_size / CXL_CAPACITY_MULTIPLIER); + stq_le_p(&part_info->next_pmem, 0); *len = sizeof(*part_info); return CXL_MBOX_SUCCESS; diff --git a/hw/mem/cxl_type3.c b/hw/mem/cxl_type3.c index 2db756851c..2adacbd01b 100644 --- a/hw/mem/cxl_type3.c +++ b/hw/mem/cxl_type3.c @@ -31,7 +31,8 @@ enum { }; static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, - int dsmad_handle, MemoryRegion *mr) + int dsmad_handle, MemoryRegion *mr, + bool is_pmem, uint64_t dpa_base) { g_autofree CDATDsmas *dsmas = NULL; g_autofree CDATDslbis *dslbis0 = NULL; @@ -50,8 +51,8 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, .length = sizeof(*dsmas), }, .DSMADhandle = dsmad_handle, - .flags = CDAT_DSMAS_FLAG_NV, - .DPA_base = 0, + .flags = is_pmem ? CDAT_DSMAS_FLAG_NV : 0, + .DPA_base = dpa_base, .DPA_length = memory_region_size(mr), }; @@ -130,8 +131,11 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, .length = sizeof(*dsemts), }, .DSMAS_handle = dsmad_handle, - /* Reserved - the non volatile from DSMAS matters */ - .EFI_memory_type_attr = 2, + /* + * NV: Reserved - the non volatile from DSMAS matters + * V: EFI_MEMORY_SP + */ + .EFI_memory_type_attr = is_pmem ? 2 : 1, .DPA_offset = 0, .DPA_length = memory_region_size(mr), }; @@ -150,33 +154,68 @@ static int ct3_build_cdat_entries_for_mr(CDATSubHeader **cdat_table, static int ct3_build_cdat_table(CDATSubHeader ***cdat_table, void *priv) { g_autofree CDATSubHeader **table = NULL; - MemoryRegion *nonvolatile_mr; CXLType3Dev *ct3d = priv; + MemoryRegion *volatile_mr = NULL, *nonvolatile_mr = NULL; int dsmad_handle = 0; - int rc; + int cur_ent = 0; + int len = 0; + int rc, i; - if (!ct3d->hostmem) { + if (!ct3d->hostpmem && !ct3d->hostvmem) { return 0; } - nonvolatile_mr = host_memory_backend_get_memory(ct3d->hostmem); - if (!nonvolatile_mr) { - return -EINVAL; + if (ct3d->hostvmem) { + volatile_mr = host_memory_backend_get_memory(ct3d->hostvmem); + if (!volatile_mr) { + return -EINVAL; + } + len += CT3_CDAT_NUM_ENTRIES; } - table = g_malloc0(CT3_CDAT_NUM_ENTRIES * sizeof(*table)); + if (ct3d->hostpmem) { + nonvolatile_mr = host_memory_backend_get_memory(ct3d->hostpmem); + if (!nonvolatile_mr) { + return -EINVAL; + } + len += CT3_CDAT_NUM_ENTRIES; + } + + table = g_malloc0(len * sizeof(*table)); if (!table) { return -ENOMEM; } - rc = ct3_build_cdat_entries_for_mr(table, dsmad_handle++, nonvolatile_mr); - if (rc < 0) { - return rc; + /* Now fill them in */ + if (volatile_mr) { + rc = ct3_build_cdat_entries_for_mr(table, dsmad_handle++, volatile_mr, + false, 0); + if (rc < 0) { + return rc; + } + cur_ent = CT3_CDAT_NUM_ENTRIES; } + if (nonvolatile_mr) { + rc = ct3_build_cdat_entries_for_mr(&(table[cur_ent]), dsmad_handle++, + nonvolatile_mr, true, + (volatile_mr ? + memory_region_size(volatile_mr) : 0)); + if (rc < 0) { + goto error_cleanup; + } + cur_ent += CT3_CDAT_NUM_ENTRIES; + } + assert(len == cur_ent); + *cdat_table = g_steal_pointer(&table); - return CT3_CDAT_NUM_ENTRIES; + return len; +error_cleanup: + for (i = 0; i < cur_ent; i++) { + g_free(table[i]); + } + return rc; } static void ct3_free_cdat_table(CDATSubHeader **cdat_table, int num, void *priv) @@ -264,16 +303,42 @@ static void build_dvsecs(CXLType3Dev *ct3d) { CXLComponentState *cxl_cstate = &ct3d->cxl_cstate; uint8_t *dvsec; + uint32_t range1_size_hi, range1_size_lo, + range1_base_hi = 0, range1_base_lo = 0, + range2_size_hi = 0, range2_size_lo = 0, + range2_base_hi = 0, range2_base_lo = 0; + + /* + * Volatile memory is mapped as (0x0) + * Persistent memory is mapped at (volatile->size) + */ + if (ct3d->hostvmem) { + range1_size_hi = ct3d->hostvmem->size >> 32; + range1_size_lo = (2 << 5) | (2 << 2) | 0x3 | + (ct3d->hostvmem->size & 0xF0000000); + if (ct3d->hostpmem) { + range2_size_hi = ct3d->hostpmem->size >> 32; + range2_size_lo = (2 << 5) | (2 << 2) | 0x3 | + (ct3d->hostpmem->size & 0xF0000000); + } + } else { + range1_size_hi = ct3d->hostpmem->size >> 32; + range1_size_lo = (2 << 5) | (2 << 2) | 0x3 | + (ct3d->hostpmem->size & 0xF0000000); + } dvsec = (uint8_t *)&(CXLDVSECDevice){ .cap = 0x1e, .ctrl = 0x2, .status2 = 0x2, - .range1_size_hi = ct3d->hostmem->size >> 32, - .range1_size_lo = (2 << 5) | (2 << 2) | 0x3 | - (ct3d->hostmem->size & 0xF0000000), - .range1_base_hi = 0, - .range1_base_lo = 0, + .range1_size_hi = range1_size_hi, + .range1_size_lo = range1_size_lo, + .range1_base_hi = range1_base_hi, + .range1_base_lo = range1_base_lo, + .range2_size_hi = range2_size_hi, + .range2_size_lo = range2_size_lo, + .range2_base_hi = range2_base_hi, + .range2_base_lo = range2_base_lo, }; cxl_component_create_dvsec(cxl_cstate, CXL2_TYPE3_DEVICE, PCIE_CXL_DEVICE_DVSEC_LENGTH, @@ -514,36 +579,69 @@ static void ct3d_reg_write(void *opaque, hwaddr offset, uint64_t value, static bool cxl_setup_memory(CXLType3Dev *ct3d, Error **errp) { DeviceState *ds = DEVICE(ct3d); - MemoryRegion *mr; - char *name; - if (!ct3d->hostmem) { - error_setg(errp, "memdev property must be set"); + if (!ct3d->hostmem && !ct3d->hostvmem && !ct3d->hostpmem) { + error_setg(errp, "at least one memdev property must be set"); + return false; + } else if (ct3d->hostmem && ct3d->hostpmem) { + error_setg(errp, "[memdev] cannot be used with new " + "[persistent-memdev] property"); + return false; + } else if (ct3d->hostmem) { + /* Use of hostmem property implies pmem */ + ct3d->hostpmem = ct3d->hostmem; + ct3d->hostmem = NULL; + } + + if (ct3d->hostpmem && !ct3d->lsa) { + error_setg(errp, "lsa property must be set for persistent devices"); return false; } - mr = host_memory_backend_get_memory(ct3d->hostmem); - if (!mr) { - error_setg(errp, "memdev property must be set"); - return false; + if (ct3d->hostvmem) { + MemoryRegion *vmr; + char *v_name; + + vmr = host_memory_backend_get_memory(ct3d->hostvmem); + if (!vmr) { + error_setg(errp, "volatile memdev must have backing device"); + return false; + } + memory_region_set_nonvolatile(vmr, false); + memory_region_set_enabled(vmr, true); + host_memory_backend_set_mapped(ct3d->hostvmem, true); + if (ds->id) { + v_name = g_strdup_printf("cxl-type3-dpa-vmem-space:%s", ds->id); + } else { + v_name = g_strdup("cxl-type3-dpa-vmem-space"); + } + address_space_init(&ct3d->hostvmem_as, vmr, v_name); + ct3d->cxl_dstate.vmem_size = memory_region_size(vmr); + ct3d->cxl_dstate.mem_size += memory_region_size(vmr); + g_free(v_name); } - memory_region_set_nonvolatile(mr, true); - memory_region_set_enabled(mr, true); - host_memory_backend_set_mapped(ct3d->hostmem, true); - if (ds->id) { - name = g_strdup_printf("cxl-type3-dpa-space:%s", ds->id); - } else { - name = g_strdup("cxl-type3-dpa-space"); - } - address_space_init(&ct3d->hostmem_as, mr, name); - g_free(name); + if (ct3d->hostpmem) { + MemoryRegion *pmr; + char *p_name; - ct3d->cxl_dstate.pmem_size = ct3d->hostmem->size; - - if (!ct3d->lsa) { - error_setg(errp, "lsa property must be set"); - return false; + pmr = host_memory_backend_get_memory(ct3d->hostpmem); + if (!pmr) { + error_setg(errp, "persistent memdev must have backing device"); + return false; + } + memory_region_set_nonvolatile(pmr, true); + memory_region_set_enabled(pmr, true); + host_memory_backend_set_mapped(ct3d->hostpmem, true); + if (ds->id) { + p_name = g_strdup_printf("cxl-type3-dpa-pmem-space:%s", ds->id); + } else { + p_name = g_strdup("cxl-type3-dpa-pmem-space"); + } + address_space_init(&ct3d->hostpmem_as, pmr, p_name); + ct3d->cxl_dstate.pmem_size = memory_region_size(pmr); + ct3d->cxl_dstate.mem_size += memory_region_size(pmr); + g_free(p_name); } return true; @@ -633,7 +731,12 @@ err_release_cdat: err_free_special_ops: g_free(regs->special_ops); err_address_space_free: - address_space_destroy(&ct3d->hostmem_as); + if (ct3d->hostpmem) { + address_space_destroy(&ct3d->hostpmem_as); + } + if (ct3d->hostvmem) { + address_space_destroy(&ct3d->hostvmem_as); + } return; } @@ -646,7 +749,12 @@ static void ct3_exit(PCIDevice *pci_dev) pcie_aer_exit(pci_dev); cxl_doe_cdat_release(cxl_cstate); g_free(regs->special_ops); - address_space_destroy(&ct3d->hostmem_as); + if (ct3d->hostpmem) { + address_space_destroy(&ct3d->hostpmem_as); + } + if (ct3d->hostvmem) { + address_space_destroy(&ct3d->hostvmem_as); + } } /* TODO: Support multiple HDM decoders and DPA skip */ @@ -681,51 +789,77 @@ static bool cxl_type3_dpa(CXLType3Dev *ct3d, hwaddr host_addr, uint64_t *dpa) return true; } +static int cxl_type3_hpa_to_as_and_dpa(CXLType3Dev *ct3d, + hwaddr host_addr, + unsigned int size, + AddressSpace **as, + uint64_t *dpa_offset) +{ + MemoryRegion *vmr = NULL, *pmr = NULL; + + if (ct3d->hostvmem) { + vmr = host_memory_backend_get_memory(ct3d->hostvmem); + } + if (ct3d->hostpmem) { + pmr = host_memory_backend_get_memory(ct3d->hostpmem); + } + + if (!vmr && !pmr) { + return -ENODEV; + } + + if (!cxl_type3_dpa(ct3d, host_addr, dpa_offset)) { + return -EINVAL; + } + + if (*dpa_offset > ct3d->cxl_dstate.mem_size) { + return -EINVAL; + } + + if (vmr) { + if (*dpa_offset < memory_region_size(vmr)) { + *as = &ct3d->hostvmem_as; + } else { + *as = &ct3d->hostpmem_as; + *dpa_offset -= memory_region_size(vmr); + } + } else { + *as = &ct3d->hostpmem_as; + } + + return 0; +} + MemTxResult cxl_type3_read(PCIDevice *d, hwaddr host_addr, uint64_t *data, unsigned size, MemTxAttrs attrs) { - CXLType3Dev *ct3d = CXL_TYPE3(d); - uint64_t dpa_offset; - MemoryRegion *mr; + uint64_t dpa_offset = 0; + AddressSpace *as = NULL; + int res; - /* TODO support volatile region */ - mr = host_memory_backend_get_memory(ct3d->hostmem); - if (!mr) { + res = cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size, + &as, &dpa_offset); + if (res) { return MEMTX_ERROR; } - if (!cxl_type3_dpa(ct3d, host_addr, &dpa_offset)) { - return MEMTX_ERROR; - } - - if (dpa_offset > memory_region_size(mr)) { - return MEMTX_ERROR; - } - - return address_space_read(&ct3d->hostmem_as, dpa_offset, attrs, data, size); + return address_space_read(as, dpa_offset, attrs, data, size); } MemTxResult cxl_type3_write(PCIDevice *d, hwaddr host_addr, uint64_t data, unsigned size, MemTxAttrs attrs) { - CXLType3Dev *ct3d = CXL_TYPE3(d); - uint64_t dpa_offset; - MemoryRegion *mr; + uint64_t dpa_offset = 0; + AddressSpace *as = NULL; + int res; - mr = host_memory_backend_get_memory(ct3d->hostmem); - if (!mr) { - return MEMTX_OK; + res = cxl_type3_hpa_to_as_and_dpa(CXL_TYPE3(d), host_addr, size, + &as, &dpa_offset); + if (res) { + return MEMTX_ERROR; } - if (!cxl_type3_dpa(ct3d, host_addr, &dpa_offset)) { - return MEMTX_OK; - } - - if (dpa_offset > memory_region_size(mr)) { - return MEMTX_OK; - } - return address_space_write(&ct3d->hostmem_as, dpa_offset, attrs, - &data, size); + return address_space_write(as, dpa_offset, attrs, &data, size); } static void ct3d_reset(DeviceState *dev) @@ -740,7 +874,11 @@ static void ct3d_reset(DeviceState *dev) static Property ct3_props[] = { DEFINE_PROP_LINK("memdev", CXLType3Dev, hostmem, TYPE_MEMORY_BACKEND, - HostMemoryBackend *), + HostMemoryBackend *), /* for backward compatibility */ + DEFINE_PROP_LINK("persistent-memdev", CXLType3Dev, hostpmem, + TYPE_MEMORY_BACKEND, HostMemoryBackend *), + DEFINE_PROP_LINK("volatile-memdev", CXLType3Dev, hostvmem, + TYPE_MEMORY_BACKEND, HostMemoryBackend *), DEFINE_PROP_LINK("lsa", CXLType3Dev, lsa, TYPE_MEMORY_BACKEND, HostMemoryBackend *), DEFINE_PROP_UINT64("sn", CXLType3Dev, sn, UI64_NULL), @@ -752,6 +890,10 @@ static uint64_t get_lsa_size(CXLType3Dev *ct3d) { MemoryRegion *mr; + if (!ct3d->lsa) { + return 0; + } + mr = host_memory_backend_get_memory(ct3d->lsa); return memory_region_size(mr); } @@ -769,6 +911,10 @@ static uint64_t get_lsa(CXLType3Dev *ct3d, void *buf, uint64_t size, MemoryRegion *mr; void *lsa; + if (!ct3d->lsa) { + return 0; + } + mr = host_memory_backend_get_memory(ct3d->lsa); validate_lsa_access(mr, size, offset); @@ -784,6 +930,10 @@ static void set_lsa(CXLType3Dev *ct3d, const void *buf, uint64_t size, MemoryRegion *mr; void *lsa; + if (!ct3d->lsa) { + return; + } + mr = host_memory_backend_get_memory(ct3d->lsa); validate_lsa_access(mr, size, offset); @@ -955,7 +1105,7 @@ static void ct3_class_init(ObjectClass *oc, void *data) pc->config_read = ct3d_config_read; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - dc->desc = "CXL PMEM Device (Type 3)"; + dc->desc = "CXL Memory Device (Type 3)"; dc->reset = ct3d_reset; device_class_set_props(dc, ct3_props); diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 7fd88b0e9c..159e4edb8f 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1867,13 +1867,13 @@ static void test_acpi_q35_cxl(void) " -device pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1" " -device pxb-cxl,bus_nr=222,bus=pcie.0,id=cxl.2" " -device cxl-rp,port=0,bus=cxl.1,id=rp1,chassis=0,slot=2" - " -device cxl-type3,bus=rp1,memdev=cxl-mem1,lsa=lsa1" + " -device cxl-type3,bus=rp1,persistent-memdev=cxl-mem1,lsa=lsa1" " -device cxl-rp,port=1,bus=cxl.1,id=rp2,chassis=0,slot=3" - " -device cxl-type3,bus=rp2,memdev=cxl-mem2,lsa=lsa2" + " -device cxl-type3,bus=rp2,persistent-memdev=cxl-mem2,lsa=lsa2" " -device cxl-rp,port=0,bus=cxl.2,id=rp3,chassis=0,slot=5" - " -device cxl-type3,bus=rp3,memdev=cxl-mem3,lsa=lsa3" + " -device cxl-type3,bus=rp3,persistent-memdev=cxl-mem3,lsa=lsa3" " -device cxl-rp,port=1,bus=cxl.2,id=rp4,chassis=0,slot=6" - " -device cxl-type3,bus=rp4,memdev=cxl-mem4,lsa=lsa4" + " -device cxl-type3,bus=rp4,persistent-memdev=cxl-mem4,lsa=lsa4" " -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G,cxl-fmw.0.interleave-granularity=8k," "cxl-fmw.1.targets.0=cxl.1,cxl-fmw.1.targets.1=cxl.2,cxl-fmw.1.size=4G,cxl-fmw.1.interleave-granularity=8k", tmp_path, tmp_path, tmp_path, tmp_path, diff --git a/tests/qtest/cxl-test.c b/tests/qtest/cxl-test.c index eda2bbbbe6..edcad4a0ce 100644 --- a/tests/qtest/cxl-test.c +++ b/tests/qtest/cxl-test.c @@ -34,32 +34,46 @@ "-device cxl-rp,id=rp2,bus=cxl.1,chassis=0,slot=2 " \ "-device cxl-rp,id=rp3,bus=cxl.1,chassis=0,slot=3 " -#define QEMU_T3D \ +#define QEMU_T3D_DEPRECATED \ "-object memory-backend-file,id=cxl-mem0,mem-path=%s,size=256M " \ "-object memory-backend-file,id=lsa0,mem-path=%s,size=256M " \ "-device cxl-type3,bus=rp0,memdev=cxl-mem0,lsa=lsa0,id=cxl-pmem0 " +#define QEMU_T3D_PMEM \ + "-object memory-backend-file,id=cxl-mem0,mem-path=%s,size=256M " \ + "-object memory-backend-file,id=lsa0,mem-path=%s,size=256M " \ + "-device cxl-type3,bus=rp0,persistent-memdev=cxl-mem0,lsa=lsa0,id=pmem0 " + +#define QEMU_T3D_VMEM \ + "-object memory-backend-ram,id=cxl-mem0,size=256M " \ + "-device cxl-type3,bus=rp0,volatile-memdev=cxl-mem0,id=mem0 " + +#define QEMU_T3D_VMEM_LSA \ + "-object memory-backend-ram,id=cxl-mem0,size=256M " \ + "-object memory-backend-file,id=lsa0,mem-path=%s,size=256M " \ + "-device cxl-type3,bus=rp0,volatile-memdev=cxl-mem0,lsa=lsa0,id=mem0 " + #define QEMU_2T3D \ "-object memory-backend-file,id=cxl-mem0,mem-path=%s,size=256M " \ "-object memory-backend-file,id=lsa0,mem-path=%s,size=256M " \ - "-device cxl-type3,bus=rp0,memdev=cxl-mem0,lsa=lsa0,id=cxl-pmem0 " \ + "-device cxl-type3,bus=rp0,persistent-memdev=cxl-mem0,lsa=lsa0,id=pmem0 " \ "-object memory-backend-file,id=cxl-mem1,mem-path=%s,size=256M " \ "-object memory-backend-file,id=lsa1,mem-path=%s,size=256M " \ - "-device cxl-type3,bus=rp1,memdev=cxl-mem1,lsa=lsa1,id=cxl-pmem1 " + "-device cxl-type3,bus=rp1,persistent-memdev=cxl-mem1,lsa=lsa1,id=pmem1 " #define QEMU_4T3D \ "-object memory-backend-file,id=cxl-mem0,mem-path=%s,size=256M " \ "-object memory-backend-file,id=lsa0,mem-path=%s,size=256M " \ - "-device cxl-type3,bus=rp0,memdev=cxl-mem0,lsa=lsa0,id=cxl-pmem0 " \ + "-device cxl-type3,bus=rp0,persistent-memdev=cxl-mem0,lsa=lsa0,id=pmem0 " \ "-object memory-backend-file,id=cxl-mem1,mem-path=%s,size=256M " \ "-object memory-backend-file,id=lsa1,mem-path=%s,size=256M " \ - "-device cxl-type3,bus=rp1,memdev=cxl-mem1,lsa=lsa1,id=cxl-pmem1 " \ + "-device cxl-type3,bus=rp1,persistent-memdev=cxl-mem1,lsa=lsa1,id=pmem1 " \ "-object memory-backend-file,id=cxl-mem2,mem-path=%s,size=256M " \ "-object memory-backend-file,id=lsa2,mem-path=%s,size=256M " \ - "-device cxl-type3,bus=rp2,memdev=cxl-mem2,lsa=lsa2,id=cxl-pmem2 " \ + "-device cxl-type3,bus=rp2,persistent-memdev=cxl-mem2,lsa=lsa2,id=pmem2 " \ "-object memory-backend-file,id=cxl-mem3,mem-path=%s,size=256M " \ "-object memory-backend-file,id=lsa3,mem-path=%s,size=256M " \ - "-device cxl-type3,bus=rp3,memdev=cxl-mem3,lsa=lsa3,id=cxl-pmem3 " + "-device cxl-type3,bus=rp3,persistent-memdev=cxl-mem3,lsa=lsa3,id=pmem3 " static void cxl_basic_hb(void) { @@ -98,14 +112,53 @@ static void cxl_2root_port(void) } #ifdef CONFIG_POSIX -static void cxl_t3d(void) +static void cxl_t3d_deprecated(void) { g_autoptr(GString) cmdline = g_string_new(NULL); g_autofree const char *tmpfs = NULL; tmpfs = g_dir_make_tmp("cxl-test-XXXXXX", NULL); - g_string_printf(cmdline, QEMU_PXB_CMD QEMU_RP QEMU_T3D, tmpfs, tmpfs); + g_string_printf(cmdline, QEMU_PXB_CMD QEMU_RP QEMU_T3D_DEPRECATED, + tmpfs, tmpfs); + + qtest_start(cmdline->str); + qtest_end(); +} + +static void cxl_t3d_persistent(void) +{ + g_autoptr(GString) cmdline = g_string_new(NULL); + g_autofree const char *tmpfs = NULL; + + tmpfs = g_dir_make_tmp("cxl-test-XXXXXX", NULL); + + g_string_printf(cmdline, QEMU_PXB_CMD QEMU_RP QEMU_T3D_PMEM, + tmpfs, tmpfs); + + qtest_start(cmdline->str); + qtest_end(); +} + +static void cxl_t3d_volatile(void) +{ + g_autoptr(GString) cmdline = g_string_new(NULL); + + g_string_printf(cmdline, QEMU_PXB_CMD QEMU_RP QEMU_T3D_VMEM); + + qtest_start(cmdline->str); + qtest_end(); +} + +static void cxl_t3d_volatile_lsa(void) +{ + g_autoptr(GString) cmdline = g_string_new(NULL); + g_autofree const char *tmpfs = NULL; + + tmpfs = g_dir_make_tmp("cxl-test-XXXXXX", NULL); + + g_string_printf(cmdline, QEMU_PXB_CMD QEMU_RP QEMU_T3D_VMEM_LSA, + tmpfs); qtest_start(cmdline->str); qtest_end(); @@ -155,7 +208,10 @@ int main(int argc, char **argv) qtest_add_func("/pci/cxl/rp", cxl_root_port); qtest_add_func("/pci/cxl/rp_x2", cxl_2root_port); #ifdef CONFIG_POSIX - qtest_add_func("/pci/cxl/type3_device", cxl_t3d); + qtest_add_func("/pci/cxl/type3_device", cxl_t3d_deprecated); + qtest_add_func("/pci/cxl/type3_device_pmem", cxl_t3d_persistent); + qtest_add_func("/pci/cxl/type3_device_vmem", cxl_t3d_volatile); + qtest_add_func("/pci/cxl/type3_device_vmem_lsa", cxl_t3d_volatile_lsa); qtest_add_func("/pci/cxl/rp_x2_type3_x2", cxl_1pxb_2rp_2t3d); qtest_add_func("/pci/cxl/pxb_x2_root_port_x4_type3_x4", cxl_2pxb_4rp_4t3d); #endif diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 7bb4d2f4f6..e934e0a13a 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -328,6 +328,14 @@ from Intel that was not properly allocated. Since version 5.2, the controller has used a properly allocated identifier. Deprecate the ``use-intel-id`` machine compatibility parameter. +``-device cxl-type3,memdev=xxxx`` (since 8.0) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The ``cxl-type3`` device initially only used a single memory backend. With +the addition of volatile memory support, it is now necessary to distinguish +between persistent and volatile memory backends. As such, memdev is deprecated +in favor of persistent-memdev. + Block device options '''''''''''''''''''' diff --git a/docs/system/devices/cxl.rst b/docs/system/devices/cxl.rst index 8f2885aba1..f12011e230 100644 --- a/docs/system/devices/cxl.rst +++ b/docs/system/devices/cxl.rst @@ -300,7 +300,7 @@ Example topology involving a switch:: Example command lines --------------------- -A very simple setup with just one directly attached CXL Type 3 device:: +A very simple setup with just one directly attached CXL Type 3 Persistent Memory device:: qemu-system-x86_64 -M q35,cxl=on -m 4G,maxmem=8G,slots=8 -smp 4 \ ... @@ -308,7 +308,28 @@ A very simple setup with just one directly attached CXL Type 3 device:: -object memory-backend-file,id=cxl-lsa1,share=on,mem-path=/tmp/lsa.raw,size=256M \ -device pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1 \ -device cxl-rp,port=0,bus=cxl.1,id=root_port13,chassis=0,slot=2 \ - -device cxl-type3,bus=root_port13,memdev=cxl-mem1,lsa=cxl-lsa1,id=cxl-pmem0 \ + -device cxl-type3,bus=root_port13,persistent-memdev=cxl-mem1,lsa=cxl-lsa1,id=cxl-pmem0 \ + -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G + +A very simple setup with just one directly attached CXL Type 3 Volatile Memory device:: + + qemu-system-aarch64 -M virt,gic-version=3,cxl=on -m 4g,maxmem=8G,slots=8 -cpu max \ + ... + -object memory-backend-ram,id=vmem0,share=on,size=256M \ + -device pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1 \ + -device cxl-rp,port=0,bus=cxl.1,id=root_port13,chassis=0,slot=2 \ + -device cxl-type3,bus=root_port13,volatile-memdev=vmem0,id=cxl-vmem0 \ + -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G + +The same volatile setup may optionally include an LSA region:: + + qemu-system-aarch64 -M virt,gic-version=3,cxl=on -m 4g,maxmem=8G,slots=8 -cpu max \ + ... + -object memory-backend-ram,id=vmem0,share=on,size=256M \ + -object memory-backend-file,id=cxl-lsa0,share=on,mem-path=/tmp/lsa.raw,size=256M \ + -device pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1 \ + -device cxl-rp,port=0,bus=cxl.1,id=root_port13,chassis=0,slot=2 \ + -device cxl-type3,bus=root_port13,volatile-memdev=vmem0,lsa=cxl-lsa0,id=cxl-vmem0 \ -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G A setup suitable for 4 way interleave. Only one fixed window provided, to enable 2 way @@ -328,13 +349,13 @@ the CXL Type3 device directly attached (no switches).:: -device pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1 \ -device pxb-cxl,bus_nr=222,bus=pcie.0,id=cxl.2 \ -device cxl-rp,port=0,bus=cxl.1,id=root_port13,chassis=0,slot=2 \ - -device cxl-type3,bus=root_port13,memdev=cxl-mem1,lsa=cxl-lsa1,id=cxl-pmem0 \ + -device cxl-type3,bus=root_port13,persistent-memdev=cxl-mem1,lsa=cxl-lsa1,id=cxl-pmem0 \ -device cxl-rp,port=1,bus=cxl.1,id=root_port14,chassis=0,slot=3 \ - -device cxl-type3,bus=root_port14,memdev=cxl-mem2,lsa=cxl-lsa2,id=cxl-pmem1 \ + -device cxl-type3,bus=root_port14,persistent-memdev=cxl-mem2,lsa=cxl-lsa2,id=cxl-pmem1 \ -device cxl-rp,port=0,bus=cxl.2,id=root_port15,chassis=0,slot=5 \ - -device cxl-type3,bus=root_port15,memdev=cxl-mem3,lsa=cxl-lsa3,id=cxl-pmem2 \ + -device cxl-type3,bus=root_port15,persistent-memdev=cxl-mem3,lsa=cxl-lsa3,id=cxl-pmem2 \ -device cxl-rp,port=1,bus=cxl.2,id=root_port16,chassis=0,slot=6 \ - -device cxl-type3,bus=root_port16,memdev=cxl-mem4,lsa=cxl-lsa4,id=cxl-pmem3 \ + -device cxl-type3,bus=root_port16,persistent-memdev=cxl-mem4,lsa=cxl-lsa4,id=cxl-pmem3 \ -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.targets.1=cxl.2,cxl-fmw.0.size=4G,cxl-fmw.0.interleave-granularity=8k An example of 4 devices below a switch suitable for 1, 2 or 4 way interleave:: @@ -354,15 +375,23 @@ An example of 4 devices below a switch suitable for 1, 2 or 4 way interleave:: -device cxl-rp,port=1,bus=cxl.1,id=root_port1,chassis=0,slot=1 \ -device cxl-upstream,bus=root_port0,id=us0 \ -device cxl-downstream,port=0,bus=us0,id=swport0,chassis=0,slot=4 \ - -device cxl-type3,bus=swport0,memdev=cxl-mem0,lsa=cxl-lsa0,id=cxl-pmem0 \ + -device cxl-type3,bus=swport0,persistent-memdev=cxl-mem0,lsa=cxl-lsa0,id=cxl-pmem0 \ -device cxl-downstream,port=1,bus=us0,id=swport1,chassis=0,slot=5 \ - -device cxl-type3,bus=swport1,memdev=cxl-mem1,lsa=cxl-lsa1,id=cxl-pmem1 \ + -device cxl-type3,bus=swport1,persistent-memdev=cxl-mem1,lsa=cxl-lsa1,id=cxl-pmem1 \ -device cxl-downstream,port=2,bus=us0,id=swport2,chassis=0,slot=6 \ - -device cxl-type3,bus=swport2,memdev=cxl-mem2,lsa=cxl-lsa2,id=cxl-pmem2 \ + -device cxl-type3,bus=swport2,persistent-memdev=cxl-mem2,lsa=cxl-lsa2,id=cxl-pmem2 \ -device cxl-downstream,port=3,bus=us0,id=swport3,chassis=0,slot=7 \ - -device cxl-type3,bus=swport3,memdev=cxl-mem3,lsa=cxl-lsa3,id=cxl-pmem3 \ + -device cxl-type3,bus=swport3,persistent-memdev=cxl-mem3,lsa=cxl-lsa3,id=cxl-pmem3 \ -M cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=4G,cxl-fmw.0.interleave-granularity=4k +Deprecations +------------ + +The Type 3 device [memdev] attribute has been deprecated in favor of the +[persistent-memdev] attributes. [memdev] will default to a persistent memory +device for backward compatibility and is incapable of being used in combination +with [persistent-memdev]. + Kernel Configuration Options ---------------------------- -- MST

1 0

[PATCH] qemu: Use thread-context even with numatune's restrive mode
by Martin Kletzander 19 May '23

19 May '23

We cannot use host-nodes attribute for it, but there is no reason for us to skip the preallocation optimisation using thread-context in such case. Thankfully returning the proper nodemask from qemuBuildMemoryBackendProps is enough to trigger this. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9b993c3aad76..cb09fed0676a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3245,7 +3245,7 @@ qemuBuildMemoryGetPagesize(virQEMUDriverConfig *cfg, * @def: domain definition object * @mem: memory definition object * @force: forcibly use one of the backends - * @nodemaskRet: [out] bitmap used to format .host-nodes attribute + * @nodemaskRet: [out] bitmap where the memory should be allocated * * Creates a configuration object that represents memory backend of given guest * NUMA node (domain @def and @mem). Use @priv->autoNodeset to fine tune the @@ -3458,10 +3458,10 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps, "S:policy", qemuNumaPolicyTypeToString(mode), NULL) < 0) return -1; - - if (nodemaskRet) - *nodemaskRet = nodemask; } + + if (nodemaskRet) + *nodemaskRet = nodemask; } /* If none of the following is requested... */ -- 2.40.1

2 1

[libvirt PATCH] NEWS: Mention support for compressing parallel migration
by Jiri Denemark 19 May '23

19 May '23

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- NEWS.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 446998e12e..1b85ef6d37 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,10 @@ v9.4.0 (unreleased) * **New features** + * qemu: Support compression for parallel migration + + QEMU supports parallel migration to be compressed using either zstd or zlib. + * **Improvements** * **Bug fixes** -- 2.40.1

2 1

[PATCH 0/2] docs: improve isa-debugcon example
by Laszlo Ersek 18 May '23

18 May '23

The feature from libvirt 8.1 that the OVMF debug log can be captured with native domain XML elements is super useful, but the example snippet in the documentation is more difficult to use than necessary. Improve it. Cc: "Daniel P. Berrangé" <berrange(a)redhat.com> Cc: Andrea Bolognani <abologna(a)redhat.com> Thanks! Laszlo Laszlo Ersek (2): docs: fix typo in isa-debugcon example docs: make isa-debugcon example more useful / directly applicable docs/formatdomain.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) base-commit: 5ee27c37e6d0d081714d1e1d25a0a4e472665120

3 6

[PATCH V3 0/3] migration: add qemu parallel migration options
by Jiang Jiacheng 18 May '23

18 May '23

Add compress method zlib and zstd for parallel migration and new migration options to set qemu's parameter related with parallel migration(multifd-compression, multifd-zlib-level and multifd-zstd-level). These parameters has been supported by QEMU since 5.0. v3 of: https://listman.redhat.com/archives/libvir-list/2023-February/237604.html diff to v2: * merge the processing of new method into 'qemuMigrationParamsSetCompression' * improve descriptions for the new options. Jiang Jiacheng (3): Add public API for parallel compression method virsh: Add migrate options to set parallel compress level qemu: support set parallel migration compression method docs/manpages/virsh.rst | 29 ++++++++---- include/libvirt/libvirt-domain.h | 30 ++++++++++-- src/qemu/qemu_migration.h | 2 + src/qemu/qemu_migration_params.c | 80 +++++++++++++++++++++++++++++++- src/qemu/qemu_migration_params.h | 3 ++ tools/virsh-domain.c | 26 +++++++++++ 6 files changed, 156 insertions(+), 14 deletions(-) -- 2.33.0

2 12

[PATCH 0/7] docs: Cleanups of generated pages and generators
by Peter Krempa 17 May '23

17 May '23

Browse the affected content at: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4302989355/artifacts/website/hvs… https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4302989355/artifacts/website/htm… https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4302989355/artifacts/website/htm… Peter Krempa (7): docs: Remove XSLT table of contents generator scripts: hvsupport: Properly register virConnectOpenAuth/virConnectOpenReadOnly APIs hvsupport: Split out common APIs from hypervisor API section css: Remove override of width for 'hvsupport' page docs: html: Add a manually written index page docs: newapi.xsl: Remove support for generating index page docs: xsl: Simplify templating XSL docs/css/libvirt.css | 2 - docs/html/index.rst | 65 +++++++++++++++++++++++ docs/html/meson.build | 46 +++++++++++++++- docs/newapi.xsl | 119 ++++++++++++++++-------------------------- docs/page.xsl | 66 ----------------------- scripts/hvsupport.py | 71 +++++++++++++++++++------ 6 files changed, 208 insertions(+), 161 deletions(-) create mode 100644 docs/html/index.rst -- 2.40.1

2 8

[PATCH v3] vfio/pci: Propagate ACPI notifications to user-space via eventfd
by Grzegorz Jaszczyk 17 May '23

17 May '23

From: Grzegorz Jaszczyk <jaz(a)semihalf.com> To allow pass-through devices receiving ACPI notifications, permit to register ACPI notify handler (via introduced new ioctl) for a given device. The handler role is to receive and propagate such ACPI notifications to the user-space through the user provided eventfd. This allows VMM to receive and propagate them further to the VM, where the actual driver for pass-through device resides and can react to device specific notifications accordingly. The eventfd usage ensures VMM and device isolation: it allows to use a dedicated channel associated with the device for such events, such that the VMM has direct access. Since the eventfd counter is used as ACPI notification value placeholder, the eventfd signaling needs to be serialized in order to not end up with notification values being coalesced. Therefore ACPI notification values are buffered and signalized one by one, when the previous notification value has been consumed. Signed-off-by: Grzegorz Jaszczyk <jaz(a)semihalf.com> --- Changelog v2..v3: - Fix compilation warnings when building with "W=1" Changelog v1..v2: - The v2 implementation is actually completely different then v1: instead of using acpi netlink events for propagating ACPI notifications to the user space take advantage of eventfd, which can provide better VMM and device isolation: it allows to use a dedicated channel associated with the device for such events, such that the VMM has direct access. - Using eventfd counter as notification value placeholder was suggested in v1 and requires additional serialization logic introduced in v2. - Since the vfio-pci supports non-ACPI platforms address !CONFIG_ACPI case. - v1 discussion: https://patchwork.kernel.org/project/kvm/patch/20230307220553.631069-1-jaz@… --- drivers/vfio/pci/vfio_pci_core.c | 214 +++++++++++++++++++++++++++++++ include/linux/vfio_pci_core.h | 11 ++ include/uapi/linux/vfio.h | 15 +++ 3 files changed, 240 insertions(+) diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index a5ab416cf476..2d6101e89fde 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -10,6 +10,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include <linux/acpi.h> #include <linux/aperture.h> #include <linux/device.h> #include <linux/eventfd.h> @@ -679,6 +680,70 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev) } EXPORT_SYMBOL_GPL(vfio_pci_core_disable); +struct notification_queue { + int notification_val; + struct list_head notify_val_next; +}; + +#if IS_ENABLED(CONFIG_ACPI) +static void vfio_pci_core_acpi_notify(acpi_handle handle, u32 event, void *data) +{ + struct vfio_pci_core_device *vdev = (struct vfio_pci_core_device *)data; + struct vfio_acpi_notification *acpi_notify = vdev->acpi_notification; + struct notification_queue *entry; + + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return; + + entry->notification_val = event; + INIT_LIST_HEAD(&entry->notify_val_next); + + mutex_lock(&acpi_notify->notification_list_lock); + list_add_tail(&entry->notify_val_next, &acpi_notify->notification_list); + mutex_unlock(&acpi_notify->notification_list_lock); + + schedule_work(&acpi_notify->acpi_notification_work); +} + +static void vfio_pci_acpi_notify_close_device(struct vfio_pci_core_device *vdev) +{ + struct vfio_acpi_notification *acpi_notify = vdev->acpi_notification; + struct pci_dev *pdev = vdev->pdev; + struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); + struct notification_queue *entry, *entry_tmp; + u64 cnt; + + if (!acpi_notify || !acpi_notify->acpi_notify_trigger) + return; + + acpi_remove_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vfio_pci_core_acpi_notify); + + eventfd_ctx_remove_wait_queue(acpi_notify->acpi_notify_trigger, + &acpi_notify->wait, &cnt); + + flush_work(&acpi_notify->acpi_notification_work); + + mutex_lock(&acpi_notify->notification_list_lock); + list_for_each_entry_safe(entry, entry_tmp, + &acpi_notify->notification_list, + notify_val_next) { + list_del(&entry->notify_val_next); + kfree(entry); + } + mutex_unlock(&acpi_notify->notification_list_lock); + + eventfd_ctx_put(acpi_notify->acpi_notify_trigger); + + kfree(acpi_notify); + + vdev->acpi_notification = NULL; +} +#else +static void vfio_pci_acpi_notify_close_device(struct vfio_pci_core_device *vdev) {} +#endif /* CONFIG_ACPI */ + void vfio_pci_core_close_device(struct vfio_device *core_vdev) { struct vfio_pci_core_device *vdev = @@ -705,6 +770,8 @@ void vfio_pci_core_close_device(struct vfio_device *core_vdev) vdev->req_trigger = NULL; } mutex_unlock(&vdev->igate); + + vfio_pci_acpi_notify_close_device(vdev); } EXPORT_SYMBOL_GPL(vfio_pci_core_close_device); @@ -882,6 +949,151 @@ int vfio_pci_core_register_dev_region(struct vfio_pci_core_device *vdev, } EXPORT_SYMBOL_GPL(vfio_pci_core_register_dev_region); +#if IS_ENABLED(CONFIG_ACPI) +static int vfio_pci_eventfd_wakeup(wait_queue_entry_t *wait, unsigned int mode, + int sync, void *key) +{ + struct vfio_acpi_notification *acpi_notify = + container_of(wait, struct vfio_acpi_notification, wait); + __poll_t flags = key_to_poll(key); + + /* + * eventfd_read signalize EPOLLOUT at the end of its function - this + * means previous eventfd with its notification value was consumed so + * the next notification can be signalized now if pending - schedule + * proper work. + */ + if (flags & EPOLLOUT) { + mutex_unlock(&acpi_notify->notification_lock); + schedule_work(&acpi_notify->acpi_notification_work); + } + + return 0; +} + +static void vfio_pci_ptable_queue_proc(struct file *file, + wait_queue_head_t *wqh, poll_table *pt) +{ + struct vfio_acpi_notification *acpi_notify = + container_of(pt, struct vfio_acpi_notification, pt); + + add_wait_queue(wqh, &acpi_notify->wait); +} + +static void acpi_notification_work_fn(struct work_struct *work) +{ + struct vfio_acpi_notification *acpi_notify; + struct notification_queue *entry; + + acpi_notify = container_of(work, struct vfio_acpi_notification, + acpi_notification_work); + + mutex_lock(&acpi_notify->notification_list_lock); + if (list_empty(&acpi_notify->notification_list) || !acpi_notify->acpi_notify_trigger) + goto out; + + /* + * If the previous eventfd was not yet consumed by user-space lets hold + * on and exit. The notification function will be rescheduled when + * signaling eventfd will be possible (when the EPOLLOUT will be + * signalized and unlocks notify_events). + */ + if (!mutex_trylock(&acpi_notify->notification_lock)) + goto out; + + entry = list_first_entry(&acpi_notify->notification_list, + struct notification_queue, notify_val_next); + + list_del(&entry->notify_val_next); + mutex_unlock(&acpi_notify->notification_list_lock); + + eventfd_signal(acpi_notify->acpi_notify_trigger, entry->notification_val); + + kfree(entry); + + return; +out: + mutex_unlock(&acpi_notify->notification_list_lock); +} + +static int vfio_pci_ioctl_acpi_notify_eventfd(struct vfio_pci_core_device *vdev, struct + vfio_irq_info __user *arg) +{ + struct file *acpi_notify_trigger_file; + struct vfio_acpi_notification *acpi_notify; + struct pci_dev *pdev = vdev->pdev; + struct acpi_device *adev = ACPI_COMPANION(&pdev->dev); + struct vfio_acpi_notify_eventfd entry; + struct eventfd_ctx *efdctx; + acpi_status status; + + if (!adev) + return -ENODEV; + + if (copy_from_user(&entry, arg, sizeof(entry))) + return -EFAULT; + + if (entry.notify_eventfd < 0) + return -EINVAL; + + efdctx = eventfd_ctx_fdget(entry.notify_eventfd); + if (IS_ERR(efdctx)) + return PTR_ERR(efdctx); + + vdev->acpi_notification = kzalloc(sizeof(*acpi_notify), GFP_KERNEL); + if (!vdev->acpi_notification) + return -ENOMEM; + + acpi_notify = vdev->acpi_notification; + + INIT_WORK(&acpi_notify->acpi_notification_work, acpi_notification_work_fn); + INIT_LIST_HEAD(&acpi_notify->notification_list); + + acpi_notify->acpi_notify_trigger = efdctx; + + mutex_init(&acpi_notify->notification_lock); + + /* + * Install custom wake-up handler to be notified whenever underlying + * eventfd is consumed by the user-space. + */ + init_waitqueue_func_entry(&acpi_notify->wait, vfio_pci_eventfd_wakeup); + init_poll_funcptr(&acpi_notify->pt, vfio_pci_ptable_queue_proc); + + acpi_notify_trigger_file = eventfd_fget(entry.notify_eventfd); + vfs_poll(acpi_notify_trigger_file, &acpi_notify->pt); + + status = acpi_install_notify_handler(adev->handle, ACPI_DEVICE_NOTIFY, + vfio_pci_core_acpi_notify, (void *)vdev); + + if (ACPI_FAILURE(status)) { + u64 cnt; + + pci_err(pdev, "Failed to install notify handler: %s", + acpi_format_exception(status)); + + eventfd_ctx_remove_wait_queue(acpi_notify->acpi_notify_trigger, + &acpi_notify->wait, &cnt); + + flush_work(&acpi_notify->acpi_notification_work); + + eventfd_ctx_put(acpi_notify->acpi_notify_trigger); + + kfree(acpi_notify); + + return -ENODEV; + } + + return 0; +} +#else +static int vfio_pci_ioctl_acpi_notify_eventfd(struct vfio_pci_core_device *vdev, struct + vfio_irq_info __user *arg) +{ + return -ENODEV; +} +#endif /* CONFIG_ACPI */ + static int vfio_pci_ioctl_get_info(struct vfio_pci_core_device *vdev, struct vfio_device_info __user *arg) { @@ -1398,6 +1610,8 @@ long vfio_pci_core_ioctl(struct vfio_device *core_vdev, unsigned int cmd, return vfio_pci_ioctl_reset(vdev, uarg); case VFIO_DEVICE_SET_IRQS: return vfio_pci_ioctl_set_irqs(vdev, uarg); + case VFIO_ACPI_NOTIFY_EVENTFD: + return vfio_pci_ioctl_acpi_notify_eventfd(vdev, uarg); default: return -ENOTTY; } diff --git a/include/linux/vfio_pci_core.h b/include/linux/vfio_pci_core.h index 367fd79226a3..3711e8a1c6f0 100644 --- a/include/linux/vfio_pci_core.h +++ b/include/linux/vfio_pci_core.h @@ -49,6 +49,16 @@ struct vfio_pci_region { u32 flags; }; +struct vfio_acpi_notification { + struct eventfd_ctx *acpi_notify_trigger; + struct work_struct acpi_notification_work; + struct list_head notification_list; + struct mutex notification_list_lock; + struct mutex notification_lock; + poll_table pt; + wait_queue_entry_t wait; +}; + struct vfio_pci_core_device { struct vfio_device vdev; struct pci_dev *pdev; @@ -96,6 +106,7 @@ struct vfio_pci_core_device { struct mutex vma_lock; struct list_head vma_list; struct rw_semaphore memory_lock; + struct vfio_acpi_notification *acpi_notification; }; /* Will be exported for vfio pci drivers usage */ diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h index 0552e8dcf0cb..d4b602d8f4b2 100644 --- a/include/uapi/linux/vfio.h +++ b/include/uapi/linux/vfio.h @@ -1622,6 +1622,21 @@ struct vfio_iommu_spapr_tce_remove { }; #define VFIO_IOMMU_SPAPR_TCE_REMOVE _IO(VFIO_TYPE, VFIO_BASE + 20) +/** + * VFIO_ACPI_NOTIFY_EVENTFD - _IOW(VFIO_TYPE, VFIO_BASE + 21, struct vfio_acpi_notify_eventfd) + * + * Register ACPI notify handler for a given device which will allow to receive + * and propagate ACPI notifications to the user-space through the user provided + * eventfd. + * + * Return: 0 on success, -errno on failure. + */ +struct vfio_acpi_notify_eventfd { + __s32 notify_eventfd; + __u32 reserved; +}; +#define VFIO_ACPI_NOTIFY_EVENTFD _IO(VFIO_TYPE, VFIO_BASE + 21) + /* ***************************************************************** */ #endif /* _UAPIVFIO_H */ -- 2.40.1.495.gc816e09b53d-goog

2 2

[PATCH 00/12] docs: Finish conversion of non-generated docs to rST and fix and cleanup CSS
by Peter Krempa 17 May '23

17 May '23

Browse the results at: https://pipo.sk.gitlab.io/-/libvirt/-/jobs/4294950526/artifacts/website/ind… Peter Krempa (12): css: Drop styles for '#projects' id css: Drop style for '#changelog' id css: Drop style for 'p.image' selector css: Drop styles for '.mail' class css: Drop styles for '.gitmirror' class css: mobile: Replace tabs with spaces css: mobile: Fix responsive design of 'docs' and 'knowledgebase' pages css: mobile: Fix hiding of big logo in mobile layout css: mobile: Make colums in "3 column" mobile layout wider css: Fix styling of the "3 panel" pages docs: acl: Convert to 'rst' docs: index: Convert to 'rst' docs/acl.html.in | 101 ------------------------------ docs/acl.rst | 76 +++++++++++++++++++++++ docs/aclpolkit.rst | 2 +- docs/css/libvirt.css | 143 ++++++++----------------------------------- docs/css/mobile.css | 136 ++++++++++++++++++++-------------------- docs/index.html.in | 87 -------------------------- docs/index.rst | 70 +++++++++++++++++++++ docs/meson.build | 15 +---- 8 files changed, 245 insertions(+), 385 deletions(-) delete mode 100644 docs/acl.html.in create mode 100644 docs/acl.rst delete mode 100644 docs/index.html.in create mode 100644 docs/index.rst -- 2.40.1

2 15

[PATCH 0/3] qemu: Introduce pipewire audio backend
by Michal Privoznik 16 May '23

16 May '23

You'd expect to see src/qemu/qemu_capabilities.c changed, wouldn't you. Well, there's no way to query for supported audio backends, see: https://gitlab.com/libvirt/libvirt/-/issues/473 Michal Prívozník (3): conf: Introduce pipewire audio backend qemu: Generate cmd line for pipewire audio backend NEWS: Document pipewire audio backend NEWS.rst | 10 +++ docs/formatdomain.rst | 35 +++++++++- src/conf/domain_conf.c | 70 +++++++++++++++++++ src/conf/domain_conf.h | 12 ++++ src/conf/schemas/domaincommon.rng | 37 ++++++++++ src/qemu/qemu_command.c | 63 +++++++++++++++++ src/qemu/qemu_validate.c | 1 + .../audio-many-backends.x86_64-latest.args | 2 + .../qemuxml2argvdata/audio-many-backends.xml | 1 + .../audio-pipewire-best.x86_64-latest.args | 36 ++++++++++ .../qemuxml2argvdata/audio-pipewire-best.xml | 43 ++++++++++++ .../audio-pipewire-full.x86_64-latest.args | 36 ++++++++++ .../qemuxml2argvdata/audio-pipewire-full.xml | 43 ++++++++++++ .../audio-pipewire-minimal.x86_64-latest.args | 36 ++++++++++ .../audio-pipewire-minimal.xml | 36 ++++++++++ tests/qemuxml2argvtest.c | 12 ++++ .../audio-pipewire-best.xml | 43 ++++++++++++ .../audio-pipewire-full.xml | 43 ++++++++++++ .../audio-pipewire-minimal.xml | 36 ++++++++++ tests/qemuxml2xmltest.c | 3 + 20 files changed, 596 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/audio-pipewire-best.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-pipewire-best.xml create mode 100644 tests/qemuxml2argvdata/audio-pipewire-full.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-pipewire-full.xml create mode 100644 tests/qemuxml2argvdata/audio-pipewire-minimal.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/audio-pipewire-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/audio-pipewire-best.xml create mode 100644 tests/qemuxml2xmloutdata/audio-pipewire-full.xml create mode 100644 tests/qemuxml2xmloutdata/audio-pipewire-minimal.xml -- 2.39.3

4 7

[PATCH 0/2] qemu_domin: Account for NVMe disks when calculating memlock limit on hotplug
by Michal Privoznik 16 May '23

16 May '23

*** BLURB HERE *** Michal Prívozník (2): qemu_domin: Account for NVMe disks when calculating memlock limit on hotplug qemu: Drop @forceVFIO argument of qemuDomainGetMemLockLimitBytes() and qemuDomainAdjustMaxMemLock() src/qemu/qemu_domain.c | 75 +++++++++++++++++++++++++++-------------- src/qemu/qemu_domain.h | 9 ++--- src/qemu/qemu_hotplug.c | 16 ++++----- src/qemu/qemu_process.c | 2 +- tests/qemumemlocktest.c | 2 +- 5 files changed, 64 insertions(+), 40 deletions(-) -- 2.39.3

2 4

[PATCH 0/2] conf: Fix formatting of 'associativity' and 'policy' cache attributes
by Peter Krempa 16 May '23

16 May '23

Peter Krempa (2): virDomainNumaDefNodeCacheParseXML: Refactor parsing of cache XML conf: numa: Allow formatting 'none' values for 'associativity' and 'policy' of cache src/conf/numa_conf.c | 73 +++++-------------- .../numatune-hmat-none.x86_64-latest.args | 49 +++++++++++++ tests/qemuxml2argvdata/numatune-hmat-none.xml | 54 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../numatune-hmat-none.x86_64-latest.xml | 55 ++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 178 insertions(+), 55 deletions(-) create mode 100644 tests/qemuxml2argvdata/numatune-hmat-none.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/numatune-hmat-none.xml create mode 100644 tests/qemuxml2xmloutdata/numatune-hmat-none.x86_64-latest.xml -- 2.40.1

2 3

[libvirt PATCH] docs: Fix broken link to Windows MSI downloads
by Kashyap Chamarthy 16 May '23

16 May '23

Right now the URL is 404 due to missing .html. Reported by: Sebastien Wains <swains(a)redhat.com> Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- docs/windows.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/windows.html.in b/docs/windows.html.in index 0f2d9061c4..561c08cfa1 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -17,7 +17,7 @@ <p> Users who need pre-built Windows DLLs of libvirt are advised to use the <a href="https://virt-manager.org">Virt Viewer</a> - pre-compiled <a href="https://virt-manager.org/download/">Windows MSI packages</a> + pre-compiled <a href="https://virt-manager.org/download.html">Windows MSI packages</a> </p> <p> -- 2.40.0

2 3

[PATCH] virmockstathelpers: Adapt to musl-1.2.4
by Michal Privoznik 15 May '23

15 May '23

With musl-1.2.3: I get the following macros defined (from $builddir/meson-config.h): #define WITH_LSTAT 1 #define WITH_LSTAT64 1 #define WITH_LSTAT_DECL 1 #define WITH_STAT 1 #define WITH_STAT64 1 #define WITH_STAT_DECL 1 #define WITH___LXSTAT 1 #define WITH___LXSTAT64 1 #define WITH___XSTAT 1 #define WITH___XSTAT64 1 which in turn means the virmockstathelpers.c ends up defining: MOCK_STAT64 MOCK_LSTAT64 But with musl-1.2.4 everything changes and the set of defined macros gets simplified to: #define WITH_LSTAT 1 #define WITH_LSTAT_DECL 1 #define WITH_STAT 1 #define WITH_STAT_DECL 1 #define WITH___LXSTAT 1 #define WITH___XSTAT 1 which results in no MOCK_* macros defined in virmockstathelpers.c, i.e. no stat() mocking, nada. The reason for this simplification are thess musl commits [1][2] which removed all 64 bit aliases. And that's not what our logic for deciding what flavor of stat() to mock counted with. Nevertheless, we do build with Alpine Linux in our CI, so how come we don't see this problem there? Well, simply because Alpine Linux maintainers decided to revert the commits [3][4]. But on distributions that use vanilla musl, this problem can be seen easily. 1: https://git.musl-libc.org/cgit/musl/commit/?id=246f1c811448f37a44b41cd8df8d… 2: https://git.musl-libc.org/cgit/musl/commit/?id=25e6fee27f4a293728dd15b65917… 3: https://git.alpinelinux.org/aports/commit/main/musl?id=6a5563fbb45b3d9d6067… 4: https://git.alpinelinux.org/aports/commit/main/musl?id=a089bd852f8983623fa8… Resolves: https://bugs.gentoo.org/906167 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/virmockstathelpers.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index 5b1f3b08a7..a02ee04503 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -64,6 +64,10 @@ * building on Apple Silicon (aarch64) those functions are missing * from the header altogether and should not be mocked. * + * Starting from 1.2.4, the musl library dropped 64-bit aliases, i.e. there's + * no stat64() only stat(). BTW: while musl implements __xstat(), it's never + * declared. And even the implementation is but a direct call to stat(). + * * With all this in mind the list of functions we have to mock will depend * on several factors * @@ -82,7 +86,9 @@ #if !defined(__APPLE__) # if !defined(WITH___XSTAT_DECL) # if defined(WITH_STAT) -# if !defined(WITH___XSTAT) && !defined(WITH_STAT64) +# if (!defined(WITH___XSTAT) && !defined(WITH_STAT64)) || \ + (defined(WITH_STAT) && defined(WITH_STAT_DECL) && !defined(WITH_STAT64) && \ + !defined(WITH___XSTAT64)) /* glibc || musl */ # define MOCK_STAT # endif # endif @@ -99,7 +105,9 @@ # endif /* WITH___XSTAT_DECL */ # if !defined(WITH___LXSTAT_DECL) # if defined(WITH_LSTAT) -# if !defined(WITH___LXSTAT) && !defined(WITH_LSTAT64) +# if (!defined(WITH___LXSTAT) && !defined(WITH_LSTAT64)) || \ + (defined(WITH_LSTAT) && defined(WITH_LSTAT_DECL) && !defined(WITH_LSTAT64) \ + && !defined(WITH___LXSTAT64)) /* glibc || musl */ # define MOCK_LSTAT # endif # endif -- 2.39.3

3 2

[PATCH 0/3] backup: Fix schema and default filename filling logic
by Peter Krempa 15 May '23

15 May '23

Reported by 'philipp' on OFTC. Peter Krempa (3): virDomainBackupDefAssignStore: Restructure control flow conf: backup: Fix logic for generating default backup filenames schemas: backup: Allow missing 'type' attribute for backup disk src/conf/backup_conf.c | 17 +++++++++++------ src/conf/schemas/domainbackup.rng | 4 ++++ tests/domainbackupxml2xmlin/backup-push.xml | 3 +++ tests/domainbackupxml2xmlout/backup-push.xml | 9 +++++++++ 4 files changed, 27 insertions(+), 6 deletions(-) -- 2.40.1

2 4

[libvirt PATCH 0/3] qemu: Find dbus-daemon at runtime
by Andrea Bolognani 11 May '23

11 May '23

Same as the changes made recently for QEMU helpers, except even more straightforward. Andrea Bolognani (3): qemu: Find dbus-daemon at runtime meson: Stop looking for dbus-daemon qemu: Update documentation for dbus_daemon qemu.conf key meson.build | 12 ------------ src/qemu/qemu.conf.in | 4 +++- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_dbus.c | 14 +++++++++----- src/qemu/test_libvirtd_qemu.aug.in | 2 +- 5 files changed, 14 insertions(+), 19 deletions(-) -- 2.40.1

2 4

[libvirt PATCH] rpm: Don't require qemu-img at build time
by Andrea Bolognani 10 May '23

10 May '23

It's not used as part of the build process or even searched for at build time. The QEMU driver detects its path at runtime. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index c542ec3b2b..69cafc8b91 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -310,8 +310,6 @@ BuildRequires: util-linux %if %{with_qemu} # For managing ACLs BuildRequires: libacl-devel -# From QEMU RPMs -BuildRequires: /usr/bin/qemu-img %endif # For LVM drivers BuildRequires: lvm2 -- 2.40.1

4 6

[PATCH 0/2] Fix mocking around networkxml2firewalltest
by Michal Privoznik 10 May '23

10 May '23

*** BLURB HERE *** Michal Prívozník (2): util: include virfirewall.h in virfirewalld.h virfirewallmock: Replace virFindFileInPath() with virFirewallDIsRegistered() src/util/virfirewalld.h | 2 ++ tests/virfirewallmock.c | 16 ++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) -- 2.39.2

3 5