- Devel - libvirt List Archives

[libvirt] [PATCH] domain_conf: Drop ancient reservation of unit 7 in drive address
by Michal Privoznik 11 Sep '19

11 Sep '19

Introduced in v1.0.6~3, the idea was that unit 7 was reserved and couldn't be used by QEMU. Well, that limitation is long gone. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b7a342bb91..6a019490fd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4812,12 +4812,6 @@ bool virDomainSCSIDriveAddressIsUsed(const virDomainDef *def, const virDomainDeviceDriveAddress *addr) { - /* In current implementation, the maximum unit number of a controller - * is either 16 or 7 (narrow SCSI bus), and if the maximum unit number - * is 16, the controller itself is on unit 7 */ - if (addr->unit == 7) - return true; - if (virDomainDriveAddressIsUsedByDisk(def, VIR_DOMAIN_DISK_BUS_SCSI, addr) || virDomainDriveAddressIsUsedByHostdev(def, -- 2.21.0

3 4

[libvirt] [PATCH v4 0/2] snapshot: Store both config and live XML in the
by Maxiwell S. Garcia 11 Sep '19

11 Sep '19

This patchset store both config and live XML in the snapshot XML. To avoid nest 'config' XML one level deeper ('inactive/domain'), it was necessary to create a function that has a new rootname parameter. V4: - Create a new function to format the XML domain choosing the root name Maxiwell S. Garcia (2): qemu: formatting XML from domain def choosing the root name snapshot: Store both config and live XML in the snapshot domain src/conf/domain_conf.c | 35 ++++++++++++++++++++++++++--------- src/conf/domain_conf.h | 6 ++++++ src/conf/moment_conf.c | 1 + src/conf/moment_conf.h | 11 +++++++++++ src/conf/snapshot_conf.c | 22 ++++++++++++++++++++-- src/qemu/qemu_driver.c | 37 ++++++++++++++++++++++++++++--------- 6 files changed, 92 insertions(+), 20 deletions(-) -- 2.20.1

3 8

[libvirt] [PATCH] qemu: Don't leak domain def when RevertToSnapshot fails
by Jiri Denemark 11 Sep '19

11 Sep '19

Once we copy the domain definition from virDomainSnapshotDef, we either need to assign it to the domain object or free it to avoid memory leaks. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b28a26c3d6..a984b1e65c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16568,6 +16568,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virCPUDefPtr origCPU = NULL; unsigned int start_flags = VIR_QEMU_PROCESS_START_GEN_VMID; qemuDomainAsyncJob jobType = QEMU_ASYNC_JOB_START; + bool defined = false; virCheckFlags(VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED | @@ -16779,6 +16780,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virDomainObjAssignDef(vm, config, false, NULL); virCPUDefFree(priv->origCPU); VIR_STEAL_PTR(priv->origCPU, origCPU); + config = NULL; + defined = true; } if (cookie && !cookie->slirpHelper) @@ -16788,8 +16791,11 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, /* Transitions 2, 3 */ load: was_stopped = true; - if (config) + if (config) { virDomainObjAssignDef(vm, config, false, NULL); + config = NULL; + defined = true; + } /* No cookie means libvirt which saved the domain was too old to * mess up the CPU definitions. @@ -16875,8 +16881,11 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuProcessEndJob(driver, vm); goto cleanup; } - if (config) + if (config) { virDomainObjAssignDef(vm, config, false, NULL); + config = NULL; + defined = true; + } if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { @@ -16944,7 +16953,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } else if (snap) { virDomainSnapshotSetCurrent(vm->snapshots, NULL); } - if (ret == 0 && config && vm->persistent && + if (ret == 0 && defined && vm->persistent && !(ret = virDomainSaveConfig(cfg->configDir, driver->caps, vm->newDef ? vm->newDef : vm->def))) { detail = VIR_DOMAIN_EVENT_DEFINED_FROM_SNAPSHOT; @@ -16960,6 +16969,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virObjectUnref(cfg); virNWFilterUnlockFilterUpdates(); virCPUDefFree(origCPU); + virDomainDefFree(config); return ret; } -- 2.23.0

2 1

Re: [libvirt] [Libvirt-ci] Build failed in Jenkins: libosinfo-build » libvirt-fedora-rawhide #231
by Fabiano Fidêncio 10 Sep '19

10 Sep '19

[snip] > *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.19 but the autoconf macros are from gettext version 0.20 > gmake[2]: *** [Makefile:237: stamp-po] Error 1 > gmake[2]: Leaving directory '<https://ci.centos.org/job/libosinfo-build/systems=libvirt-fedora-rawhide/ws…'> > gmake[1]: *** [Makefile:587: all-recursive] Error 1 > gmake[1]: Leaving directory '<https://ci.centos.org/job/libosinfo-build/systems=libvirt-fedora-rawhide/ws…'> > gmake: *** [Makefile:473: all] Error 2 > Build step 'Execute shell' marked build as failure > JFTR: Instead of spending time trying to figure out what's going on here, let's just get meson patches merged to libosinfo as, with that, we'll get rid of this for free. Ci: https://gitlab.com/fidencio/libosinfo/pipelines/81396029

1 0

[libvirt] [PATCH v4 0/8] CPU Model Baseline and Comparison for s390x
by Collin Walling 10 Sep '19

10 Sep '19

Changelog: v3 - rebased on master v2 - numerous cleanups - removed "policy fix function" and now properly check for policy == -1 in the CPUDef -> JSON parser - resolved some memory leaks - added string arg to qemuMonitorJSONParseCPUModelData for error message to print out proper command name v1 - introduce baseline - split patches into small chunks - free'd lingering qemuMonitorCPUModelInfo pointer - when converting from virCPUDef -> virJSON, consider feature policy FORCED for enabled ___ To run these patches, execute the virsh hypervisor-cpu-compare or hypervisor-cpu-baseline commands and pass an XML file describing one or more CPU definition. You can use the definition from virsh domcapabilities or from a guest XML. There is no need extract it from the file and place it a new one, as the XML parser will look specifically for the CPU tags. ___ These patches hookup the virsh hypervisor-cpu-compare/baseline commands for the s390x architecture. They take an XML file describing some CPU definitions and passes the data to QEMU, where the actual CPU model comparison / baseline calculation is handled (available since QEMU 2.8.5). These calculations are compared against / baselined with the hypervisor CPU model, which can be observed via the virsh domcapabilities command for s390x. When baselining CPU models and the user appends the --features argument to the command, s390x will only report back features that supersede the base model definition. *NOTE* if the --features flag is intended to expand /ALL/ features available to a CPU model (such as the huge list of features reported by a full CPU model expansion), please let me know and I can resolve this. The first patch pulls some code out of the CPU Model Expansion JSON function so that it can be later used for the Comparison and Baseline JSON functions. The rest of the patches follow this sequence: - introduce JSON monitor functions - introduce capability and update test files - hook up monitor functions to virsh command Patch 7 pulls out some code from the CPUDef XML parser to be reused in the comparison hookup. Thanks. x86 and Power review by Daniel Henrique Barboza (thanks!) Collin Walling (8): qemu_monitor: helper functions for CPU models qemu_monitor: implement query-cpu-model-baseline qemu_capabilities: introduce QEMU_CAPS_QUERY_CPU_MODEL_BASELINE qemu_driver: hook up query-cpu-model-baseline qemu_monitor: implement query-cpu-model-comparison qemu_capabilities: introduce QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON cpu_conf: xml to cpu definition parse helper qemu_driver: hook up query-cpu-model-comparison src/conf/cpu_conf.c | 30 +++ src/conf/cpu_conf.h | 6 + src/cpu/cpu.c | 14 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 136 +++++++++++ src/qemu/qemu_capabilities.h | 18 ++ src/qemu/qemu_driver.c | 38 +++ src/qemu/qemu_monitor.c | 44 ++++ src/qemu/qemu_monitor.h | 18 ++ src/qemu/qemu_monitor_json.c | 297 ++++++++++++++++++++--- src/qemu/qemu_monitor_json.h | 20 ++ tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 + tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 + 18 files changed, 587 insertions(+), 49 deletions(-) -- 2.7.4

4 35

[libvirt] [PATCH] qemu: Fix regression in snapshot-revert
by Eric Blake 10 Sep '19

10 Sep '19

Commit f10562799 introduced a regression: if reverting to a snapshot fails early (such as when we refuse to revert to an external snapshot), we lose track of the domain's current snapshot. See: https://bugzilla.redhat.com/1738747 Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b28a26c3d6..093b15f500 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16941,8 +16941,6 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virDomainSnapshotSetCurrent(vm->snapshots, NULL); ret = -1; } - } else if (snap) { - virDomainSnapshotSetCurrent(vm->snapshots, NULL); } if (ret == 0 && config && vm->persistent && !(ret = virDomainSaveConfig(cfg->configDir, driver->caps, -- 2.21.0

2 3

[libvirt] [PATCH 0/7] qemu_command: clean up more labels (virtio-fs epopee)
by Ján Tomko 10 Sep '19

10 Sep '19

Ján Tomko (7): qemuBuildHostNetStr: remove unused cfg qemuBuildHostNetStr: remove unused 'driver' argument qemuBuildHostNetStr: remove unnecessary cleanup label qemuBuildSoundCommandLine: reduce scope of codecstr qemuBuildMemoryBackendProps: remove useless cleanup label qemuBuildMemoryBackendProps: use 'rc' instead of ret. qemuBuildMemoryCellBackendStr: remove useless ret variable src/qemu/qemu_command.c | 87 ++++++++++++++++++----------------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 38 insertions(+), 52 deletions(-) -- 2.19.2

2 8

[libvirt] Error when creating VM with persistent memory
by Seema Pandit 10 Sep '19

10 Sep '19

I am trying to create a VM with added persistent memory using virsh. It fails when persistent memory namespace size is larger than available system memory. Please see error below, prealloc=yes is set in the command line. For dax type namespace, as I understand, prealloc should not be needed. Is this support to add persistent memory implemented in virsh? If so, how to set prealloc=no? Anything else needed to add in xml for persistent memory? Thanks. 1. dax namespace (400GB) which is larger than system memory. # ndctl create-namespace -t pmem -m devdax --align=4k -s 400G { "dev":"namespace1.0", "mode":"devdax", "map":"dev", "size":"393.75 GiB (422.78 GB)", "uuid":"00670b70-7871-4749-a901-9184b7a388d8", "raw_uuid":"a5a1d3f8-01e4-45a2-bad1-38fd09bf4672", "daxregion":{ "id":1, "size":"393.75 GiB (422.78 GB)", "align":4096, "devices":[ { "chardev":"dax1.0", "size":"393.75 GiB (422.78 GB)" } ] }, "numa_node":1 } 2. Relevant parts of xml <domain type='kvm'> <name>test</name> <uuid>02c49a19-ce9e-4320-9a6b-1ebf0913a10e</uuid> <maxMemory slots='16' unit='KiB'>459800576</maxMemory> <memory unit='KiB'>65536000</memory> <currentMemory unit='KiB'>65536000</currentMemory> <vcpu placement='static'>4</vcpu> <os> : : <cpu mode='custom' match='exact' check='partial'> <feature policy='require' name='hypervisor'/> <numa> <cell id='0' cpus='0-3' memory='65536000' unit='KiB'/> </numa> </cpu> : : <memory model='nvdimm'> <source> <path>/dev/dax1.0</path> </source> <target> <size unit='GiB'>376</size> <node>0</node> <label> <size unit='KiB'>128</size> </label> </target> <address type='dimm' slot='0'/> </memory> 3. Error: # virsh start test error: Failed to start domain test error: internal error: qemu unexpectedly closed the monitor: ftruncate: Invalid argument 2019-08-22T04:16:08.744402Z qemu-system-x86_64: -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/dev/dax1.0,size=403726925824: unable to map backing store for guest RAM: Cannot allocate memory Virsh version 4.7.0, qemu version 3.0.0

4 8

[libvirt] [PATCH] virnetdevmacvlan: Provide stubs for macvlan related functions
by Michal Privoznik 10 Sep '19

10 Sep '19

In recent commit of 3d21ff72e0e the virNetDevMacVLanTapOpen() and virNetDevMacVLanTapSetup() functions were exported in our private symbols. But these functions live in an #ifdef so they need a stub implementation. Then in 1b46566ee the virNetDevMacVLanIsMacvtap() function was implemented but again, only for #idef and without stub. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. src/util/virnetdevmacvlan.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 9a9750f24a..e8a9b052b6 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1178,6 +1178,13 @@ int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, } #else /* ! WITH_MACVTAP */ +bool virNetDevMacVLanIsMacvtap(const char *ifname ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return false; +} + int virNetDevMacVLanCreate(const char *ifname ATTRIBUTE_UNUSED, const char *type ATTRIBUTE_UNUSED, const virMacAddr *macaddress ATTRIBUTE_UNUSED, @@ -1197,6 +1204,26 @@ int virNetDevMacVLanDelete(const char *ifname ATTRIBUTE_UNUSED) return -1; } +int +virNetDevMacVLanTapOpen(const char *ifname ATTRIBUTE_UNUSED, + int *tapfd ATTRIBUTE_UNUSED, + size_t tapfdSize ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} + +int +virNetDevMacVLanTapSetup(int *tapfd ATTRIBUTE_UNUSED, + size_t tapfdSize ATTRIBUTE_UNUSED, + bool vnet_hdr ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} + int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UNUSED, const virMacAddr *macaddress ATTRIBUTE_UNUSED, const char *linkdev ATTRIBUTE_UNUSED, -- 2.21.0

