- Devel - libvirt List Archives

[PATCH] qemu: don't raise error upon interface update without <frames/> for <rx/> in coalesce
by Kristina Hanicova 09 Mar '21

09 Mar '21

With this, incomplete XML without <frames/> for <rx/> in coalesce won't raise error as before. It will leave the coalesce parameter empty, thanks to passing it as a parameter and return an integer to indicate error state - previously it returned pointer (or NULL for both error and incomplete XML). The code went through some refactoring: * change of a condition * addition of a parameter * change of order, that allowed removal of VIR_FREE * removal of redundant labels and variables Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1535930 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_conf.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b731744f04..798594f520 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7516,11 +7516,11 @@ virDomainNetIPInfoParseXML(const char *source, } -static virNetDevCoalescePtr +static int virDomainNetDefCoalesceParseXML(xmlNodePtr node, - xmlXPathContextPtr ctxt) + xmlXPathContextPtr ctxt, + virNetDevCoalescePtr *coalesce) { - virNetDevCoalescePtr ret = NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned long long tmp = 0; g_autofree char *str = NULL; @@ -7529,15 +7529,13 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, str = virXPathString("string(./rx/frames/@max)", ctxt); if (!str) - return NULL; - - ret = g_new0(virNetDevCoalesce, 1); + return 0; if (virStrToLong_ullp(str, NULL, 10, &tmp) < 0) { virReportError(VIR_ERR_XML_DETAIL, _("cannot parse value '%s' for coalesce parameter"), str); - goto error; + return -1; } if (tmp > UINT32_MAX) { @@ -7545,15 +7543,13 @@ virDomainNetDefCoalesceParseXML(xmlNodePtr node, _("value '%llu' is too big for coalesce " "parameter, maximum is '%lu'"), tmp, (unsigned long) UINT32_MAX); - goto error; + return -1; } - ret->rx_max_coalesced_frames = tmp; - return ret; + *coalesce = g_new0(virNetDevCoalesce, 1); + (*coalesce)->rx_max_coalesced_frames = tmp; - error: - VIR_FREE(ret); - return NULL; + return 0; } static void @@ -11517,8 +11513,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, node = virXPathNode("./coalesce", ctxt); if (node) { - def->coalesce = virDomainNetDefCoalesceParseXML(node, ctxt); - if (!def->coalesce) + if (virDomainNetDefCoalesceParseXML(node, ctxt, &def->coalesce) < 0) goto error; } -- 2.29.2

2 1

[libvirt PATCH 0/2] docs: less docs for insecure SASL mechanisms
by Daniel P. Berrangé 08 Mar '21

08 Mar '21

GSSAPI and SCRAM-SHA-256 are the only two SASL mechanisms we especially want people to be using. Even the latter is a little questionable due to storing passwords in cleartext on the server. Daniel P. Berrangé (2): docs: convert auth page into RST format docs: stop mentioning insecure / broken SASL mechanisms docs/auth.html.in | 368 --------------------------------------- docs/auth.rst | 323 ++++++++++++++++++++++++++++++++++ docs/meson.build | 2 +- src/remote/libvirtd.sasl | 11 +- 4 files changed, 330 insertions(+), 374 deletions(-) delete mode 100644 docs/auth.html.in create mode 100644 docs/auth.rst -- 2.29.2

2 8

[PATCH v2 0/3] Drop deprecated floppy config & bogus -drive if=T
by Markus Armbruster 08 Mar '21

08 Mar '21

v2: * Rebased, straightforward conflict with commit f5d33dd51f "hw/block/fdc: Remove the check_media_rate property" resolved * PATCH 2: Commit message fixed [Kevin] Markus Armbruster (3): fdc: Drop deprecated floppy configuration fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() blockdev: Drop deprecated bogus -drive interface type docs/system/deprecated.rst | 33 -- docs/system/removed-features.rst | 33 ++ include/sysemu/blockdev.h | 1 - blockdev.c | 37 +- hw/block/fdc.c | 73 +--- softmmu/vl.c | 8 +- tests/qemu-iotests/172 | 31 +- tests/qemu-iotests/172.out | 562 +------------------------------ 8 files changed, 59 insertions(+), 719 deletions(-) -- 2.26.2

3 12

[PATCH] virDevMapperGetTargetsImpl: Use correct length when copying into dm.name
by Michal Privoznik 08 Mar '21

08 Mar '21

For reasons unknown, when rewriting this code and dropping libdevmapper I've mistakenly used incorrect length of dm.name. In linux/dm-ioctl.h the dm_ioctl struct is defined as follows: #define DM_NAME_LEN 128 struct dm_ioctl { ... char name[DM_NAME_LEN]; /* device name */ ... }; However, when copying string into this member, DM_TABLE_DEPS was used, which is defined as follows: #define DM_TABLE_DEPS _IOWR(DM_IOCTL, DM_TABLE_DEPS_CMD, struct dm_ioctl) After decryption, this results in the following size: 3241737483. Fixes: 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virdevmapper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index fcb11e954f..2c4c2df999 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -240,7 +240,7 @@ virDevMapperGetTargetsImpl(int controlFD, if (!(sanitizedPath = virDMSanitizepath(path))) return 0; - if (virStrcpy(dm.name, sanitizedPath, DM_TABLE_DEPS) < 0) { + if (virStrcpy(dm.name, sanitizedPath, DM_NAME_LEN) < 0) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Resolved device mapper name too long")); return -1; -- 2.26.2

