- Devel - libvirt List Archives

[PATCH] virsh: Simplify @flags handing in cmdSetmem() and cmdSetmaxmem()
by Michal Privoznik 02 Feb '21

02 Feb '21

What code tries to achieve is that if no flags were provided to either 'setmem' or 'setmaxmem' commands then the old (no flags) API is called to be able to communicate with older daemons. Well, the code can be simplified a bit. Note that with this change the old no flag version of APIs is used more often. Previously if --current argument was given it resulted in *Flags() version to be called even though it is not necessary - VIR_DOMAIN_AFFECT_CURRENT is implied. Therefore, this change in fact allows virsh to talk with broader set of daemons. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2bb136333f..9746117bdb 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9018,9 +9018,6 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_CONFIG; if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - /* none of the options were specified */ - if (!current && !live && !config) - flags = -1; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -9037,7 +9034,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) } kibibytes = VIR_DIV_UP(bytes, 1024); - if (flags == -1) { + if (flags == 0) { if (virDomainSetMemory(dom, kibibytes) != 0) ret = false; } else { @@ -9090,7 +9087,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT | VIR_DOMAIN_MEM_MAXIMUM; + unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT; VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); @@ -9099,9 +9096,6 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_CONFIG; if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - /* none of the options were specified */ - if (!current && !live && !config) - flags = -1; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -9118,13 +9112,13 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) } kibibytes = VIR_DIV_UP(bytes, 1024); - if (flags == -1) { + if (flags == 0) { if (virDomainSetMaxMemory(dom, kibibytes) != 0) { vshError(ctl, "%s", _("Unable to change MaxMemorySize")); ret = false; } } else { - if (virDomainSetMemoryFlags(dom, kibibytes, flags) < 0) { + if (virDomainSetMemoryFlags(dom, kibibytes, flags | VIR_DOMAIN_MEM_MAXIMUM) < 0) { vshError(ctl, "%s", _("Unable to change MaxMemorySize")); ret = false; } -- 2.26.2

2 4

[PATCH 00/12] Hyper-V serial ports, NICs, and screeshots
by Matt Coleman 02 Feb '21

02 Feb '21

This patchset makes the following changes to the Hyper-V driver: * enable XML parsing and creation of serial ports and NICs * implement several networking APIs * implement screenshots Matt Coleman (12): hyperv: XML parsing of serial ports hyperv: add support for creating serial devices hyperv: XML parsing of Ethernet adapters hyperv: add support for creating network adapters hyperv: implement connectListAllNetworks and connectNumOfNetworks hyperv: implement networkLookupByName and networkLookupByUUID hyperv: implement connectNumOfDefinedNetworks and connectListDefinedNetworks hyperv: implement networkGetAutostart, networkIsActive, and networkIsPersistent hyperv: implement networkGetXMLDesc hyperv: implement domainScreenshot hyperv: provide a more detailed error message for WSMan faults news: implement new Hyper-V APIs NEWS.rst | 12 + po/POTFILES.in | 1 + src/hyperv/hyperv_driver.c | 620 ++++++++++++++++++++++++++ src/hyperv/hyperv_network_driver.c | 242 ++++++++++ src/hyperv/hyperv_network_driver.h | 26 ++ src/hyperv/hyperv_wmi.c | 45 +- src/hyperv/hyperv_wmi.h | 12 + src/hyperv/hyperv_wmi_classes.h | 36 ++ src/hyperv/hyperv_wmi_generator.input | 309 +++++++++++++ src/hyperv/meson.build | 1 + 10 files changed, 1301 insertions(+), 3 deletions(-) create mode 100644 src/hyperv/hyperv_network_driver.c create mode 100644 src/hyperv/hyperv_network_driver.h -- 2.30.0

3 17

[PATCH] virNetDevOpenvswitchGetVhostuserIfname: Remove a single '\n' from ifname
by Yalei Li 02 Feb '21

02 Feb '21

Ovs-vsctl returns a newline result. Signed-off-by: Yalei Li <liyl43(a)chinatelecom.cn> --- src/util/virnetdevopenvswitch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index f9b3369b2a..bd840bd3b7 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -575,6 +575,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, return 0; } + virStringTrimOptionalNewline(*ifname); if (virNetDevOpenvswitchMaybeUnescapeReply(*ifname) < 0) { VIR_FREE(*ifname); return -1; -- 2.27.0

2 2

[PATCH] Revert "remote: Add libvirtd dependency to virt-guest-shutdown.target"
by Jim Fehlig 01 Feb '21

01 Feb '21

Further testing revealed commit f035f53baa regresses Debian bug 955216 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=955216 Restarting libvirt-guests on libvirtd restart is worse than the original dependency issue, so revert the commit until a better solution is found. This reverts commit f035f53baa2e5dc00b8e866e594672a90b4cea78. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/remote/virt-guest-shutdown.target | 1 - 1 file changed, 1 deletion(-) diff --git a/src/remote/virt-guest-shutdown.target b/src/remote/virt-guest-shutdown.target index e2efa3e63a..25d4aaa267 100644 --- a/src/remote/virt-guest-shutdown.target +++ b/src/remote/virt-guest-shutdown.target @@ -1,4 +1,3 @@ [Unit] Description=Libvirt guests shutdown -Requires=libvirtd.service Documentation=https://libvirt.org -- 2.29.2

3 2

[PATCH v2] docs: Clarify the documentation of the <css> elements
by Thomas Huth 01 Feb '21

01 Feb '21

The channel subsystem elements describe a channel in the I/O subsystem of a s390x machine, and not a normal device (like a disk or network card). Reword the documentation here to make it this a little bit clearer. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1898074 Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- v2: "channel" -> "subchannel" as suggested by Cornelia docs/formatnode.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 1010a37a3d..5c7286df8a 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -396,15 +396,15 @@ </dl> </dd> <dt><code>css</code></dt> - <dd>Describes a Channel SubSystem (CSS) device commonly found on - the S390 architecture. Sub-elements include: + <dd>Describes a subchannel in the Channel SubSystem (CSS) commonly + found on the S390 architecture. Sub-elements include: <dl> <dt><code>cssid</code></dt> <dd>The channel subsystem identifier.</dd> <dt><code>ssid</code></dt> <dd>The subchannel-set identifier.</dd> <dt><code>devno</code></dt> - <dd>The device number.</dd> + <dd>The subchannel number.</dd> <dt><code>capability</code></dt> <dd> This optional element can occur multiple times. If it -- 2.27.0

3 2

[PATCH v5 0/5] migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 01 Feb '21

01 Feb '21

V4 -> V5: squash 1/7 and bits of 5/7 and 6/7 into 2/7 in v4 (to be 1/5 in v5) squash left of 5/7 into 4/7 in v4 (to be 3/5 in v5) add VIR_DOMAIN_DIRTYRATE_DEFAULT flag remove redundant error report rename virsh api to "domdirtyrate" use vshTablePtr for virsh api output add description in docs/manpages/virsh.rst other format optimize V3 -> V4: define flags to unsigned int fix some compile warnings V2 -> V3: reorganize patchset to fix compile warning V1 -> V2: replace QEMU_JOB_ASYNC with QEMU_JOB_QUERY Sometimes domain's memory dirty rate is expected by user in order to decide whether it's proper to be migrated out or not. We have already completed the QEMU part of the capability: https://patchew.org/QEMU/1600237327-33618-1-git-send-email-zhengchuan@huawe… And this serial of patches introduce the corresponding LIBVIRT part -- DomainGetDirtyRateInfo API and corresponding virsh api -- "domdirtyrate". instructions: bash# virsh domdirtyrate --help NAME domdirtyrate - Get a vm's memory dirty rate SYNOPSIS domdirtyrate <domain> [--seconds <number>] [--calculate] [--query] DESCRIPTION Get memory dirty rate of a domain in order to decide whether it's proper to be migrated out or not. OPTIONS [--domain] <string> domain name, id or uuid --seconds <number> calculate memory dirty rate within specified seconds, the supported value range is [1, 60], default to 1s. --calculate calculate dirty rate only, can be used together with --query, either or both is expected, otherwise would default to both. --query query dirty rate only, can be used together with --calculate, either or both is expected, otherwise would default to both. example: bash# virsh domdirtyrate vm0 --calculate --query --seconds 1 Item Value ----------------------------- Status: measured Start time: 51585 Calculate time: 1 s Dirty rate: 18 MB/s Hao Wang (5): migration/dirtyrate: Introduce DomainGetDirtyRateInfo API migration/dirtyrate: Implement qemuDomainCalculateDirtyRate migration/dirtyrate: Implement qemuDomainQueryDirtyRate migration/dirtyrate: Implement qemuDomainGetDirtyRateInfo migration/dirtyrate: Introduce domdirtyrate virsh api docs/manpages/virsh.rst | 17 +++++ include/libvirt/libvirt-domain.h | 59 ++++++++++++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 56 ++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 67 ++++++++++++++++ src/qemu/qemu_migration.c | 48 ++++++++++++ src/qemu/qemu_migration.h | 10 +++ src/qemu/qemu_monitor.c | 24 ++++++ src/qemu/qemu_monitor.h | 8 ++ src/qemu/qemu_monitor_json.c | 99 ++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 ++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 21 ++++- tools/virsh-domain.c | 127 +++++++++++++++++++++++++++++++ 15 files changed, 556 insertions(+), 1 deletion(-) -- 2.23.0

3 12

[PATCH 00/14] util: Remove VIR_DISPOSE(_N)
by Peter Krempa 01 Feb '21

01 Feb '21

Most callers are way better off using memset directly additionally few places didn't even use it to clear sensitive data in the first place since the name probably sounded as the right thing to use. Peter Krempa (14): hypervFreeInvokeParams: Don't use VIR_DISPOSE_N for freeing 'params' libxlMakeDomBuildInfo: Don't use VIR_DISPOSE_N for USB device list storage_backend_iscsi(_direct): Properly clear secrets libxlMakeNetworkDiskSrc: Avoid use of VIR_DISPOSE_N qemuDomainMasterKeyCreate: Don't use VIR_DISPOSE_N on failure qemu: domain: Use memset for clearing secrets instead of VIR_DISPOSE_N cmdSecretSetValue: Make it obvious that --file, --base64 and --interactive are exlcusive virsh: cmdSecretSetValue: Rework handling of the secret value virsh: cmdSecretGetValue: Use memset instead of VIR_DISPOSE_N virStorageBackendRBDOpenRADOSConn: Use memset instead of VIR_DISPOSE_N virCryptoEncryptDataAESgnutls: Use memset instead of VIR_DISPOSE_N storageBackendCreateQemuImgSecretPath: Use memset instead of VIR_DISPOSE_N tests: viralloc: Remove testDispose case util: viralloc: Remove VIR_DISPOSE(_N) src/hyperv/hyperv_wmi.c | 4 +- src/libvirt_private.syms | 1 - src/libxl/libxl_conf.c | 8 +-- src/qemu/qemu_domain.c | 24 ++++++--- src/storage/storage_backend_iscsi.c | 16 +++--- src/storage/storage_backend_iscsi_direct.c | 17 ++++--- src/storage/storage_backend_rbd.c | 5 +- src/storage/storage_util.c | 5 +- src/util/viralloc.c | 39 +------------- src/util/viralloc.h | 27 ---------- src/util/vircrypto.c | 3 +- tests/viralloctest.c | 34 ------------- tools/virsh-secret.c | 59 ++++++++++------------ 13 files changed, 76 insertions(+), 166 deletions(-) -- 2.29.2

2 16

[PATCH] util: virstring: Remove unused prototypes for virStr(n)dup
by Peter Krempa 01 Feb '21

01 Feb '21

The headers weren't removed after use of VIR_STRDUP was removed. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virstring.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/util/virstring.h b/src/util/virstring.h index 55547b040a..cfd24f0b74 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -123,13 +123,6 @@ int virStrcpy(char *dest, const char *src, size_t destbytes) G_GNUC_WARN_UNUSED_RESULT; #define virStrcpyStatic(dest, src) virStrcpy((dest), (src), sizeof(dest)) -/* Don't call these directly - use the macros below */ -int virStrdup(char **dest, const char *src) - G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); - -int virStrndup(char **dest, const char *src, ssize_t n) - G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); - size_t virStringListLength(const char * const *strings); int virStringSortCompare(const void *a, const void *b); -- 2.29.2

2 1

[libvirt PATCH v2 00/10] Random bits found by clang-tidy
by Tim Wiederhake 01 Feb '21

01 Feb '21

clang-tidy is a static code analysis tool under the llvm umbrella. It is primarily meant to be used on C++ code bases, but some of the checks it provides also apply to C. The findings vary in severity and contain pseudo-false-positives, i.e. clang-tidy is flagging potential execution flows that could happen in theory but are virtually impossible in real life: In function `virGetUnprivSGIOSysfsPath`, variables `maj` and `min` would be read unintialized if `stat()` failed and set `errno` to a negative value, to name just one example. The main source of false positive findings is the lack of support for `__attribute__((cleanup))` in clang-tidy, which is heavily used in libvirt through glib's `g_autofree` and `g_auto()` macros: #include <stdlib.h> void freeptr(int** p) { if (*p) free(*p); } int main() { __attribute__((cleanup(freeptr))) int *ptr = NULL; ptr = calloc(sizeof(int), 1); return 0; /* flagged as memory leak of `ptr` */ } This sadly renders clang-tidy's analysis of dynamic memory useless, hiding all real issues that it could otherwise find. Meson provides excellent integration for clang-tidy (a "clang-tidy" target is automatically generated if a ".clang-tidy" configuration file is present in the project's root directory). The amount of false-positives (many of which present in a group of checks that cannot be disabled), random segfaults in memory constraint environments such as the containers in the CI, and the slow analysis (triggering time-outs in the CI), make this tool unfit for inclusion in libvirt's GitLab CI though. The patches in this series are the result of fixing some of the issues reported by running CC=clang meson build ninja -C build # generate sources and header files ninja -C build clang-tidy with the following `.clang-tidy` configuration file: --- Checks: > *, -abseil-*, -android-*, -boost-*, -cppcoreguidelines-*, -fuchsia-*, -google-*, -hicpp-*, -llvm-*, -modernize-*, -mpi-, -objc-, -openmp-, -zircon-*, -readability-braces-around-statements, -readability-magic-numbers WarningsAsErrors: '*' HeaderFilterRegex: '' FormatStyle: none ... V1: https://www.redhat.com/archives/libvir-list/2021-January/msg01152.html Changes since V1: * Expanded the justification for the "Replace bzero() with memset()" patch. * Rewrote "udevProcessCCW: Initialize variable". * Rewrote "tests: Prevent mallo with size 0". * Dropped "vircommand: Remove NULL check in virCommandAddArg". Note that this series now depends on the rewrite of tests/commandhelper.c, which can be found here: https://www.redhat.com/archives/libvir-list/2021-February/msg00034.html Regards, Tim Tim Wiederhake (10): virfile: Remove redundant #ifndef xen: Fix indentation in xenParseXLSpice qemu_tpm: Fix indentation in qemuTPMEmulatorBuildCommand virsh-domain: Fix error handling of pthread_sigmask Replace bzero() with memset() udevProcessCCW: Initialize variable virhostuptime: Fix rounding in uptime calculation tests: Prevent malloc with size 0 vircryptotest: Directly assign string to avoid memcpy vircommand: Simplify virCommandAddArg src/libxl/xen_xl.c | 5 ++--- src/node_device/node_device_udev.c | 2 +- src/qemu/qemu_tpm.c | 8 +++++--- src/util/virarptable.c | 2 +- src/util/vircommand.c | 7 +------ src/util/virfile.c | 4 ++-- src/util/virhostuptime.c | 4 +++- tests/commandhelper.c | 3 +++ tests/vircryptotest.c | 5 +---- tests/virpcimock.c | 2 +- tools/virsh-domain.c | 8 ++++---- 11 files changed, 24 insertions(+), 26 deletions(-) -- 2.26.2

2 13

[PATCH] virfile: workaround for when posix_fallocate() is not supported by FS
by Roman Bogorodskiy 01 Feb '21

01 Feb '21

posix_fallocate() might be not supported by a filesystem, for example, it's not supported by ZFS. In that case it fails with return code 22 (EINVAL), and thus safezero_posix_fallocate() returns -1. As safezero_posix_fallocate() is the first function tried by safezero() and it tries other functions only when it returns -2, it fails immediately without falling back to other methods, such as safezero_slow(). Fix that by returning -2 if posix_fallocate() returns EINVAL, to give safezero() a chance to try other functions. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/util/virfile.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index 609cafdd34..67a350deb3 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1119,6 +1119,16 @@ safezero_posix_fallocate(int fd, off_t offset, off_t len) int ret = posix_fallocate(fd, offset, len); if (ret == 0) return 0; + else if (ret == EINVAL) + /* EINVAL is returned when either: + - Operation is not supported by the underlying filesystem, + - offset or len argument values are invalid. + Assuming that offset and len are valid, this error means + the operation is not supported, and we need to fall back + to other methods. + */ + return -2; + errno = ret; return -1; } -- 2.30.0

2 1

[PULL 00/13] Misc patches
by Daniel P. Berrangé 30 Jan '21

30 Jan '21

The following changes since commit 5101d00d2f1138a73344dc4833587f76d7a5fa5c: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-p= ull-request' into staging (2021-01-29 10:10:43 +0000) are available in the Git repository at: https://gitlab.com/berrange/qemu tags/misc-fixes-pull-request for you to fetch changes up to ecb98f5c7589ba8ecd15c8b1baa2ec7192e47c75: tests: Replace deprecated ASN1 code (2021-01-29 17:07:53 +0000) ---------------------------------------------------------------- * Replace --enable/disable-git-update with --with-git-submodules to allow improved control over use of git submodules * Deprecate the -enable-fips option * Ensure docs use prefer format for bool options * Clarify platform support rules * Misc fixes to keymap conversions * Fix misc problems on macOS ---------------------------------------------------------------- Dan Streetman (1): configure: replace --enable/disable-git-update with --with-git-submodules Daniel P. Berrang=C3=A9 (5): os: deprecate the -enable-fips option and QEMU's FIPS enforcement Prefer 'on' | 'off' over 'yes' | 'no' for bool options docs: simplify and clarify the platform support rules docs: fix missing backslash in certtool shell example ui: update keycodemapdb submodule commit Kevin Wolf (3): crypto: Move USER_CREATABLE to secret_common base class crypto: Forbid broken unloading of secrets crypto: Fix memory leaks in set_loaded for tls-* Stefan Weil (2): tests: Fix runtime error in test-authz-pam tests: Replace deprecated ASN1 code shiliyang (2): crypto: Fix some code style problems, add spaces around operator crypto: Add spaces around operator Makefile | 24 ++----------- configure | 51 +++++++++++++++++++------- crypto/aes.c | 6 ++-- crypto/desrfb.c | 4 +-- crypto/secret.c | 14 -------- crypto/secret_common.c | 21 +++++++++-- crypto/secret_keyring.c | 14 -------- crypto/tlscredsanon.c | 3 +- crypto/tlscredspsk.c | 3 +- crypto/tlscredsx509.c | 5 ++- docs/system/build-platforms.rst | 63 ++++++++++++--------------------- docs/system/deprecated.rst | 12 +++++++ docs/system/tls.rst | 2 +- docs/system/vnc-security.rst | 10 +++--- include/authz/listfile.h | 2 +- os-posix.c | 3 ++ qemu-options.hx | 4 +-- scripts/git-submodule.sh | 34 +++++++++++++----- tests/crypto-tls-x509-helpers.c | 10 +++--- tests/crypto-tls-x509-helpers.h | 2 +- tests/pkix_asn1_tab.c | 2 +- tests/qemu-iotests/233 | 4 +-- tests/test-authz-pam.c | 10 +++++- ui/keycodemapdb | 2 +- ui/meson.build | 3 +- 25 files changed, 161 insertions(+), 147 deletions(-) --=20 2.29.2

3 15

[libvirt PATCH 00/19] Overhaul test/commandhelper.c
by Tim Wiederhake 30 Jan '21

30 Jan '21

I stumbled upon a buffer overflow / stack smash present in "test/commandhelper.c" that could be triggered by e.g. $ ./tests/commandhelper --readfd 0 --readfd 0 --readfd 0 --readfd x Could not parse fd x *** stack smashing detected ***: terminated Aborted (core dumped) This series cleans up the file, fixes the buffer overflow and converts (most) memory handling to g_auto*. Note that it does not touch the "prevent malloc with zero size" issue discussed in https://www.redhat.com/archives/libvir-list/2021-January/msg01160.html, this will be done in the other series. Please feel free to comment on whether the copyright year in the file's header should be updated and whether a prefix for the function names and the new type is required. Cheers, Tim Tim Wiederhake (19): commandhelper: Remove origenv variable commandhelper: Remove numpollfds variable commandhelper: Simplify envsort commandhelper: Consolidate error paths commandhelper: Consolidate argument parsing commandhelper: Split argument parsing and printing commandhelper: Factor out parseArguments commandhelper: Factor out printArguments commandhelper: Factor out printEnvironment commandhelper: Factor out printFds commandhelper: Factor out printDaemonization commandhelper: Factor out printCwd commandhelper: Factor out printInput commandhelper: Make number of fds variable in printInput commandhelper: Make number of fds variable in parseArguments commandhelper: Convert parseArguments to g_auto* commandhelper: Convert printEnvironment to g_auto* commandhelper: Convert printCwd to g_auto* commandhelper: Convert main to g_auto* tests/commandhelper.c | 295 +++++++++++++++++++++++++++--------------- 1 file changed, 188 insertions(+), 107 deletions(-) -- 2.26.2

4 28

[libvirt PATCH v2 0/2] stop using netcf for the interface driver backend
by Laine Stump 30 Jan '21

30 Jan '21

V1 here: https://www.redhat.com/archives/libvir-list/2021-January/msg00922.html A short version of the cover letter from V1: this is a followup to my proposal to stop using netcf for the interface driver backend in Fedora/RHEL/CentOS builds and use the udev backend instead (it turns out Ubuntu already disabled netcf in 2018). Changes in V2: * removed the patch that made the default netcf=disabled even when netcf-devel was found on the host. If someone has netcf-devel installed and still wants to build without netcf, then can add "-Dnetcf=disabled" on the meson commandline. * Made the specfile changes more intelligent: * instead of hardcoding -Dnetcf=disabled, we now have a variable %{with_netcf} that is set to 1 for current Fedora (< 34) and current RHEL (< 9) but will be set to 0 for future Fedora/RHEL. This way the behavior on current OS releases will remain the same even for future libvirt. * it is possible to for netcf support off even in current/older OS releases by adding "--without netcf" to the rpmbuild commandline. I think at this point I would be comfortable pushing these patches, unless someone has misgivings about it... Laine Stump (2): build: support explicitly disabling netcf rpm: disable netcf for the interface driver in rpm build on new targets libvirt.spec.in | 22 +++++++++++++++++----- meson.build | 10 ++++++---- 2 files changed, 23 insertions(+), 9 deletions(-) -- 2.29.2

4 8

[PATCH] Increase timeout for tests and syntax-check
by Michal Privoznik 30 Jan '21

30 Jan '21

Since we've switched to meson our tests run with a timeout (meson uses 30 seconds as the default). However, not every machine that builds libvirt is fast enough to run every test under 30 seconds (each test binary has its own timeout, but still). For instance when building a package for distro on a farm that's under load. Or on a generally slow ARM hardware. While each developer can tune their command line for building by adding --timeout-multiplier=10, this is hard to do for aforementioned build farms. It's time to admit that not everybody has the latest, top shelf CPU and increase the timeout. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Successfully tested on my RasPi 2B, where the top three longest test were: qemuxml2argvtest OK 142.43s virschematest OK 40.82s virnettlssessiontest OK 38.64s and syntax-check: sc_spacing-check OK 50.26 sc_avoid_if_before_free OK 42.30s sc_prohibit_cross_inclusion OK 40.51s build-aux/meson.build | 1 + tests/meson.build | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build-aux/meson.build b/build-aux/meson.build index c506feefd2..e7b2db8759 100644 --- a/build-aux/meson.build +++ b/build-aux/meson.build @@ -44,6 +44,7 @@ if git potfiles_dep, ], suite: 'syntax-check', + timeout: 120, ) endforeach endif diff --git a/tests/meson.build b/tests/meson.build index 0de0783839..702090d594 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -546,6 +546,10 @@ if conf.has('WITH_YAJL') ] endif +# Increase the default timeout because some tests may run longer, +# esp. on slower systems. +timeout = 180 + foreach data : tests test_sources = '@0@.c'.format(data['name']) test_bin = executable( @@ -577,12 +581,6 @@ foreach data : tests ], export_dynamic: true, ) - if data['name'] == 'qemuxml2argvtest' - timeout = 90 - else - # default meson timeout - timeout = 30 - endif test(data['name'], test_bin, env: tests_env, timeout: timeout) endforeach @@ -683,7 +681,7 @@ endif foreach name : test_scripts script = find_program(name) - test(name, script, env: tests_env) + test(name, script, env: tests_env, timeout: timeout) endforeach add_test_setup( @@ -703,6 +701,6 @@ add_test_setup( '--suppressions=@0@'.format(meson.current_source_dir() / '.valgrind.supp'), '--error-exitcode=1', ], - # default timeout in meson is 30s + # Tests take a lot longer when run under Valgrind timeout_multiplier: 4, ) -- 2.26.2

5 17

[libvirt PATCH] docs: compiling: mention build dir
by Ján Tomko 29 Jan '21

29 Jan '21

Our docs have not been fully updated to reflect the separate build directory. Suggested-by: Laszlo Ersek <lersek(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/compiling.html.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/compiling.html.in b/docs/compiling.html.in index c2c9d9f0ed..df6074780f 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -98,15 +98,17 @@ $ ninja -C build <pre> $ su - # service libvirtd stop (or systemctl stop libvirtd.service) -# /home/to/your/checkout/src/libvirtd +# /home/to/your/checkout/build/src/libvirtd </pre> <p> - It is also possible to run virsh directly from the source tree + It is also possible to run virsh directly from the build tree using the ./run script (which sets some environment variables): </p> <pre> +$ pwd +/home/to/your/checkout/build $ ./run ./tools/virsh .... </pre> </body> -- 2.29.2

2 1

[libvirt PATCH] news: document virtiofs boot order
by Ján Tomko 29 Jan '21

29 Jan '21

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 7a2d6649b4..8b8a132e41 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -18,6 +18,11 @@ v7.1.0 (unreleased) The virtio-pmem is a virtio variant of NVDIMM and just like NVDIMM virtio-pmem also allows accessing host pages bypassing guest page cache. + * Introduce ``<boot order/>`` for ``<filesystem>`` + + Booting is possible from virtiofs filesystems. Introduce an option + to control the boot order, like we do for other bootable devices. + * **Improvements** * **Bug fixes** -- 2.29.2

2 1

[libvirt PATCH 0/7] Add boot order to virtiofs
by Ján Tomko 29 Jan '21

29 Jan '21

Sadly, the replies changes for older QEMUs are synthetic. Separated for easier review. Also available on gitlab: git fetch https://gitlab.com/janotomko/libvirt/ virtiofs-bootindex https://gitlab.com/janotomko/libvirt/-/tree/virtiofs-bootindex And a broken pipeline: https://gitlab.com/janotomko/libvirt/-/pipelines/248162273 Ján Tomko (7): tests: switch vhost-user-fs-hugepages to use boot order conf: add boot order to filesystem qemu: add QEMU_CAPS_VHOST_USER_FS_BOOTINDEX fixup: vhost-user-fs-device properties fixup: renumber Add validation for virtiofs boot order setting qemu: format bootindex for vhost-user-fs docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 5 +- src/conf/domain_validate.c | 17 ++- src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 3 + src/qemu/qemu_validate.c | 6 + .../caps_4.2.0.aarch64.replies | 131 ++++++++++++---- .../caps_4.2.0.s390x.replies | 119 ++++++++++++--- .../caps_4.2.0.x86_64.replies | 131 ++++++++++++---- .../caps_5.0.0.aarch64.replies | 136 +++++++++++++---- .../caps_5.0.0.ppc64.replies | 124 +++++++++++++--- .../caps_5.0.0.riscv64.replies | 120 ++++++++++++--- .../caps_5.0.0.x86_64.replies | 136 +++++++++++++---- .../caps_5.1.0.x86_64.replies | 136 +++++++++++++---- .../caps_5.2.0.aarch64.replies | 136 +++++++++++++---- .../caps_5.2.0.ppc64.replies | 124 +++++++++++++--- .../caps_5.2.0.riscv64.replies | 120 ++++++++++++--- .../caps_5.2.0.s390x.replies | 124 +++++++++++++--- .../caps_5.2.0.x86_64.replies | 136 +++++++++++++---- .../caps_6.0.0.x86_64.replies | 140 ++++++++++++++---- .../caps_6.0.0.x86_64.xml | 1 + ...vhost-user-fs-hugepages.x86_64-latest.args | 3 +- .../vhost-user-fs-hugepages.xml | 3 +- 24 files changed, 1534 insertions(+), 329 deletions(-) -- 2.29.2

3 10

[PATCH] conf: rename virDomainCheckVirtioOptions
by Boris Fiuczynski 29 Jan '21

29 Jan '21

Rename virDomainCheckVirtioOptions into virDomainCheckVirtioOptionsAreAbent since it checks if all virtio options are absent. The old name was very misleading. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- src/conf/domain_validate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index dd4c6e0fb3..a2f236c299 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -227,7 +227,7 @@ virSecurityDeviceLabelDefValidate(virSecurityDeviceLabelDefPtr *seclabels, static int -virDomainCheckVirtioOptions(virDomainVirtioOptionsPtr virtio) +virDomainCheckVirtioOptionsAreAbsent(virDomainVirtioOptionsPtr virtio) { if (!virtio) return 0; @@ -316,7 +316,7 @@ virDomainDiskDefValidate(const virDomainDef *def, return -1; } - if (virDomainCheckVirtioOptions(disk->virtio) < 0) + if (virDomainCheckVirtioOptionsAreAbsent(disk->virtio) < 0) return -1; } @@ -1363,7 +1363,7 @@ virDomainNetDefValidate(const virDomainNetDef *net) } if (!virDomainNetIsVirtioModel(net) && - virDomainCheckVirtioOptions(net->virtio) < 0) { + virDomainCheckVirtioOptionsAreAbsent(net->virtio) < 0) { return -1; } @@ -1513,7 +1513,7 @@ virDomainVsockDefValidate(const virDomainVsockDef *vsock) } if (!virDomainVsockIsVirtioModel(vsock) && - virDomainCheckVirtioOptions(vsock->virtio) < 0) + virDomainCheckVirtioOptionsAreAbsent(vsock->virtio) < 0) return -1; return 0; -- 2.26.2

5 5

[PATCH] docs: Clarify the documentation of the <css> elements
by Thomas Huth 29 Jan '21

29 Jan '21

The channel subsystem elements describe a channel in the I/O subsystem of a s390x machine, and not a normal device (like a disk or network card). Reword the documentation here to make it this a little bit clearer. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1898074 Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- docs/formatnode.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 1010a37a3d..8fbd3e6ece 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -396,15 +396,15 @@ </dl> </dd> <dt><code>css</code></dt> - <dd>Describes a Channel SubSystem (CSS) device commonly found on - the S390 architecture. Sub-elements include: + <dd>Describes a channel in the Channel SubSystem (CSS) commonly found + on the S390 architecture. Sub-elements include: <dl> <dt><code>cssid</code></dt> <dd>The channel subsystem identifier.</dd> <dt><code>ssid</code></dt> <dd>The subchannel-set identifier.</dd> <dt><code>devno</code></dt> - <dd>The device number.</dd> + <dd>The subchannel number.</dd> <dt><code>capability</code></dt> <dd> This optional element can occur multiple times. If it -- 2.27.0

3 2

[PATCH] qemu: Add virtio related options to vsock
by Boris Fiuczynski 29 Jan '21

29 Jan '21

Add virtio related options iommu, ats and packed as driver element attributes to vsock devices. Ex: <vsock model='virtio'> <cid auto='no' address='3'/> <driver iommu='on'/> </vsock> Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- docs/formatdomain.rst | 2 + docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 34 +++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_validate.c | 3 ++ .../vhost-vsock-ccw-iommu.s390x-latest.args | 42 +++++++++++++++++++ .../vhost-vsock-ccw-iommu.xml | 33 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../vhost-vsock-ccw-iommu.s390x-latest.xml | 37 ++++++++++++++++ tests/qemuxml2xmltest.c | 2 + 11 files changed, 160 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index c738078b90..a09868bed5 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -7433,6 +7433,8 @@ devices <#elementsVirtioTransitional>`__ for more details. The optional attribute ``address`` of the ``cid`` element specifies the CID assigned to the guest. If the attribute ``auto`` is set to ``yes``, libvirt will assign a free CID automatically on domain startup. :since:`Since 4.4.0` +The optional ``driver`` element allows to specify virtio options, see +`Virtio-specific options <#elementsVirtio>`__ for more details. :since:`Since 7.1.0` :: diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a4bddcf132..232587e690 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4883,6 +4883,11 @@ <optional> <ref name="alias"/> </optional> + <optional> + <element name="driver"> + <ref name="virtioOptions"/> + </element> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dab4f10326..b94204cb4f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2457,6 +2457,7 @@ virDomainVsockDefFree(virDomainVsockDefPtr vsock) virObjectUnref(vsock->privateData); virDomainDeviceInfoClear(&vsock->info); + VIR_FREE(vsock->virtio); VIR_FREE(vsock); } @@ -5321,7 +5322,16 @@ virDomainNetDefPostParse(virDomainNetDefPtr net) } -static void +static bool +virDomainVsockIsVirtioModel(const virDomainVsockDef *vsock) +{ + return (vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO || + vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO_TRANSITIONAL || + vsock->model == VIR_DOMAIN_VSOCK_MODEL_VIRTIO_NON_TRANSITIONAL); +} + + +static int virDomainVsockDefPostParse(virDomainVsockDefPtr vsock) { if (vsock->auto_cid == VIR_TRISTATE_BOOL_ABSENT) { @@ -5330,6 +5340,12 @@ virDomainVsockDefPostParse(virDomainVsockDefPtr vsock) else vsock->auto_cid = VIR_TRISTATE_BOOL_YES; } + + if (!virDomainVsockIsVirtioModel(vsock) && + virDomainCheckVirtioOptions(vsock->virtio) < 0) + return -1; + + return 0; } @@ -5410,8 +5426,7 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, break; case VIR_DOMAIN_DEVICE_VSOCK: - virDomainVsockDefPostParse(dev->data.vsock); - ret = 0; + ret = virDomainVsockDefPostParse(dev->data.vsock); break; case VIR_DOMAIN_DEVICE_MEMORY: @@ -15711,6 +15726,11 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xmlopt, if (virDomainDeviceInfoParseXML(xmlopt, node, &vsock->info, flags) < 0) return NULL; + if (virDomainVirtioOptionsParseXML(virXPathNode("./driver", ctxt), + &vsock->virtio) < 0) + return NULL; + + return g_steal_pointer(&vsock); } @@ -22897,6 +22917,10 @@ virDomainVsockDefCheckABIStability(virDomainVsockDefPtr src, return false; } + if (src->virtio && dst->virtio && + !virDomainVirtioOptionsCheckABIStability(src->virtio, dst->virtio)) + return false; + if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) return false; @@ -28087,6 +28111,7 @@ virDomainVsockDefFormat(virBufferPtr buf, g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf); g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) cidAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) drvAttrBuf = VIR_BUFFER_INITIALIZER; if (vsock->model) { virBufferAsprintf(&attrBuf, " model='%s'", @@ -28103,6 +28128,9 @@ virDomainVsockDefFormat(virBufferPtr buf, virDomainDeviceInfoFormat(&childBuf, &vsock->info, 0); + virDomainVirtioOptionsFormat(&drvAttrBuf, vsock->virtio); + + virXMLFormatElement(&childBuf, "driver", &drvAttrBuf, NULL); virXMLFormatElement(buf, "vsock", &attrBuf, &childBuf); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 95ad052891..0a5d151150 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2543,6 +2543,7 @@ struct _virDomainVsockDef { virTristateBool auto_cid; virDomainDeviceInfo info; + virDomainVirtioOptionsPtr virtio; }; struct _virDomainVirtioOptions { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1ec302d4ac..4986ca8b08 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9733,6 +9733,9 @@ qemuBuildVsockDevStr(virDomainDefPtr def, virBufferAsprintf(&buf, ",id=%s", vsock->info.alias); virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid); virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd); + + qemuBuildVirtioOptionsStr(&buf, vsock->virtio); + if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info, qemuCaps) < 0) return NULL; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a060bd98ba..cb9311cb9c 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4200,6 +4200,9 @@ qemuValidateDomainDeviceDefVsock(const virDomainVsockDef *vsock, "vsock")) return -1; + if (qemuValidateDomainVirtioOptions(vsock->virtio, qemuCaps) < 0) + return -1; + return 0; } diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args new file mode 100644 index 0000000000..aed32eef25 --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.s390x-latest.args @@ -0,0 +1,42 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-s390x \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\ +memory-backend=s390.ram \ +-cpu qemu \ +-m 214 \ +-object memory-backend-ram,id=s390.ram,size=224395264 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,\ +bootindex=1 \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-device vhost-vsock-ccw,id=vsock0,guest-cid=4,vhostfd=6789,iommu_platform=on,\ +devno=fe.0.0002 \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml new file mode 100644 index 0000000000..ba9cdc82bf --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml @@ -0,0 +1,33 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>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-s390x</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='virtio'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </disk> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> + </memballoon> + <panic model='s390'/> + <vsock model='virtio'> + <cid auto='no' address='4'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> + <driver iommu='on'/> + </vsock> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cf77224fc3..c5d82ac72e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3400,6 +3400,7 @@ mymain(void) DO_TEST_CAPS_LATEST("vhost-vsock-auto"); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); DO_TEST_CAPS_VER("launch-security-sev", "2.12.0"); DO_TEST_CAPS_VER("launch-security-sev-missing-platform-info", "2.12.0"); diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml new file mode 100644 index 0000000000..dbfe082a6f --- /dev/null +++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-iommu.s390x-latest.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='virtio'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> + </memballoon> + <panic model='s390'/> + <vsock model='virtio'> + <cid auto='no' address='4'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> + <driver iommu='on'/> + </vsock> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 9553a8a4f8..50dd970789 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1403,6 +1403,8 @@ mymain(void) QEMU_CAPS_CCW); DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK, QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); + DO_TEST_CAPS_LATEST("vhost-user-fs-fd-memory"); DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages"); -- 2.26.2

2 5

[PATCH 0/3] conf: Couple of virtio options related improvements
by Michal Privoznik 29 Jan '21

29 Jan '21

I've noticed these while reviewing Boris' patch: https://www.redhat.com/archives/libvir-list/2021-January/msg01149.html Michal Prívozník (3): conf: Move virDomainCheckVirtioOptions() into domain_validate.c conf: Drop empty virDomainNetDefPostParse() conf: Improve virDomainVirtioOptionsCheckABIStability() src/conf/domain_conf.c | 83 +++++++++----------------------------- src/conf/domain_validate.c | 55 ++++++++++++++++++++----- 2 files changed, 64 insertions(+), 74 deletions(-) -- 2.26.2

2 4

[libvirt PATCH 00/11] Random bits found by clang-tidy
by Tim Wiederhake 29 Jan '21

29 Jan '21

clang-tidy is a static code analysis tool under the llvm umbrella. It is primarily meant to be used on C++ code bases, but some of the checks it provides also apply to C. The findings vary in severity and contain pseudo-false-positives, i.e. clang-tidy is flagging potential execution flows that could happen in theory but are virtually impossible in real life: In function `virGetUnprivSGIOSysfsPath`, variables `maj` and `min` would be read unintialized if `stat()` failed and set `errno` to a negative value, to name just one example. The main source of false positive findings is the lack of support for `__attribute__((cleanup))` in clang-tidy, which is heavily used in libvirt through glib's `g_autofree` and `g_auto()` macros: #include <stdlib.h> void freeptr(int** p) { if (*p) free(*p); } int main() { __attribute__((cleanup(freeptr))) int *ptr = NULL; ptr = calloc(sizeof(int), 1); return 0; /* flagged as memory leak of `ptr` */ } This sadly renders clang-tidy's analysis of dynamic memory useless, hiding all real issues that it could otherwise find. Meson provides excellent integration for clang-tidy (a "clang-tidy" target is automatically generated if a ".clang-tidy" configuration file is present in the project's root directory). The amount of false-positives and the slow analysis, triggering time-outs in the CI, make this tool unfit for inclusion in libvirt's GitLab CI though. The patches in this series are the result of fixing some of the issues reported by running CC=clang meson build ninja -C build # generate sources and header files ninja -C build clang-tidy with the following `.clang-tidy` configuration file: --- Checks: > *, -abseil-*, -android-*, -boost-*, -cppcoreguidelines-*, -fuchsia-*, -google-*, -hicpp-*, -llvm-*, -modernize-*, -mpi-, -objc-, -openmp-, -zircon-*, -readability-braces-around-statements, -readability-magic-numbers WarningsAsErrors: '*' HeaderFilterRegex: '' FormatStyle: none ... Regards, Tim Tim Wiederhake (11): virfile: Remove redundant #ifndef xen: Fix indentation in xenParseXLSpice qemu_tpm: Fix indentation in qemuTPMEmulatorBuildCommand virsh-domain: Fix error handling of pthread_sigmask Replace bzero() with memset() udevGetIntSysfsAttr: Return -1 for missing attributes virhostuptime: Fix rounding in uptime calculation tests: Prevent malloc with size 0 vircryptotest: Directly assign string to avoid memcpy vircommand: Remove NULL check in virCommandAddArg vircommand: Simplify virCommandAddArg src/libxl/xen_xl.c | 5 ++--- src/node_device/node_device_udev.c | 5 ++++- src/qemu/qemu_tpm.c | 8 +++++--- src/util/virarptable.c | 2 +- src/util/vircommand.c | 12 +----------- src/util/virfile.c | 4 ++-- src/util/virhostuptime.c | 4 +++- tests/commandhelper.c | 2 +- tests/vircryptotest.c | 5 +---- tests/virpcimock.c | 2 +- tools/virsh-domain.c | 8 ++++---- 11 files changed, 25 insertions(+), 32 deletions(-) -- 2.26.2

4 28

[PATCH] remote: Add libvirtd dependency to virt-guest-shutdown.target
by Jim Fehlig 29 Jan '21

29 Jan '21

When restarting libvirt services and sockets *and* libvirt-guests.service is running, the latter will sometimes hang when trying to connect to libvirtd. Even though libvirt-guests has 'Wants=libvirtd.service' and 'After=libvirtd.service', we can see via journalctl that it is not shutdown before libvirtd when executing something like systemctl try-restart libvirtd.service libvirtd.socket \ libvirtd-ro.socket virtlockd.service virtlockd.socket \ virtlogd.service virtlogd.socket virt-guest-shutdown.target Oct 28 15:53:31 systemd[1]: Stopping Virtualization daemon... Oct 28 15:53:31 systemd[1]: libvirtd.service: Succeeded. Oct 28 15:53:31 systemd[1]: Stopped Virtualization daemon. Oct 28 15:53:31 systemd[1]: libvirtd-admin.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt admin socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:53:31 systemd[1]: libvirtd-ro.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: libvirtd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Libvirt local socket. Oct 28 15:53:31 systemd[1]: Stopping Libvirt local socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt local socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:53:31 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:53:31 systemd[1]: virtlockd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:53:31 systemd[1]: virtlogd.socket: Succeeded. Oct 28 15:53:31 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:53:31 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... In this case, the try-restart command hung and libvirt-guests was stuck trying to connect to libvirtd. In the following case, the try-restart worked since libvirtd was started again before libvirt-guests was stopped! Oct 28 15:19:02 systemd[1]: Stopping Virtualization daemon... Oct 28 15:19:02 systemd[1]: Stopped Virtualization daemon. Oct 28 15:19:02 systemd[1]: Closed Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:19:02 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Closed Libvirt local socket. Oct 28 15:19:02 systemd[1]: Stopping Libvirt local socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt local socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:19:02 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:19:02 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:19:02 systemd[1]: Starting Virtualization daemon... Oct 28 15:19:02 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... Oct 28 15:19:02 systemd[1]: Started Virtualization daemon. Oct 28 15:19:02 libvirt-guests.sh[4912]: Running guests on default URI: no running guests. Oct 28 15:19:02 systemd[1]: Stopped Suspend/Resume Running libvirt Guests. Oct 28 15:19:02 systemd[1]: Stopped target Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Stopping Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Reached target Libvirt guests shutdown. Oct 28 15:19:02 systemd[1]: Starting Suspend/Resume Running libvirt Guests... Oct 28 15:19:02 systemd[1]: Started Suspend/Resume Running libvirt Guests. Adding 'Requires=libvirtd.service' to virt-guest-shutdown.target results in expected behavior Oct 28 15:40:00 systemd[1]: Stopping Suspend/Resume Running libvirt Guests... Oct 28 15:40:00 libvirt-guests.sh[5245]: Running guests on default URI: no running guests. Oct 28 15:40:00 systemd[1]: Stopped Suspend/Resume Running libvirt Guests. Oct 28 15:40:00 systemd[1]: Stopped target Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Stopping Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Stopping Virtualization daemon... Oct 28 15:40:00 systemd[1]: Stopped Virtualization daemon. Oct 28 15:40:00 systemd[1]: Closed Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Stopping Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Listening on Virtual machine log manager socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Closed Libvirt local socket. Oct 28 15:40:00 systemd[1]: Stopping Libvirt local socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt local socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt admin socket. Oct 28 15:40:00 systemd[1]: Listening on Libvirt local read-only socket. Oct 28 15:40:00 systemd[1]: Closed Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Stopping Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Listening on Virtual machine lock manager socket. Oct 28 15:40:00 systemd[1]: Starting Virtualization daemon... Oct 28 15:40:00 systemd[1]: Started Virtualization daemon. Oct 28 15:40:00 systemd[1]: Reached target Libvirt guests shutdown. Oct 28 15:40:00 systemd[1]: Starting Suspend/Resume Running libvirt Guests... Oct 28 15:40:00 systemd[1]: Started Suspend/Resume Running libvirt Guests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I asked about this on the dev list but it is probably best to send a patch for discussion instead. https://www.redhat.com/archives/libvir-list/2020-October/msg01492.html src/remote/virt-guest-shutdown.target | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remote/virt-guest-shutdown.target b/src/remote/virt-guest-shutdown.target index 25d4aaa267..e2efa3e63a 100644 --- a/src/remote/virt-guest-shutdown.target +++ b/src/remote/virt-guest-shutdown.target @@ -1,3 +1,4 @@ [Unit] Description=Libvirt guests shutdown +Requires=libvirtd.service Documentation=https://libvirt.org -- 2.28.0

3 3

failed to start vm after add vsock device
by longguang.yue 28 Jan '21

28 Jan '21

Hi, all: there is no error when launch qemu-kvm from cli directly, but vm fails to start via libvirtd. i have tried to chmod 0666 /dev/vhost-vsock. error: internal error: qemu unexpectedly closed the monitor: 2021-01-26T13:06:06.403097Z qemu-kvm: -device vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=4: vhost-vsock: failed to open vhost device: Unknown error -13 <qemu:commandline> <qemu:arg value='-device'/> <qemu:arg value='vhost-vsock-pci,id=vhost-vsock-pci0,guest-cid=4'/> </qemu:commandline> thanks

2 3

Re: [RFC] Change default ipv6 network from fec0/10 (site local) to fe80/10 (link local)
by Philippe Mathieu-Daudé 28 Jan '21

28 Jan '21

Hi Doug, Cc'ing more developers. On 1/27/21 8:13 PM, Doug Evans wrote: > Hi. > > This is just an information gathering question. I don't know enough to > formally propose the change. > I happened to notice QEMU's default for the ipv6 network is fec0::/10 > which is deprecated (RFC3879). > I think(!) an obvious replacement is fe80::/10, link local. > > Has anyone thought about this issue or know of reasons why we shouldn't > make this change? I'm a bit worried this could break various scripts and firewall rules where this is the expected default range...

2 1