- Devel - libvirt List Archives

[PATCH v4 0/4] Drop deprecated floppy config & bogus -drive if=T
by Markus Armbruster 12 Mar '21

12 Mar '21

v4: * PATCH 3: Move a declaration into a loop [Richard] * PATCH 4: Drop a superfluous call to drive_check_orphaned() [Daniel], fix comments [John] v3: * PATCH 1: New [Daniel] 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 (4): docs/system/deprecated: Fix note on fdc drive properties 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 | 56 +++ include/sysemu/blockdev.h | 1 - blockdev.c | 37 +- hw/block/fdc.c | 73 +--- softmmu/vl.c | 11 +- tests/qemu-iotests/172 | 31 +- tests/qemu-iotests/172.out | 562 +------------------------------ 8 files changed, 82 insertions(+), 722 deletions(-) -- 2.26.2

3 6

[PATCH] Add 'interleave' to the sub-element for video device in rng file
by Kristina Hanicova 12 Mar '21

12 Mar '21

Previously, validation of XML failed if sub-elements of video device were in different order. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1825769 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- docs/schemas/domaincommon.rng | 216 +++++++++++++++++----------------- 1 file changed, 109 insertions(+), 107 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f7f804adc0..e6db2f5b74 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4009,120 +4009,122 @@ --> <define name="video"> <element name="video"> - <optional> - <element name="driver"> - <optional> - <ref name="virtioOptions"/> - </optional> - <optional> - <attribute name="name"> - <choice> - <value>qemu</value> - <value>vhostuser</value> - </choice> - </attribute> - </optional> - <optional> - <attribute name="vgaconf"> - <choice> - <value>io</value> - <value>on</value> - <value>off</value> - </choice> - </attribute> - </optional> - </element> - </optional> - <optional> - <element name="model"> - <choice> - <attribute name="type"> - <choice> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>xen</value> - <value>vbox</value> - <value>virtio</value> - <value>gop</value> - <value>none</value> - <value>bochs</value> - <value>ramfb</value> - </choice> - </attribute> - <group> + <interleave> + <optional> + <element name="driver"> + <optional> + <ref name="virtioOptions"/> + </optional> + <optional> + <attribute name="name"> + <choice> + <value>qemu</value> + <value>vhostuser</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name="vgaconf"> + <choice> + <value>io</value> + <value>on</value> + <value>off</value> + </choice> + </attribute> + </optional> + </element> + </optional> + <optional> + <element name="model"> + <choice> <attribute name="type"> - <value>qxl</value> + <choice> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>xen</value> + <value>vbox</value> + <value>virtio</value> + <value>gop</value> + <value>none</value> + <value>bochs</value> + <value>ramfb</value> + </choice> </attribute> - <optional> - <attribute name="ram"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="vgamem"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="vram64"> - <ref name="unsignedInt"/> - </attribute> - </optional> - </group> - </choice> - <optional> - <attribute name="vram"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="heads"> - <ref name="unsignedInt"/> - </attribute> - </optional> - <optional> - <attribute name="primary"> - <ref name="virYesNo"/> - </attribute> - </optional> - <optional> - <element name="acceleration"> - <optional> - <attribute name="accel3d"> - <ref name="virYesNo"/> - </attribute> - </optional> - <optional> - <attribute name="accel2d"> - <ref name="virYesNo"/> - </attribute> - </optional> - <optional> - <attribute name="rendernode"> - <ref name="absFilePath"/> + <group> + <attribute name="type"> + <value>qxl</value> </attribute> - </optional> - </element> - </optional> - <optional> - <element name="resolution"> - <attribute name="x"> + <optional> + <attribute name="ram"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> + <attribute name="vgamem"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> + <attribute name="vram64"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </group> + </choice> + <optional> + <attribute name="vram"> <ref name="unsignedInt"/> </attribute> - <attribute name="y"> + </optional> + <optional> + <attribute name="heads"> <ref name="unsignedInt"/> </attribute> - </element> - </optional> - </element> - </optional> - <optional> - <ref name="alias"/> - </optional> - <optional> - <ref name="address"/> - </optional> + </optional> + <optional> + <attribute name="primary"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <element name="acceleration"> + <optional> + <attribute name="accel3d"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <attribute name="accel2d"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <attribute name="rendernode"> + <ref name="absFilePath"/> + </attribute> + </optional> + </element> + </optional> + <optional> + <element name="resolution"> + <attribute name="x"> + <ref name="unsignedInt"/> + </attribute> + <attribute name="y"> + <ref name="unsignedInt"/> + </attribute> + </element> + </optional> + </element> + </optional> + <optional> + <ref name="alias"/> + </optional> + <optional> + <ref name="address"/> + </optional> + </interleave> </element> </define> <!-- -- 2.29.2