2 1

[PATCH] meson: tools: depend on keycode generated sources
by Roman Bogorodskiy 06 Mar '21

06 Mar '21

Tools depend on keycode generated sources, so declare that as an explicit dependency, otherwise it might fail with: ../tools/virsh-completer-domain.c:35:10: fatal error: 'virkeynametable_linux.h' file not found ^~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- I noticed that build failure on FreeBSD 11.x. For some reason, it doesn't show up on newer versions. This is strange, but as the fix appears to be straight-forward, I didn't spend much time figuring out the reason. In case you're interested, a full failing build log is here: https://people.freebsd.org/~novel/misc/libvirt-7.1.0.log It doesn't seem to even try to generate these files. When I inspected filesystem state, these files were missing. src/util/meson.build | 2 ++ tools/meson.build | 1 + 2 files changed, 3 insertions(+) diff --git a/src/util/meson.build b/src/util/meson.build index 0080825bd0..cd3fe18524 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -168,6 +168,8 @@ foreach name : keyname_list ) endforeach +keycode_dep = declare_dependency(sources: keycode_gen_sources) + io_helper_sources = [ 'iohelper.c', ] diff --git a/tools/meson.build b/tools/meson.build index b8c6802f0a..42dc609439 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -186,6 +186,7 @@ executable( tools_dep, readline_dep, thread_dep, + keycode_dep, ], link_args: [ coverage_flags, -- 2.30.0

3 5

[PATCH] docs: Document qemu.conf locations
by Michal Privoznik 05 Mar '21

05 Mar '21

Surprisingly, we never documented the relationship between connection URI and the location of qemu.conf. Users might wonder what qemu.conf is loaded when they are connecting to the session daemon or embed URI. And what to do if the file doesn't exist for the URI they're using. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/drvqemu.html.in | 39 +++++++++++++++++++++++++++++++++++++ docs/manpages/libvirtd.rst | 20 +++++++++++++++++++ docs/manpages/virtqemud.rst | 22 +++++++++++++++++++++ 3 files changed, 81 insertions(+) diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 31d3fee213..a784f5768c 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -162,6 +162,45 @@ qemu+ssh://root@example.com/system (remote access, SSH tunnelled) of libvirt, once QMP processing moves to a dedicated thread. </p> + <h2><a id="configFiles">Location of configuration files</a></h2> + + <p> + The QEMU driver comes with sane default values. However, during its + initialization it reads a configuration file which offers system + administrator or an user to override some of that default. The location + of the file depends on the connection URI, as follows: + </p> + + <table> + <tr> + <td><code>qemu:///system</code></td> + <td><code>/etc/libvirt/qemu.conf</code></td> + </tr> + <tr> + <td><code>qemu:///session</code></td> + <td><code>$XDG_CONFIG_HOME/libvirt/qemu.conf</code></td> + </tr> + <tr> + <td><code>qemu:///embed</code></td> + <td><code>$rootdir/etc/qemu.conf</code></td> + </tr> + </table> + + <p> + If <code>$XDG_CONFIG_HOME</code> is not set in the environment, it + defaults to <code>$HOME/.config</code>. For the embed URI the + <code>$rootdir</code> represents the specified root directory from + the connection URI. + </p> + + <p> + Please note, that it is very likely that the only qemu.conf file that + will exist after installing libvirt is the + <code>/etc/libvirt/qemu.conf</code>, if users of the session daemon or + the embed driver want to override a built in value, then they need to + create the file before connecting to the respective URI. + </p> + <h2><a id="security">Driver security architecture</a></h2> <p> diff --git a/docs/manpages/libvirtd.rst b/docs/manpages/libvirtd.rst index ed591f4778..6545dc58d3 100644 --- a/docs/manpages/libvirtd.rst +++ b/docs/manpages/libvirtd.rst @@ -136,6 +136,16 @@ When run as *root* The default configuration file used by ``libvirtd``, unless overridden on the command line using the ``-f`` | ``--config`` option. +If QEMU driver is installed, then the following file is also read: + +* ``@SYSCONFDIR@/libvirt/qemu.conf`` + +This file contains various knobs and default values for virtual machines +created within QEMU driver, and offers a way to override the built in defaults, +for instance (but not limited to): paths to various supplementary binaries, TLS +certificates location, graphical consoles configuration and others. Location of +this file can't be overridden by any command line switch. + * ``@RUNSTATEDIR@/libvirt/libvirt-sock`` * ``@RUNSTATEDIR@/libvirt/libvirt-sock-ro`` @@ -166,6 +176,16 @@ When run as *non-root* The default configuration file used by ``libvirtd``, unless overridden on the command line using the ``-f``|``--config`` option. +If QEMU driver is installed, then the following file is also read: + +* ``$XDG_CONFIG_HOME/libvirt/qemu.conf`` + +If the file exists, it can contain various knobs and default values for virtual +machines created within QEMU driver, and offers a way to override the built in +defaults, for instance (but not limited to): paths to various supplementary +binaries, TLS certificates location, graphical consoles configuration and +others. Location of this file can't be overridden by any command line switch. + * ``$XDG_RUNTIME_DIR/libvirt/libvirt-sock`` The socket ``libvirtd`` will use. diff --git a/docs/manpages/virtqemud.rst b/docs/manpages/virtqemud.rst index fbcc6e45fa..d82d09ee61 100644 --- a/docs/manpages/virtqemud.rst +++ b/docs/manpages/virtqemud.rst @@ -111,6 +111,17 @@ When run as *root* The default configuration file used by ``virtqemud``, unless overridden on the command line using the ``-f`` | ``--config`` option. +In addition to the default configuration file, ``virtqemud`` reads +configuration for the qemu driver from: + +* ``@SYSCONFDIR@/libvirt/qemu.conf`` + +This file contains various knobs and default values for virtual machines +created within QEMU driver, and offers a way to override the built in defaults, +for instance (but not limited to): paths to various supplementary binaries, TLS +certificates location, graphical consoles configuration and others. Location of +this file can't be overridden by any command line switch. + * ``@RUNSTATEDIR@/libvirt/virtqemud-sock`` * ``@RUNSTATEDIR@/libvirt/virtqemud-sock-ro`` * ``@RUNSTATEDIR@/libvirt/virtqemud-admin-sock`` @@ -132,6 +143,17 @@ When run as *non-root* The default configuration file used by ``virtqemud``, unless overridden on the command line using the ``-f``|``--config`` option. +In addition to the default configuration file, ``virtqemud`` reads +configuration for the qemu driver from: + +* ``$XDG_CONFIG_HOME/libvirt/qemu.conf`` + +If the file exists, it can contain various knobs and default values for virtual +machines created within QEMU driver, and offers a way to override the built in +defaults, for instance (but not limited to): paths to various supplementary +binaries, TLS certificates location, graphical consoles configuration and +others. Location of this file can't be overridden by any command line switch. + * ``$XDG_RUNTIME_DIR/libvirt/virtqemud-sock`` * ``$XDG_RUNTIME_DIR/libvirt/virtqemud-admin-sock`` -- 2.26.2

2 2

[PATCH] virFirewallApply: Fix possible NULL dereference on error
by Peter Krempa 05 Mar '21

05 Mar '21

Commit bbc25f0d03d443efd35381463efc81b01cb6ae96 juggled around some error reporting. Unfortunately virFirewallApply tries to report the errno stored in the firewall object and we'd try to do that when the firewall object is NULL too. Report EINVAL if 'firewall' is NULL. Found by Coverity. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virfirewall.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index c1b7d2268b..0dc0cecd53 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -766,8 +766,12 @@ virFirewallApply(virFirewallPtr firewall) goto cleanup; } if (!firewall || firewall->err) { - virReportSystemError(firewall->err, "%s", - _("Unable to create rule")); + int err = EINVAL; + + if (firewall) + err = firewall->err; + + virReportSystemError(err, "%s", _("Unable to create rule")); goto cleanup; } -- 2.29.2

2 1

[libvirt PATCH v2 0/1] qemuProcessUpdateGuestCPU: Check host cpu for forbidden features
by Tim Wiederhake 05 Mar '21

05 Mar '21

V1: https://listman.redhat.com/archives/libvir-list/2021-February/msg01275.ht= ml Changes since V1: * Only check for forbidden features * Check if `check` !=3D none * Renamed patch Tim Wiederhake (1): qemuProcessUpdateGuestCPU: Check host cpu for forbidden features src/qemu/qemu_process.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) --=20 2.26.2

3 3

[PATCH v6 0/5] migration/dirtyrate: Introduce APIs for getting domain memory dirty rate
by Hao Wang 05 Mar '21

05 Mar '21

V5 -> V6: split DomainGetDirtyRateInfo(domdirtyrate) API into two parts: 1. DomainStartDirtyRateCalc(domdirtyrate-calc) for starting dirty rate calculation; 2. qemuDomainGetStatsDirtyRate(domstats --dirtyrate) for querying dirty rate infomation. 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: 1. Calculating Introduce a new API DomainStartDirtyRateCalc and corresponding virsh api (domdirtyrate-calc) for starting dirty rate calculation by calling qmp 'calc-dirty-rate'. # virsh domdirtyrate-calc <domain> [--seconds <sec>] 2. Querying Introduce command 'virsh domstats --dirtyrate' for reporting memory dirty rate infomation by calling qmp 'query-dirty-rate'. The info is listed as: Domain: 'vm0' dirtyrate.calc_status=measured dirtyrate.calc_start_time=502814 dirtyrate.calc_period=1 dirtyrate.megabytes_per_second=2 Hao Wang (5): migration/dirtyrate: Introduce virDomainStartDirtyRateCalc API migration/dirtyrate: Implement qemuDomainStartDirtyRateCalc migration/dirtyrate: Introduce domdirtyrate-calc virsh api migration/dirtyrate: Implement qemuMonitorQueryDirtyRate migration/dirtyrate: Introduce command 'virsh domstats --dirtyrate' docs/manpages/virsh.rst | 33 ++++++++- include/libvirt/libvirt-domain.h | 5 ++ src/driver-hypervisor.h | 6 ++ src/libvirt-domain.c | 57 +++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_driver.c | 115 +++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 24 +++++++ src/qemu/qemu_monitor.h | 18 +++++ src/qemu/qemu_monitor_json.c | 88 +++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 8 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 +++- src/remote_protocol-structs | 6 ++ tools/virsh-domain-monitor.c | 7 ++ tools/virsh-domain.c | 63 +++++++++++++++++ 15 files changed, 447 insertions(+), 3 deletions(-) -- 2.23.0

2 10

[PATCH 0/4] Replace virFileMakePath*() with g_mkdir_with_parents()
by Michal Privoznik 05 Mar '21

05 Mar '21

2 7

[PATCH 00/33] Remove the now misleading virReportOOMError infra
by Peter Krempa 05 Mar '21

05 Mar '21

'virReportOOMError' is nowadays mostly useless since an OOM error will trigger yet another allocation failure in the logger when attempting to log the error. Additionally it was also used in few places which can fail with other failures than OOM. To prevent both errorneous usage types, let's remove it completely. In the rare case we'd want to allocate a massive buffer and want to fail gracefully we still can use virReportError with VIR_ERR_NO_MEMORY. The series starts by some cleanup, then removes error handling from places where it's now dead code as we'll abort before the reporting, then converts some real OOM scenarios to abort() directly and lastly fixes the error message for cases where other errors are possible and lastly removes virReportOOMError. Pipelines are stuck, so hopefully it will go through: https://gitlab.com/pipo.sk/libvirt/-/pipelines/261161989 Peter Krempa (33): Remove useless comments for VIR_FROM_THIS definition util: xml: Introduce autoptr cleanup support for 'xmlNode' virDomainDefSetMetadata: Avoid temporary variable for string copy virCommandAddEnv: Make stealing of argument more obvious virCommandAddArgBuffer: Simplify clearing of @buf virCPUx86DataParse: Don't check error from x86FeatureNames virhostcputest: linuxCPUStatsCompareFiles: Don't check return value of virBufferContentAndReset virBuildPath: Remove return value lxc_process: Remove OOM handling from logging setup virDomainDefSetMetadata: Rework memory handling util: vircommand: Remove OOM handling virCloseCallbacksGetForConn: Remove OOM handling virfirewall: Don't check OOM in ADD_ARG macro virfirewall: Remove OOM checks from virFirewallStartTransaction virfirewall: virFirewallAddRuleFullV: Remove OOM check from VIR_APPEND_ELEMENT virfirewall: Remove impossible OOM error reporting util: virnetlink: Add wrapper for 'nlmsg_alloc_simple' util: xml: Add virXMLBufferCreate wrapper util: xml: Add wrapper for 'xmlNewNode' Don't report OOM error on xmlCopyNode failure virXMLXPathContextNew: abort() on allocation failure virXMLParseHelper: abort() on allocation failure util: virprocess: abort() on CPU_ALLOC failure virURIFormat: abort() on failure util: iohelper: Don't handle OOM from posix_memalign hyperv: abort() failure of wsmc_fault_new() vbox: abort() on allocation failure in UTF8<->UTF16 conversion libxl: abort() on failure of libxl_cpu_bitmap_alloc() virVBoxSnapshotConfSaveVboxFile: abort() on failure to allocate xmlDoc and comment util: json: Report non-OOM error on yajl failure storage: Don't report OOM error on failure of glfs_new virVMXConvertToUTF8: Report non-OOM error on failure of xmlBufferCreateStatic util: virerror: Remove virReportOOMError build-aux/syntax-check.mk | 8 -- docs/internals/command.html.in | 8 +- src/conf/domain_conf.c | 62 ++++----- src/conf/network_conf.c | 5 +- src/cpu/cpu_x86.c | 6 +- src/hyperv/hyperv_wmi.c | 8 +- src/hypervisor/virclosecallbacks.c | 15 +-- src/libvirt_private.syms | 3 +- src/libxl/libxl_conf.c | 6 +- src/libxl/libxl_driver.c | 7 +- src/lxc/lxc_process.c | 9 +- src/storage/storage_backend_gluster.c | 3 +- .../storage_file_backend_gluster.c | 3 +- src/test/test_driver.c | 6 +- src/util/iohelper.c | 7 +- src/util/vircommand.c | 119 +++++------------- src/util/virerror.c | 22 ---- src/util/virerror.h | 8 -- src/util/virfcp.c | 3 +- src/util/virfile.c | 7 +- src/util/virfile.h | 2 +- src/util/virfirewall.c | 62 ++------- src/util/virhook.c | 14 +-- src/util/virjson.c | 6 +- src/util/virnetdev.c | 18 +-- src/util/virnetdevbridge.c | 10 +- src/util/virnetdevip.c | 15 +-- src/util/virnetdevvportprofile.c | 6 +- src/util/virnetlink.c | 38 +++--- src/util/virnetlink.h | 4 + src/util/virpci.c | 12 +- src/util/virprocess.c | 12 +- src/util/virscsi.c | 1 - src/util/virscsivhost.c | 1 - src/util/viruri.c | 8 +- src/util/virxml.c | 44 ++++--- src/util/virxml.h | 8 ++ src/vbox/vbox_common.c | 20 --- src/vbox/vbox_common.h | 15 ++- src/vbox/vbox_snapshot_conf.c | 46 ++----- src/vmx/vmx.c | 9 +- tests/virhostcputest.c | 5 +- tools/virsh-domain.c | 5 +- 43 files changed, 214 insertions(+), 462 deletions(-) -- 2.29.2

3 39

[PATCH] tests: Don't return -1 as program return value
by Peter Krempa 05 Mar '21

05 Mar '21

In cases we use -1 for failure internally we still must return EXIT_FAILURE. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemucommandutiltest.c | 3 +-- tests/virnetdevbandwidthtest.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c index 6291c3b787..03947d87bc 100644 --- a/tests/qemucommandutiltest.c +++ b/tests/qemucommandutiltest.c @@ -146,8 +146,7 @@ mymain(void) "server.2.type=tcp," "server.2.host=example.com"); - return ret; - + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } VIR_TEST_MAIN(mymain) diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 2e76af3d0c..6d0443876c 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -156,7 +156,7 @@ mymain(void) TC " filter add dev eth0 parent ffff: protocol all u32 match u32 0 0 " "police rate 5kbps burst 7kb mtu 64kb drop flowid :1\n")); - return ret; + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virnetdevbandwidth")) -- 2.29.2