1 0

[libvirt] [PATCH 0/2] conf: Avoid checking root element name in virDomainDefParseNode
by Jiri Denemark 10 Sep '19

10 Sep '19

The only caller for which this check makes sense is virDomainDefParse. Thus the check should be moved there. Jiri Denemark (2): conf: Add cleanup label to virDomainDefParse conf: Avoid checking root element name in virDomainDefParseNode src/conf/domain_conf.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) -- 2.23.0

2 3

[libvirt] [PATCH 0/6] qemu_conf: Use more VIR_AUTO*()
by Michal Privoznik 10 Sep '19

10 Sep '19

Michal Prívozník (6): qemu_conf.c: Fix naming of *AddRemove* functions qemu_conf: Drop a pair of needless 'cleanup' labels qemu_conf: Use more of VIR_AUTOFREE() qemu_conf: Use more of VIR_AUTOUNREF() lxcParseConfigString: Don't return success if post parse callback fails lib: Define and use autofree for virConfPtr src/bhyve/bhyve_conf.c | 10 +- src/libvirt-admin.c | 3 +- src/libvirt.c | 4 +- src/libxl/libxl_conf.c | 22 +- src/libxl/libxl_driver.c | 8 +- src/libxl/xen_xl.c | 33 ++- src/libxl/xen_xm.c | 19 +- src/locking/lock_daemon_config.c | 7 +- src/locking/lock_driver_lockd.c | 18 +- src/locking/lock_driver_sanlock.c | 3 +- src/logging/log_daemon_config.c | 7 +- src/lxc/lxc_conf.c | 16 +- src/lxc/lxc_native.c | 17 +- src/qemu/qemu_conf.c | 360 ++++++++++++------------------ src/remote/remote_daemon_config.c | 14 +- src/security/security_selinux.c | 4 +- src/util/virconf.h | 2 + src/vmx/vmx.c | 3 +- tests/virconftest.c | 93 ++++---- tests/xlconfigtest.c | 8 +- tests/xmconfigtest.c | 8 +- tools/virt-login-shell-helper.c | 3 +- 22 files changed, 254 insertions(+), 408 deletions(-) -- 2.21.0

3 19

[libvirt] [PATCH v3 0/5] PCI Multifunction hotplug/unplug, part 1
by Daniel Henrique Barboza 09 Sep '19

09 Sep '19

changes in v3: - rebased after all PCI test changes went to master. - a couple of patches were dropped due to redundancy with what Michal already pushed upstream. - patches 3 and 5 were already R-b by Michal in v2. Hi, In this new version I'm sending what was left to fix after Michal pushed his "Drop KVM assignment" series, which ended up having redundancy of fixes with the previous version. This is the first part of the feature discussed at [1]. These patches are mostly cleanup and fixes, thus it is beneficial to have them upstream right away. The whole feature can be checked out at [2]. All patches survives unit testing. The feature was stress tested with hundreds of consecutive hotplug/unplugs of a Broadcom BCM5719 multifunction network card in a guest running in a Power 8 server. Hopefully I'll find a suitable x86 env to stress test the feature there too. [1] https://www.redhat.com/archives/libvir-list/2019-June/msg00703.html [2] https://github.com/danielhb/libvirt/tree/multifunction_latest Daniel Henrique Barboza (2): virpcimock.c: mock /dev/vfio virpcimock.c: simplify getrealpath() usage Shivaprasad G Bhat (3): virpcimock: Mock the SRIOV Virtual functions tests: Add test case for QEMU pci-hostdev hotplug tests: Add a baseline test for multifunction pci device use case src/util/virprocess.h | 2 +- tests/Makefile.am | 7 + tests/qemuhotplugtest.c | 40 ++- .../qemuhotplug-hostdev-pci.xml | 6 + .../qemuhotplug-base-live+hostdev-pci.xml | 58 +++++ ...uhotplug-pseries-base-live+hostdev-pci.xml | 51 ++++ .../qemuhotplug-pseries-base-live.xml | 43 ++++ .../hostdev-pci-multifunction.args | 35 +++ .../hostdev-pci-multifunction.xml | 59 +++++ .../hostdev-vfio-multidomain.args | 2 +- .../hostdev-vfio-multidomain.xml | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-fail.xml | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2argvtest.c | 3 + .../hostdev-pci-multifunction.xml | 79 ++++++ tests/qemuxml2xmloutdata/hostdev-vfio.xml | 2 +- tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 2 +- tests/qemuxml2xmltest.c | 1 + tests/virpcimock.c | 232 +++++++++++++++--- tests/virpcitestdata/0000-06-12.0.config | Bin 0 -> 256 bytes tests/virpcitestdata/0000-06-12.1.config | Bin 0 -> 256 bytes tests/virpcitestdata/0000-06-12.2.config | Bin 0 -> 256 bytes tests/virprocessmock.c | 28 +++ 26 files changed, 611 insertions(+), 51 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml create mode 100644 tests/virpcitestdata/0000-06-12.0.config create mode 100644 tests/virpcitestdata/0000-06-12.1.config create mode 100644 tests/virpcitestdata/0000-06-12.2.config create mode 100644 tests/virprocessmock.c -- 2.21.0

2 7

[libvirt] [PATCH] virhostdev: Don't unref @pcidevs twice
by Michal Privoznik 09 Sep '19

09 Sep '19

In f08e6883cb4 I've made @pcidevs in virHostdevReAttachPCIDevices() to be automatically unrefed using VIR_AUTOUNREF() but I forgot to remove the line that explicitly unrefs the object at the end of the function. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/util/virhostdev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index d710193b94..41fcab7222 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -1091,7 +1091,6 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, virObjectUnlock(mgr->activePCIHostdevs); virObjectUnlock(mgr->inactivePCIHostdevs); - virObjectUnref(pcidevs); } int -- 2.21.0

1 0

[libvirt] [PATCH 0/3] Fix memlock limit during hotplug of mdev devices
by Eric Farman 09 Sep '19

09 Sep '19

The routine qemuDomainGetMemLockLimitBytes() has a couple tests to determine what the maximum limit of locked memory should be. If I start a domain without any vfio stuff, /proc/$PID/limits says the limit is 64KiB. If I start a guest with a vfio-ccw hostdev, the limit is now $GUEST_MEMORY + 1GiB. It doesn't matter if I have one hostdev or a thousand; it's always 1GiB more than the configured amount of guest memory. If I start a guest without any vfio devices, and hotplug that same vfio-ccw hostdev, the limit remains at 64KiB and I start getting I/O errors in the guest. This makes sense, since some of the I/O chains are long enough to exceed that page limit, and the host starts throwing errors. There is already code that adjusts this limit during the hotplug of vfio-pci devices, so patch 1 refactors that code so that it can be re-used on the mdev hotplug path in patch 3. Patch 2, meanwhile, adds some cleanup that I think is missing in the vfio-pci path, based on my read of the mdev path. $ grep locked /proc/83543/limits Max locked memory 65536 65536 bytes $ virsh attach-device guest scratch-ca8b.xml Device attached successfully $ grep locked /proc/83543/limits Max locked memory 3221225472 3221225472 bytes Eric Farman (3): qemu: Refactor the max memlock routine qemu: Reset the maximum locked memory on hotplug fail qemu: Adjust max memlock on mdev hotplug src/qemu/qemu_domain.c | 30 ++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_hotplug.c | 22 ++++++++++++---------- 3 files changed, 44 insertions(+), 10 deletions(-) -- 2.17.1

3 9

[libvirt] [dockerfiles PATCH v2] refresh: Update Dockerfiles due to new "locales" dependency
by Fabiano Fidêncio 09 Sep '19

09 Sep '19