2 1

[libvirt PATCH] spec: Drop BuildDepends on make
by Andrea Bolognani 12 Mar '21

12 Mar '21

make is only used for the syntax-check tests, which we are explicitly skipping when building RPMs. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 1 - mingw-libvirt.spec.in | 1 - 2 files changed, 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d8b900fbb..f9af330186 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -266,7 +266,6 @@ BuildRequires: python3-docutils BuildRequires: gcc BuildRequires: meson >= 0.54.0 BuildRequires: ninja-build -BuildRequires: make BuildRequires: git %if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: perl-interpreter diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 0686cbaf78..288f533d52 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -54,7 +54,6 @@ BuildRequires: libxslt BuildRequires: python3 BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) -BuildRequires: make BuildRequires: meson BuildRequires: ninja-build BuildRequires: python3-docutils -- 2.26.2

2 1

[PATCH 0/2] Properly fix backup job termination
by Peter Krempa 12 Mar '21

12 Mar '21

Peter Krempa (2): backup: Store 'apiFlags' in private section of virDomainBackupDef qemuBackupJobTerminate: Fix job termination for inactive VMs src/conf/backup_conf.h | 2 ++ src/qemu/qemu_backup.c | 33 ++++++++++++++++++--------------- src/qemu/qemu_process.c | 9 ++++++--- 3 files changed, 26 insertions(+), 18 deletions(-) -- 2.29.2

2 3

[PATCH v2 0/3] ui: add support for 'secret' object to provide VNC/SPICE passwords
by Daniel P. Berrangé 11 Mar '21

11 Mar '21

This fixes a long standing limitation of the VNC/SPICE code which was unable to securely accept passswords on the CLI, instead requiring use of separate monitor commands after startup. In v2: - Dropped patch removing ACL commands, as it will move to a bigger deprecation cleanup series - Rebased and resolved conflicts Daniel P. Berrangé (3): ui: introduce "password-secret" option for VNC servers ui: introduce "password-secret" option for SPICE server ui: deprecate "password" option for SPICE server docs/system/deprecated.rst | 8 ++++++++ qemu-options.hx | 18 ++++++++++++++++-- ui/spice-core.c | 32 ++++++++++++++++++++++++++++++-- ui/vnc.c | 23 ++++++++++++++++++++++- 4 files changed, 76 insertions(+), 5 deletions(-) -- 2.29.2

2 4

[PATCH 0/4] ui: add support for 'secret' object to provide VNC/SPICE passwords
by Daniel P. Berrangé 11 Mar '21

11 Mar '21

This fixes a long standing limitation of the VNC/SPICE code which was unable to securely accept passswords on the CLI, instead requiring use of separate monitor commands after startup. This takes the opportunity to also remove previously deprecated ACL functionality from VNC. Daniel P. Berrangé (4): ui: introduce "password-secret" option for VNC servers ui: introduce "password-secret" option for SPICE server ui: deprecate "password" option for SPICE server ui, monitor: remove deprecated VNC ACL option and HMP commands docs/system/deprecated.rst | 24 ++-- docs/system/removed-features.rst | 13 +++ hmp-commands.hx | 76 ------------- monitor/misc.c | 187 ------------------------------- qemu-options.hx | 17 ++- ui/spice-core.c | 32 +++++- ui/vnc.c | 61 ++++------ 7 files changed, 88 insertions(+), 322 deletions(-) -- 2.29.2

3 8

[PATCH 00/23] RFC: get rid of macros when dealing with block io tunes
by Nikolay Shirokovskiy 11 Mar '21

11 Mar '21

