September 2024 - Devel - libvirt List Archives

[PATCH] docs: Mark "gluster" support in QEMU as deprecated
by Thomas Huth 24 Sep '24

24 Sep '24

According to https://marc.info/?l=fedora-devel-list&m=171934833215726 the GlusterFS development effectively ended. Thus mark it as deprecated in QEMU, so we can remove it in a future release if the project does not gain momentum again. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/about/deprecated.rst | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ed31d4b0b2..b231aa3948 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -395,6 +395,15 @@ Specifying the iSCSI password in plain text on the command line using the used instead, to refer to a ``--object secret...`` instance that provides a password via a file, or encrypted. +``gluster`` backend (since 9.2) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +According to https://marc.info/?l=fedora-devel-list&m=171934833215726 +the GlusterFS development effectively ended. Unless the development +gains momentum again, the QEMU project might remove the gluster backend +in a future release. + + Character device options '''''''''''''''''''''''' -- 2.46.0

3 3

[RFC PATCH v1 0/6] swtpm: Add support for profiles
by Stefan Berger 24 Sep '24

24 Sep '24

Upcoming libtpms v0.10 and swtpm v0.10 will have TPM profile support that allows to restrict a TPM's provided set of crypto algorithms and commands and through which backwards compatibility and migration from newer versions of libtpms to older ones (up to libtpms v0.9) is supported. For the latter to work it is necessary that the user chooses the right profile. This series adds support for passing a profile choice to swtpm_setup by setting it in the domain XML using the <profile/> XML node. An optional attribute 'remove_disabled' can be set in this node and accepts two values: "check": test a few crypto algorithms (tdes, camellia, unpadded encryption, and others) for whether they are currently disabled due to FIPS mode on the host and remove these algorithms in the 'custom' profile if they are disabled; "fips-host": do not test but remove all potentially disabled crypto algorithms Also extend the documentation but point the user to swtpm and libtpms documentation for further details. Stefan Stefan Berger (6): util: Add parsing support for swtpm_setup's cmdarg-profile capability conf: Define enum virDomainTPMProfileRemoveDisabled schema: Extend schema for TPM emulator profile node conf: Add support for profile parameter on TPM emulator in domain XML docs: Add documentation for the TPM backend profile node qemu: Run swtpm_setup with --profile option if profile given docs/formatdomain.rst | 20 ++++++++++++++++ src/conf/domain_conf.c | 39 +++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++ src/conf/domain_validate.c | 7 ++++++ src/conf/schemas/basictypes.rng | 6 +++++ src/conf/schemas/domaincommon.rng | 17 ++++++++++++++ src/qemu/qemu_tpm.c | 26 +++++++++++++++++++-- src/util/virtpm.c | 1 + src/util/virtpm.h | 1 + tests/testutilsqemu.c | 1 + 10 files changed, 127 insertions(+), 2 deletions(-) -- 2.46.0

4 19

[PATCH] rpc: ssh: Allow SSH_ASKPASS_REQUIRE
by Cole Robinson 24 Sep '24

24 Sep '24

openssh 8.4p1 released in Sep 2020 added a feature to force use of SSH_ASKPASS https://man.openbsd.org/ssh.1#SSH_ASKPASS_REQUIRE Don't strip it from the environment Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/rpc/virnetsocket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 79bf8e511a..e8fc2d5f7d 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -850,6 +850,7 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddEnvPass(cmd, "KRB5CCNAME"); virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK"); virCommandAddEnvPass(cmd, "SSH_ASKPASS"); + virCommandAddEnvPass(cmd, "SSH_ASKPASS_REQUIRE"); virCommandAddEnvPass(cmd, "OPENSSL_CONF"); virCommandAddEnvPass(cmd, "DISPLAY"); virCommandAddEnvPass(cmd, "XAUTHORITY"); -- 2.46.0

2 1

[libvirt PATCH] ci: refresh generated files
by Ján Tomko 24 Sep '24