Let's refresh the archived Dockerfiles as "locales" dependency has to be added to all Debian, Ubuntu, and Fedora files. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- buildenv-libosinfo-debian-10.zip | Bin 559 -> 629 bytes buildenv-libosinfo-debian-sid.zip | Bin 559 -> 629 bytes buildenv-libosinfo-fedora-29.zip | Bin 492 -> 502 bytes buildenv-libosinfo-fedora-30.zip | Bin 555 -> 564 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 512 -> 522 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 887 -> 956 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 880 -> 949 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 884 -> 954 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 883 -> 952 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 878 -> 947 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 892 -> 960 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 882 -> 952 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 890 -> 961 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 883 -> 951 bytes buildenv-libvirt-debian-10.zip | Bin 773 -> 843 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 896 -> 964 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 887 -> 955 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 893 -> 961 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 886 -> 954 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 898 -> 966 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 889 -> 958 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 898 -> 966 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 890 -> 958 bytes buildenv-libvirt-debian-9.zip | Bin 777 -> 846 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 886 -> 956 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 879 -> 948 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 884 -> 954 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 883 -> 952 bytes buildenv-libvirt-debian-sid-cross-mips.zip | Bin 877 -> 947 bytes buildenv-libvirt-debian-sid-cross-mips64el.zip | Bin 892 -> 960 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 882 -> 951 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 890 -> 961 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 883 -> 951 bytes buildenv-libvirt-debian-sid.zip | Bin 773 -> 843 bytes buildenv-libvirt-fedora-29.zip | Bin 694 -> 706 bytes buildenv-libvirt-fedora-30.zip | Bin 809 -> 821 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 714 -> 726 bytes buildenv-libvirt-ubuntu-16.zip | Bin 784 -> 854 bytes buildenv-libvirt-ubuntu-18.zip | Bin 783 -> 855 bytes 39 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildenv-libosinfo-debian-10.zip b/buildenv-libosinfo-debian-10.zip index 4a057eb..99f5121 100644 Binary files a/buildenv-libosinfo-debian-10.zip and b/buildenv-libosinfo-debian-10.zip differ diff --git a/buildenv-libosinfo-debian-sid.zip b/buildenv-libosinfo-debian-sid.zip index 86cf9dd..d006478 100644 Binary files a/buildenv-libosinfo-debian-sid.zip and b/buildenv-libosinfo-debian-sid.zip differ diff --git a/buildenv-libosinfo-fedora-29.zip b/buildenv-libosinfo-fedora-29.zip index 8fac1a5..7e49dbf 100644 Binary files a/buildenv-libosinfo-fedora-29.zip and b/buildenv-libosinfo-fedora-29.zip differ diff --git a/buildenv-libosinfo-fedora-30.zip b/buildenv-libosinfo-fedora-30.zip index 10f89e9..a028fa2 100644 Binary files a/buildenv-libosinfo-fedora-30.zip and b/buildenv-libosinfo-fedora-30.zip differ diff --git a/buildenv-libosinfo-fedora-rawhide.zip b/buildenv-libosinfo-fedora-rawhide.zip index 7cf81df..88d8b28 100644 Binary files a/buildenv-libosinfo-fedora-rawhide.zip and b/buildenv-libosinfo-fedora-rawhide.zip differ diff --git a/buildenv-libvirt-debian-10-cross-aarch64.zip b/buildenv-libvirt-debian-10-cross-aarch64.zip index 8f2dbbc..99d6fd1 100644 Binary files a/buildenv-libvirt-debian-10-cross-aarch64.zip and b/buildenv-libvirt-debian-10-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-10-cross-armv6l.zip b/buildenv-libvirt-debian-10-cross-armv6l.zip index 774ff27..6f9f077 100644 Binary files a/buildenv-libvirt-debian-10-cross-armv6l.zip and b/buildenv-libvirt-debian-10-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-10-cross-armv7l.zip b/buildenv-libvirt-debian-10-cross-armv7l.zip index 893c929..bc69e02 100644 Binary files a/buildenv-libvirt-debian-10-cross-armv7l.zip and b/buildenv-libvirt-debian-10-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-10-cross-i686.zip b/buildenv-libvirt-debian-10-cross-i686.zip index 97e88e4..d496520 100644 Binary files a/buildenv-libvirt-debian-10-cross-i686.zip and b/buildenv-libvirt-debian-10-cross-i686.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mips.zip b/buildenv-libvirt-debian-10-cross-mips.zip index 332cb6c..6af1e1e 100644 Binary files a/buildenv-libvirt-debian-10-cross-mips.zip and b/buildenv-libvirt-debian-10-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mips64el.zip b/buildenv-libvirt-debian-10-cross-mips64el.zip index 7964dca..d381766 100644 Binary files a/buildenv-libvirt-debian-10-cross-mips64el.zip and b/buildenv-libvirt-debian-10-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mipsel.zip b/buildenv-libvirt-debian-10-cross-mipsel.zip index a4198d6..65087a7 100644 Binary files a/buildenv-libvirt-debian-10-cross-mipsel.zip and b/buildenv-libvirt-debian-10-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-10-cross-ppc64le.zip b/buildenv-libvirt-debian-10-cross-ppc64le.zip index 567f5b5..a892db1 100644 Binary files a/buildenv-libvirt-debian-10-cross-ppc64le.zip and b/buildenv-libvirt-debian-10-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-10-cross-s390x.zip b/buildenv-libvirt-debian-10-cross-s390x.zip index 42723f0..d4dfa9d 100644 Binary files a/buildenv-libvirt-debian-10-cross-s390x.zip and b/buildenv-libvirt-debian-10-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-10.zip b/buildenv-libvirt-debian-10.zip index 14634db..3353af9 100644 Binary files a/buildenv-libvirt-debian-10.zip and b/buildenv-libvirt-debian-10.zip differ diff --git a/buildenv-libvirt-debian-9-cross-aarch64.zip b/buildenv-libvirt-debian-9-cross-aarch64.zip index 3fbf049..df304ad 100644 Binary files a/buildenv-libvirt-debian-9-cross-aarch64.zip and b/buildenv-libvirt-debian-9-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-9-cross-armv6l.zip b/buildenv-libvirt-debian-9-cross-armv6l.zip index 0e4a55d..efc035c 100644 Binary files a/buildenv-libvirt-debian-9-cross-armv6l.zip and b/buildenv-libvirt-debian-9-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-9-cross-armv7l.zip b/buildenv-libvirt-debian-9-cross-armv7l.zip index 6db735b..c7cc84a 100644 Binary files a/buildenv-libvirt-debian-9-cross-armv7l.zip and b/buildenv-libvirt-debian-9-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mips.zip b/buildenv-libvirt-debian-9-cross-mips.zip index 27b2a88..e984733 100644 Binary files a/buildenv-libvirt-debian-9-cross-mips.zip and b/buildenv-libvirt-debian-9-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mips64el.zip b/buildenv-libvirt-debian-9-cross-mips64el.zip index 04711c3..5a5d1c8 100644 Binary files a/buildenv-libvirt-debian-9-cross-mips64el.zip and b/buildenv-libvirt-debian-9-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mipsel.zip b/buildenv-libvirt-debian-9-cross-mipsel.zip index 0403a0b..9b4b450 100644 Binary files a/buildenv-libvirt-debian-9-cross-mipsel.zip and b/buildenv-libvirt-debian-9-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.zip b/buildenv-libvirt-debian-9-cross-ppc64le.zip index 2edfed1..c983903 100644 Binary files a/buildenv-libvirt-debian-9-cross-ppc64le.zip and b/buildenv-libvirt-debian-9-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-9-cross-s390x.zip b/buildenv-libvirt-debian-9-cross-s390x.zip index aacac06..5217aa5 100644 Binary files a/buildenv-libvirt-debian-9-cross-s390x.zip and b/buildenv-libvirt-debian-9-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-9.zip b/buildenv-libvirt-debian-9.zip index 4ef6ccf..eb477f3 100644 Binary files a/buildenv-libvirt-debian-9.zip and b/buildenv-libvirt-debian-9.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-aarch64.zip b/buildenv-libvirt-debian-sid-cross-aarch64.zip index 0583c1b..86dd0b6 100644 Binary files a/buildenv-libvirt-debian-sid-cross-aarch64.zip and b/buildenv-libvirt-debian-sid-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-armv6l.zip b/buildenv-libvirt-debian-sid-cross-armv6l.zip index 0087dd3..9146520 100644 Binary files a/buildenv-libvirt-debian-sid-cross-armv6l.zip and b/buildenv-libvirt-debian-sid-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-armv7l.zip b/buildenv-libvirt-debian-sid-cross-armv7l.zip index d296967..2d66e64 100644 Binary files a/buildenv-libvirt-debian-sid-cross-armv7l.zip and b/buildenv-libvirt-debian-sid-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-i686.zip b/buildenv-libvirt-debian-sid-cross-i686.zip index 0f8bb16..40d8c1c 100644 Binary files a/buildenv-libvirt-debian-sid-cross-i686.zip and b/buildenv-libvirt-debian-sid-cross-i686.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mips.zip b/buildenv-libvirt-debian-sid-cross-mips.zip index 31912c4..bc858ca 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mips.zip and b/buildenv-libvirt-debian-sid-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mips64el.zip b/buildenv-libvirt-debian-sid-cross-mips64el.zip index 3cbe12e..80e1b48 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mips64el.zip and b/buildenv-libvirt-debian-sid-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.zip b/buildenv-libvirt-debian-sid-cross-mipsel.zip index 51c59db..3ba15c1 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mipsel.zip and b/buildenv-libvirt-debian-sid-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-ppc64le.zip b/buildenv-libvirt-debian-sid-cross-ppc64le.zip index 27dccb1..0542b8f 100644 Binary files a/buildenv-libvirt-debian-sid-cross-ppc64le.zip and b/buildenv-libvirt-debian-sid-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-s390x.zip b/buildenv-libvirt-debian-sid-cross-s390x.zip index 7504d28..a4f1528 100644 Binary files a/buildenv-libvirt-debian-sid-cross-s390x.zip and b/buildenv-libvirt-debian-sid-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-sid.zip b/buildenv-libvirt-debian-sid.zip index 874bb1b..7c576ae 100644 Binary files a/buildenv-libvirt-debian-sid.zip and b/buildenv-libvirt-debian-sid.zip differ diff --git a/buildenv-libvirt-fedora-29.zip b/buildenv-libvirt-fedora-29.zip index 43594d4..6fd188f 100644 Binary files a/buildenv-libvirt-fedora-29.zip and b/buildenv-libvirt-fedora-29.zip differ diff --git a/buildenv-libvirt-fedora-30.zip b/buildenv-libvirt-fedora-30.zip index 93773cb..9edc06c 100644 Binary files a/buildenv-libvirt-fedora-30.zip and b/buildenv-libvirt-fedora-30.zip differ diff --git a/buildenv-libvirt-fedora-rawhide.zip b/buildenv-libvirt-fedora-rawhide.zip index da6c064..f353c12 100644 Binary files a/buildenv-libvirt-fedora-rawhide.zip and b/buildenv-libvirt-fedora-rawhide.zip differ diff --git a/buildenv-libvirt-ubuntu-16.zip b/buildenv-libvirt-ubuntu-16.zip index 8cff046..5142f87 100644 Binary files a/buildenv-libvirt-ubuntu-16.zip and b/buildenv-libvirt-ubuntu-16.zip differ diff --git a/buildenv-libvirt-ubuntu-18.zip b/buildenv-libvirt-ubuntu-18.zip index 83546be..ca0c445 100644 Binary files a/buildenv-libvirt-ubuntu-18.zip and b/buildenv-libvirt-ubuntu-18.zip differ -- 2.21.0

2 1

[libvirt] [jenkins-ci PATCH] lcitool: Generate the en_US.UTF-8 locale for deb containers
by Fabiano Fidêncio 09 Sep '19

09 Sep '19

osinfo-db tests require "en_US.UTF-8" locate to be set. Since commit 3b682c416b0d the locales are installed but we have to actually generate it for the containers. The reason we don't have to do that for the virtual machines is because the preseed file used for installed them already forces it: ``` # Environment configuration # # Locale, keyboard and timezone. All these will be configured again # later with Ansible, but they're required information so we must # provide them d-i debian-installer/locale string en_US.UTF-8 ``` Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/lcitool | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index 5cf8efe..5b5b622 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -675,7 +675,9 @@ class Application: {package_manager} dist-upgrade -y && \\ {package_manager} install --no-install-recommends -y {pkgs} && \\ {package_manager} autoremove -y && \\ - {package_manager} autoclean -y + {package_manager} autoclean -y && \\ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\\1,' /etc/locale.gen && \\ + dpkg-reconfigure locales """).format(**varmap)) if args.cross_arch: # Intentionally a separate RUN command from the above -- 2.21.0

2 1

[libvirt] [PATCH] Revert "dbus: correctly build reply message"
by Michal Privoznik 09 Sep '19

09 Sep '19

