June 2020 - Devel - libvirt List Archives

[PATCH 00/40] convert virObjects to GObject
by Rafael Fonseca 04 Jun '20

04 Jun '20

This patch series convert various simple instances of virObject to a GObject equivalent. virLockableObject and virObjects which are subclassed will be covered in future patchsets. New in v3: - merge *Dispose back into *Finalize - rebased on top of master Rafael Fonseca (40): util: virresctrl: convert classes to GObject conf: capabilities: convert virCaps to GOBject qemu: convert virQEMUCaps to GObject util: add function to unref array of GObjects rpc: convert virNetClientProgram to GObject rpc: convert virNetServerProgram to GObject conf: convert virDomainXMLOption to GObject bhyve: convert bhyveMonitor to GObject bhyve: convert virBhyveDriverConfig to GObject rpc: convert virNetServerService to GObject conf: convert virDomainCapsCPUModels to GObject util: convert dnsmasqCaps to GObject conf: convert virDomainChrSourceDef to GObject rpc: gendispatch: prepare for GObject conversion admin: convert virAdmServer to GObject admin: convert virAdmClient to GObject datatypes: convert virDomainCheckpoint to GObject datatypes: convert virDomainSnapshot to GObject datatypes: convert virNWFilter to GObject datatypes: convert virNWFilterBinding to GObject datatypes: convert virNetwork to GObject datatypes: convert virNetworkPort to GObject datatypes: convert virInterface to GObject datatypes: convert virStoragePool to GObject datatypes: convert virStorageVol to GObject datatypes: convert virNodeDevice to GObject datatypes: convert virSecret to GObject datatypes: convert virStream to GObject datatypes: convert virDomain to GObject rpc: gendispatch: use g_autoptr where possible conf: convert virNetworkXMLOption to GObject lxc: convert virLXCDriverConfig to GObject libxl: convert libxlDriverConfig to GObject hypervisor: convert virHostdevManager to GObject libxl: convert libxlMigrationDstArgs to GObject qemu: convert qemuBlockJobData to GObject qemu: convert virQEMUDriverConfig to GObject conf: convert virDomain*Private to GObject conf: convert virSaveCookie to GObject util: convert virStorageSource to GObject src/admin/admin_remote.c | 9 +- src/admin/libvirt-admin.c | 4 +- src/admin/libvirt_admin_private.syms | 4 +- src/bhyve/bhyve_capabilities.c | 19 +- src/bhyve/bhyve_conf.c | 36 +- src/bhyve/bhyve_driver.c | 33 +- src/bhyve/bhyve_monitor.c | 37 +- src/bhyve/bhyve_monitor.h | 3 +- src/bhyve/bhyve_utils.h | 11 +- src/conf/capabilities.c | 41 +- src/conf/capabilities.h | 6 +- src/conf/domain_capabilities.c | 48 +- src/conf/domain_capabilities.h | 10 +- src/conf/domain_conf.c | 117 ++--- src/conf/domain_conf.h | 36 +- src/conf/domain_event.c | 58 +-- src/conf/network_conf.c | 24 +- src/conf/network_conf.h | 12 +- src/conf/network_event.c | 7 +- src/conf/node_device_event.c | 11 +- src/conf/node_device_util.c | 4 +- src/conf/secret_event.c | 15 +- src/conf/snapshot_conf.c | 2 +- src/conf/snapshot_conf.h | 2 +- src/conf/storage_capabilities.c | 4 +- src/conf/storage_event.c | 15 +- src/conf/virchrdev.c | 4 +- src/conf/virconftypes.h | 3 +- src/conf/virdomaincheckpointobjlist.c | 7 +- src/conf/virdomainsnapshotobjlist.c | 7 +- src/conf/virinterfaceobj.c | 5 +- src/conf/virnetworkobj.c | 10 +- src/conf/virnodedeviceobj.c | 3 +- src/conf/virnwfilterbindingobjlist.c | 2 +- src/conf/virnwfilterobj.c | 7 +- src/conf/virsavecookie.c | 10 +- src/conf/virsavecookie.h | 14 +- src/conf/virsecretobj.c | 2 +- src/conf/virstorageobj.c | 4 +- src/datatypes.c | 658 +++++++++++++++--------- src/datatypes.h | 219 ++++---- src/esx/esx_driver.c | 33 +- src/hyperv/hyperv_driver.c | 8 +- src/hypervisor/virhostdev.c | 31 +- src/hypervisor/virhostdev.h | 13 +- src/interface/interface_backend_netcf.c | 7 +- src/interface/interface_backend_udev.c | 8 +- src/libvirt-domain-checkpoint.c | 7 +- src/libvirt-domain-snapshot.c | 7 +- src/libvirt-domain.c | 6 +- src/libvirt-interface.c | 6 +- src/libvirt-network.c | 14 +- src/libvirt-nodedev.c | 6 +- src/libvirt-nwfilter.c | 14 +- src/libvirt-secret.c | 7 +- src/libvirt-storage.c | 12 +- src/libvirt-stream.c | 7 +- src/libvirt_private.syms | 35 +- src/libxl/libxl_capabilities.c | 19 +- src/libxl/libxl_conf.c | 56 +- src/libxl/libxl_conf.h | 12 +- src/libxl/libxl_driver.c | 175 +++---- src/libxl/libxl_migration.c | 92 ++-- src/libxl/xen_common.c | 3 +- src/locking/lock_daemon.c | 28 +- src/locking/lock_driver_lockd.c | 19 +- src/locking/sanlock_helper.c | 5 +- src/logging/log_daemon.c | 28 +- src/logging/log_manager.c | 15 +- src/lxc/lxc_conf.c | 46 +- src/lxc/lxc_conf.h | 10 +- src/lxc/lxc_controller.c | 20 +- src/lxc/lxc_driver.c | 98 ++-- src/lxc/lxc_monitor.c | 2 +- src/lxc/lxc_process.c | 35 +- src/network/bridge_driver.c | 24 +- src/nwfilter/nwfilter_driver.c | 3 +- src/openvz/openvz_conf.c | 8 +- src/qemu/qemu_blockjob.c | 119 ++--- src/qemu/qemu_blockjob.h | 15 +- src/qemu/qemu_capabilities.c | 165 +++--- src/qemu/qemu_capabilities.h | 9 +- src/qemu/qemu_conf.c | 42 +- src/qemu/qemu_conf.h | 19 +- src/qemu/qemu_domain.c | 436 +++++++--------- src/qemu/qemu_domain.h | 157 ++++-- src/qemu/qemu_driver.c | 34 +- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_migration.c | 34 +- src/qemu/qemu_process.c | 20 +- src/qemu/qemu_virtiofs.c | 12 +- src/remote/remote_daemon.c | 52 +- src/remote/remote_daemon_dispatch.c | 188 +++---- src/remote/remote_daemon_stream.c | 6 +- src/remote/remote_driver.c | 178 +++---- src/rpc/gendispatch.pl | 90 ++-- src/rpc/virnetclient.c | 7 +- src/rpc/virnetclientprogram.c | 29 +- src/rpc/virnetclientprogram.h | 10 +- src/rpc/virnetclientstream.c | 4 +- src/rpc/virnetserver.c | 21 +- src/rpc/virnetserverprogram.c | 30 +- src/rpc/virnetserverprogram.h | 17 +- src/rpc/virnetserverservice.c | 87 ++-- src/security/virt-aa-helper.c | 9 +- src/storage/storage_backend.c | 3 +- src/storage/storage_driver.c | 7 +- src/storage/storage_util.c | 4 +- src/test/test_driver.c | 33 +- src/util/virdnsmasq.c | 56 +- src/util/virdnsmasq.h | 6 +- src/util/virfdstream.c | 4 +- src/util/virfilecache.c | 43 +- src/util/virfilecache.h | 12 +- src/util/virobject.c | 24 + src/util/virobject.h | 4 + src/util/virresctrl.c | 155 +++--- src/util/virresctrl.h | 15 +- src/util/virsecret.c | 3 +- src/util/virstoragefile.c | 42 +- src/util/virstoragefile.h | 9 +- src/vbox/vbox_common.c | 19 +- src/vmware/vmware_conf.c | 13 +- src/vz/vz_driver.c | 33 +- src/vz/vz_sdk.c | 22 +- tests/bhyveargv2xmltest.c | 4 +- tests/bhyvexml2argvtest.c | 4 +- tests/bhyvexml2xmltest.c | 4 +- tests/cputest.c | 48 +- tests/domaincapstest.c | 5 +- tests/domainconftest.c | 4 +- tests/genericxml2xmltest.c | 4 +- tests/networkxml2conftest.c | 10 +- tests/networkxml2xmltest.c | 3 +- tests/openvzutilstest.c | 4 +- tests/qemublocktest.c | 3 +- tests/qemucapabilitiestest.c | 9 +- tests/qemucaps2xmltest.c | 29 +- tests/qemucapsprobe.c | 4 +- tests/qemuhotplugtest.c | 6 +- tests/qemumemlocktest.c | 3 +- tests/testutils.c | 4 +- tests/testutilslxc.c | 22 +- tests/testutilsqemu.c | 31 +- tests/testutilsxen.c | 7 +- tests/vircaps2xmltest.c | 6 +- tests/vircapstest.c | 14 +- tests/virfilecachetest.c | 69 ++- tests/virnetdaemontest.c | 4 +- tests/virresctrltest.c | 6 +- tests/vmx2xmltest.c | 10 +- tests/xml2vmxtest.c | 12 +- 152 files changed, 2411 insertions(+), 2660 deletions(-) -- 2.26.2