24 Sep '24

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- ci/buildenv/fedora-rawhide.sh | 2 +- ci/buildenv/opensuse-tumbleweed.sh | 2 +- ci/containers/fedora-rawhide.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/buildenv/fedora-rawhide.sh b/ci/buildenv/fedora-rawhide.sh index f89a87ad63..17ed6fe7a4 100644 --- a/ci/buildenv/fedora-rawhide.sh +++ b/ci/buildenv/fedora-rawhide.sh @@ -81,7 +81,7 @@ function install_buildenv() { sed \ systemd-devel \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel \ yajl-devel diff --git a/ci/buildenv/opensuse-tumbleweed.sh b/ci/buildenv/opensuse-tumbleweed.sh index ac566d349f..59a786efac 100644 --- a/ci/buildenv/opensuse-tumbleweed.sh +++ b/ci/buildenv/opensuse-tumbleweed.sh @@ -81,7 +81,7 @@ function install_buildenv() { sanlock-devel \ sed \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-dtrace \ wireshark-devel \ xen-devel rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 6f06843985..90f2372663 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -92,7 +92,7 @@ exec "$@"\n' > /usr/bin/nosync && \ sed \ systemd-devel \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-sdt-dtrace \ wireshark-devel \ xen-devel \ yajl-devel && \ diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 2b7cdb4af5..5d0bd77113 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -82,7 +82,7 @@ RUN zypper dist-upgrade -y && \ sanlock-devel \ sed \ systemd-rpm-macros \ - systemtap-sdt-devel \ + systemtap-dtrace \ wireshark-devel \ xen-devel && \ zypper clean --all && \ -- 2.46.1

2 2

[PATCH 0/2] meson: Sort summary() values alphabetically
by Michal Privoznik 24 Sep '24

24 Sep '24

*** BLURB HERE *** Michal Prívozník (2): meson: Restore alphabetical order of reported libraries meson: Sort values reported in summary() meson.build | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) -- 2.45.2

2 3

[PATCH v2 0/8] qemu: Remember memory backing paths for started domains
by Martin Kletzander 24 Sep '24

24 Sep '24

Every time we work with file-backed memory we construct the paths from the driver config. Not only does is that slow, it is also wrong. If the configuration changes while a domain with file-backed memory is running, once the daemon is restarted and the domain is being stopped, we construct the wrong path to clean up. And it also makes it more difficult to change that in the future, for example the patch series which led me to write this patch series: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/I6V… The patches are maybe split way too much, so feel free to suggest squashing some together, I'm not opposed to that. v2: - Do not introduce unused functions v1: - https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/H57G… Martin Kletzander (8): qemu: Move domain-related functions to qemu_domain qemu: Change parameters of qemuGetMemoryBackingDomainPath() qemu: Add memoryBackingDir to qemuDomainObjPrivate qemu: Set memoryBackingDir in private data upon start qemu: Use per-domain private memoryBackingDir for new memory backends qemu: Make qemuGetMemoryBackingDomainPath static qemu: Rename memory path functions qemu: Generate domain memory backing path directly src/qemu/qemu_command.c | 5 +- src/qemu/qemu_conf.c | 58 --------------- src/qemu/qemu_conf.h | 8 -- src/qemu/qemu_domain.c | 73 ++++++++++++++++++- src/qemu/qemu_domain.h | 7 ++ src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_process.c | 13 ++-- src/qemu/qemu_process.h | 3 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 1 + .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../memory-backing-dir-in.xml | 61 ++++++++++++++++ .../memory-backing-dir-out.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-bitmaps-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + tests/qemuxmlactivetest.c | 2 + 22 files changed, 163 insertions(+), 83 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/memory-backing-dir-in.xml create mode 120000 tests/qemustatusxml2xmldata/memory-backing-dir-out.xml -- 2.46.1

2 9

[PATCH 0/4] small improvements to virSocketAddr, and a trivial debug log change
by Laine Stump 21 Sep '24

21 Sep '24

I noticed the virSocjetAddr() stuff when I was writing code that was going to use virSocketAddrMask(). I think I ended up not using that function after all, but the fixes are still worthwhile. Laine Stump (4): network: fix argument order/log level in message about firewall_backend util: fix virSocketAddrMask() when source and result are the same object util: make virSocketAddrIPv4 a union util: use uint32 instead of char[4] for several virSocketAddrIPv4 operations src/network/bridge_driver_conf.c | 4 +- src/util/virsocketaddr.c | 84 +++++++++++++++----------------- 2 files changed, 42 insertions(+), 46 deletions(-) -- 2.46.0

2 11

[libvirt PATCHv2 00/15] Switch to json-c from yajl
by Ján Tomko 20 Sep '24

20 Sep '24

Ján Tomko (15): util: json: introduce virJSONStringPrettifyBlanks tests: switch to compact empty JSON object formatting build: introduce WITH_JSON ci: install json-c too meson: add option for building with json-c meson: switch checks to depend on json-c as well as yajl build: do not depend on yajl build: link with json_c util: json: write a json-c implementation nss: convert findLeases to use json-c nss: convert findMACs to use json-c meson: do not link anything with yajl anymore meson: options: drop yajl meson: drop yajl detection ci: drop yajl completely ci/buildenv/almalinux-9.sh | 4 +- ci/buildenv/alpine-319.sh | 4 +- ci/buildenv/alpine-edge.sh | 4 +- ci/buildenv/centos-stream-9.sh | 4 +- ci/buildenv/debian-11-cross-aarch64.sh | 2 +- ci/buildenv/debian-11-cross-armv6l.sh | 2 +- ci/buildenv/debian-11-cross-armv7l.sh | 2 +- ci/buildenv/debian-11-cross-i686.sh | 2 +- ci/buildenv/debian-11-cross-mips64el.sh | 2 +- ci/buildenv/debian-11-cross-mipsel.sh | 2 +- ci/buildenv/debian-11-cross-ppc64le.sh | 2 +- ci/buildenv/debian-11-cross-s390x.sh | 2 +- ci/buildenv/debian-11.sh | 2 +- ci/buildenv/debian-12-cross-aarch64.sh | 2 +- ci/buildenv/debian-12-cross-armv6l.sh | 2 +- ci/buildenv/debian-12-cross-armv7l.sh | 2 +- ci/buildenv/debian-12-cross-i686.sh | 2 +- ci/buildenv/debian-12-cross-mips64el.sh | 2 +- ci/buildenv/debian-12-cross-mipsel.sh | 2 +- ci/buildenv/debian-12-cross-ppc64le.sh | 2 +- ci/buildenv/debian-12-cross-s390x.sh | 2 +- ci/buildenv/debian-12.sh | 2 +- ci/buildenv/debian-sid-cross-aarch64.sh | 2 +- ci/buildenv/debian-sid-cross-armv6l.sh | 2 +- ci/buildenv/debian-sid-cross-armv7l.sh | 2 +- ci/buildenv/debian-sid-cross-i686.sh | 2 +- ci/buildenv/debian-sid-cross-mips64el.sh | 2 +- ci/buildenv/debian-sid-cross-ppc64le.sh | 2 +- ci/buildenv/debian-sid-cross-s390x.sh | 2 +- ci/buildenv/debian-sid.sh | 2 +- ci/buildenv/fedora-39.sh | 4 +- ci/buildenv/fedora-40.sh | 4 +- ci/buildenv/fedora-rawhide.sh | 4 +- ci/buildenv/opensuse-leap-15.sh | 2 +- ci/buildenv/opensuse-tumbleweed.sh | 2 +- ci/buildenv/ubuntu-2204.sh | 2 +- ci/buildenv/ubuntu-2404.sh | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-14.vars | 2 +- ci/cirrus/macos-13.vars | 2 +- ci/cirrus/macos-14.vars | 2 +- ci/containers/almalinux-9.Dockerfile | 4 +- ci/containers/alpine-319.Dockerfile | 4 +- ci/containers/alpine-edge.Dockerfile | 4 +- ci/containers/centos-stream-9.Dockerfile | 4 +- .../debian-11-cross-aarch64.Dockerfile | 2 +- .../debian-11-cross-armv6l.Dockerfile | 2 +- .../debian-11-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-11-cross-i686.Dockerfile | 2 +- .../debian-11-cross-mips64el.Dockerfile | 2 +- .../debian-11-cross-mipsel.Dockerfile | 2 +- .../debian-11-cross-ppc64le.Dockerfile | 2 +- .../debian-11-cross-s390x.Dockerfile | 2 +- ci/containers/debian-11.Dockerfile | 2 +- .../debian-12-cross-aarch64.Dockerfile | 2 +- .../debian-12-cross-armv6l.Dockerfile | 2 +- .../debian-12-cross-armv7l.Dockerfile | 2 +- ci/containers/debian-12-cross-i686.Dockerfile | 2 +- .../debian-12-cross-mips64el.Dockerfile | 2 +- .../debian-12-cross-mipsel.Dockerfile | 2 +- .../debian-12-cross-ppc64le.Dockerfile | 2 +- .../debian-12-cross-s390x.Dockerfile | 2 +- ci/containers/debian-12.Dockerfile | 2 +- .../debian-sid-cross-aarch64.Dockerfile | 2 +- .../debian-sid-cross-armv6l.Dockerfile | 2 +- .../debian-sid-cross-armv7l.Dockerfile | 2 +- .../debian-sid-cross-i686.Dockerfile | 2 +- .../debian-sid-cross-mips64el.Dockerfile | 2 +- .../debian-sid-cross-ppc64le.Dockerfile | 2 +- .../debian-sid-cross-s390x.Dockerfile | 2 +- ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/fedora-39.Dockerfile | 4 +- ci/containers/fedora-40.Dockerfile | 4 +- ci/containers/fedora-rawhide.Dockerfile | 4 +- ci/containers/opensuse-leap-15.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 2 +- ci/containers/ubuntu-2204.Dockerfile | 2 +- ci/containers/ubuntu-2404.Dockerfile | 2 +- ci/lcitool/projects/libvirt.yml | 2 +- libvirt.spec.in | 6 +- meson.build | 62 +-- meson_options.txt | 8 +- src/libvirt_private.syms | 1 + src/meson.build | 2 +- src/util/meson.build | 2 +- src/util/virjson.c | 485 +++++------------- src/util/virjson.h | 2 + tests/meson.build | 8 +- tests/qemublocktest.c | 5 +- .../backupmerge/empty-out.json | 4 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamstest.c | 5 +- tests/virmacmaptest.c | 5 +- tests/virmacmaptestdata/empty.json | 4 +- tests/virnetdaemontest.c | 2 +- tests/virstoragetest.c | 4 +- tools/nss/libvirt_nss_leases.c | 370 +++++-------- tools/nss/libvirt_nss_macs.c | 278 +++------- tools/nss/meson.build | 4 +- 99 files changed, 475 insertions(+), 972 deletions(-) -- 2.46.0

2 31

[PATCH] ci: Switch from macOS 13 to macOS 15
by Michal Privoznik 20 Sep '24

20 Sep '24

libvirt-ci added macOS 15 so let's introduce it and while at it drop macOS 13. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- ci/cirrus/{macos-13.vars => macos-15.vars} | 0 ci/gitlab/builds.yml | 32 +++++++++++----------- ci/manifest.yml | 14 +++++----- 3 files changed, 23 insertions(+), 23 deletions(-) rename ci/cirrus/{macos-13.vars => macos-15.vars} (100%) diff --git a/ci/cirrus/macos-13.vars b/ci/cirrus/macos-15.vars similarity index 100% rename from ci/cirrus/macos-13.vars rename to ci/cirrus/macos-15.vars diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 214119b902..6f78ba2e89 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -624,22 +624,6 @@ x86_64-freebsd-14: UPGRADE_COMMAND: pkg upgrade -y -aarch64-macos-13: - extends: .cirrus_build_job - needs: [] - allow_failure: false - variables: - CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-ventura-base:latest - CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_INSTANCE_TYPE: macos_instance - INSTALL_COMMAND: brew install - NAME: macos-13 - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - UPDATE_COMMAND: brew update - UPGRADE_COMMAND: brew upgrade - - aarch64-macos-14: extends: .cirrus_build_job needs: [] @@ -654,3 +638,19 @@ aarch64-macos-14: PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig UPDATE_COMMAND: brew update UPGRADE_COMMAND: brew upgrade + + +aarch64-macos-15: + extends: .cirrus_build_job + needs: [] + allow_failure: false + variables: + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-sonoma-base:latest + CIRRUS_VM_IMAGE_SELECTOR: image + CIRRUS_VM_INSTANCE_TYPE: macos_instance + INSTALL_COMMAND: brew install + NAME: macos-15 + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + UPDATE_COMMAND: brew update + UPGRADE_COMMAND: brew upgrade diff --git a/ci/manifest.yml b/ci/manifest.yml index 647510ed2f..3c2366380c 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -203,13 +203,6 @@ targets: variables: RPM: skip - macos-13: - jobs: - - arch: aarch64 - variables: - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig - macos-14: jobs: - arch: aarch64 @@ -217,6 +210,13 @@ targets: PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + macos-15: + jobs: + - arch: aarch64 + variables: + PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin:/usr/local/opt/libpcap/bin:/usr/local/opt/libxslt/bin + PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/libpcap/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + ubuntu-2204: jobs: - arch: x86_64 -- 2.44.2

4 9

[PATCH v2 0/2] qemu: Provide sane default for dump_guest_core
by Michal Privoznik 20 Sep '24

20 Sep '24

v2 of: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/X7JU… diff to v1: - Produce a VIR_INFO() message when enabling dump_guest_core - Fixed comment to dump_guest_core in qemu.conf - Fixed typo on commit message of 2/2 Michal Prívozník (2): qemu.conf.in: Fix dumpCore capitalization qemu: Provide sane default for dump_guest_core meson.build | 1 + src/qemu/qemu.conf.in | 8 ++++---- src/qemu/qemu_conf.c | 12 ++++++++++++ tests/testutilsqemu.c | 2 ++ 4 files changed, 19 insertions(+), 4 deletions(-) -- 2.44.2

2 3

[PATCH 0/4] improve device-update for network interface devices
by Laine Stump 19 Sep '24

19 Sep '24

These patches are in response to a bug report filed a few years ago where I said "I can look at it next week" and then promptly forgot about it :-/ https://bugzilla.redhat.com/1949432 I was reminded of it when a bunch of old bugs were migrated from bugzilla.redhat.com to issues.redhat.com and Yalan Zhang added the comment that the bug was still reproducible on libvirt 10.4.0. https://issues.redhat.com/browse/RHEL-7036 This got it back onto my todo list (where it should have been the entire time!) and I've finally gotten to it. Two similar-but-differen failures had been reported (one when using a network of "direct" (macvtap) devices, and one when using an openvswitch bridge, and it turned out that two different (but related) fixes were needed - the direct problem is fixed *mostly* in patch 1, with the other patches fixing the ovs problem (and the remainder of the direct problem). Laine Stump (4): qemu: prevent unnecessarily failing live interface update util: don't return early from virNetDevTapReattachBridge() if "force" is true qemu: replace open-coded remove/attach bridge with virNetDevTapReattachBridge() qemu: rework needBridgeChange/needReconnect decisions in qemuDomainChangeNet() src/conf/domain_conf.c | 2 +- src/qemu/qemu_hotplug.c | 263 +++++++++++++++++++++++++--------------- src/util/virnetdevtap.c | 8 +- src/util/virnetdevtap.h | 3 +- 4 files changed, 172 insertions(+), 104 deletions(-) -- 2.46.0

2 6

[PATCH 0/8] qemu: Remember memory backing paths for started domains
by Martin Kletzander 19 Sep '24

19 Sep '24

Every time we work with file-backed memory we construct the paths from the driver config. Not only does is that slow, it is also wrong. If the configuration changes while a domain with file-backed memory is running, once the daemon is restarted and the domain is being stopped, we construct the wrong path to clean up. And it also makes it more difficult to change that in the future, for example the patch series which led me to write this patch series: https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/I6V… The patches are maybe split way too much, so feel free to suggest squashing some together, I'm not opposed to that. Martin Kletzander (8): qemu: Move domain-related functions to qemu_domain qemu_domain.h: Change indentation for new functions qemu: Change parameters of qemuGetMemoryBackingDomainPath() qemu_domain: Add memoryBackingDir to qemuDomainObjPrivate qemu_domain: Add qemuDomainSetPrivateMemPath() qemu_domain: Set memoryBackingDir in private data upon start qemu: Use per-domain private memoryBackingDir for new memory backends qemu_domain: Remove unused qemuGetMemoryBackingDomainPath() src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.c | 58 --------------- src/qemu/qemu_conf.h | 8 -- src/qemu/qemu_domain.c | 74 ++++++++++++++++++- src/qemu/qemu_domain.h | 11 +++ src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_process.c | 12 +-- src/qemu/qemu_process.h | 3 +- .../qemustatusxml2xmldata/backup-pull-in.xml | 1 + .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../memory-backing-dir-in.xml | 61 +++++++++++++++ .../memory-backing-dir-out.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-bitmaps-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + tests/qemuxmlactivetest.c | 2 + 22 files changed, 167 insertions(+), 82 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/memory-backing-dir-in.xml create mode 120000 tests/qemustatusxml2xmldata/memory-backing-dir-out.xml -- 2.46.0

2 9

[PATCH (pushed)] qemuBuildChardevCommand: Remove unused variable
by Peter Krempa 19 Sep '24

19 Sep '24

'charstr' is unused since 36d06a5637f, breaking the build on some platforms. Remove it. Fixes: 36d06a5637f Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Build-breaker fix. src/qemu/qemu_command.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c2d65645c4..c20d033aea 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1300,7 +1300,6 @@ qemuBuildChardevCommand(virCommand *cmd, virQEMUCaps *qemuCaps) { qemuDomainChrSourcePrivate *chrSourcePriv = QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev); - g_autofree char *charstr = NULL; switch ((virDomainChrType) dev->type) { case VIR_DOMAIN_CHR_TYPE_TCP: -- 2.46.0

1 0

[PATCH 0/2] qemu: Provide sane default for dump_guest_core
by Michal Privoznik 19 Sep '24

19 Sep '24

*** BLURB HERE *** Michal Prívozník (2): qemu.conf.in: Fix dumpCore capitalization qemu: Provide sane default for dump_guest_core meson.build | 1 + src/qemu/qemu.conf.in | 4 ++-- src/qemu/qemu_conf.c | 11 +++++++++++ tests/testutilsqemu.c | 2 ++ 4 files changed, 16 insertions(+), 2 deletions(-) -- 2.44.2

2 3

[PULL 01/18] deprecation: don't enable TCG plugins by default on 32 bit hosts
by Alex Bennée 18 Sep '24

18 Sep '24

The existing plugins already liberally use host pointer stuffing for passing user data which will fail when doing 64 bit guests on 32 bit hosts. We should discourage this by officially deprecating support and adding another nail to the 32 bit host coffin. Reviewed-by: Pierrick Bouvier <pierrick.bouvier(a)linaro.org> Signed-off-by: Alex Bennée <alex.bennee(a)linaro.org> Message-Id: <20240916085400.1046925-2-alex.bennee(a)linaro.org> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index ed31d4b0b2..809b2b9b81 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -184,6 +184,17 @@ be an effective use of its limited resources, and thus intends to discontinue it. Since all recent x86 hardware from the past >10 years is capable of the 64-bit x86 extensions, a corresponding 64-bit OS should be used instead. +TCG Plugin support not enabled by default on 32-bit hosts (since 9.2) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +While it is still possible to enable TCG plugin support for 32-bit +hosts there are a number of potential pitfalls when instrumenting +64-bit guests. The plugin APIs typically pass most addresses as +uint64_t but practices like encoding that address in a host pointer +for passing as user-data will lose data. As most software analysis +benefits from having plenty of host memory it seems reasonable to +encourage users to use 64 bit builds of QEMU for analysis work +whatever targets they are instrumenting. System emulator CPUs -------------------- diff --git a/configure b/configure index f3e7572afb..cc8e1ed5b8 100755 --- a/configure +++ b/configure @@ -516,6 +516,25 @@ case "$cpu" in ;; esac +# Now we have our CPU_CFLAGS we can check if we are targeting a 32 or +# 64 bit host. + +check_64bit_host() { +cat > $TMPC <<EOF +#if __SIZEOF_POINTER__ != 8 +#error not 64 bit system +#endif +int main(void) { return 0; } +EOF + compile_object "$1" +} + +if check_64bit_host "$CPU_CFLAGS"; then + host_bits=64 +else + host_bits=32 +fi + if test -n "$host_arch" && { ! test -d "$source_path/linux-user/include/host/$host_arch" || ! test -d "$source_path/common-user/host/$host_arch"; }; then @@ -1028,7 +1047,7 @@ if test "$static" = "yes" ; then fi plugins="no" fi -if test "$plugins" != "no"; then +if test "$plugins" != "no" && test $host_bits -eq 64; then plugins=yes subdirs="$subdirs contrib/plugins" fi -- 2.39.5

1 0

Plans for 10.8.0 release (freeze on Wednesday 25 Sep)
by Jiri Denemark 18 Sep '24

18 Sep '24

We are getting close to 10.8.0 release of libvirt. To aim for the release on Tuesday 01 Oct I suggest entering the freeze on Wednesday 25 Sep and tagging RC2 on Friday 27 Sep. I hope this works for everyone. Jirka

1 0

[PATCH 0/2] qemu: Reject unsupported chardev '<protocol' settings
by Peter Krempa 18 Sep '24

18 Sep '24

See 2/2 Peter Krempa (2): conf: Convert 'protocol' field of TCP char device backend to proper type qemu: Reject unsupported chardev backend protocols src/conf/domain_conf.c | 11 +++------ src/conf/domain_conf.h | 2 +- src/qemu/qemu_validate.c | 19 +++++++++++++++ src/vmx/vmx.c | 7 +++--- ...rial-tcp-chardev-telnets.x86_64-latest.err | 1 + .../serial-tcp-chardev-telnets.xml | 23 +++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 7 files changed, 51 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxmlconfdata/serial-tcp-chardev-telnets.x86_64-latest.err create mode 100644 tests/qemuxmlconfdata/serial-tcp-chardev-telnets.xml -- 2.46.0

2 3

[PATCH 0/8] qemu: Unify generators for commandline and monitor chardev backends
by Peter Krempa 18 Sep '24

18 Sep '24

Apart from having just one place to fix when changing chardev backends this also adds validation against the schema so we can spot deprecations early. Peter Krempa (8): qemu: capabilities: Explain that QEMU_CAPS_CHARDEV_JSON will be used in tests only qemuxmlconftest: Add 'chardev-backends' test case qemu: Introduce unified chardev backend config generator qemuxmlconftest: Add support for validating schema for 'chardev-add' qemuxmlconftest: Add test case for QMP schema validation of -chardev backends qemu: Move check for chardev backends which can't be hotplugged out of the monitor qemu: Use the new chardev backend JSON props generator also in the monitor qemu: monitor: Remove the old chardev backend generator src/qemu/meson.build | 1 + src/qemu/qemu_block.c | 9 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_chardev.c | 488 ++++++++++++++++++ src/qemu/qemu_chardev.h | 22 + src/qemu/qemu_command.c | 202 +------- src/qemu/qemu_hotplug.c | 51 +- src/qemu/qemu_monitor.c | 8 +- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 273 +--------- src/qemu/qemu_monitor_json.h | 4 +- tests/qemumonitorjsontest.c | 23 +- .../chardev-backends-json.x86_64-latest.args | 79 +++ .../chardev-backends-json.x86_64-latest.xml | 1 + .../qemuxmlconfdata/chardev-backends-json.xml | 1 + .../chardev-backends.x86_64-latest.args | 79 +++ .../chardev-backends.x86_64-latest.xml | 149 ++++++ tests/qemuxmlconfdata/chardev-backends.xml | 111 ++++ tests/qemuxmlconftest.c | 7 + 19 files changed, 1026 insertions(+), 488 deletions(-) create mode 100644 src/qemu/qemu_chardev.c create mode 100644 src/qemu/qemu_chardev.h create mode 100644 tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.args create mode 120000 tests/qemuxmlconfdata/chardev-backends-json.x86_64-latest.xml create mode 120000 tests/qemuxmlconfdata/chardev-backends-json.xml create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-latest.args create mode 100644 tests/qemuxmlconfdata/chardev-backends.x86_64-latest.xml create mode 100644 tests/qemuxmlconfdata/chardev-backends.xml -- 2.46.0

2 16

[PATCH] rpm: Add riscv64 to arches_qemu_kvm
by Andrea Bolognani 18 Sep '24

18 Sep '24

The riscv64 architecture is not yet fully integrated into Fedora, but KVM support is already implemented across the stack and the Fedora package for QEMU is already set up to generate the qemu-kvm binary package when targeting it. Thanks: David Abdurachmanov <davidlt(a)rivosinc.com> 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 4dec7ace6f..c332fb4ff1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -6,7 +6,7 @@ %define min_rhel 8 %define min_fedora 37 -%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x +%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x riscv64 %if 0%{?rhel} %if 0%{?rhel} > 8 %define arches_qemu_kvm x86_64 aarch64 s390x -- 2.46.0

2 1

[PATCH 0/5] network: a few fixes related to <forward mode='open'/>
by Laine Stump 17 Sep '24

17 Sep '24

While closing out the > 50 open tabs that had accumulated in one of my 3 browser windows, I came across a couple of upstream issues where I had posted a comment several months ago that I would fix some simple problem "tomorrow" (or maybe it was "next week"). Now that I've been reminded, I thought I should actually do that. Laine Stump (5): network: permit <forward mode='open'/> when a network has no IP address network: belatedly update an error message network: support setting firewalld zone for bridge device of open networks network: remove firewalld version check from networkSetBridgeZone() network: *un*set the firewalld zone while shutting down a network src/conf/network_conf.c | 5 +- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 8 +++ src/network/bridge_driver_linux.c | 96 +++++++++++++++------------- src/network/bridge_driver_nop.c | 19 ++++++ src/network/bridge_driver_platform.h | 4 ++ src/util/virfirewalld.c | 23 +++++++ src/util/virfirewalld.h | 2 + 8 files changed, 112 insertions(+), 46 deletions(-) -- 2.46.0

2 15

[PATCH] network: Remove unused variable in networkDestroy
by Martin Kletzander 17 Sep '24

17 Sep '24

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the 'build-breaker' rule. Although I have no idea why only FreeBSD and macOS builds found that issue when both older and newer clang builds on Linux did not. src/network/bridge_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 0ba62d986ff4..fe053f423ab5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3475,7 +3475,6 @@ static int networkDestroy(virNetworkPtr net) { virNetworkDriverState *driver = networkGetDriver(); - g_autoptr(virNetworkDriverConfig) cfg = virNetworkDriverGetConfig(driver); virNetworkObj *obj; virNetworkDef *def; int ret = -1; -- 2.46.0

1 0

[PATCH 0/8] Do more cleaning up after network objects upon start
by Martin Kletzander 17 Sep '24

17 Sep '24

This was initially inspired by https://issues.redhat.com/browse/RHEL-50968 which does things behind our back. However, I have found some other things when digging into the aforemention bug. I rebased, changed, rebased, refactored, and rebased again this branch so many times there might be a bunch of weird stuff I forgot to remove before posting. I hope I did not miss any, but one can never be sure ;) Martin Kletzander (8): network: Do not update network ports for inactive networks network: Do not call virNetworkObjUnsetDefTransient on start cleanup network: Move port deletion into the shutdown function network: Don't check if network is active in networkShutdownNetwork network: Clean up after inactive objects during start network: Try to read dnsmasq PIDs for inactive networks too network: Separate cleanup from networkRemoveInactive network: Clean up after disappeared transient inactive networks src/network/bridge_driver.c | 62 ++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 12 deletions(-) -- 2.46.0

3 19

[PATCH] tests: Fix typo in README.rst of qemucapabilitiesdata
by Boris Fiuczynski 16 Sep '24

16 Sep '24

Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- tests/qemucapabilitiesdata/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemucapabilitiesdata/README.rst b/tests/qemucapabilitiesdata/README.rst index 727695c6b0..f65f07cfca 100644 --- a/tests/qemucapabilitiesdata/README.rst +++ b/tests/qemucapabilitiesdata/README.rst @@ -121,7 +121,7 @@ Fake test data dumps for certain architectures ============================================== For some architectures it was impossible or impractical to fetch real capability -dumps. To ensure coverate of certain cases the dumps were collected from +dumps. To ensure coverage of certain cases the dumps were collected from corresponding binaries running on a different architecture. Capabilities dumps for the following architectures are usually produced on real -- 2.45.0

2 1

[PATCH] apparmor: Don't check for existence of templates upfront
by Andrea Bolognani 16 Sep '24

16 Sep '24

Currently, if either template is missing AppArmor support is completely disabled. This means that uninstalling the LXC driver from a system results in QEMU domains being started without AppArmor confinement, which obviously doesn't make any sense. The problematic scenario was impossible to hit in Debian until very recently, because all AppArmor files were shipped as part of the same package; now that the Debian package is much closer to the Fedora one, and specifically ships the AppArmor files together with the corresponding driver, it becomes trivial to trigger it. Drop the checks entirely. virt-aa-helper, which is responsible for creating the per-domain profiles starting from the driver-specific template, already fails if the latter is not present, so they were always redundant. https://bugs.debian.org/1081396 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/security/security_apparmor.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 27184aef7f..a62ec1b10d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -318,27 +318,9 @@ AppArmorSetSecurityHostLabel(virSCSIVHostDevice *dev G_GNUC_UNUSED, static virSecurityDriverStatus AppArmorSecurityManagerProbe(const char *virtDriver G_GNUC_UNUSED) { - g_autofree char *template_qemu = NULL; - g_autofree char *template_lxc = NULL; - if (use_apparmor() < 0) return SECURITY_DRIVER_DISABLE; - /* see if template file exists */ - template_qemu = g_strdup_printf("%s/TEMPLATE.qemu", APPARMOR_DIR "/libvirt"); - template_lxc = g_strdup_printf("%s/TEMPLATE.lxc", APPARMOR_DIR "/libvirt"); - - if (!virFileExists(template_qemu)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("template \'%1$s\' does not exist"), template_qemu); - return SECURITY_DRIVER_DISABLE; - } - if (!virFileExists(template_lxc)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("template \'%1$s\' does not exist"), template_lxc); - return SECURITY_DRIVER_DISABLE; - } - return SECURITY_DRIVER_ENABLE; } -- 2.46.0

2 7

[PATCH] chardev: introduce 'reconnect-ms' and deprecate 'reconnect'
by Daniil Tatianin 16 Sep '24

16 Sep '24

The 'reconnect' option only allows to specify the time in seconds, which is way too long for certain workflows. We have a lightweight disk backend server, which takes about 20ms to live update, but due to this limitation in QEMU, previously the guest disk controller would hang for one second because it would take this long for QEMU to reinitialize the socket connection. Introduce a new option called 'reconnect-ms', which is the same as 'reconnect', except the value is treated as milliseconds. These are mutually exclusive and specifying both results in an error. 'reconnect' is also deprecated by this commit to make it possible to remove it in the future as to not keep two options that control the same thing. Signed-off-by: Daniil Tatianin <d-tatianin(a)yandex-team.ru> --- chardev/char-socket.c | 33 ++++++++++++++++++++++++--------- chardev/char.c | 3 +++ include/chardev/char-socket.h | 2 +- qapi/char.json | 17 +++++++++++++++-- 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 1ca9441b1b..c24331ac23 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -74,7 +74,7 @@ static void qemu_chr_socket_restart_timer(Chardev *chr) assert(!s->reconnect_timer); name = g_strdup_printf("chardev-socket-reconnect-%s", chr->label); s->reconnect_timer = qemu_chr_timeout_add_ms(chr, - s->reconnect_time * 1000, + s->reconnect_time_ms, socket_reconnect_timeout, chr); g_source_set_name(s->reconnect_timer, name); @@ -481,7 +481,7 @@ static void tcp_chr_disconnect_locked(Chardev *chr) if (emit_close) { qemu_chr_be_event(chr, CHR_EVENT_CLOSED); } - if (s->reconnect_time && !s->reconnect_timer) { + if (s->reconnect_time_ms && !s->reconnect_timer) { qemu_chr_socket_restart_timer(chr); } } @@ -1080,9 +1080,9 @@ static int tcp_chr_wait_connected(Chardev *chr, Error **errp) } else { Error *err = NULL; if (tcp_chr_connect_client_sync(chr, &err) < 0) { - if (s->reconnect_time) { + if (s->reconnect_time_ms) { error_free(err); - g_usleep(s->reconnect_time * 1000ULL * 1000ULL); + g_usleep(s->reconnect_time_ms * 1000ULL); } else { error_propagate(errp, err); return -1; @@ -1267,13 +1267,13 @@ skip_listen: static int qmp_chardev_open_socket_client(Chardev *chr, - int64_t reconnect, + int64_t reconnect_ms, Error **errp) { SocketChardev *s = SOCKET_CHARDEV(chr); - if (reconnect > 0) { - s->reconnect_time = reconnect; + if (reconnect_ms > 0) { + s->reconnect_time_ms = reconnect_ms; tcp_chr_connect_client_async(chr); return 0; } else { @@ -1371,7 +1371,7 @@ static void qmp_chardev_open_socket(Chardev *chr, bool is_tn3270 = sock->has_tn3270 ? sock->tn3270 : false; bool is_waitconnect = sock->has_wait ? sock->wait : false; bool is_websock = sock->has_websocket ? sock->websocket : false; - int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0; + int64_t reconnect_ms = 0; SocketAddress *addr; s->is_listen = is_listen; @@ -1443,7 +1443,13 @@ static void qmp_chardev_open_socket(Chardev *chr, return; } } else { - if (qmp_chardev_open_socket_client(chr, reconnect, errp) < 0) { + if (sock->has_reconnect) { + reconnect_ms = sock->reconnect * 1000ULL; + } else if (sock->has_reconnect_ms) { + reconnect_ms = sock->reconnect_ms; + } + + if (qmp_chardev_open_socket_client(chr, reconnect_ms, errp) < 0) { return; } } @@ -1509,6 +1515,15 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend, sock->wait = qemu_opt_get_bool(opts, "wait", true); sock->has_reconnect = qemu_opt_find(opts, "reconnect"); sock->reconnect = qemu_opt_get_number(opts, "reconnect", 0); + sock->has_reconnect_ms = qemu_opt_find(opts, "reconnect-ms"); + sock->reconnect_ms = qemu_opt_get_number(opts, "reconnect-ms", 0); + + if (sock->has_reconnect_ms && sock->has_reconnect) { + error_setg(errp, + "'reconnect' and 'reconnect-ms' are mutually exclusive"); + return; + } + sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); diff --git a/chardev/char.c b/chardev/char.c index ba847b6e9e..35623c78a3 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -888,6 +888,9 @@ QemuOptsList qemu_chardev_opts = { },{ .name = "reconnect", .type = QEMU_OPT_NUMBER, + },{ + .name = "reconnect-ms", + .type = QEMU_OPT_NUMBER, },{ .name = "telnet", .type = QEMU_OPT_BOOL, diff --git a/include/chardev/char-socket.h b/include/chardev/char-socket.h index 0708ca6fa9..d6d13ad37f 100644 --- a/include/chardev/char-socket.h +++ b/include/chardev/char-socket.h @@ -74,7 +74,7 @@ struct SocketChardev { bool is_websock; GSource *reconnect_timer; - int64_t reconnect_time; + int64_t reconnect_time_ms; bool connect_err_reported; QIOTask *connect_task; diff --git a/qapi/char.json b/qapi/char.json index ef58445cee..7f117438c6 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -273,7 +273,19 @@ # # @reconnect: For a client socket, if a socket is disconnected, then # attempt a reconnect after the given number of seconds. Setting -# this to zero disables this function. (default: 0) (Since: 2.2) +# this to zero disables this function. The use of this member is +# deprecated, use @reconnect-ms instead. (default: 0) (Since: 2.2) +# +# @reconnect-ms: For a client socket, if a socket is disconnected, +# then attempt a reconnect after the given number of milliseconds. +# Setting this to zero disables this function. This member is +# mutually exclusive with @reconnect. +# (default: 0) (Since: 9.2) +# +# Features: +# +# @deprecated: Member @reconnect is deprecated. Use @reconnect-ms +# instead. # # Since: 1.4 ## @@ -287,7 +299,8 @@ '*telnet': 'bool', '*tn3270': 'bool', '*websocket': 'bool', - '*reconnect': 'int' }, + '*reconnect': { 'type': 'int', 'features': [ 'deprecated' ] }, + '*reconnect-ms': 'int' }, 'base': 'ChardevCommon' } ## -- 2.34.1

6 6