2 1

[PATCH] conf: Rewrite network virtio driver formatting using virXMLFormatElement
by Peter Krempa 05 Mar '21

05 Mar '21

Simplify the logic picking which element form to format by using virBuffers for the partial properties and virXMLFormatElement for combining them. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/domain_conf.c | 93 ++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 58 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 05b6cb3000..0220db794e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25428,108 +25428,97 @@ virDomainActualNetDefFormat(virBufferPtr buf, static void -virDomainVirtioNetGuestOptsFormat(char **outstr, +virDomainVirtioNetGuestOptsFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (def->driver.virtio.guest.csum) { - virBufferAsprintf(&buf, "csum='%s' ", + virBufferAsprintf(buf, " csum='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.csum)); } if (def->driver.virtio.guest.tso4) { - virBufferAsprintf(&buf, "tso4='%s' ", + virBufferAsprintf(buf, " tso4='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.tso4)); } if (def->driver.virtio.guest.tso6) { - virBufferAsprintf(&buf, "tso6='%s' ", + virBufferAsprintf(buf, " tso6='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.tso6)); } if (def->driver.virtio.guest.ecn) { - virBufferAsprintf(&buf, "ecn='%s' ", + virBufferAsprintf(buf, " ecn='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.ecn)); } if (def->driver.virtio.guest.ufo) { - virBufferAsprintf(&buf, "ufo='%s' ", + virBufferAsprintf(buf, " ufo='%s'", virTristateSwitchTypeToString(def->driver.virtio.guest.ufo)); } - virBufferTrim(&buf, " "); - - *outstr = virBufferContentAndReset(&buf); } static void -virDomainVirtioNetHostOptsFormat(char **outstr, +virDomainVirtioNetHostOptsFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (def->driver.virtio.host.csum) { - virBufferAsprintf(&buf, "csum='%s' ", + virBufferAsprintf(buf, " csum='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.csum)); } if (def->driver.virtio.host.gso) { - virBufferAsprintf(&buf, "gso='%s' ", + virBufferAsprintf(buf, " gso='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.gso)); } if (def->driver.virtio.host.tso4) { - virBufferAsprintf(&buf, "tso4='%s' ", + virBufferAsprintf(buf, " tso4='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.tso4)); } if (def->driver.virtio.host.tso6) { - virBufferAsprintf(&buf, "tso6='%s' ", + virBufferAsprintf(buf, " tso6='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.tso6)); } if (def->driver.virtio.host.ecn) { - virBufferAsprintf(&buf, "ecn='%s' ", + virBufferAsprintf(buf, " ecn='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.ecn)); } if (def->driver.virtio.host.ufo) { - virBufferAsprintf(&buf, "ufo='%s' ", + virBufferAsprintf(buf, " ufo='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.ufo)); } if (def->driver.virtio.host.mrg_rxbuf) { - virBufferAsprintf(&buf, "mrg_rxbuf='%s' ", + virBufferAsprintf(buf, " mrg_rxbuf='%s'", virTristateSwitchTypeToString(def->driver.virtio.host.mrg_rxbuf)); } - virBufferTrim(&buf, " "); - - *outstr = virBufferContentAndReset(&buf); } static void -virDomainVirtioNetDriverFormat(char **outstr, +virDomainVirtioNetDriverFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; if (def->driver.virtio.name) { - virBufferAsprintf(&buf, " name='%s'", + virBufferAsprintf(buf, " name='%s'", virDomainNetBackendTypeToString(def->driver.virtio.name)); } if (def->driver.virtio.txmode) { - virBufferAsprintf(&buf, " txmode='%s'", + virBufferAsprintf(buf, " txmode='%s'", virDomainNetVirtioTxModeTypeToString(def->driver.virtio.txmode)); } if (def->driver.virtio.ioeventfd) { - virBufferAsprintf(&buf, " ioeventfd='%s'", + virBufferAsprintf(buf, " ioeventfd='%s'", virTristateSwitchTypeToString(def->driver.virtio.ioeventfd)); } if (def->driver.virtio.event_idx) { - virBufferAsprintf(&buf, " event_idx='%s'", + virBufferAsprintf(buf, " event_idx='%s'", virTristateSwitchTypeToString(def->driver.virtio.event_idx)); } if (def->driver.virtio.queues) - virBufferAsprintf(&buf, " queues='%u'", def->driver.virtio.queues); + virBufferAsprintf(buf, " queues='%u'", def->driver.virtio.queues); if (def->driver.virtio.rx_queue_size) - virBufferAsprintf(&buf, " rx_queue_size='%u'", + virBufferAsprintf(buf, " rx_queue_size='%u'", def->driver.virtio.rx_queue_size); if (def->driver.virtio.tx_queue_size) - virBufferAsprintf(&buf, " tx_queue_size='%u'", + virBufferAsprintf(buf, " tx_queue_size='%u'", def->driver.virtio.tx_queue_size); - virDomainVirtioOptionsFormat(&buf, def->virtio); - - *outstr = virBufferContentAndReset(&buf); + virDomainVirtioOptionsFormat(buf, def->virtio); } @@ -25834,30 +25823,18 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<model type='%s'/>\n", virDomainNetGetModelString(def)); if (virDomainNetIsVirtioModel(def)) { - g_autofree char *str = NULL; - g_autofree char *gueststr = NULL; - g_autofree char *hoststr = NULL; - - virDomainVirtioNetDriverFormat(&str, def); - virDomainVirtioNetGuestOptsFormat(&gueststr, def); - virDomainVirtioNetHostOptsFormat(&hoststr, def); - - if (!gueststr && !hoststr) { - if (str) - virBufferAsprintf(buf, "<driver%s/>\n", str); - } else { - if (str) - virBufferAsprintf(buf, "<driver%s>\n", str); - else - virBufferAddLit(buf, "<driver>\n"); - virBufferAdjustIndent(buf, 2); - if (hoststr) - virBufferAsprintf(buf, "<host %s/>\n", hoststr); - if (gueststr) - virBufferAsprintf(buf, "<guest %s/>\n", gueststr); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</driver>\n"); - } + g_auto(virBuffer) driverAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverChildBuf = VIR_BUFFER_INIT_CHILD(buf); + g_auto(virBuffer) hostAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) guestAttrBuf = VIR_BUFFER_INITIALIZER; + + virDomainVirtioNetDriverFormat(&driverAttrBuf, def); + virDomainVirtioNetGuestOptsFormat(&guestAttrBuf, def); + virDomainVirtioNetHostOptsFormat(&hostAttrBuf, def); + + virXMLFormatElement(&driverChildBuf, "host", &hostAttrBuf, NULL); + virXMLFormatElement(&driverChildBuf, "guest", &guestAttrBuf, NULL); + virXMLFormatElement(buf, "driver", &driverAttrBuf, &driverChildBuf); } } if (def->backend.tap || def->backend.vhost) { -- 2.29.2

2 1

[PATCH] virBufferAdd: Ensure that the buffer is initialized also when len == 0
by Peter Krempa 05 Mar '21

05 Mar '21

There's an optimization in virBufferAdd which returns early when the length of the added string is 0 (given that auto-indent is disabled). The optimization causes inconsistent behaviour between these two cases: virBufferAdd(buf, "", 0); // this doesn't initialize the buffer and virBufferAdd(buf, "", -1); //this initializes the buffer Since using an empty string is used to prime the buffer to an empty string it can be confusing. Remove the optimization. This fixes such a wrong initialization done in x86FeatureNames. Note that our code in many places expects that if no virBuffer APIs are used on a buffer object, then NULL should be retured, so we can't always prime the buffer to an empty string. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index ebb4108b5d..b9ddf1f5c9 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -156,7 +156,7 @@ virBufferApplyIndent(virBufferPtr buf) void virBufferAdd(virBufferPtr buf, const char *str, int len) { - if (!str || !buf || (len == 0 && buf->indent == 0)) + if (!str || !buf) return; virBufferInitialize(buf); -- 2.29.2

2 1

[PATCH 0/6] util: virerror: Avoid stack'd buffers for error message formatting
by Peter Krempa 05 Mar '21

05 Mar '21

We don't need OOM resiliency nowadays. Peter Krempa (6): util: virerror: Don't use stack'd buffers in error report helpers util: virerror: Avoid a copy of the error messages util: virprocess: Use local maximum error message size qemuProcessReportLogError: Remove unnecessary math for max error message qemuProcessReportLogError: Don't mark "%s: %s" as translatable util: virerror: Remove VIR_ERROR_MAX_LENGTH macro src/qemu/qemu_process.c | 12 +-- src/util/virerror.c | 188 ++++++++++++++++++++++------------------ src/util/virerror.h | 2 - src/util/virprocess.c | 10 ++- 4 files changed, 116 insertions(+), 96 deletions(-) -- 2.29.2

2 8

[PATCH v2 0/6] use g_autofree and g_autoptr
by Kristina Hanicova 05 Mar '21

05 Mar '21

This is v2 from https://listman.redhat.com/archives/libvir-list/2021-February/msg01117.html I split commit 3/4 into more commits and left out autofreeing outer array as suggested by Jan Tomko. Patches 2/6 and 6/6 (previously 2/4 and 4/4) have already been reviewed-by and I am sending them for completness. This uses g_autofree (if possible) in files: vsh-table, netdev_bandwidth_conf and g_autoptr instead of virNetDevBandwidthFree where possible. Kristina Hanicova (6): vsh-table: Use g_autofree where possible netdev_bandwidth_conf: Use g_autofree where possible netdev_bandwidth_conf: Refractor virNetDevBandwidthParse() Use g_steal_pointer where possible Use g_autoptr instead of virNetDevBandwidthFree where possible netdev_bandwidth_conf: Remove redundant variables/labels src/conf/netdev_bandwidth_conf.c | 67 ++++++++++++-------------------- src/network/bridge_driver.c | 6 +-- src/qemu/qemu_driver.c | 11 ++---- src/test/test_driver.c | 3 +- src/util/virnetdevbandwidth.h | 2 + tests/virnetdevbandwidthtest.c | 3 +- tools/vsh-table.c | 13 ++----- 7 files changed, 39 insertions(+), 66 deletions(-) -- 2.29.2

2 8

[libvirt PATCH] docs: Spell out our policy concerning minor releases
by Andrea Bolognani 05 Mar '21

05 Mar '21

We've already applied this policy on multiple occasions, but it's good to have it written down so that there can be no confusion. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/platforms.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/platforms.rst b/docs/platforms.rst index b0ce0c3737..6d55728625 100644 --- a/docs/platforms.rst +++ b/docs/platforms.rst @@ -44,6 +44,7 @@ for the previous major version will be dropped 2 years after the new major version is released or when the vendor itself drops support, whichever comes first. In this context, third-party efforts to extend the lifetime of a distro are not considered, even when they are endorsed by the vendor (eg. Debian LTS). +Within each major release, only the most recent minor release is considered. For the purposes of identifying supported software versions available on Linux, the project will look at CentOS, Debian, Fedora, openSUSE, RHEL, SLES and -- 2.26.2

2 1

[libvirt PATCH 0/2] glib: Avoid yet another crash due to race in event loop code
by Martin Kletzander 04 Mar '21

04 Mar '21

Similarly to commit 0db4743645b7 we need to fix the other event loop as well. To be completely honest I do not completely understand all the details in the original workaround, so I just hope this is the best way to fix the issue. Hopefully-resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1931331 Martin Kletzander (2): util: Move glib event loop workaround to glibcompat glib: Use safe glib event workaround in other event loops src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor.c | 2 +- src/util/glibcompat.c | 35 +++++++++++++++++++++++++++++++++++ src/util/glibcompat.h | 11 +++++++++++ src/util/vireventglib.c | 30 ------------------------------ src/util/vireventthread.c | 2 +- 6 files changed, 49 insertions(+), 33 deletions(-) -- 2.30.1

2 5

[PATCH 0/4] Refactoring node_device_conf
by Kristina Hanicova 04 Mar '21

04 Mar '21

This refactors file node_device_conf in order to remove VIR_FREE (if possible) and removes redundant variables and labels. Kristina Hanicova (4): node_device_conf: Use g_autofree where possible node_device_conf: Refactoring functions in order to remove VIR_FREE node_device_conf: use g_autoptr in virNodeDevCapPCIDevIommuGroupParseXML() node_device_conf: Remove redundant variables/labels src/conf/node_device_conf.c | 324 +++++++++++++----------------------- 1 file changed, 118 insertions(+), 206 deletions(-) -- 2.29.2

2 6

[libvirt PATCH 0/5] Some fixes in domain_conf.c: virDomainFeaturesDefParse
by Tim Wiederhake 04 Mar '21

04 Mar '21

Patches 1-4 are minor cleanups, patch 5 is the actual one that I want out of the way before continuing down my rabbit hole of the week. Tim Wiederhake (5): domain_conf: Reduce scope of tmp in virDomainFeaturesDefParse domain_conf: Reduce scope of gic_version in virDomainFeaturesDefParse domain_conf: Reduce scope of node in virDomainFeaturesDefParse domain_conf: Add missing break in switch domain_conf: Fix check for hyperv stimer src/conf/domain_conf.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) -- 2.26.2

2 7

[libvirt PATCH] cpu_map: Fix spelling of svme-addr-chk feature
by Jiri Denemark 04 Mar '21

04 Mar '21

Commit a208176ca1d9eedf8aa6bf12fde6a7a9579ab549 introduced this feature with an incorrect "svme-addr-check" spelling. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu_map/sync_qemu_i386.py | 2 +- src/cpu_map/x86_EPYC-Milan.xml | 2 +- src/cpu_map/x86_features.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu_map/sync_qemu_i386.py b/src/cpu_map/sync_qemu_i386.py index 3febecdfd1..1a98fa70d7 100755 --- a/src/cpu_map/sync_qemu_i386.py +++ b/src/cpu_map/sync_qemu_i386.py @@ -142,7 +142,7 @@ def translate_feature(name): "CPUID_SS": "ss", "CPUID_SVM_NPT": "npt", "CPUID_SVM_NRIPSAVE": "nrip-save", - "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-check", + "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-chk", "CPUID_TSC": "tsc", "CPUID_VME": "vme", "CPUID_XSAVE_XGETBV1": "xgetbv1", diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml index 53f0cd6aac..3055e175fa 100644 --- a/src/cpu_map/x86_EPYC-Milan.xml +++ b/src/cpu_map/x86_EPYC-Milan.xml @@ -76,7 +76,7 @@ <feature name='sse4a'/> <feature name='ssse3'/> <feature name='svm'/> - <feature name='svme-addr-check'/> + <feature name='svme-addr-chk'/> <feature name='syscall'/> <feature name='tsc'/> <feature name='umip'/> diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index c43520d08f..e98b84f3ef 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -554,7 +554,7 @@ <feature name='pfthreshold'> <cpuid eax_in='0x8000000a' edx='0x00001000'/> </feature> - <feature name='svme-addr-check'> + <feature name='svme-addr-chk'> <cpuid eax_in='0x8000000a' edx='0x10000000'/> </feature> -- 2.30.0

2 1

[PATCH 0/4] use g_autofree and g_autoptr
by Kristina Hanicova 04 Mar '21

04 Mar '21

This uses g_autofree (if possible) in files: vsh-table, netdev_bandwidth_conf and g_autoptr instead of virNetDevBandwidthFree where possible. Kristina Hanicova (4): vsh-table: Use g_autofree where possible netdev_bandwidth_conf: Use g_autofree where possible Use g_autoptr instead of virNetDevBandwidthFree where possible netdev_bandwidth_conf: Remove redundant variables/labels src/conf/netdev_bandwidth_conf.c | 67 ++++++++++++-------------------- src/network/bridge_driver.c | 6 +-- src/qemu/qemu_driver.c | 11 ++---- src/test/test_driver.c | 3 +- src/util/virnetdevbandwidth.h | 2 + tests/virnetdevbandwidthtest.c | 3 +- tools/vsh-table.c | 16 +++----- 7 files changed, 40 insertions(+), 68 deletions(-) -- 2.29.2

4 11

[PATCH 0/5] Clean up various places using strcpy()
by Peter Krempa 04 Mar '21

04 Mar '21

This series + https://listman.redhat.com/archives/libvir-list/2021-March/msg00081.html removes use of strcpy(). Peter Krempa (5): virIndexToDiskName: Make 'idx' unsigned and remove check virIndexToDiskName: Use g_string_prepend(_c) to improve readability remote_daemon_dispatch: Replace g_new + strcpy with g_strdup virHostCPUGetStatsLinux: Avoid 'strcpy' commandhelper: printCwd: Print result directly instead of copying it src/remote/remote_daemon_dispatch.c | 9 +++------ src/util/virhostcpu.c | 6 +++--- src/util/virutil.c | 29 +++++++---------------------- src/util/virutil.h | 2 +- src/vmx/vmx.c | 12 ------------ src/vz/vz_sdk.c | 3 --- tests/commandhelper.c | 7 ++++--- 7 files changed, 18 insertions(+), 50 deletions(-) -- 2.29.2

3 7

[libvirt PATCH 0/3] cgroup cpu.shares cleanup
by Pavel Hrdina 04 Mar '21

04 Mar '21

After the conversion to using systemd DBus APIs the behavior of changed for values outside of valid range. This series fixes the issue by enforcing the range on libvirt side instead of the previous magic conversion done by kernel. Pavel Hrdina (3): vircgroup: enforce range limit for cpu.shares cgroup: use virCgroupSetCpuShares instead of virCgroupSetupCpuShares vircgroup: drop unused function virCgroupSetupCpuShares docs/formatdomain.rst | 3 ++- docs/manpages/virsh.rst | 5 +---- src/conf/domain_validate.c | 10 ++++++++++ src/libvirt_private.syms | 1 - src/lxc/lxc_cgroup.c | 4 +--- src/lxc/lxc_driver.c | 6 ++---- src/qemu/qemu_cgroup.c | 21 +-------------------- src/qemu/qemu_driver.c | 7 +++---- src/util/vircgroup.c | 20 -------------------- src/util/vircgroup.h | 4 ++-- src/util/vircgroupv1.c | 10 ++++++++++ src/util/vircgroupv2.c | 10 ++++++++++ 12 files changed, 42 insertions(+), 59 deletions(-) -- 2.29.2

2 4

[PATCH] gitpublish: Drop custom prefix
by Andrea Bolognani 03 Mar '21

03 Mar '21

Now that all projects except the main library are using GitLab merge requests, all the patches that end up on libvir-list are by definition intended for libvirt itself rather than one of the subprojects, and so it's no longer necessary to include additional information in the mail subject. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitpublish | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitpublish b/.gitpublish index d37bf4174a..857f0d552c 100644 --- a/.gitpublish +++ b/.gitpublish @@ -1,4 +1,3 @@ [gitpublishprofile "default"] base = master to = libvir-list(a)redhat.com -prefix = libvirt PATCH -- 2.26.2

2 3