3 55

[PATCH 0/6] Expose QEMU's -fw_cfg
by Michal Privoznik 03 Jun '20

03 Jun '20

There was a discussion whether to do this or not: https://www.redhat.com/archives/libvir-list/2020-May/msg00954.html Before you start reviewing, naming is hard and I was unable to come up with a good element names and place, so suggestions are more than welcome! Michal Prívozník (6): domain_conf: Format NS always last conf: Add firmware blob configuration qemu: Validate firmware blob configuration qemu: Introduce fw_cfg capability secdrivers: Relabel firmware config files qemu: Generate command line for -fw_cfg docs/formatdomain.html.in | 30 +++++ docs/schemas/domaincommon.rng | 24 ++++ src/conf/domain_conf.c | 114 +++++++++++++++++- src/conf/domain_conf.h | 11 ++ src/conf/virconftypes.h | 3 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 38 ++++++ src/qemu/qemu_validate.c | 38 ++++++ src/security/security_dac.c | 14 +++ src/security/security_selinux.c | 13 ++ src/security/virt-aa-helper.c | 6 + .../caps_2.10.0.aarch64.xml | 1 + .../caps_2.10.0.ppc64.xml | 1 + .../caps_2.10.0.s390x.xml | 1 + .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.s390x.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_2.4.0.x86_64.xml | 1 + .../caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + .../caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + .../caps_2.7.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + .../caps_2.8.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.riscv32.xml | 1 + .../caps_3.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.riscv64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + tests/qemuxml2argvdata/fw_cfg.args | 32 +++++ tests/qemuxml2argvdata/fw_cfg.xml | 40 ++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/fw_cfg.xml | 1 + tests/qemuxml2xmltest.c | 1 + 62 files changed, 413 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/fw_cfg.args create mode 100644 tests/qemuxml2argvdata/fw_cfg.xml create mode 120000 tests/qemuxml2xmloutdata/fw_cfg.xml -- 2.26.2