This reverts commit 39dded7bb61444bb608fadd3f82f6fe93d08fd0e. This commit broke virpolkittest on Ubuntu 18 which has an old dbus (v1.12.2). Any other distro with the recent one works (v1.12.16) which hints its a bug in dbus somewhere. Revert the commit to stop tickling it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virdbus.c | 18 ++++++------------ src/util/virdbus.h | 6 ++---- tests/virfirewalltest.c | 9 +++------ tests/virpolkittest.c | 3 +-- 4 files changed, 12 insertions(+), 24 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 64513eef14..b0ac8d7055 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1456,7 +1456,6 @@ int virDBusCreateMethod(DBusMessage **call, /** * virDBusCreateReplyV: - * @msg: the message to reply to * @reply: pointer to be filled with a method reply message * @types: type signature for following method arguments * @args: method arguments @@ -1469,14 +1468,13 @@ int virDBusCreateMethod(DBusMessage **call, * as variadic args. See virDBusCreateMethodV for a * description of this parameter. */ -int virDBusCreateReplyV(DBusMessage *msg, - DBusMessage **reply, +int virDBusCreateReplyV(DBusMessage **reply, const char *types, va_list args) { int ret = -1; - if (!(*reply = dbus_message_new_method_return(msg))) { + if (!(*reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN))) { virReportOOMError(); goto cleanup; } @@ -1495,7 +1493,6 @@ int virDBusCreateReplyV(DBusMessage *msg, /** * virDBusCreateReply: - * @msg: the message to reply to * @reply: pointer to be filled with a method reply message * @types: type signature for following method arguments * @...: method arguments @@ -1503,15 +1500,14 @@ int virDBusCreateReplyV(DBusMessage *msg, * See virDBusCreateReplyV for a description of the * behaviour of this method. */ -int virDBusCreateReply(DBusMessage *msg, - DBusMessage **reply, +int virDBusCreateReply(DBusMessage **reply, const char *types, ...) { va_list args; int ret; va_start(args, types); - ret = virDBusCreateReplyV(msg, reply, types, args); + ret = virDBusCreateReplyV(reply, types, args); va_end(args); return ret; @@ -1815,8 +1811,7 @@ int virDBusCreateMethodV(DBusMessage **call ATTRIBUTE_UNUSED, return -1; } -int virDBusCreateReplyV(DBusMessage *msg ATTRIBUTE_UNUSED, - DBusMessage **reply ATTRIBUTE_UNUSED, +int virDBusCreateReplyV(DBusMessage **reply ATTRIBUTE_UNUSED, const char *types ATTRIBUTE_UNUSED, va_list args ATTRIBUTE_UNUSED) { @@ -1825,8 +1820,7 @@ int virDBusCreateReplyV(DBusMessage *msg ATTRIBUTE_UNUSED, return -1; } -int virDBusCreateReply(DBusMessage *msg ATTRIBUTE_UNUSED, - DBusMessage **reply ATTRIBUTE_UNUSED, +int virDBusCreateReply(DBusMessage **reply ATTRIBUTE_UNUSED, const char *types ATTRIBUTE_UNUSED, ...) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/util/virdbus.h b/src/util/virdbus.h index 0303e91045..083c074d59 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -52,11 +52,9 @@ int virDBusCreateMethodV(DBusMessage **call, const char *member, const char *types, va_list args); -int virDBusCreateReply(DBusMessage *msg, - DBusMessage **reply, +int virDBusCreateReply(DBusMessage **reply, const char *types, ...); -int virDBusCreateReplyV(DBusMessage *msg, - DBusMessage **reply, +int virDBusCreateReplyV(DBusMessage **reply, const char *types, va_list args); diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index e5eeb52175..78685a3bf4 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -150,8 +150,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, if (nargs == 1 && STREQ(type, "ipv4") && STREQ(args[0], "-L")) { - if (virDBusCreateReply(message, - &reply, + if (virDBusCreateReply(&reply, "s", TEST_FILTER_TABLE_LIST) < 0) goto error; } else if (nargs == 3 && @@ -159,13 +158,11 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, STREQ(args[0], "-t") && STREQ(args[1], "nat") && STREQ(args[2], "-L")) { - if (virDBusCreateReply(message, - &reply, + if (virDBusCreateReply(&reply, "s", TEST_NAT_TABLE_LIST) < 0) goto error; } else { - if (virDBusCreateReply(message, - &reply, + if (virDBusCreateReply(&reply, "s", "success") < 0) goto error; } diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index 845ceb1736..ce1ff92bf2 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -123,8 +123,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_and_block, VIR_FREE(cancellationId); virStringListFreeCount(details, detailslen); - if (virDBusCreateReply(message, - &reply, + if (virDBusCreateReply(&reply, "(bba&{ss})", is_authorized, is_challenge, -- 2.21.0

3 3

[libvirt] [PATCH v1 0/3] small code repetition purge on qemu_conf.c
by Daniel Henrique Barboza 09 Sep '19

09 Sep '19

Stumbled on this while changing qemu_conf.c for other reasons. Moved code around here and there to avoid repetition. Final result is 23 less lines for the same functionality, which is nothing to write home about but seems okay to contribute. Daniel Henrique Barboza (3): qemu_conf.c: introduce qemuAddRemoveSharedHostdevInternal qemu_conf.c: introduce qemuAddRemoveSharedDiskInternal qemu_conf.c: introduce qemuAddRemoveSharedDeviceInternal src/qemu/qemu_conf.c | 193 +++++++++++++++++++------------------------ 1 file changed, 85 insertions(+), 108 deletions(-) -- 2.21.0

3 9

[libvirt] [jenkins-ci PATCH v2] guests: Include "locales" by default
by Fabiano Fidêncio 09 Sep '19

09 Sep '19

osinfo-db tests require "en_US.UTF-8" locale to be set. Unfortunately, our containers do not contain the needed locale file. After a discussion on libosinfo mailing list[0], it's been agreed on having the locale as part of our libvirt-jenkins-ci's base packages. [0]: https://www.redhat.com/archives/libosinfo/2019-September/msg00011.html Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/base.yml | 1 + 2 files changed, 7 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index c5a7824..bc6ea69 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -431,6 +431,12 @@ mappings: rpm: libxslt-devel cross-policy-deb: foreign + locales: + CentOS7: glibc-common + deb: locales + Fedora: glibc-langpack-en + FreeBSD: + lsof: default: lsof diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml index a7e572b..2a84029 100644 --- a/guests/vars/projects/base.yml +++ b/guests/vars/projects/base.yml @@ -16,6 +16,7 @@ packages: - glibc - libtool - libtoolize + - locales - lsof - net-tools - make -- 2.21.0

2 3

[libvirt] [PATCH 0/4] Couple of qemu fixups
by Michal Privoznik 09 Sep '19

09 Sep '19

The first issue (patch 2/4) is an issue I've found by code investigation. The second (patch 3/4) fixes a build problem and the last patch disables detection of a feature that is not merged in QEMU just yet. Michal Prívozník (4): virdomainobjlist: Documnet virDomainObjListForEach() lib: Grab write lock when modifying list of domains qemu_slirp: Drop unused variable in qemuSlirpStart() qemu_capabilities: Temporarily disable dbus-vmstate capability src/bhyve/bhyve_driver.c | 2 +- src/bhyve/bhyve_process.c | 2 +- src/conf/virdomainobjlist.c | 23 ++++++++++++++++++++++- src/conf/virdomainobjlist.h | 1 + src/libxl/libxl_driver.c | 11 +++++++---- src/lxc/lxc_process.c | 4 ++-- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_process.c | 3 ++- src/qemu/qemu_slirp.c | 1 - src/vmware/vmware_driver.c | 2 +- 10 files changed, 37 insertions(+), 13 deletions(-) -- 2.21.0

3 11

[libvirt] [PATCH] qemu: update threading info about domain object refs
by Jonathon Jongsma 09 Sep '19

09 Sep '19

Since commit fd9ef3b31e, virDomainFindByUUIDRef() no longer exists and all virDomainObjListFindBy*() functions now increment the reference count. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/qemu/THREADS.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/qemu/THREADS.txt b/src/qemu/THREADS.txt index d17f3f4e0c..aa428fda6a 100644 --- a/src/qemu/THREADS.txt +++ b/src/qemu/THREADS.txt @@ -25,27 +25,17 @@ There are a number of locks on various objects * virDomainObjPtr - Will be locked after calling any of the virDomainObjListFindBy{ID,Name,UUID} - methods. However, preferred method is qemuDomObjFromDomain() that uses - virDomainFindByUUIDRef() which also increases the reference counter and - finds the domain in the domain list without blocking all other lookups. - When the domain is locked and the reference increased, the preferred way of - decrementing the reference counter and unlocking the domain is using the + Will be locked and the reference counter will be increased after calling + any of the virDomainObjListFindBy{ID,Name,UUID} methods. The preferred way + of decrementing the reference counter and unlocking the domain is using the virDomainObjEndAPI() function. Lock must be held when changing/reading any variable in the virDomainObjPtr - If the lock needs to be dropped & then re-acquired for a short period of - time, the reference count must be incremented first using virDomainObjRef(). - There is no need to increase the reference count if qemuDomObjFromDomain() - was used for looking up the domain. In this case there is one reference - already added by that function. - This lock must not be held for anything which sleeps/waits (i.e. monitor commands). - * qemuMonitorPrivatePtr: Job conditions Since virDomainObjPtr lock must not be held during sleeps, the job -- 2.21.0

3 2

[libvirt] [PATCH] docs: remove devhelp API docs
by Daniel P. Berrangé 09 Sep '19

09 Sep '19

We currently generate two completely separate API references for the libvirt public API. One at 'docs/html/' and one at 'docs/devhelp/'. Both are published on the website, but we only link to content in the 'docs/html/' pages. Both are installed in the libvirt-docs sub-RPM, with a full copy of the website including 'docs/html/' in /usr/share/docs/libvirt-docs, while the 'docs/devhelp/' content goes to /usr/share/gtk-doc/. The latter was broken for years until: commit ca6f602546cb28658db05f29bc840e04d22d0947 Author: Andrea Bolognani <abologna(a)redhat.com> Date: Fri May 10 14:54:52 2019 +0200 docs: Introduce $(devhelphtml_generated) Our XSLT magic generates one Devhelp-compatible HTML file per documentation module, but so far we have only shipped and installed documentation for virterror. Now that we have $(modules), however, we can generate the list of files the same way we do for regular documentation and make sure we always ship and install everything. That this bug went unnoticed for so long is a sign of how few people are using the devhelp docs. The only commits to the devhelp code since it was first introduced have been fixing various build problems that hit. The only obvious difference between the two sets of docs is the CSS styling in use. Overall devhelp does not look compelling enough to justify having two duplicated sets of API docs. Eliminating it will reduce the amount of XSL code we are carrying in the tree which is an attractive benefit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/Makefile.am | 38 +-- docs/devhelp/devhelp.xsl | 131 --------- docs/devhelp/home.png | Bin 654 -> 0 bytes docs/devhelp/html.xsl | 573 --------------------------------------- docs/devhelp/left.png | Bin 459 -> 0 bytes docs/devhelp/right.png | Bin 472 -> 0 bytes docs/devhelp/style.css | 66 ----- docs/devhelp/up.png | Bin 406 -> 0 bytes libvirt.spec.in | 8 - 9 files changed, 1 insertion(+), 815 deletions(-) delete mode 100644 docs/devhelp/devhelp.xsl delete mode 100644 docs/devhelp/home.png delete mode 100644 docs/devhelp/html.xsl delete mode 100644 docs/devhelp/left.png delete mode 100644 docs/devhelp/right.png delete mode 100644 docs/devhelp/style.css delete mode 100644 docs/devhelp/up.png diff --git a/docs/Makefile.am b/docs/Makefile.am index 1cdb584b0b..7a5d3450fc 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -17,7 +17,6 @@ ## <http://www.gnu.org/licenses/>. HTML_DIR = $(docdir)/html -DEVHELP_DIR=$(datadir)/gtk-doc/html/libvirt modules = \ libvirt-common \ @@ -50,16 +49,6 @@ apipng = \ html/home.png \ html/right.png -devhelphtml = \ - devhelp/libvirt.devhelp \ - devhelp/index.html \ - devhelp/general.html \ - $(devhelphtml_generated) - -devhelphtml_generated = \ - $(addprefix devhelp/libvirt-,$(addsuffix .html,$(modules))) \ - $(NULL) - css = \ generic.css \ libvirt.css \ @@ -84,16 +73,6 @@ fonts = \ fonts/overpass-mono-semibold.woff \ fonts/overpass-regular.woff -devhelppng = \ - devhelp/home.png \ - devhelp/left.png \ - devhelp/right.png \ - devhelp/up.png - -devhelpcss = devhelp/style.css - -devhelpxsl = devhelp/devhelp.xsl devhelp/html.xsl - logofiles = \ logos/logo-base.svg \ logos/logo-square.svg \ @@ -188,7 +167,6 @@ EXTRA_DIST= \ site.xsl subsite.xsl newapi.xsl page.xsl \ wrapstring.xsl \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ - $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \ $(xml) $(qemu_xml) $(lxc_xml) $(admin_xml) $(fig) $(png) $(css) \ $(javascript) $(logofiles) \ $(internals_html_in) $(internals_html) $(fonts) \ @@ -206,7 +184,6 @@ $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \ MAINTAINERCLEANFILES = \ $(addprefix $(srcdir)/,$(dot_html)) \ $(addprefix $(srcdir)/,$(apihtml)) \ - $(addprefix $(srcdir)/,$(devhelphtml)) \ $(addprefix $(srcdir)/,$(internals_html)) \ $(addprefix $(srcdir)/,$(kbase_html)) \ $(srcdir)/hvsupport.html.in $(srcdir)/aclperms.htmlinc @@ -226,7 +203,7 @@ lxc_api: $(srcdir)/libvirt-lxc-api.xml $(srcdir)/libvirt-lxc-refs.xml admin_api: $(srcdir)/libvirt-admin-api.xml $(srcdir)/libvirt-admin-refs.xml web: $(dot_html) $(internals_html) $(kbase_html) \ - html/index.html devhelp/index.html + html/index.html hvsupport.html: $(srcdir)/hvsupport.html.in @@ -284,12 +261,6 @@ html/index.html: libvirt-api.xml newapi.xsl page.xsl $(APIBUILD_STAMP) $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml && \ $(XMLLINT) --nonet --noout $(srcdir)/html/*.html -$(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) - $(AM_V_GEN)$(XSLTPROC) --stringparam timestamp $(timestamp) \ - --nonet -o $(srcdir)/devhelp/ \ - $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml - - python_generated_files = \ $(srcdir)/html/libvirt-libvirt-lxc.html \ $(srcdir)/html/libvirt-libvirt-qemu.html \ @@ -388,10 +359,6 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/kbase for f in $(kbase_html); do \ $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/kbase; done - $(mkinstalldirs) $(DESTDIR)$(DEVHELP_DIR) - for file in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - $(INSTALL) -m 0644 $(srcdir)/$${file} $(DESTDIR)$(DEVHELP_DIR) ; \ - done $(mkinstalldirs) $(DESTDIR)$(HTML_DIR)/fonts for f in $(fonts); do \ $(INSTALL) -m 0644 $(srcdir)/$$f $(DESTDIR)$(HTML_DIR)/fonts; \ @@ -415,6 +382,3 @@ uninstall-local: for f in $(kbase_html); do \ rm -f $(DESTDIR)$(HTML_DIR)/$$f; \ done - for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \ - rm -f $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \ - done diff --git a/docs/devhelp/devhelp.xsl b/docs/devhelp/devhelp.xsl deleted file mode 100644 index 17a980c73a..0000000000 --- a/docs/devhelp/devhelp.xsl +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" - xmlns="http://www.devhelp.net/book" - xmlns:exsl="http://exslt.org/common" - xmlns:str="http://exslt.org/strings" - extension-element-prefixes="exsl str" - exclude-result-prefixes="exsl str"> -  - <xsl:import href="html.xsl"/> - - <xsl:output method="xml" encoding="UTF-8" indent="yes"/> - -  - <xsl:key name="symbols" match="/api/symbols/*" use="@name"/> - - <xsl:template match="/"> - <xsl:document xmlns="http://www.devhelp.net/book" href="libvirt.devhelp" - method="xml" encoding="UTF-8" indent="yes"> - <xsl:apply-templates/> - </xsl:document> - </xsl:template> - - <xsl:template match="/api"> - <book title="{@name} Reference Manual" link="index.html" author="" name="{@name}"> - <xsl:apply-templates select="files"/> - <xsl:apply-templates select="symbols"/> - </book> - <xsl:call-template name="generate_index"/> - <xsl:call-template name="generate_general"/> - </xsl:template> - <xsl:template match="/api/files"> - <chapters> - <sub name="API" link="general.html"> - <xsl:apply-templates select="file"/> - </sub> - </chapters> - </xsl:template> - <xsl:template match="/api/files/file"> - <xsl:variable name="module" select="@name"/> - <xsl:variable name="prev" select="string(preceding-sibling::file[position()=1]/@name)"/> - <xsl:variable name="next" select="string(following-sibling::file[position()=1]/@name)"/> - <sub name="{@name}" link="libvirt-{(a)name}.html"/> - <xsl:document xmlns="" href="libvirt-{(a)name}.html" method="xml" indent="yes" encoding="UTF-8"> - <html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><xsl:value-of select="concat(@name, ': ', summary)"/></title> - <meta name="generator" content="Libvirt devhelp stylesheet"/> - <link rel="start" href="index.html" title="libvirt Reference Manual"/> - <link rel="up" href="general.html" title="API"/> - <link rel="stylesheet" href="style.css" type="text/css"/> - <link rel="chapter" href="general.html" title="API"/> - </head> - <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> - - <table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> - <tr valign="middle"> - <xsl:if test="$prev != ''"> - <td><a accesskey="p" href="libvirt-{$prev}.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"/></a></td> - </xsl:if> - <td><a accesskey="u" href="general.html"><img src="up.png" width="24" height="24" border="0" alt="Up"/></a></td> - <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"/></a></td> - <xsl:if test="$next != ''"> - <td><a accesskey="n" href="libvirt-{$next}.html"><img src="right.png" width="24" height="24" border="0" alt="Next"/></a></td> - </xsl:if> - <th width="100%" align="center">libvirt Reference Manual</th> - </tr> - </table> - <h2><span class="refentrytitle"><xsl:value-of select="@name"/></span></h2> - <p><xsl:value-of select="@name"/> - <xsl:value-of select="summary"/></p> - <p><xsl:value-of select="description"/></p> - <xsl:if test="deprecated"> - <p> WARNING: this module is deprecated !</p> - </xsl:if> - <div class="refsynopsisdiv"> - <h2>Synopsis</h2> - <pre class="synopsis"> - <xsl:apply-templates mode="synopsis" select="exports"/> - </pre> - </div> - <div class="refsect1" lang="en"> - <h2>Description</h2> - </div> - <div class="refsect1" lang="en"> - <h2>Details</h2> - <div class="refsect2" lang="en"> - <xsl:apply-templates mode="details" select="/api/symbols/macro[@file=$module]"/> - <xsl:apply-templates mode="details" select="/api/symbols/typedef[@file=$module] | /api/symbols/struct[@file=$module]"/> - <xsl:apply-templates mode="details" select="/api/symbols/functype[@file=$module]"/> - <xsl:apply-templates mode="details" select="/api/symbols/variable[@file=$module]"/> - <xsl:apply-templates mode="details" select="/api/symbols/function[@file=$module]"/> - </div> - </div> - </body> - </html> - </xsl:document> - </xsl:template> - <xsl:template match="/api/symbols"> - <functions> - <xsl:apply-templates select="macro"/> - <xsl:apply-templates select="enum"/> - <xsl:apply-templates select="typedef"/> - <xsl:apply-templates select="struct"/> - <xsl:apply-templates select="functype"/> - <xsl:apply-templates select="variable"/> - <xsl:apply-templates select="function"/> - </functions> - </xsl:template> - <xsl:template match="/api/symbols/functype"> - <function name="{@name}" link="libvirt-{@file}.html#{@name}"/> - </xsl:template> - <xsl:template match="/api/symbols/function"> - <function name="{@name} ()" link="libvirt-{@file}.html#{@name}"/> - </xsl:template> - <xsl:template match="/api/symbols/typedef"> - <function name="{@name}" link="libvirt-{@file}.html#{@name}"/> - </xsl:template> - <xsl:template match="/api/symbols/enum"> - <function name="{@name}" link="libvirt-{@file}.html#{@name}"/> - </xsl:template> - <xsl:template match="/api/symbols/struct"> - <function name="{@name}" link="libvirt-{@file}.html#{@name}"/> - </xsl:template> - <xsl:template match="/api/symbols/macro"> - <function name="{@name}" link="libvirt-{@file}.html#{@name}"/> - </xsl:template> - <xsl:template match="/api/symbols/variable"> - <function name="{@name}" link="libvirt-{@file}.html#{@name}"/> - </xsl:template> - -</xsl:stylesheet> diff --git a/docs/devhelp/home.png b/docs/devhelp/home.png deleted file mode 100644 index 17003611d9..0000000000 Binary files a/docs/devhelp/home.png and /dev/null differ diff --git a/docs/devhelp/html.xsl b/docs/devhelp/html.xsl deleted file mode 100644 index 587cbfc1a9..0000000000 --- a/docs/devhelp/html.xsl +++ /dev/null @@ -1,573 +0,0 @@ -<?xml version="1.0"?> -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" - xmlns:exsl="http://exslt.org/common" - xmlns:str="http://exslt.org/strings" - extension-element-prefixes="exsl str" - exclude-result-prefixes="exsl str"> - <xsl:output method="xml" encoding="UTF-8" indent="yes"/> - -  - <xsl:template mode="dumptoken" match='*'> - <xsl:param name="token"/> - <xsl:variable name="ref" select="key('symbols', $token)"/> - <xsl:choose> - <xsl:when test="$ref"> - <a href="libvirt-{$ref/@file}.html#{$ref/@name}"><xsl:value-of select="$token"/></a> - </xsl:when> - <xsl:otherwise> - <xsl:value-of select="$token"/> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - -  - <xsl:template name="dumptext"> - <xsl:param name="text"/> - <xsl:variable name="ctxt" select='.'/> -  - <xsl:for-each select="str:tokenize($text, ' 	')"> - <xsl:apply-templates select="$ctxt" mode='dumptoken'> - <xsl:with-param name="token" select="string(.)"/> - </xsl:apply-templates> - <xsl:if test="position() != last()"> - <xsl:text> </xsl:text> - </xsl:if> - </xsl:for-each> - </xsl:template> - - - <xsl:template mode="synopsis" match="function"> - <xsl:variable name="name" select="string(@name)"/> - <xsl:variable name="nlen" select="string-length($name)"/> - <xsl:variable name="tlen" select="string-length(return/@type)"/> - <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="return/@type"/> - </xsl:call-template> - <xsl:text>	</xsl:text> - <a href="#{@name}"><xsl:value-of select="@name"/></a> - <xsl:if test="$blen - 40 < -8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 < 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>	(</xsl:text> - <xsl:if test="not(arg)"> - <xsl:text>void</xsl:text> - </xsl:if> - <xsl:for-each select="arg"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@type"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:value-of select="@name"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text><br/> - <xsl:if test="$blen - 40 > 8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 > 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>					 </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text>);</xsl:text> - <xsl:text> -</xsl:text> - </xsl:template> - - <xsl:template mode="synopsis" match="functype"> - <xsl:variable name="name" select="string(@name)"/> - <xsl:variable name="nlen" select="string-length($name)"/> - <xsl:variable name="tlen" select="string-length(return/@type)"/> - <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> - <xsl:text>typedef </xsl:text> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="return/@type"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <a href="#{@name}"><xsl:value-of select="@name"/></a> - <xsl:if test="$blen - 40 < -8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 < 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>	(</xsl:text> - <xsl:if test="not(arg)"> - <xsl:text>void</xsl:text> - </xsl:if> - <xsl:for-each select="arg"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@type"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:value-of select="@name"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text><br/> - <xsl:if test="$blen - 40 > 8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 > 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>					 </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text>);</xsl:text> - <xsl:text> -</xsl:text> - </xsl:template> - - <xsl:template mode="synopsis" match="exports[@type='function']"> - <xsl:variable name="def" select="key('symbols',@symbol)"/> - <xsl:apply-templates mode="synopsis" select="$def"/> - </xsl:template> - - <xsl:template mode="synopsis" match="exports[@type='typedef']"> - <xsl:text>typedef </xsl:text> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="string(key('symbols',@symbol)/@type)"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <a href="#{@symbol}"><xsl:value-of select="@symbol"/></a> - <xsl:text>; -</xsl:text> - </xsl:template> - - <xsl:template mode="synopsis" match="exports[@type='macro']"> - <xsl:variable name="def" select="key('symbols',@symbol)"/> - <xsl:text>#define </xsl:text> - <a href="#{@symbol}"><xsl:value-of select="@symbol"/></a> - <xsl:if test="$def/arg"> - <xsl:text>(</xsl:text> - <xsl:for-each select="$def/arg"> - <xsl:value-of select="@name"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text>)</xsl:text> - </xsl:if> - <xsl:text>; -</xsl:text> - </xsl:template> - <xsl:template mode="synopsis" match="exports[@type='enum']"> - </xsl:template> - <xsl:template mode="synopsis" match="exports[@type='struct']"> - </xsl:template> - - - <xsl:template mode="details" match="struct"> - <xsl:variable name="name" select="string(@name)"/> - <div class="refsect2" lang="en"> - <h3><a id="{$name}">Structure </a><xsl:value-of select="$name"/></h3> - <pre class="programlisting"> - <xsl:value-of select="@type"/><xsl:text> { -</xsl:text> - <xsl:if test="not(field)"> - <xsl:text>The content of this structure is not made public by the API. -</xsl:text> - </xsl:if> - <xsl:for-each select="field"> - <xsl:text> </xsl:text> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@type"/> - </xsl:call-template> - <xsl:text>	</xsl:text> - <xsl:value-of select="@name"/> - <xsl:if test="@info != ''"> - <xsl:text>	: </xsl:text> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="substring(@info, 1, 70)"/> - </xsl:call-template> - </xsl:if> - <xsl:text> -</xsl:text> - </xsl:for-each> - <xsl:text>} </xsl:text> - <xsl:value-of select="$name"/> - <xsl:text>; -</xsl:text> - </pre> - <p> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="info"/> - </xsl:call-template> - </p><xsl:text> -</xsl:text> - </div><hr/> - </xsl:template> - - <xsl:template mode="details" match="typedef[@type != 'enum']"> - <xsl:variable name="name" select="string(@name)"/> - <div class="refsect2" lang="en"> - <h3><a id="{$name}">Typedef </a><xsl:value-of select="$name"/></h3> - <pre class="programlisting"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="string(@type)"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:value-of select="$name"/> - <xsl:text>; -</xsl:text> - </pre> - <p> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="info"/> - </xsl:call-template> - </p><xsl:text> -</xsl:text> - </div><hr/> - </xsl:template> - - <xsl:template mode="details" match="variable"> - <xsl:variable name="name" select="string(@name)"/> - <div class="refsect2" lang="en"> - <h3><a id="{$name}">Variable </a><xsl:value-of select="$name"/></h3> - <pre class="programlisting"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="string(@type)"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:value-of select="$name"/> - <xsl:text>; -</xsl:text> - </pre> - <p> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="info"/> - </xsl:call-template> - </p><xsl:text> -</xsl:text> - </div><hr/> - </xsl:template> - - <xsl:template mode="details" match="typedef[@type = 'enum']"> - <xsl:variable name="name" select="string(@name)"/> - <div class="refsect2" lang="en"> - <h3><a id="{$name}">Enum </a><xsl:value-of select="$name"/></h3> - <pre class="programlisting"> - <xsl:text>enum </xsl:text> - <a href="#{$name}"><xsl:value-of select="$name"/></a> - <xsl:text> { -</xsl:text> - <xsl:for-each select="/api/symbols/enum[@type=$name]"> - <xsl:sort select="@value" data-type="number" order="ascending"/> - <xsl:text> </xsl:text> - <a id="{@name}"><xsl:value-of select="@name"/></a> - <xsl:if test="@value"> - <xsl:text> = </xsl:text> - <xsl:value-of select="@value"/> - </xsl:if> - <xsl:if test="@info"> - <xsl:text> /* </xsl:text> - <xsl:value-of select="@info"/> - <xsl:text> */</xsl:text> - </xsl:if> - <xsl:text> -</xsl:text> - </xsl:for-each> - <xsl:text>}; -</xsl:text> - </pre> - <p> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="info"/> - </xsl:call-template> - </p><xsl:text> -</xsl:text> - </div><hr/> - </xsl:template> - - <xsl:template mode="details" match="macro"> - <xsl:variable name="name" select="string(@name)"/> - <div class="refsect2" lang="en"> - <h3><a id="{$name}">Macro </a><xsl:value-of select="$name"/></h3> - <pre class="programlisting"> - <xsl:text>#define </xsl:text> - <a href="#{$name}"><xsl:value-of select="$name"/></a> - <xsl:if test="arg"> - <xsl:text>(</xsl:text> - <xsl:for-each select="arg"> - <xsl:value-of select="@name"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text>)</xsl:text> - </xsl:if> - <xsl:text>; -</xsl:text> - </pre> - <p> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="info"/> - </xsl:call-template> - </p> - <xsl:if test="arg"> - <div class="variablelist"><table border="0"><col align="left"/><tbody> - <xsl:for-each select="arg"> - <tr> - <td><span class="term"><i><tt><xsl:value-of select="@name"/></tt></i>:</span></td> - <td> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@info"/> - </xsl:call-template> - </td> - </tr> - </xsl:for-each> - </tbody></table></div> - </xsl:if> - <xsl:text> -</xsl:text> - </div><hr/> - </xsl:template> - - <xsl:template mode="details" match="function"> - <xsl:variable name="name" select="string(@name)"/> - <xsl:variable name="nlen" select="string-length($name)"/> - <xsl:variable name="tlen" select="string-length(return/@type)"/> - <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> - <div class="refsect2" lang="en"> - <h3><a id="{$name}"></a><xsl:value-of select="$name"/> ()</h3> - <pre class="programlisting"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="return/@type"/> - </xsl:call-template> - <xsl:text>	</xsl:text> - <xsl:value-of select="@name"/> - <xsl:if test="$blen - 40 < -8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 < 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>	(</xsl:text> - <xsl:if test="not(arg)"> - <xsl:text>void</xsl:text> - </xsl:if> - <xsl:for-each select="arg"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@type"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:value-of select="@name"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text><br/> - <xsl:if test="$blen - 40 > 8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 > 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>					 </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text>)</xsl:text><br/> - <xsl:text> -</xsl:text> - </pre> - <p> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="info"/> - </xsl:call-template> - </p><xsl:text> -</xsl:text> - <xsl:if test="arg | return/@info"> - <div class="variablelist"><table border="0"><col align="left"/><tbody> - <xsl:for-each select="arg"> - <tr> - <td><span class="term"><i><tt><xsl:value-of select="@name"/></tt></i>:</span></td> - <td> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@info"/> - </xsl:call-template> - </td> - </tr> - </xsl:for-each> - <xsl:if test="return/@info"> - <tr> - <td><span class="term"><i><tt>Returns</tt></i>:</span></td> - <td> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="return/@info"/> - </xsl:call-template> - </td> - </tr> - </xsl:if> - </tbody></table></div> - </xsl:if> - </div><hr/> - </xsl:template> - - <xsl:template mode="details" match="functype"> - <xsl:variable name="name" select="string(@name)"/> - <xsl:variable name="nlen" select="string-length($name)"/> - <xsl:variable name="tlen" select="string-length(return/@type)"/> - <xsl:variable name="blen" select="(($nlen + 8) - (($nlen + 8) mod 8)) + (($tlen + 8) - (($tlen + 8) mod 8))"/> - <div class="refsect2" lang="en"> - <h3><a id="{$name}"></a>Function type <xsl:value-of select="$name"/> </h3> - <pre class="programlisting"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="return/@type"/> - </xsl:call-template> - <xsl:text>	</xsl:text> - <xsl:value-of select="@name"/> - <xsl:if test="$blen - 40 < -8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 < 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>	(</xsl:text> - <xsl:if test="not(arg)"> - <xsl:text>void</xsl:text> - </xsl:if> - <xsl:for-each select="arg"> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@type"/> - </xsl:call-template> - <xsl:text> </xsl:text> - <xsl:value-of select="@name"/> - <xsl:if test="position() != last()"> - <xsl:text>, </xsl:text><br/> - <xsl:if test="$blen - 40 > 8"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:if test="$blen - 40 > 0"> - <xsl:text>	</xsl:text> - </xsl:if> - <xsl:text>					 </xsl:text> - </xsl:if> - </xsl:for-each> - <xsl:text>)</xsl:text><br/> - <xsl:text> -</xsl:text> - </pre> - <p> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="info"/> - </xsl:call-template> - </p><xsl:text> -</xsl:text> - <xsl:if test="arg | return/@info"> - <div class="variablelist"><table border="0"><col align="left"/><tbody> - <xsl:for-each select="arg"> - <tr> - <td><span class="term"><i><tt><xsl:value-of select="@name"/></tt></i>:</span></td> - <td> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="@info"/> - </xsl:call-template> - </td> - </tr> - </xsl:for-each> - <xsl:if test="return/@info"> - <tr> - <td><span class="term"><i><tt>Returns</tt></i>:</span></td> - <td> - <xsl:call-template name="dumptext"> - <xsl:with-param name="text" select="return/@info"/> - </xsl:call-template> - </td> - </tr> - </xsl:if> - </tbody></table></div> - </xsl:if> - </div><hr/> - </xsl:template> - - - <xsl:template name="generate_general"> - <xsl:variable name="next" select="string(/api/files/file[position()=1]/@name)"/> - <xsl:document xmlns="" href="general.html" method="xml" indent="yes" encoding="UTF-8"> - <html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title><xsl:value-of select="concat(@name, ': ', summary)"/></title> - <meta name="generator" content="Libvirt devhelp stylesheet"/> - <link rel="start" href="index.html" title="libvirt Reference Manual"/> - <link rel="up" href="index.html" title="libvirt Reference Manual"/> - <link rel="stylesheet" href="style.css" type="text/css"/> - <link rel="chapter" href="index.html" title="libvirt Reference Manual"/> - </head> - <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> - - <table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> - <tr valign="middle"> - <td><a accesskey="u" href="index.html"><img src="up.png" width="24" height="24" border="0" alt="Up"/></a></td> - <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"/></a></td> - <xsl:if test="$next != ''"> - <td><a accesskey="n" href="libvirt-{$next}.html"><img src="right.png" width="24" height="24" border="0" alt="Next"/></a></td> - </xsl:if> - <th width="100%" align="center">libvirt Reference Manual</th> - </tr> - </table> - <h2><span class="refentrytitle">libvirt API Modules</span></h2> - <p> - <xsl:for-each select="/api/files/file"> - <a href="libvirt-{(a)name}.html"><xsl:value-of select="@name"/></a> - <xsl:value-of select="summary"/><br/> - </xsl:for-each> - </p> - </body> - </html> - </xsl:document> - </xsl:template> - - - <xsl:template name="generate_index"> - <xsl:document xmlns="" href="index.html" method="xml" indent="yes" encoding="UTF-8"> - <html> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <title>libvirt Reference Manual</title> - <meta name="generator" content="Libvirt devhelp stylesheet"/> - <link rel="stylesheet" href="style.css" type="text/css"/> - </head> - <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> - - <table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> - <tr valign="middle"> - <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"/></a></td> - <td><a accesskey="n" href="general.html"><img src="right.png" width="24" height="24" border="0" alt="Next"/></a></td> - <th width="100%" align="center">libvirt Reference Manual</th> - </tr> - </table> - <h2><span class="refentrytitle">libvirt Reference Manual</span></h2> -<p>Libvir is a C toolkit to interact with the virtualization capabilities of -recent versions of Linux (and other OSes). It is free software available -under the <a href="http://www.opensource.org/licenses/lgpl-license.html">GNU -Lesser General Public License</a>. Virtualization of the Linux Operating -System means the ability to run multiple instances of Operating Systems -concurrently on a single hardware system where the basic resources are driven -by a Linux instance. The library aim at providing long term stable C API -initially for the <a href="http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html">Xen -paravirtualization</a> but should be able to integrate other virtualization -mechanisms if needed.</p> - </body> - </html> - </xsl:document> - </xsl:template> - -</xsl:stylesheet> diff --git a/docs/devhelp/left.png b/docs/devhelp/left.png deleted file mode 100644 index 2d05b3d5b4..0000000000 Binary files a/docs/devhelp/left.png and /dev/null differ diff --git a/docs/devhelp/right.png b/docs/devhelp/right.png deleted file mode 100644 index 92832e3a45..0000000000 Binary files a/docs/devhelp/right.png and /dev/null differ diff --git a/docs/devhelp/style.css b/docs/devhelp/style.css deleted file mode 100644 index dfbb41e34c..0000000000 --- a/docs/devhelp/style.css +++ /dev/null @@ -1,66 +0,0 @@ -.synopsis, .classsynopsis -{ - background: #eeeeee; - border: solid 1px #aaaaaa; - padding: 0.5em; -} -.programlisting -{ - background: #eeeeff; - border: solid 1px #aaaaff; - padding: 0.5em; -} -.variablelist -{ - padding: 4px; - margin-left: 3em; -} -.variablelist td:first-child -{ - vertical-align: top; -} -table.navigation -{ - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0.5em; - margin-bottom: 0.5em; -} -.navigation a -{ - color: #770000; -} -.navigation a:visited -{ - color: #550000; -} -.navigation .title -{ - font-size: 200%; -} -div.refnamediv -{ - margin-top: 2em; -} -div.gallery-float -{ - float: left; - padding: 10px; -} -div.gallery-float img -{ - border-style: none; -} -div.gallery-spacer -{ - clear: both; -} -a -{ - text-decoration: none; -} -a:hover -{ - text-decoration: underline; - color: #FF0000; -} diff --git a/docs/devhelp/up.png b/docs/devhelp/up.png deleted file mode 100644 index 85b3e2a275..0000000000 Binary files a/docs/devhelp/up.png and /dev/null differ diff --git a/libvirt.spec.in b/libvirt.spec.in index dde8bf3a97..d4d2ec8db9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1528,14 +1528,6 @@ exit 0 %doc AUTHORS ChangeLog.gz NEWS README README.md %doc libvirt-docs/* -# API docs -%dir %{_datadir}/gtk-doc/html/libvirt/ -%doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp -%doc %{_datadir}/gtk-doc/html/libvirt/*.html -%doc %{_datadir}/gtk-doc/html/libvirt/*.png -%doc %{_datadir}/gtk-doc/html/libvirt/*.css - - %files daemon %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ -- 2.21.0

3 2

[libvirt] [PATCH v2] util: activate directory override when used from library
by Daniel P. Berrangé 09 Sep '19

09 Sep '19

The Perl bindings for libvirt use the test driver for unit tests. This tries to load the cpu_map/index.xml file, and when run from an uninstalled build will fail. The problem is that virFileActivateDirOverride is called by our various binaries like libvirtd, virsh, but is not called when a 3rd party app uses libvirt.so To deal with this we allow the LIBVIRT_DIR_OVERRIDE=1 env variable to be set and make virInitialize look for this. The 'run' script will set it, so now build using this script to run against an uninstalled tree we will correctly resolve files to the source tree. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changed in v2: - Use a separate function for env var override run.in | 7 ++++++ src/libvirt.c | 2 ++ src/libvirt_private.syms | 3 ++- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/remote/remote_daemon.c | 2 +- src/security/virt-aa-helper.c | 2 +- src/util/virfile.c | 40 ++++++++++++++++++++++++++--------- src/util/virfile.h | 3 ++- tests/testutils.c | 2 +- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- 12 files changed, 50 insertions(+), 19 deletions(-) diff --git a/run.in b/run.in index 9a1c6ea11a..ed946a0899 100644 --- a/run.in +++ b/run.in @@ -60,6 +60,13 @@ else fi export PKG_CONFIG_PATH +# Ensure that any 3rd party apps using libvirt.so from +# the build tree get files resolved to the build/source +# tree too. Typically useful for language bindings +# running tests against non-installed libvirt. +LIBVIRT_DIR_OVERRIDE=1 +export LIBVIRT_DIR_OVERRIDE + # This is a cheap way to find some use-after-free and uninitialized # read problems when using glibc. random_val="$(awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)" diff --git a/src/libvirt.c b/src/libvirt.c index 9650aaa453..a1ecd8bacc 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -247,6 +247,8 @@ virGlobalInit(void) virErrorInitialize() < 0) goto error; + virFileActivateDirOverrideForLib(); + if (getuid() != geteuid() || getgid() != getegid()) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a34d92f5ef..21cd6a8ef7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1917,7 +1917,8 @@ virDirOpenQuiet; virDirRead; virFileAbsPath; virFileAccessibleAs; -virFileActivateDirOverride; +virFileActivateDirOverrideForLib; +virFileActivateDirOverrideForProg; virFileBindMountDevice; virFileBuildPath; virFileCanonicalizePath; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index ac242bf65c..edb61d74c0 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1188,7 +1188,7 @@ int main(int argc, char **argv) { } } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!(config = virLockDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index f74e900aea..85c58aaa7b 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -960,7 +960,7 @@ int main(int argc, char **argv) { } } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!(config = virLogDaemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 546328b24d..8cf9412128 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -1034,7 +1034,7 @@ int main(int argc, char **argv) { virUpdateSelfLastChanged(argv[0]); - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); while (1) { int optidx = 0; diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 3f9d775acc..326cfaf52a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1427,7 +1427,7 @@ main(int argc, char **argv) exit(EXIT_FAILURE); } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); /* Initialize the log system */ virLogSetFromEnv(); diff --git a/src/util/virfile.c b/src/util/virfile.c index 81a3c096eb..d9ac482435 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1766,7 +1766,7 @@ virFileFindResource(const char *filename, /** - * virFileActivateDirOverride: + * virFileActivateDirOverrideForProg: * @argv0: argv[0] of the calling program * * Look at @argv0 and try to detect if running from @@ -1774,20 +1774,40 @@ virFileFindResource(const char *filename, * on the binary name, or '/.libs/' in the path */ void -virFileActivateDirOverride(const char *argv0) +virFileActivateDirOverrideForProg(const char *argv0) { - char *file = strrchr(argv0, '/'); - if (!file || file[1] == '\0') - return; - file++; - if (STRPREFIX(file, "lt-") || - strstr(argv0, "/.libs/")) { - useDirOverride = true; - VIR_DEBUG("Activating build dir override for %s", argv0); + if (argv0 == NULL) { + if (getenv("LIBVIRT_DIR_OVERRIDE") != NULL) + useDirOverride = true; + } else { + char *file = strrchr(argv0, '/'); + if (!file || file[1] == '\0') + return; + file++; + if (STRPREFIX(file, "lt-") || + strstr(argv0, "/.libs/")) { + useDirOverride = true; + VIR_DEBUG("Activating build dir override for %s", argv0); + } } } +/** + * virFileActivateDirOverrideForEnv: + * + * Look for LIBVIRT_DIR_OVERRIDE env var to see if + * we should find files from the build/src tree + * instead of install tree + */ +void +virFileActivateDirOverrideForLib(void) +{ + if (getenv("LIBVIRT_DIR_OVERRIDE") != NULL) + useDirOverride = true; +} + + /** * virFileLength: * @path: full path of the file diff --git a/src/util/virfile.h b/src/util/virfile.h index a8a5dd8074..2b037b00aa 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -193,8 +193,9 @@ char *virFileFindResourceFull(const char *filename, const char *installdir, const char *envname) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5); -void virFileActivateDirOverride(const char *argv0) +void virFileActivateDirOverrideForProg(const char *argv0) ATTRIBUTE_NONNULL(1); +void virFileActivateDirOverrideForLib(void); off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1); bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1); diff --git a/tests/testutils.c b/tests/testutils.c index 8b2c51044e..003893dc44 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -992,7 +992,7 @@ int virTestMain(int argc, setenv("VIR_TEST_MOCK_PROGNAME", progname, 1); - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (virTestSetEnvPath() < 0) return EXIT_AM_HARDFAIL; diff --git a/tools/virsh.c b/tools/virsh.c index e76d242ec8..ec20f35a77 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -897,7 +897,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 4ff006ffcb..e549ec1f83 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1552,7 +1552,7 @@ main(int argc, char **argv) return EXIT_FAILURE; } - virFileActivateDirOverride(argv[0]); + virFileActivateDirOverrideForProg(argv[0]); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); -- 2.21.0

2 2

[libvirt] [dockerfiles PATCH] refresh: Update Dockerfiles due to new "locales" dependency
by Fabiano Fidêncio 09 Sep '19

09 Sep '19

Let's refresh the archived Dockerfiles as "locales" dependency has to be added to all Debian, Ubuntu, and Fedora files. Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- This commit is available in the following branch: https://gitlab.com/fidencio/libvirt-dockerfiles/tree/wip/locales Here's the libvirt-jenkins-ci counter part: https://www.redhat.com/archives/libvir-list/2019-September/msg00270.html --- buildenv-libosinfo-debian-10.zip | Bin 559 -> 567 bytes buildenv-libosinfo-debian-sid.zip | Bin 559 -> 567 bytes buildenv-libosinfo-fedora-29.zip | Bin 492 -> 502 bytes buildenv-libosinfo-fedora-30.zip | Bin 555 -> 564 bytes buildenv-libosinfo-fedora-rawhide.zip | Bin 512 -> 522 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 887 -> 892 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 880 -> 885 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 884 -> 890 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 883 -> 889 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 878 -> 885 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 892 -> 896 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 882 -> 887 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 890 -> 896 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 883 -> 888 bytes buildenv-libvirt-debian-10.zip | Bin 773 -> 778 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 896 -> 901 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 887 -> 892 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 893 -> 898 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 886 -> 892 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 898 -> 903 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 889 -> 895 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 898 -> 903 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 890 -> 895 bytes buildenv-libvirt-debian-9.zip | Bin 777 -> 782 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 886 -> 891 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 879 -> 885 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 884 -> 890 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 883 -> 889 bytes buildenv-libvirt-debian-sid-cross-mips.zip | Bin 877 -> 884 bytes buildenv-libvirt-debian-sid-cross-mips64el.zip | Bin 892 -> 896 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 882 -> 887 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 890 -> 896 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 883 -> 888 bytes buildenv-libvirt-debian-sid.zip | Bin 773 -> 778 bytes buildenv-libvirt-fedora-29.zip | Bin 694 -> 706 bytes buildenv-libvirt-fedora-30.zip | Bin 809 -> 821 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 714 -> 726 bytes buildenv-libvirt-ubuntu-16.zip | Bin 784 -> 788 bytes buildenv-libvirt-ubuntu-18.zip | Bin 783 -> 790 bytes 39 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildenv-libosinfo-debian-10.zip b/buildenv-libosinfo-debian-10.zip index 4a057eb..6413bb9 100644 Binary files a/buildenv-libosinfo-debian-10.zip and b/buildenv-libosinfo-debian-10.zip differ diff --git a/buildenv-libosinfo-debian-sid.zip b/buildenv-libosinfo-debian-sid.zip index 86cf9dd..b077868 100644 Binary files a/buildenv-libosinfo-debian-sid.zip and b/buildenv-libosinfo-debian-sid.zip differ diff --git a/buildenv-libosinfo-fedora-29.zip b/buildenv-libosinfo-fedora-29.zip index 8fac1a5..185000f 100644 Binary files a/buildenv-libosinfo-fedora-29.zip and b/buildenv-libosinfo-fedora-29.zip differ diff --git a/buildenv-libosinfo-fedora-30.zip b/buildenv-libosinfo-fedora-30.zip index 10f89e9..f3a0914 100644 Binary files a/buildenv-libosinfo-fedora-30.zip and b/buildenv-libosinfo-fedora-30.zip differ diff --git a/buildenv-libosinfo-fedora-rawhide.zip b/buildenv-libosinfo-fedora-rawhide.zip index 7cf81df..8d2d603 100644 Binary files a/buildenv-libosinfo-fedora-rawhide.zip and b/buildenv-libosinfo-fedora-rawhide.zip differ diff --git a/buildenv-libvirt-debian-10-cross-aarch64.zip b/buildenv-libvirt-debian-10-cross-aarch64.zip index 8f2dbbc..ae285b9 100644 Binary files a/buildenv-libvirt-debian-10-cross-aarch64.zip and b/buildenv-libvirt-debian-10-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-10-cross-armv6l.zip b/buildenv-libvirt-debian-10-cross-armv6l.zip index 774ff27..bb4adda 100644 Binary files a/buildenv-libvirt-debian-10-cross-armv6l.zip and b/buildenv-libvirt-debian-10-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-10-cross-armv7l.zip b/buildenv-libvirt-debian-10-cross-armv7l.zip index 893c929..7bf00e1 100644 Binary files a/buildenv-libvirt-debian-10-cross-armv7l.zip and b/buildenv-libvirt-debian-10-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-10-cross-i686.zip b/buildenv-libvirt-debian-10-cross-i686.zip index 97e88e4..2576aac 100644 Binary files a/buildenv-libvirt-debian-10-cross-i686.zip and b/buildenv-libvirt-debian-10-cross-i686.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mips.zip b/buildenv-libvirt-debian-10-cross-mips.zip index 332cb6c..ad9084a 100644 Binary files a/buildenv-libvirt-debian-10-cross-mips.zip and b/buildenv-libvirt-debian-10-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mips64el.zip b/buildenv-libvirt-debian-10-cross-mips64el.zip index 7964dca..2210700 100644 Binary files a/buildenv-libvirt-debian-10-cross-mips64el.zip and b/buildenv-libvirt-debian-10-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-10-cross-mipsel.zip b/buildenv-libvirt-debian-10-cross-mipsel.zip index a4198d6..37390da 100644 Binary files a/buildenv-libvirt-debian-10-cross-mipsel.zip and b/buildenv-libvirt-debian-10-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-10-cross-ppc64le.zip b/buildenv-libvirt-debian-10-cross-ppc64le.zip index 567f5b5..9e77173 100644 Binary files a/buildenv-libvirt-debian-10-cross-ppc64le.zip and b/buildenv-libvirt-debian-10-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-10-cross-s390x.zip b/buildenv-libvirt-debian-10-cross-s390x.zip index 42723f0..4681152 100644 Binary files a/buildenv-libvirt-debian-10-cross-s390x.zip and b/buildenv-libvirt-debian-10-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-10.zip b/buildenv-libvirt-debian-10.zip index 14634db..10e73d5 100644 Binary files a/buildenv-libvirt-debian-10.zip and b/buildenv-libvirt-debian-10.zip differ diff --git a/buildenv-libvirt-debian-9-cross-aarch64.zip b/buildenv-libvirt-debian-9-cross-aarch64.zip index 3fbf049..b7b3643 100644 Binary files a/buildenv-libvirt-debian-9-cross-aarch64.zip and b/buildenv-libvirt-debian-9-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-9-cross-armv6l.zip b/buildenv-libvirt-debian-9-cross-armv6l.zip index 0e4a55d..8e1e247 100644 Binary files a/buildenv-libvirt-debian-9-cross-armv6l.zip and b/buildenv-libvirt-debian-9-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-9-cross-armv7l.zip b/buildenv-libvirt-debian-9-cross-armv7l.zip index 6db735b..7acab06 100644 Binary files a/buildenv-libvirt-debian-9-cross-armv7l.zip and b/buildenv-libvirt-debian-9-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mips.zip b/buildenv-libvirt-debian-9-cross-mips.zip index 27b2a88..960f2dc 100644 Binary files a/buildenv-libvirt-debian-9-cross-mips.zip and b/buildenv-libvirt-debian-9-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mips64el.zip b/buildenv-libvirt-debian-9-cross-mips64el.zip index 04711c3..1d84bea 100644 Binary files a/buildenv-libvirt-debian-9-cross-mips64el.zip and b/buildenv-libvirt-debian-9-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-9-cross-mipsel.zip b/buildenv-libvirt-debian-9-cross-mipsel.zip index 0403a0b..02954f4 100644 Binary files a/buildenv-libvirt-debian-9-cross-mipsel.zip and b/buildenv-libvirt-debian-9-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-9-cross-ppc64le.zip b/buildenv-libvirt-debian-9-cross-ppc64le.zip index 2edfed1..327ee9f 100644 Binary files a/buildenv-libvirt-debian-9-cross-ppc64le.zip and b/buildenv-libvirt-debian-9-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-9-cross-s390x.zip b/buildenv-libvirt-debian-9-cross-s390x.zip index aacac06..3dd9779 100644 Binary files a/buildenv-libvirt-debian-9-cross-s390x.zip and b/buildenv-libvirt-debian-9-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-9.zip b/buildenv-libvirt-debian-9.zip index 4ef6ccf..ab00cb8 100644 Binary files a/buildenv-libvirt-debian-9.zip and b/buildenv-libvirt-debian-9.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-aarch64.zip b/buildenv-libvirt-debian-sid-cross-aarch64.zip index 0583c1b..3b2ad74 100644 Binary files a/buildenv-libvirt-debian-sid-cross-aarch64.zip and b/buildenv-libvirt-debian-sid-cross-aarch64.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-armv6l.zip b/buildenv-libvirt-debian-sid-cross-armv6l.zip index 0087dd3..b13be7e 100644 Binary files a/buildenv-libvirt-debian-sid-cross-armv6l.zip and b/buildenv-libvirt-debian-sid-cross-armv6l.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-armv7l.zip b/buildenv-libvirt-debian-sid-cross-armv7l.zip index d296967..c4262b1 100644 Binary files a/buildenv-libvirt-debian-sid-cross-armv7l.zip and b/buildenv-libvirt-debian-sid-cross-armv7l.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-i686.zip b/buildenv-libvirt-debian-sid-cross-i686.zip index 0f8bb16..0b64ca7 100644 Binary files a/buildenv-libvirt-debian-sid-cross-i686.zip and b/buildenv-libvirt-debian-sid-cross-i686.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mips.zip b/buildenv-libvirt-debian-sid-cross-mips.zip index 31912c4..02ba200 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mips.zip and b/buildenv-libvirt-debian-sid-cross-mips.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mips64el.zip b/buildenv-libvirt-debian-sid-cross-mips64el.zip index 3cbe12e..8d96e14 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mips64el.zip and b/buildenv-libvirt-debian-sid-cross-mips64el.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-mipsel.zip b/buildenv-libvirt-debian-sid-cross-mipsel.zip index 51c59db..12e5704 100644 Binary files a/buildenv-libvirt-debian-sid-cross-mipsel.zip and b/buildenv-libvirt-debian-sid-cross-mipsel.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-ppc64le.zip b/buildenv-libvirt-debian-sid-cross-ppc64le.zip index 27dccb1..ec2f772 100644 Binary files a/buildenv-libvirt-debian-sid-cross-ppc64le.zip and b/buildenv-libvirt-debian-sid-cross-ppc64le.zip differ diff --git a/buildenv-libvirt-debian-sid-cross-s390x.zip b/buildenv-libvirt-debian-sid-cross-s390x.zip index 7504d28..5b77b3a 100644 Binary files a/buildenv-libvirt-debian-sid-cross-s390x.zip and b/buildenv-libvirt-debian-sid-cross-s390x.zip differ diff --git a/buildenv-libvirt-debian-sid.zip b/buildenv-libvirt-debian-sid.zip index 874bb1b..b2ebf71 100644 Binary files a/buildenv-libvirt-debian-sid.zip and b/buildenv-libvirt-debian-sid.zip differ diff --git a/buildenv-libvirt-fedora-29.zip b/buildenv-libvirt-fedora-29.zip index 43594d4..4553498 100644 Binary files a/buildenv-libvirt-fedora-29.zip and b/buildenv-libvirt-fedora-29.zip differ diff --git a/buildenv-libvirt-fedora-30.zip b/buildenv-libvirt-fedora-30.zip index 93773cb..0ca2d35 100644 Binary files a/buildenv-libvirt-fedora-30.zip and b/buildenv-libvirt-fedora-30.zip differ diff --git a/buildenv-libvirt-fedora-rawhide.zip b/buildenv-libvirt-fedora-rawhide.zip index da6c064..dff0361 100644 Binary files a/buildenv-libvirt-fedora-rawhide.zip and b/buildenv-libvirt-fedora-rawhide.zip differ diff --git a/buildenv-libvirt-ubuntu-16.zip b/buildenv-libvirt-ubuntu-16.zip index 8cff046..94ec27a 100644 Binary files a/buildenv-libvirt-ubuntu-16.zip and b/buildenv-libvirt-ubuntu-16.zip differ diff --git a/buildenv-libvirt-ubuntu-18.zip b/buildenv-libvirt-ubuntu-18.zip index 83546be..f4a4b7b 100644 Binary files a/buildenv-libvirt-ubuntu-18.zip and b/buildenv-libvirt-ubuntu-18.zip differ -- 2.21.0

2 1

[libvirt] [PATCH] libvirtd: Fix control socket path being incorrectly build
by eater 09 Sep '19

09 Sep '19

Socket path in 5.7 would result in libvirt//var/run/libvirt-sock instead of /var/run/libvirt/libvirt-sock Signed-off-by: eater <=(a)eater.me> --- src/remote/remote_daemon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 546328b24d..5d64397062 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config, if (config->unix_sock_dir) { if (virAsprintf(sockfile, "%s/%s-sock", - SOCK_PREFIX, config->unix_sock_dir) < 0) + config->unix_sock_dir, SOCK_PREFIX) < 0) goto cleanup; if (privileged) { if (virAsprintf(rosockfile, "%s/%s-sock-ro", - SOCK_PREFIX, config->unix_sock_dir) < 0 || + config->unix_sock_dir, SOCK_PREFIX) < 0 || virAsprintf(admsockfile, "%s/%s-admin-sock", - SOCK_PREFIX, config->unix_sock_dir) < 0) + config->unix_sock_dir, SOCK_PREFIX) < 0) goto cleanup; } } else { -- 2.23.0

2 2