Hi, all. I started this work as adding missing parts/fixing issues/etc in block iotune code but then turned to refactoring code. We use a lot of macros in this place and if we get rid of them I belive we will have much more readable/reusable/ extendable code. Most of macros usage is for iterating over unsigned long long values. I'm talking about parsing/formating xml, converting from/to virTypedParameterPtr list etc. These places do not care about tune semantics and thus we can add tools for the said iteration. See patch [1] for the first such conversion. Patches before it partially prepare for this conversion, partially just improve code reuse and add missing parts. The work on removing macros in code handling iotunes is not finished as I wanted to get an approvement that I have taken a right direction. At the same time series shows the potential of the approach (take a look on how qemuDomainSetBlockIoTune and testDomainSetBlockIoTune are looking now!). Some places like qemuDomainSetBlockIoTuneDefaults deal with fields semantics. So we need another approach to remove macros there but it is a matter of a different RFC. Nikolay Shirokovskiy (23): qemu: pass supportGroupNameOption as expected qemu: factor out qemuValidateDomainBlkdeviotune qemu: reuse validation in qemuDomainSetBlockIoTune qemu: remove extra check for QEMU_BLOCK_IOTUNE_MAX conf: factor out virDomainBlockIoTuneValidate qemu: reuse virDomainBlockIoTuneValidate test driver: reuse virDomainBlockIoTuneValidate qemu: reset max iotune setting when needed qemu: add max iotune settings check to virDomainBlockIoTuneValidate qemu: remove iotune max checks test driver: remove iotune max checks qemu: prepare for removing qemuBlockIoTuneSetFlags qemu: use group_name instead of QEMU_BLOCK_IOTUNE_SET_GROUP_NAME qemu: remove qemuBlockIoTuneSetFlags usage in qemuDomainSetBlockIoTune qemu: remove qemuBlockIoTuneSetFlags enum completly conf: get rid of macros in virDomainDiskDefIotuneParse [1] conf: get rid of macros in virDomainDiskDefFormatIotune conf: add virDomainBlockIoTuneFromParams conf: add virDomainBlockIoTuneToEventParams qemu: qemuDomainSetBlockIoTune use functions to convert to/from params test driver: remove TEST_BLOCK_IOTUNE_MAX checks test driver: prepare to delete macros in testDomainSetBlockIoTune test driver: testDomainSetBlockIoTune: use functions to convert to/from params src/conf/domain_conf.c | 303 +++++++++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 16 +++ src/libvirt_private.syms | 3 + src/qemu/qemu_driver.c | 281 ++++++++++++------------------------------- src/qemu/qemu_validate.c | 100 +++++++++------- src/qemu/qemu_validate.h | 4 + src/test/test_driver.c | 156 ++---------------------- 7 files changed, 380 insertions(+), 483 deletions(-) -- 1.8.3.1

2 42

[PATCH v3 0/4] Drop deprecated floppy config & bogus -drive if=T
by Markus Armbruster 11 Mar '21

11 Mar '21

v3: * PATCH 1: New [Daniel] 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

4 13

[PATCH v2 00/12] qemu: Prepare for QAPIfied object-add
by Peter Krempa 11 Mar '21

11 Mar '21