2 7

[PATCH] autogen.sh: Restore --no-git (avoid git submodule update)
by Ian Jackson 03 Jun '20

03 Jun '20

Prior to 2621d48f005a "gnulib: delete all gnulib integration", one could pass ./autogen.sh --no-git to prevent the libvirt build system from running git submodule update. This feature is needed by systems like the Xen Project CI which want to explicitly control the revisions of every tree. These will typically arrange to initialise the submodules check out the right version of everything, and then expect the build system not to mess with it any more. Despite to the old documentation comments referring only to gnulib, the --no-git feature is required not only because of gnulib but also because of the other submodule, src/keycodemapdb. (And in any case, even if it were no longer required because all the submodules were removed, it ought ideally to have been retained as a no-op for compaibility reasons.) So restore the --no-git feature. Because of the way the argument parsing of autogen.sh works, it is easiest to recognise this option only if it comes first. This works for the Xen Project CI, which has always passed this option first. If something else is using this option (and hasn't introduced a different workaround in the meantime), not in the first position, then perhaps a more sophisticated approach will be needed. But I think this will do for now. Signed-off-by: Ian Jackson <ian.jackson(a)eu.citrix.com> --- autogen.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 4e1bbceb0a..1c98273452 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,10 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. +# +# THe following options must come first. All other or subsequent +# arguments are passed to configure: +# --no-git skip `git submodule update --init` + test -n "$srcdir" || srcdir=$(dirname "$0") test -n "$srcdir" || srcdir=. @@ -13,7 +18,11 @@ cd "$srcdir" exit 1 } -git submodule update --init || exit 1 +if [ "x$1" = x--no-git ]; then + shift +else + git submodule update --init || exit 1 +fi autoreconf --verbose --force --install || exit 1 -- 2.11.0

4 7

[PATCH] libxl: Normalize MAC address in device conf when hotplugging a netdev
by Jim Fehlig 03 Jun '20

03 Jun '20

Similar to commit 6c17606b7cc, normalize the MAC addresses in persistent and live device config to avoid a different MAC address for the device once the VM is rebooted and persistent config takes affect. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 56 +++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 63ec0a2188..a80bc3fe3a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4096,6 +4096,31 @@ libxlDomainUpdateDeviceConfig(virDomainDefPtr vmdef, virDomainDeviceDefPtr dev) } +static void +libxlDomainAttachDeviceNormalize(const virDomainDeviceDef *devConf, + virDomainDeviceDefPtr devLive) +{ + /* + * Fixup anything that needs to be identical in the live and + * config versions of DeviceDef, but might not be. Do this by + * changing the contents of devLive. This is done after all + * post-parse tweaks and validation, so be very careful about what + * changes are made. + */ + + /* MAC address should be identical in both DeviceDefs, but if it + * wasn't specified in the XML, and was instead autogenerated, it + * will be different for the two since they are each the result of + * a separate parser call. If it *was* specified, it will already + * be the same, so copying does no harm. + */ + + if (devConf->type == VIR_DOMAIN_DEVICE_NET) + virMacAddrSet(&devLive->data.net->mac, &devConf->data.net->mac); + +} + + static int libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, unsigned int flags) @@ -4104,7 +4129,9 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainObjPtr vm = NULL; virDomainDefPtr vmdef = NULL; - virDomainDeviceDefPtr dev = NULL; + virDomainDeviceDefPtr devConf = NULL; + virDomainDeviceDef devConfSave = { 0 }; + virDomainDeviceDefPtr devLive = NULL; int ret = -1; virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | @@ -4123,28 +4150,36 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, goto endjob; if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - if (!(dev = virDomainDeviceDefParse(xml, vm->def, - driver->xmlopt, NULL, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(devConf = virDomainDeviceDefParse(xml, vm->def, + driver->xmlopt, NULL, + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto endjob; /* Make a copy for updated domain. */ if (!(vmdef = virDomainObjCopyPersistentDef(vm, driver->xmlopt, NULL))) goto endjob; - if (libxlDomainAttachDeviceConfig(vmdef, dev) < 0) + /* + * devConf will be NULLed out by + * libxlDomainAttachDeviceConfig(), so save it for later use by + * libxlDomainAttachDeviceNormalize() + */ + devConfSave = *devConf; + + if (libxlDomainAttachDeviceConfig(vmdef, devConf) < 0) goto endjob; } if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { - /* If dev exists it was created to modify the domain config. Free it. */ - virDomainDeviceDefFree(dev); - if (!(dev = virDomainDeviceDefParse(xml, vm->def, + if (!(devLive = virDomainDeviceDefParse(xml, vm->def, driver->xmlopt, NULL, VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto endjob; - if (libxlDomainAttachDeviceLive(driver, vm, dev) < 0) + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + libxlDomainAttachDeviceNormalize(&devConfSave, devLive); + + if (libxlDomainAttachDeviceLive(driver, vm, devLive) < 0) goto endjob; /* @@ -4171,7 +4206,8 @@ libxlDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, cleanup: virDomainDefFree(vmdef); - virDomainDeviceDefFree(dev); + virDomainDeviceDefFree(devConf); + virDomainDeviceDefFree(devLive); virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; -- 2.26.0

2 2

[libvirt PATCH 0/5] news: Convert to reStructuredText
by Andrea Bolognani 03 Jun '20

03 Jun '20

Rationale in patch 4/5, in case that diffstat is not enough of a selling point for you ;) Some of the patches in this series are __heavily__ snipped. browse: https://gitlab.com/abologna/libvirt/-/tree/news-convert-cleanup git fetch: https://gitlab.com/abologna/libvirt.git news-convert-cleanup Andrea Bolognani (5): docs: Fix dot_rst_html_in definition news: Point to GitLab for full git log news: Output reStructuredText for the ASCII version news: Convert to reStructuredText news: Add information about old releases Makefile.am | 22 +- NEWS.rst | 4077 ++++++++++++++++++++++++++++ docs/Makefile.am | 27 +- docs/libvirt.css | 15 - docs/news-2005.html.in | 28 - docs/news-2006.html.in | 354 --- docs/news-2007.html.in | 534 ---- docs/news-2008.html.in | 580 ---- docs/news-2009.html.in | 1603 ----------- docs/news-2010.html.in | 2218 --------------- docs/news-2011.html.in | 3314 ----------------------- docs/news-2012.html.in | 3012 --------------------- docs/news-2013.html.in | 3675 ------------------------- docs/news-2014.html.in | 3418 ------------------------ docs/news-2015.html.in | 2864 -------------------- docs/news-2016.html.in | 3740 -------------------------- docs/news-ascii.xsl | 69 - docs/news-html.xsl | 106 - docs/news.rng | 72 - docs/news.xml | 5473 -------------------------------------- scripts/reformat-news.py | 102 - tests/virschematest.c | 2 - 22 files changed, 4089 insertions(+), 31216 deletions(-) create mode 100644 NEWS.rst delete mode 100644 docs/news-2005.html.in delete mode 100644 docs/news-2006.html.in delete mode 100644 docs/news-2007.html.in delete mode 100644 docs/news-2008.html.in delete mode 100644 docs/news-2009.html.in delete mode 100644 docs/news-2010.html.in delete mode 100644 docs/news-2011.html.in delete mode 100644 docs/news-2012.html.in delete mode 100644 docs/news-2013.html.in delete mode 100644 docs/news-2014.html.in delete mode 100644 docs/news-2015.html.in delete mode 100644 docs/news-2016.html.in delete mode 100644 docs/news-ascii.xsl delete mode 100644 docs/news-html.xsl delete mode 100644 docs/news.rng delete mode 100644 docs/news.xml delete mode 100755 scripts/reformat-news.py -- 2.25.4

2 13

[PATCH 0/2] Use more of VIR_XPATH_NODE_AUTORESTORE
by Michal Privoznik 03 Jun '20

03 Jun '20

2 4

[libvirt PATCH 0/7] po: updates to switch over to use of Weblate
by Daniel P. Berrangé 03 Jun '20

03 Jun '20

The Fedora translation team has stopped using Zanata because the software itself is dead upstream. In its place is the Weblate platform. In theory we should have been able to work with Weblate in the same way as we did for Zanata, pushing a pot file periodically, and pulling .po files periodically. In practice this fails for libvirt.git because Weblates RPC API doesn't scale sufficiently well. It will frequently throw errors with the large libvirt.pot file and it gets slower at an exponential rate as you add more languages. Weblate has another mode of operating though which is way more common, whereby it directly pulls a .pot from your git repo, and then directly pushes .po files back, either using a trusted SSH key, or by opening a merge request for GitLab/GitHub/etc. This is the mode we're going to have to use in libvirt projects. Compared to what we're currently doing with Zanata the downsides are: - We have to store libvirt.pot in git and refresh it periodically - The .po files are only partially minimized, as while they have locations stripped, they still contain non-translated msgids The plussides are - We don't have to interact with Weblate at all, only the libvirt git repo - We'll be able to use the normal meson i18n integration, merely by calling i18n.gettext(meson.project_name(), args: ['--sort-output'], preset: 'glib') I'm intending to open discussion with weblate maintainers to see if either of those two downsides can be eliminated via feature enhancements to Weblate. In the meanwhile we just have to accept them, as otherwise we're not going to get any translations since Zanata is dead. Daniel P. Berrangé (7): po: switch to using LINGUAS file for list of languages po: delete empty translations po: refresh to drop unused translations po: rename the .mini.po files to have just a .po suffix po: generate .pot file with strings in alphabetical order po: stop stripping non-translated strings from po files po: go back to storing the .pot file in git Makefile.am | 1 - po/LINGUAS | 42 + po/Makefile.am | 50 +- po/af.mini.po | 19 - po/am.mini.po | 19 - po/anp.mini.po | 19 - po/ar.mini.po | 23 - po/{as.mini.po => as.po} | 402 +- po/ast.mini.po | 19 - po/bal.mini.po | 19 - po/be.mini.po | 20 - po/{bg.mini.po => bg.po} | 5 +- po/bn.mini.po | 21 - po/{bn_IN.mini.po => bn_IN.po} | 126 +- po/bo.mini.po | 19 - po/br.mini.po | 19 - po/brx.mini.po | 19 - po/{bs.mini.po => bs.po} | 5 +- po/{ca.mini.po => ca.po} | 15 +- po/{cs.mini.po => cs.po} | 523 +- po/cy.mini.po | 23 - po/{da.mini.po => da.po} | 5 +- po/{de.mini.po => de.po} | 408 +- po/de_CH.mini.po | 19 - po/{el.mini.po => el.po} | 2 +- po/{en_GB.mini.po => en_GB.po} | 402 +- po/eo.mini.po | 19 - po/{es.mini.po => es.po} | 409 +- po/et.mini.po | 21 - po/eu.mini.po | 21 - po/fa.mini.po | 19 - po/{fi.mini.po => fi.po} | 26 +- po/fil.mini.po | 19 - po/{fr.mini.po => fr.po} | 75 +- po/fur.mini.po | 19 - po/ga.mini.po | 20 - po/gl.mini.po | 21 - po/{gu.mini.po => gu.po} | 408 +- po/he.mini.po | 21 - po/{hi.mini.po => hi.po} | 300 +- po/hr.mini.po | 20 - po/{hu.mini.po => hu.po} | 5 +- po/ia.mini.po | 19 - po/{id.mini.po => id.po} | 2 +- po/ilo.mini.po | 19 - po/is.mini.po | 21 - po/{it.mini.po => it.po} | 175 +- po/{ja.mini.po => ja.po} | 407 +- po/ka.mini.po | 21 - po/kk.mini.po | 19 - po/km.mini.po | 19 - po/{kn.mini.po => kn.po} | 407 +- po/{ko.mini.po => ko.po} | 240 +- po/kw.mini.po | 20 - po/kw(a)kkcor.mini.po | 20 - po/kw(a)uccor.mini.po | 20 - po/kw_GB.mini.po | 20 - po/ky.mini.po | 19 - po/libvirt.pot | 48582 +++++++++++++++++++++++++ po/lt.mini.po | 22 - po/lv.mini.po | 22 - po/mai.mini.po | 19 - po/{mk.mini.po => mk.po} | 5 +- po/{ml.mini.po => ml.po} | 402 +- po/mn.mini.po | 19 - po/{mr.mini.po => mr.po} | 434 +- po/{ms.mini.po => ms.po} | 2 +- po/my.mini.po | 19 - po/{nb.mini.po => nb.po} | 5 +- po/nds.mini.po | 19 - po/ne.mini.po | 19 - po/{nl.mini.po => nl.po} | 215 +- po/nn.mini.po | 21 - po/nso.mini.po | 21 - po/{or.mini.po => or.po} | 375 +- po/{pa.mini.po => pa.po} | 402 +- po/{pl.mini.po => pl.po} | 239 +- po/{pt.mini.po => pt.po} | 5 +- po/{pt_BR.mini.po => pt_BR.po} | 407 +- po/ro.mini.po | 22 - po/{ru.mini.po => ru.po} | 376 +- po/si.mini.po | 21 - po/sk.mini.po | 21 - po/sl.mini.po | 22 - po/sq.mini.po | 23 - po/{sr.mini.po => sr.po} | 16 +- po/{sr(a)latin.mini.po => sr(a)latin.po} | 16 +- po/{sv.mini.po => sv.po} | 105 +- po/{ta.mini.po => ta.po} | 407 +- po/{te.mini.po => te.po} | 402 +- po/tg.mini.po | 19 - po/th.mini.po | 21 - po/tr.mini.po | 21 - po/tw.mini.po | 19 - po/{uk.mini.po => uk.po} | 534 +- po/ur.mini.po | 21 - po/{vi.mini.po => vi.po} | 193 +- po/wba.mini.po | 19 - po/yo.mini.po | 19 - po/{zh_CN.mini.po => zh_CN.po} | 421 +- po/zh_HK.mini.po | 19 - po/{zh_TW.mini.po => zh_TW.po} | 9 +- po/zu.mini.po | 21 - scripts/minimize-po.py | 54 - 104 files changed, 48678 insertions(+), 10512 deletions(-) create mode 100644 po/LINGUAS delete mode 100644 po/af.mini.po delete mode 100644 po/am.mini.po delete mode 100644 po/anp.mini.po delete mode 100644 po/ar.mini.po rename po/{as.mini.po => as.po} (98%) delete mode 100644 po/ast.mini.po delete mode 100644 po/bal.mini.po delete mode 100644 po/be.mini.po rename po/{bg.mini.po => bg.po} (99%) delete mode 100644 po/bn.mini.po rename po/{bn_IN.mini.po => bn_IN.po} (98%) delete mode 100644 po/bo.mini.po delete mode 100644 po/br.mini.po delete mode 100644 po/brx.mini.po rename po/{bs.mini.po => bs.po} (99%) rename po/{ca.mini.po => ca.po} (99%) rename po/{cs.mini.po => cs.po} (98%) delete mode 100644 po/cy.mini.po rename po/{da.mini.po => da.po} (99%) rename po/{de.mini.po => de.po} (97%) delete mode 100644 po/de_CH.mini.po rename po/{el.mini.po => el.po} (99%) rename po/{en_GB.mini.po => en_GB.po} (97%) delete mode 100644 po/eo.mini.po rename po/{es.mini.po => es.po} (97%) delete mode 100644 po/et.mini.po delete mode 100644 po/eu.mini.po delete mode 100644 po/fa.mini.po rename po/{fi.mini.po => fi.po} (98%) delete mode 100644 po/fil.mini.po rename po/{fr.mini.po => fr.po} (98%) delete mode 100644 po/fur.mini.po delete mode 100644 po/ga.mini.po delete mode 100644 po/gl.mini.po rename po/{gu.mini.po => gu.po} (97%) delete mode 100644 po/he.mini.po rename po/{hi.mini.po => hi.po} (97%) delete mode 100644 po/hr.mini.po rename po/{hu.mini.po => hu.po} (99%) delete mode 100644 po/ia.mini.po rename po/{id.mini.po => id.po} (99%) delete mode 100644 po/ilo.mini.po delete mode 100644 po/is.mini.po rename po/{it.mini.po => it.po} (96%) rename po/{ja.mini.po => ja.po} (97%) delete mode 100644 po/ka.mini.po delete mode 100644 po/kk.mini.po delete mode 100644 po/km.mini.po rename po/{kn.mini.po => kn.po} (97%) rename po/{ko.mini.po => ko.po} (97%) delete mode 100644 po/kw.mini.po delete mode 100644 po/kw(a)kkcor.mini.po delete mode 100644 po/kw(a)uccor.mini.po delete mode 100644 po/kw_GB.mini.po delete mode 100644 po/ky.mini.po create mode 100644 po/libvirt.pot delete mode 100644 po/lt.mini.po delete mode 100644 po/lv.mini.po delete mode 100644 po/mai.mini.po rename po/{mk.mini.po => mk.po} (99%) rename po/{ml.mini.po => ml.po} (97%) delete mode 100644 po/mn.mini.po rename po/{mr.mini.po => mr.po} (98%) rename po/{ms.mini.po => ms.po} (98%) delete mode 100644 po/my.mini.po rename po/{nb.mini.po => nb.po} (98%) delete mode 100644 po/nds.mini.po delete mode 100644 po/ne.mini.po rename po/{nl.mini.po => nl.po} (97%) delete mode 100644 po/nn.mini.po delete mode 100644 po/nso.mini.po rename po/{or.mini.po => or.po} (97%) rename po/{pa.mini.po => pa.po} (97%) rename po/{pl.mini.po => pl.po} (97%) rename po/{pt.mini.po => pt.po} (99%) rename po/{pt_BR.mini.po => pt_BR.po} (97%) delete mode 100644 po/ro.mini.po rename po/{ru.mini.po => ru.po} (98%) delete mode 100644 po/si.mini.po delete mode 100644 po/sk.mini.po delete mode 100644 po/sl.mini.po delete mode 100644 po/sq.mini.po rename po/{sr.mini.po => sr.po} (99%) rename po/{sr(a)latin.mini.po => sr(a)latin.po} (99%) rename po/{sv.mini.po => sv.po} (95%) rename po/{ta.mini.po => ta.po} (98%) rename po/{te.mini.po => te.po} (97%) delete mode 100644 po/tg.mini.po delete mode 100644 po/th.mini.po delete mode 100644 po/tr.mini.po delete mode 100644 po/tw.mini.po rename po/{uk.mini.po => uk.po} (98%) delete mode 100644 po/ur.mini.po rename po/{vi.mini.po => vi.po} (97%) delete mode 100644 po/wba.mini.po delete mode 100644 po/yo.mini.po rename po/{zh_CN.mini.po => zh_CN.po} (98%) delete mode 100644 po/zh_HK.mini.po rename po/{zh_TW.mini.po => zh_TW.po} (99%) delete mode 100644 po/zu.mini.po delete mode 100755 scripts/minimize-po.py -- 2.26.2

2 8

[libvirt PATCH] tools: libvirt-guests: correctly check shutdown value
by Ján Tomko 03 Jun '20

03 Jun '20

The variable cleanup introduced a typo. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Fixes: 08071ec0f113bb1fe8dcc263cb6bf87529e8b76b Reported-by: Bronek Kozicki Closes: https://gitlab.com/libvirt/libvirt/-/issues/27 --- Pushed as trivial. tools/libvirt-guests.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index 7af24dab3b..534c4d5e0f 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -444,7 +444,7 @@ stop() { # last stop was not followed by start [ -f "$LISTFILE" ] && return 0 - if [ "/x$ON_SHUTDOWN" = xshutdown ]; then + if [ "x$ON_SHUTDOWN" = xshutdown ]; then suspending=false if [ $SHUTDOWN_TIMEOUT -lt 0 ]; then gettext "SHUTDOWN_TIMEOUT must be equal or greater than 0" -- 2.25.4

1 0

[PATCH] virsysinfo: Parse OEM strings
by Michal Privoznik 03 Jun '20

03 Jun '20

Setting OEM strings for a domain was introduced in v4.1.0-rc1~315. However, any application that wanted to use them (e.g. to point to an URL where a config file is stored) had to 'dmidecode -u --oem-string N' (where N is index of the string). Well, we can expose them under our <sysinfo/> XML and if the domain is running Libvirt inside it can be obtained using virConnectGetSysinfo() API. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virsysinfo.c | 60 ++++++++++++++++++++++++++++- tests/sysinfodata/x86sysinfo.data | 10 +++++ tests/sysinfodata/x86sysinfo.expect | 10 +++++ 3 files changed, 79 insertions(+), 1 deletion(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 41f4d1cff9..94f7ca8811 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -919,6 +919,61 @@ virSysinfoParseX86Chassis(const char *base, } +static int +virSysinfoParseOEMStrings(const char *base, + virSysinfoOEMStringsDefPtr *stringsRet) +{ + virSysinfoOEMStringsDefPtr strings = NULL; + int ret = -1; + const char *cur; + + if (!(cur = strstr(base, "OEM Strings"))) + return 0; + + if (VIR_ALLOC(strings) < 0) + return -1; + + while ((cur = strstr(cur, "String "))) { + char *eol; + + cur += 7; + + if (!(eol = strchr(cur, '\n'))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed output of dmidecode")); + goto cleanup; + } + + while (g_ascii_isdigit(*cur)) + cur++; + + if (*cur != ':') { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed output of dmidecode")); + goto cleanup; + } + + cur += 2; + + virSkipSpacesBackwards(cur, &eol); + if (!eol) + continue; + + if (VIR_EXPAND_N(strings->values, strings->nvalues, 1) < 0) + goto cleanup; + + strings->values[strings->nvalues - 1] = g_strndup(cur, eol - cur); + } + + *stringsRet = g_steal_pointer(&strings); + ret = 0; + + cleanup: + virSysinfoOEMStringsDefFree(strings); + return ret; +} + + static int virSysinfoParseX86Processor(const char *base, virSysinfoDefPtr ret) { @@ -1132,7 +1187,7 @@ virSysinfoReadDMI(void) return NULL; } - cmd = virCommandNewArgList(path, "-q", "-t", "0,1,2,3,4,17", NULL); + cmd = virCommandNewArgList(path, "-q", "-t", "0,1,2,3,4,11,17", NULL); VIR_FREE(path); virCommandSetOutputBuffer(cmd, &outbuf); if (virCommandRun(cmd, NULL) < 0) @@ -1155,6 +1210,9 @@ virSysinfoReadDMI(void) if (virSysinfoParseX86Chassis(outbuf, &ret->chassis) < 0) goto error; + if (virSysinfoParseOEMStrings(outbuf, &ret->oemStrings) < 0) + goto error; + ret->nprocessor = 0; ret->processor = NULL; if (virSysinfoParseX86Processor(outbuf, ret) < 0) diff --git a/tests/sysinfodata/x86sysinfo.data b/tests/sysinfodata/x86sysinfo.data index 426261041d..5615e144fb 100644 --- a/tests/sysinfodata/x86sysinfo.data +++ b/tests/sysinfodata/x86sysinfo.data @@ -81,3 +81,13 @@ Memory Device Serial Number: 29057112 Asset Tag: 0839 Part Number: IMSH2GS13A1F1C-10F + +OEM Strings + String 1: Default string + String 2: Default string + String 3: MIAMI + String 4: Default string + String 5: FFFFFFFFFFFFF + String 6: FFFFFFFFFFFFF + String 7: FFFFFFFFFFFFF + String 8: Default string diff --git a/tests/sysinfodata/x86sysinfo.expect b/tests/sysinfodata/x86sysinfo.expect index fcdd790cbd..118cc4277e 100644 --- a/tests/sysinfodata/x86sysinfo.expect +++ b/tests/sysinfodata/x86sysinfo.expect @@ -50,4 +50,14 @@ <entry name='serial_number'>29057112</entry> <entry name='part_number'>IMSH2GS13A1F1C-10F</entry> </memory_device> + <oemStrings> + <entry>Default string</entry> + <entry>Default string</entry> + <entry>MIAMI</entry> + <entry>Default string</entry> + <entry>FFFFFFFFFFFFF</entry> + <entry>FFFFFFFFFFFFF</entry> + <entry>FFFFFFFFFFFFF</entry> + <entry>Default string</entry> + </oemStrings> </sysinfo> -- 2.26.2

2 4

[libvirt PATCH 0/3] Point to our gitlab.com repos more
by Ján Tomko 03 Jun '20

03 Jun '20

Ján Tomko (3): docs: csharp: remove outdated comment docs: virshcmdref: change repo URL to GitLab docs: point to GitLab as the primary git hosting ChangeLog | 4 ++-- docs/aclpolkit.html.in | 2 +- docs/bindings.html.in | 2 +- docs/csharp.html.in | 25 ++----------------------- docs/dbus.html.in | 12 ++---------- docs/hacking.rst | 4 ++-- docs/java.html.in | 12 ++---------- docs/php.html.in | 10 ++-------- docs/securityprocess.html.in | 2 +- docs/testapi.html.in | 2 +- docs/testsuites.html.in | 4 ++-- docs/testtck.html.in | 2 +- docs/virshcmdref.html.in | 16 ++-------------- 13 files changed, 21 insertions(+), 76 deletions(-) -- 2.25.4

2 5