QEMU plans to QAPIfy object add. This series prepares for the API change (drop of 'props' wrapper for the object) and adds testing based on our qemuxml2argv test data which forces the output to JSON and validates it agains the schema. Based on Kevin's qemu patches: https://listman.redhat.com/archives/libvir-list/2021-February/msg01168.html Last patch forces more files to be processed and as the summary suggest will not be pushed. The patch updating qemucapabilitiesdata will be updated after Kevin's patches hit upstream repo. Peter Krempa (12): qemu: command: Generate commandline of 'masterKey0' secret via JSON qemu: command: Generate commandline of 'sev0' sev-guest object via JSON qemu: command: Generate commandline of iothread objects JSON qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED tests: qemuxml2argv: Validate generation of JSON props for object-add qemu: command: Introduce raw JSON passthrough for '-object' for testing qemu: monitor: Make wrapping of 'props' of 'object-add' optional qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED qemumonitorjsontest: Remove bomb guarding object-add tests: qemucapabilities: Update qemu caps for object-add qapification [DON'T PUSH] Force-check all configs with latest capabilities src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 326 +- src/qemu/qemu_monitor.c | 78 +- src/qemu/qemu_monitor.h | 4 - src/util/virqemu.c | 48 +- src/util/virqemu.h | 3 +- .../caps_6.0.0.x86_64.replies | 3238 ++++++++++++----- .../caps_6.0.0.x86_64.xml | 83 +- tests/qemumonitorjsontest.c | 14 - ...v-missing-platform-info.x86_64-2.12.0.args | 2 +- .../launch-security-sev.x86_64-2.12.0.args | 2 +- tests/qemuxml2argvtest.c | 24 +- 13 files changed, 2775 insertions(+), 1054 deletions(-) -- 2.29.2

2 18

[PATCH] XML validate that 'ramfb' has no address
by Kristina Hanicova 11 Mar '21

11 Mar '21

With this, XML fails if config video type 'ramfb' contains address, since address is not supported for 'ramfb' video devices. Previously it didn't raise error. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1891416 Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_validate.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index b4e09e21fe..c9c677ddf5 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -151,6 +151,14 @@ virDomainVideoDefValidate(const virDomainVideoDef *video, } } + if (video->type == VIR_DOMAIN_VIDEO_TYPE_RAMFB) { + if (video->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("address not supported for video type ramfb")); + return -1; + } + } + return 0; } -- 2.29.2

2 1

[PATCH] virQEMUCapsInitQMPArch: Refactor cleanup
by Yi Li 11 Mar '21

11 Mar '21

Switch to using the 'g_auto*' helpers. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/qemu/qemu_capabilities.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 790375ac38..447cf77875 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5044,23 +5044,18 @@ static int virQEMUCapsInitQMPArch(virQEMUCapsPtr qemuCaps, qemuMonitorPtr mon) { - char *archstr = NULL; - int ret = -1; + g_autofree char *archstr = NULL; if (!(archstr = qemuMonitorGetTargetArch(mon))) - goto cleanup; + return -1; if ((qemuCaps->arch = virQEMUCapsArchFromString(archstr)) == VIR_ARCH_NONE) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unknown QEMU arch %s"), archstr); - goto cleanup; + return -1; } - ret = 0; - - cleanup: - VIR_FREE(archstr); - return ret; + return 0; } -- 2.25.3

2 1

[PATCH 0/4] Discourage use of some GLib functions
by Michal Privoznik 11 Mar '21

11 Mar '21

See 4/4 for the list and explanation. Michal Prívozník (4): qemu_shim: Replace g_file_get_contents() with virFileReadAll() virutil: Do not use g_get_host_name() to obtain hostname syntax-check: Update list of gethostname exceptions docs: Discourage use of some glib functions build-aux/syntax-check.mk | 2 +- docs/glib-adoption.rst | 17 +++++++++++++++++ src/qemu/qemu_shim.c | 18 +++++++++++------- src/util/virutil.c | 12 +++++++++--- 4 files changed, 38 insertions(+), 11 deletions(-) -- 2.26.2

3 8

[PATCH 00/16] Improve virStrcpy and remove virStrncpy
by Peter Krempa 11 Mar '21

11 Mar '21

Peter Krempa (16): util: virstring: Always copy string in virStrcpy virProcessRunInForkHelper: Use virStrcpyStatic for static buffers sanlock: Use virStrcpy instead of virStrncpy virDevMapperGetTargetsImpl: Use virStrcpy instead of virStrncpy virFileLoopDeviceAssociate: Use virStrcpy instead of virStrncpy xenParseXMDisk: Replace g_new + virStrncpy by g_strndup test_driver: Rewrite testBuildFilename xenParseVif: Refactor parser xenParseSxprSound: Refactor parsing of model list openvzReadNetworkConf: Rework parser xenParseXLChannel: Use g_strndup instead of virStrndup xenParseXLUSBController: Avoid use of virStrndup xenParseXLUSB: Rewrite to avoid virStrncpy virNetLibsshAuthenticatePrivkeyCb: Use g_autofree for 'actual_prompt' virNetLibsshAuthenticatePrivkeyCb: Use virStrcpy instead of virStrncpy util: virstring: Remove virStrncpy docs/coding-style.rst | 13 --- src/libvirt_private.syms | 1 - src/libxl/xen_common.c | 182 +++++++++++------------------- src/libxl/xen_xl.c | 84 ++++---------- src/libxl/xen_xm.c | 9 +- src/locking/lock_driver_sanlock.c | 4 +- src/openvz/openvz_conf.c | 77 +++++-------- src/rpc/virnetlibsshsession.c | 17 +-- src/test/test_driver.c | 35 +----- src/util/virdevmapper.c | 2 +- src/util/virfile.c | 3 +- src/util/virprocess.c | 8 +- src/util/virstring.c | 54 +-------- src/util/virstring.h | 5 +- 14 files changed, 137 insertions(+), 357 deletions(-) -- 2.29.2

2 33

RFC: do we want/need the "Ptr" typedefs for internal code ?
by Daniel P. Berrangé 11 Mar '21

11 Mar '21

One of the conventions we have had since the early days of libvirt is that every struct typedef, has a corresponding "Ptr" typedef too. For example typedef struct _virDomainDef virDomainDef; typedef virDomainDef *virDomainDefPtr; Periodically someone has questioned what the purpose of these Ptr typedefs is, and we've not had an compelling answer, other than that's what we've always done. There are a few things that make me question the status quo - If we want a const pointer, we can't use const virDomainDefPtr def because that expands to "struct _virDomainDef * const", which is not what we need semantically. Instead we must write const virDomainDef *def It is not at all obvious why these two are different, but none the less they are, which is confusing to contributors To me this a compelling reason to consider the "Ptr" typedefs a waste of time, if not actively harmful. Please don't suggest adding virDomainDefConstPtr too ! - Writing 'virDomainDefPtr' is actually two characters more typing than 'virDomainDef *'. IOW these "Ptr" typedefs aren't saving us time when writing code. - This convention of having "Ptr" typedefs is atypical among C projects I've worked on. Anything that is peculiar to libvirt is another item that new contributors need to learn, so has a cost to the project that must be weighed against its benefit. We can't do anything about the use "Ptr" in the include/ files because that is public ABI. We can potentially eliminate "Ptr" types everywhere else in the codebase, even the src/libvirt*.c files corresponding to the public includes. Does anyone have suggestions for how these "Ptr" typedefs are benefiting libvirt ? Would anyone miss them ? Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

7 10

[PATCH 0/2] fix crash on invalid construction of a gvariant
by Peter Krempa 10 Mar '21

10 Mar '21

Peter Krempa (2): virSystemdCreateMachine: Use proper format string for uint64_t when constructing gvariant virsystemdtest: Call at least one virSystemdCreateMachine with 'maxthreads' > 0 src/util/virsystemd.c | 5 +++-- tests/virsystemdtest.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) -- 2.29.2

2 3

Libvirt has been accepted into GSoC 2021
by Michal Privoznik 10 Mar '21

10 Mar '21

Dear list, let me share great news: just like in the past years, libvirt is going to be part of Google Summer of Code also this year [1]. We can expect interested students to show up and discuss possible projects to work on. However, there are some changes made to this year's run [2]: 1) Smaller projects - with everything going on one can hardly expect students to commit to 350 hours of coding over three months. This is now reduced to 175 hours over 10 weeks, 2) More elligible students - now even PhD students and licensed coding school students can apply, 2) Halved stipends - since the amount of work is halved, so are the stipends, 3) Two evaluations - again, shorted time period requires less evaluations. Happy hacking, Michal 1: https://summerofcode.withgoogle.com/organizations/5771368592834560/ 2: https://opensource.googleblog.com/2020/10/google-summer-of-code-2021-is-bri…

1 0

[PULL 05/17] utils: Deprecate hex-with-suffix sizes
by Eric Blake 09 Mar '21

09 Mar '21

Supporting '0x20M' looks odd, particularly since we have a 'B' suffix that is ambiguous for bytes, as well as a less-frequently-used 'E' suffix for extremely large exibytes. In practice, people using hex inputs are specifying values in bytes (and would have written 0x2000000, or possibly relied on default_suffix in the case of qemu_strtosz_MiB), and the use of scaling suffixes makes the most sense for inputs in decimal (where the user would write 32M). But rather than outright dropping support for hex-with-suffix, let's follow our deprecation policy. Sadly, since qemu_strtosz() does not have an Err** parameter, and plumbing that in would be a much larger task, we instead go with just directly emitting the deprecation warning to stderr. Signed-off-by: Eric Blake <eblake(a)redhat.com> Message-Id: <20210211204438.1184395-4-eblake(a)redhat.com> Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/system/deprecated.rst | 8 ++++++++ util/cutils.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index cfabe6984677..ecff6bf8c633 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -166,6 +166,14 @@ Using ``-M kernel-irqchip=off`` with x86 machine types that include a local APIC is deprecated. The ``split`` setting is supported, as is using ``-M kernel-irqchip=off`` with the ISA PC machine type. +hexadecimal sizes with scaling multipliers (since 6.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Input parameters that take a size value should only use a size suffix +(such as 'k' or 'M') when the base is written in decimal, and not when +the value is hexadecimal. That is, '0x20M' is deprecated, and should +be written either as '32M' or as '0x2000000'. + QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/util/cutils.c b/util/cutils.c index 189a184859c0..d89a40a8c325 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -250,6 +250,9 @@ static int64_t suffix_mul(char suffix, int64_t unit) * fractional portion is truncated to byte * - 0x7fEE - hexadecimal, unit determined by @default_suffix * + * The following cause a deprecation warning, and may be removed in the future + * - 0xabc{kKmMgGtTpP} - hex with scaling suffix + * * The following are intentionally not supported * - octal, such as 08 * - fractional hex, such as 0x1.8 @@ -272,7 +275,7 @@ static int do_strtosz(const char *nptr, const char **end, int retval; const char *endptr, *f; unsigned char c; - bool mul_required = false; + bool mul_required = false, hex = false; uint64_t val; int64_t mul; double fraction = 0.0; @@ -298,6 +301,7 @@ static int do_strtosz(const char *nptr, const char **end, retval = -EINVAL; goto out; } + hex = true; } else if (*endptr == '.') { /* * Input looks like a fraction. Make sure even 1.k works @@ -320,6 +324,10 @@ static int do_strtosz(const char *nptr, const char **end, c = *endptr; mul = suffix_mul(c, unit); if (mul > 0) { + if (hex) { + warn_report("Using a multiplier suffix on hex numbers " + "is deprecated: %s", nptr); + } endptr++; } else { mul = suffix_mul(default_suffix, unit); -- 2.30.1

1 0

[PATCH v4 0/1] qemu: add per-vcpu delay stats
by Aleksei Zakharov 09 Mar '21

09 Mar '21

Fixed since v3: - Report error if cannot read stats. - Don't fail if cannot read stats. - Add documentation. - Drop unnecessary checks. - Don't delete unrelated whitespace. - Make sure schedstat file is closed before returning. Fixed since v2: - Close schedstat file after use. Fixes since v1: - Collect per-vcpu stats. - Coding style errors - Use glib functions. Aleksei Zakharov (1): qemu: add per-vcpu delay stats docs/manpages/virsh.rst | 4 ++++ src/libvirt-domain.c | 4 ++++ src/qemu/qemu_driver.c | 44 +++++++++++++++++++++++++++++++++++++++-- 3 files changed, 50 insertions(+), 2 deletions(-) -- 2.17.1

3 4

[libvirt PATCH 00/17] qemu: Implement external limit manager feature
by Andrea Bolognani 09 Mar '21

09 Mar '21

This feature has been requested by KubeVirt developers and will make it possible for them to make some VFIO-related features, such as migration and hotplug, work correctly. https://bugzilla.redhat.com/show_bug.cgi?id=1916346 The first part of the series, especially the first 9 patches, is preparation work: it addresses a few annoying issues with our APIs that deal with process limits, and makes them all nice, consistent and easy to reason about while moving policy code from the generic code to the QEMU driver where it belongs. Andrea Bolognani (17): util: Document limit-related functions util: Simplify stubs util: Always pass a pid to virProcessSetMax*() util: Introduce virProcess{Get,Set}Limit() qemu: Make some minor tweaks qemu: Set all limits at the same time util: Have virCommand remember whether limits are set qemu: Set limits only when explicitly asked to do so util: Don't special-case setting a limit to zero conf: Rename original_memlock -> originalMemlock tests: Mock virProcessGetMaxMemLock() util: Try to get limits from /proc qemu: Don't ignore virProcessGetMaxMemLock() errors qemu: Refactor qemuDomainAdjustMaxMemLock() qemu: Add external_limit_manager config knob qemu: Wire up external limit manager news: Document external limit manager feature NEWS.rst | 10 + src/conf/domain_conf.h | 5 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 12 + src/qemu/qemu_command.c | 4 - src/qemu/qemu_conf.c | 4 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 47 ++-- src/qemu/qemu_migration.c | 2 + src/qemu/qemu_process.c | 30 ++- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 21 +- src/util/virprocess.c | 340 ++++++++++++++++++++--------- src/util/virprocess.h | 2 +- tests/virprocessmock.c | 7 + 15 files changed, 354 insertions(+), 133 deletions(-) -- 2.26.2

3 42

[PATCH] domaincapstest: Return EXIT_SUCCESS / EXIT_FAILURE instead of -1
by Peter Krempa 09 Mar '21

09 Mar '21

The value is used as return value for the process itself. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/domaincapstest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 7a082705c6..65d9f4c635 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -475,7 +475,7 @@ mymain(void) DO_TEST_BHYVE("fbuf", "/usr/sbin/bhyve", &bhyve_caps, VIR_DOMAIN_VIRT_BHYVE); #endif /* WITH_BHYVE */ - return ret; + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } #if WITH_QEMU -- 2.29.2

2 1

[PATCH] qemuMigrationSrcRun: Don't jump to 'exit_monitor' from outside of the monitor
by Peter Krempa 09 Mar '21

09 Mar '21

Failure of 'qemuMigrationSetDBusVMState' would jump to 'exit_monitor' but the function isn't called inside of the monitor context. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e44931dcfa..79dcb4a15d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4156,7 +4156,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, } if (qemuMigrationSetDBusVMState(driver, vm) < 0) - goto exit_monitor; + goto error; /* Before EnterMonitor, since already qemuProcessStopCPUs does that */ if (!(flags & VIR_MIGRATE_LIVE) && -- 2.29.2

2 1

[PATCH] meson: Add documentation installation directory option
by Chris Mayo 09 Mar '21

09 Mar '21

Allow the directory to be chosen at installation time, to support local conventions e.g. versioning. Signed-off-by: Chris Mayo <aklhfex(a)gmail.com> --- meson.build | 6 +++++- meson_options.txt | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 369548f127..5c7a335947 100644 --- a/meson.build +++ b/meson.build @@ -83,8 +83,12 @@ mandir = prefix / get_option('mandir') sbindir = prefix / get_option('sbindir') sharedstatedir = prefix / get_option('sharedstatedir') +docdir = get_option('docdir') +if docdir == '' + docdir = datadir / 'doc' / meson.project_name() +endif + confdir = sysconfdir / meson.project_name() -docdir = datadir / 'doc' / meson.project_name() pkgdatadir = datadir / meson.project_name() diff --git a/meson_options.txt b/meson_options.txt index e5d79c2b6b..2606648b64 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,6 +7,7 @@ option('expensive_tests', type: 'feature', value: 'auto', description: 'set the option('test_coverage', type: 'boolean', value: false, description: 'turn on code coverage instrumentation') option('git_werror', type: 'feature', value: 'auto', description: 'use -Werror if building from GIT') option('rpath', type: 'feature', value: 'auto', description: 'whether to include rpath information in installed binaries and libraries') +option('docdir', type: 'string', value: '', description: 'documentation installation directory') option('docs', type: 'feature', value: 'auto', description: 'whether to generate documentation') option('tests', type: 'feature', value: 'auto', description: 'whether to build tests') -- 2.28.0

3 2

[libvirt PATCH] util: Fix error reporting in virnetlink
by Andrea Bolognani 09 Mar '21

09 Mar '21

The preprocessor macro we use to check whether we're on Linux has not been spelled properly, and so we will always report the error message intended for other platforms. Fixes: 879bcee08ce0f91f556fddfe452c3fbed5318468 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/util/virnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index a06195bd00..cfb86550a5 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -1231,7 +1231,7 @@ virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr, #else -# if defined(__linux) +# if defined(__linux__) static const char *unsupported = N_("libnl was not available at build time"); # else static const char *unsupported = N_("not supported on non-linux platforms"); -- 2.26.2

2 1

[libvirt PATCH] util: don't log error if SRIOV PF has no associated netdev
by Laine Stump 09 Mar '21

09 Mar '21

Some SRIOV PFs don't have a netdev associated with them (the spec apparently doesn't require it). In most cases when libvirt is dealing with an SRIOV VF, that VF must have a PF, and the PF *must* have an associated netdev (the only way to set the MAC address of a VF is by sending a netlink message to the netdev of that VF's PF). But there are times when we don't need for the PF to have a netdev; in particular, when we're just getting the Switchdev Features for a VF, we don't need the PF netdev - the netdev of the VF (apparently) works just as well. Commit 6452e2f5 (libvirt 5.1.0) *kind of* made libvirt work around PFs with no netdevs in this case - if virNetDevGetPhysicalFunction returned an error when setting up to retrieve Switchdev feature info, it would ignore the error, and then check if the PF netdev name was NULL and, if so it would reset the error object and continue on rather than returning early with a failure. The problem is that by the time this special handling occured, the error message about missing netdev had already been logged, which was harmless to proper operation, but confused the user. Fortunately there are only 2 users of virNetDevGetPhysicalFunction, so it is easy to redefine it's API to state that a missing netdev name is *not* an error - in that case it will still return success, but the caller must be prepared for the PF netdev name to be NULL. After making this change, we can modify the two callers to behave properly with the new semantics (for one of the callers it *is* still an error, so the error message is moved there, but for the other it is okay to continue), and our spurious error messages are a thing of the past. Resolves: https://bugzilla.redhat.com/1924616 Fixes: 6452e2f5e1837bd753ee465e6607ed3c4f62b815 Signed-off-by: Laine Stump <laine(a)redhat.com> --- src/util/virnetdev.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 2b4c8b6280..7b766234ec 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1339,7 +1339,8 @@ virNetDevGetVirtualFunctionIndex(const char *pfname, const char *vfname, * * @ifname : name of the physical function interface name * @pfname : Contains sriov physical function for interface ifname - * upon successful return + * upon successful return (might be NULL if the PF has no + * associated netdev. This is *not* an error) * * Returns 0 on success, -1 on failure * @@ -1361,15 +1362,6 @@ virNetDevGetPhysicalFunction(const char *ifname, char **pfname) return -1; } - if (!*pfname) { - /* The SRIOV standard does not require VF netdevs to have - * the netdev assigned to a PF. */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("The PF device for VF %s has no network device name"), - ifname); - return -1; - } - return 0; } @@ -1442,6 +1434,17 @@ virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname, if (virNetDevGetPhysicalFunction(vfname, pfname) < 0) return -1; + if (!*pfname) { + /* The SRIOV standard does not require VF netdevs to have the + * netdev assigned to a PF, but our method of retrieving + * VFINFO does. + */ + virReportError(VIR_ERR_INTERNAL_ERROR, + _("The PF device for VF %s has no network device name, cannot get virtual function info"), + vfname); + return -1; + } + if (virNetDevGetVirtualFunctionIndex(*pfname, vfname, vf) < 0) goto cleanup; @@ -3204,12 +3207,8 @@ virNetDevSwitchdevFeature(const char *ifname, if ((is_vf = virNetDevIsVirtualFunction(ifname)) < 0) return ret; - if (is_vf == 1) { - /* Ignore error if PF does not have netdev assigned. - * In that case pfname == NULL. */ - if (virNetDevGetPhysicalFunction(ifname, &pfname) < 0) - virResetLastError(); - } + if (is_vf == 1 && virNetDevGetPhysicalFunction(ifname, &pfname) < 0) + return ret; pci_device_ptr = pfname ? virNetDevGetPCIDevice(pfname) : virNetDevGetPCIDevice(ifname); -- 2.29.2

2 3

[PATCH] virnetdevbandwidth: Don't generate burst outside of boundaries
by Michal Privoznik 09 Mar '21

09 Mar '21

When generating TC rules for domain's outbound traffic, Libvirt will use the 'average' as the default for 'burst' - it's been this way since the feature introduction in v0.9.4-rc1~22. The reason is that 'average' considers 'burst' for policing. However, when parsing its command line TC uses an unsigned int (with overflow detection) to store the 'burst' size. This means, that the upper limit for the value is UINT_MAX, well UINT_MAX / 1024 because we are putting the value in KiB onto the command line. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1912210 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevbandwidth.c | 12 +++++++++++- tests/virnetdevbandwidthtest.c | 15 +++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 612e8f985c..77a97176b0 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -358,7 +358,17 @@ virNetDevBandwidthSet(const char *ifname, if (rx) { average = g_strdup_printf("%llukbps", rx->average); - burst = g_strdup_printf("%llukb", rx->burst ? rx->burst : rx->average); + + if (rx->burst) { + burst = g_strdup_printf("%llukb", rx->burst); + } else { + /* Internally, tc uses uint to store burst size (in bytes). + * Therefore, the largest value we can set is UINT_MAX bytes. + * We're outputting the vale in KiB though. */ + unsigned long long avg = MIN(rx->average, UINT_MAX / 1024); + + burst = g_strdup_printf("%llukb", avg); + } virCommandFree(cmd); cmd = virCommandNew(TC); diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 2e76af3d0c..7c236f50f3 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -156,6 +156,21 @@ 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")); + DO_TEST_SET(("<bandwidth>" + " <inbound average='4294967295'/>" + " <outbound average='4294967295'/>" + "</bandwidth>"), + (TC " qdisc del dev eth0 root\n" + TC " qdisc del dev eth0 ingress\n" + TC " qdisc add dev eth0 root handle 1: htb default 1\n" + TC " class add dev eth0 parent 1: classid 1:1 htb rate 4294967295kbps quantum 366503875\n" + TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n" + TC " filter add dev eth0 parent 1:0 protocol all prio 1 handle 1 fw flowid 1\n" + TC " qdisc add dev eth0 ingress\n" + TC " filter add dev eth0 parent ffff: protocol all u32 match " + "u32 0 0 police rate 4294967295kbps burst 4194303kb mtu 64kb " + "drop flowid :1\n")); + return ret; } -- 2.26.2

2 1