- Devel - libvirt List Archives

[libvirt] [PATCH] maint: Use pep8 to implement sc_prohibit_semicolon_at_eol_in_python
by Shi Lei 12 Sep '19

12 Sep '19

Now sc_prohibit_semicolon_at_eol_in_python can't handle semicolon within multiline strings(comments) properly. I suggest that we could use pep8 to check python code style error, such as 'statement ends with a semicolon'. In future, we could use '--select' to introduce other rules. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- cfg.mk | 6 ++---- configure.ac | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cfg.mk b/cfg.mk index 42e1abf0..c8eaf74e 100644 --- a/cfg.mk +++ b/cfg.mk @@ -813,10 +813,8 @@ sc_require_enum_last_marker: # In Python files we don't want to end lines with a semicolon like in C sc_prohibit_semicolon_at_eol_in_python: - @prohibit='^[^#].*\;$$' \ - in_vc_files='\.py$$' \ - halt='python does not require to end lines with a semicolon' \ - $(_sc_search_regexp) + @$(VC_LIST_EXCEPT) | $(GREP) '\.py$$' | xargs $(PEP8) --select E703 \ + | $(GREP) . && { exit 1; } || : # mymain() in test files should use return, not exit, for nicer output sc_prohibit_exit_in_tests: diff --git a/configure.ac b/configure.ac index bf9e7681..37fa9924 100644 --- a/configure.ac +++ b/configure.ac @@ -704,6 +704,10 @@ AC_PATH_PROGS([PYTHON], [python3 python2 python]) if test -z "$PYTHON"; then AC_MSG_ERROR(['python3', 'python2' or 'python' binary is required to build libvirt]) fi +AC_PATH_PROG([PEP8], [pep8]) +if test -z "$PEP8"; then + AC_MSG_ERROR(['pep8' binary is required to check python code style]) +fi AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then AC_MSG_ERROR(['perl' binary is required to build libvirt]) -- 2.17.1

5 7

[libvirt] [PATCH] conf: correctly convert 'managed' attribute from network port
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

The virNetworkPortDef config stores the 'managed' attribute as the virTristate type. The virDomainDef config stores the 'managed' attribute as the bool type. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3dc638f0de..ae196cac52 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30688,7 +30688,15 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDefPtr iface, actual->data.hostdev.def.parentnet = iface; actual->data.hostdev.def.info = &iface->info; actual->data.hostdev.def.mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; - actual->data.hostdev.def.managed = port->plug.hostdevpci.managed; + switch (port->plug.hostdevpci.managed) { + case VIR_TRISTATE_BOOL_YES: + actual->data.hostdev.def.managed = true; + break; + case VIR_TRISTATE_BOOL_ABSENT: + case VIR_TRISTATE_BOOL_NO: + actual->data.hostdev.def.managed = false; + break; + } actual->data.hostdev.def.source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI; actual->data.hostdev.def.source.subsys.u.pci.addr = port->plug.hostdevpci.addr; switch ((virNetworkForwardDriverNameType)port->plug.hostdevpci.driver) { @@ -30820,7 +30828,10 @@ virDomainNetDefActualToNetworkPort(virDomainDefPtr dom, iface->ifname); goto error; } - port->plug.hostdevpci.managed = actual->data.hostdev.def.managed; + if (actual->data.hostdev.def.managed) + port->plug.hostdevpci.managed = VIR_TRISTATE_BOOL_YES; + else + port->plug.hostdevpci.managed = VIR_TRISTATE_BOOL_NO; port->plug.hostdevpci.addr = actual->data.hostdev.def.source.subsys.u.pci.addr; switch ((virDomainHostdevSubsysPCIBackendType)actual->data.hostdev.def.source.subsys.u.pci.backend) { case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: -- 2.21.0

2 1

[libvirt] [PATCH python] sanitytest: whitelist 'network' method as having no C impl
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix for the previous patch. sanitytest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sanitytest.py b/sanitytest.py index e87b57d..0b415fd 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -357,7 +357,7 @@ for klass in gotfunctions: for func in sorted(gotfunctions[klass]): # These are pure python methods with no C APi if func in ["connect", "getConnect", "domain", "getDomain", - "virEventInvokeFreeCallback", + "virEventInvokeFreeCallback", "network", "sparseRecvAll", "sparseSendAll"]: continue -- 2.21.0

1 0

[libvirt] [PATCH v2 0/4] util: abort when out of memory
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

This is the first part of a previously posted series: https://www.redhat.com/archives/libvir-list/2019-August/msg01374.html I've temporarily split the addition of glib into a separate branch until we get clarity on guarantees around g_malloc() and mallc() using the same allocator. I published a docs update https://gitlab.gnome.org/GNOME/glib/merge_requests/1099/ to attempt to get confirmation from glib maintainers on this matter. Changed in v2: - Keep ATTRIBUTE_RETURN_CHECK annotations. We're aborting on OOM, but don't want to update all callers to drop return value checks yet - Update docs for virAsprintfQuiet too Daniel P. Berrangé (4): util: purge all code for testing OOM handling util: make allocation functions abort on OOM util: remove several unused _QUIET allocation macro variants util: make string functions abort on OOM configure.ac | 17 -- docs/docs.html.in | 3 - docs/internals/oomtesting.html.in | 213 -------------------- src/libvirt_private.syms | 4 - src/util/viralloc.c | 314 +++++------------------------- src/util/viralloc.h | 192 ++++-------------- src/util/virstring.c | 93 +++------ src/util/virstring.h | 73 +++---- tests/Makefile.am | 1 - tests/oomtrace.pl | 41 ---- tests/qemuxml2argvtest.c | 12 +- tests/testutils.c | 189 +----------------- tests/testutils.h | 2 - tests/virfirewalltest.c | 12 -- 14 files changed, 136 insertions(+), 1030 deletions(-) delete mode 100644 docs/internals/oomtesting.html.in delete mode 100755 tests/oomtrace.pl -- 2.21.0

2 8

[libvirt] [PATCH] fix memleak in virNodeDeviceGetPCISRIOVCaps
by Yi Wang 12 Sep '19

12 Sep '19

From: Jiang Kun <jiang.kun2(a)zte.com.cn> it always alloc new memory when get dumpxml of pf device,but never free it. Now free the old first,then alloc new memory. Signed-off-by: Jiang kun <jiang.kun2(a)zte.com.cn> --- src/conf/node_device_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index e51371d..618ce8e 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2509,6 +2509,7 @@ virNodeDeviceGetPCISRIOVCaps(const char *sysfsPath, for (i = 0; i < pci_dev->num_virtual_functions; i++) VIR_FREE(pci_dev->virtual_functions[i]); VIR_FREE(pci_dev->virtual_functions); + VIR_FREE(pci_dev->physical_function); pci_dev->num_virtual_functions = 0; pci_dev->max_virtual_functions = 0; pci_dev->flags &= ~VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION; -- 1.8.3.1

2 1

[libvirt] [python PATCH] generator: fix constructor for virNetworkPort
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

The virNetworkPort class is passed both the virNetwork parent python class and the virNetworkPort C object. This needs special handling in the generator, similar to how virDomainSnapshots are dealt with. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- generator.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/generator.py b/generator.py index 0b0a5a7..433c1f2 100755 --- a/generator.py +++ b/generator.py @@ -1083,6 +1083,10 @@ class_domain_impl = { "virDomainSnapshot": True, } +class_network_impl = { + "virNetworkPort": True, +} + functions_noexcept = { 'virDomainGetID': True, 'virDomainGetName': True, @@ -1551,6 +1555,8 @@ def buildWrappers(module): classes.write(" def __init__(self, conn, _obj=None):\n") elif classname in [ "virDomainCheckpoint", "virDomainSnapshot" ]: classes.write(" def __init__(self, dom, _obj=None):\n") + elif classname in [ "virNetworkPort" ]: + classes.write(" def __init__(self, net, _obj=None):\n") else: classes.write(" def __init__(self, _obj=None):\n") if classname in [ "virDomain", "virNetwork", "virInterface", @@ -1564,6 +1570,9 @@ def buildWrappers(module): elif classname in [ "virDomainCheckpoint", "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") + elif classname in [ "virNetworkPort" ]: + classes.write(" self._net = net\n") + classes.write(" self._conn = net.connect()\n") classes.write(" if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n") classes.write(" raise Exception(\"Expected a wrapped C Object but got %s\" % type(_obj))\n") classes.write(" self._o = _obj\n\n") @@ -1585,6 +1594,10 @@ def buildWrappers(module): classes.write(" def domain(self):\n") classes.write(" return self._dom\n\n") + if classname in class_network_impl: + classes.write(" def network(self):\n") + classes.write(" return self._net\n\n") + classes.write(" def c_pointer(self):\n") classes.write(" \"\"\"Get C pointer to underlying object\"\"\"\n") classes.write(" return libvirtmod.%s_pointer(self._o)\n\n" % -- 2.21.0

2 1

[libvirt] [PATCH] tools: add virsh docs for network port commands
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tools/virsh.pod | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tools/virsh.pod b/tools/virsh.pod index 59fb4bfc2e..cf2798e71a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3780,6 +3780,42 @@ specified. =back +=head1 NETWORK PORT COMMANDS + +The following commands manipulate network ports. Libvirt virtual networks +have ports created when a virtual machine has a virtual network interface +added. In general there should be no need to use any of the commands +here, since the hypervisor drivers run these commands are the right +point in a virtual machine's lifecycle. They can be useful for debugging +problems and / or recovering from bugs / stale state. + +=over 4 + +=item B<net-port-list> { [I<--table>] | I<--uuid> } + I<network> + +List all network ports recorded against the network. + +If I<--uuid> is specified network ports' UUID's are printed +instead of a table. Flag I<--table> specifies that the legacy +table-formatted output should be used. This is the default. +All of these are mutually exclusive. + +=item B<net-port-create> I<network> I<file> + +Allocate a new network port reserving resources based on the +port description. + +=item B<net-port-dumpxml> I<network> I<port> + +Output the network port information as an XML dump to stdout. + +=item B<net-port-delete> I<network> I<port> + +Delete record of the network port and release its resources + +=back + =head1 INTERFACE COMMANDS The following commands manipulate host interfaces. Often, these host -- 2.21.0

2 1

[libvirt] [PATCH] tools: fix XML validator detection of network port XML schema
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tools/virt-xml-validate.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 5cb7dcd276..249bcf7eef 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -80,6 +80,9 @@ if [ -z "$TYPE" ]; then *domain*) TYPE="domain" ;; + *networkport*) + TYPE="networkport" + ;; *network*) TYPE="network" ;; -- 2.21.0

2 1

[libvirt] [PATCH] conf: avoid looking up network port that doesn't exist
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

If the hypervisor driver has not yet created the network port, the portid field will be "00000000-0000-0000-0000-000000000000". If a failure occurs during early VM startup, the hypervisor driver may none the less try to release the network port, resulting in an undesirable warning: 2019-09-12 13:17:42.349+0000: 16544: error : virNetworkObjLookupPort:1679 : network port not found: Network port with UUID 00000000-0000-0000-0000-000000000000 does not exist By checking if the portid UUID is valid, we can avoid polluting the logs in this way. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3dc638f0de..b1f8a13319 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -30994,6 +30994,12 @@ virDomainNetReleaseActualDevice(virConnectPtr conn, virNetworkPortPtr port = NULL; int ret = -1; + /* Port might not exist if a failure occurred during VM startup */ + if (!virUUIDIsValid(iface->data.network.portid)) { + ret = 0; + goto cleanup; + } + if (!(net = virNetworkLookupByName(conn, iface->data.network.name))) goto cleanup; -- 2.21.0

2 1

[libvirt] [PATCH 0/7] util: abort when out of memory
by Daniel P. Berrangé 12 Sep '19

12 Sep '19

See this previous thread: https://www.redhat.com/archives/libvir-list/2019-May/msg00273.html The executive summary is that catching & reporting ENOMEM is not worth the maint cost because: - this code will almost never run on Linux hosts - if it does run it will likely have bad behaviour silently dropping data or crashing the process - apps using libvirt often do so via a non-C language that aborts/exits the app on OOM regardless, or use other C libraries that abort - we can build a system that is more reliable when OOM happens by not catching OOM, instead simply letting apps exit, restart and carry on where they left off The first part of the series does the bare minimum to cull OOM handling. With this done, the main reason why we never adopted glib is now removed. Thus the second part of this series introduces use of glib into libvirt and converts our our allocation APIs to use the glib allocation APIs internally. In future I'd especially like to use glib to replace virObject code, which I knowingly wrote as a somewhat pathetic clone of GObject. Eliminating all our DBus code is also another thing I'd like, since Glib's DBus client code is better IMHO. Note that none of the callers are updated at this point, so they are all still attempting to handle errors from VIR_ALLOC, VIR_STRDUP, etc. If we convert VIR_ALLOC calls to remove return value checks, and then later convert to glib's g_new0 API, we go through two lots of churn which I think is undesirable. Thus I think it is highly desirable to introduce glib straight away and do a single conversion step. It also means we can introduce other data structures from glib to replace ours and avoid wasting time converting those too. Overall the code in this series is all quite simple and a nice cleanup. 50% of the lines culled come from the first patch removing OOM testing, the other 50% come from viralloc.c impl simplification The interesting question is the impact is has on downstreams who have to backport patches to older versions. If we start converting callers to g_new0, etc, then downstream have to either * Change g_new0 back into VIR_ALLOC and likely re-add many goto calls we purged Or * Backport all the patches in this series that drop OOM handling and introduce glib usage If we start adopting other glib features beyond g_new0, then downstreams are pretty much forced into option 2. Given the benefit I think we'll see from this series in our codebase, I'm inclined to say we should prioritize the future, over prioritizing the past (backports), and thus freely adopt use of glib APIs rightaway. IOW, I think we should expect vendors to backport this series as a starting point, before any other patches. I've not tested but I'm hopeful that such a backport of this series is fairly easy. The viralloc.{c,h} file hasn't seen much change in recent times so ought to be a clean cherry-pick. The glib additions might hit some conflicts in makefiles, but not too terrible I hope. Probably worth doing a test to see just how easy backports are over the past 1 year of releases. Daniel P. Berrangé (7): util: purge all code for testing OOM handling util: make allocation functions abort on OOM util: remove several unused _QUIET allocation macro variants util: make string functions abort on OOM build: probe for glib-2 library in configure build: link to glib library util: use glib allocation functions configure.ac | 19 +- docs/docs.html.in | 3 - docs/internals/oomtesting.html.in | 213 -------------------- libvirt.spec.in | 1 + m4/virt-glib.m4 | 30 +++ mingw-libvirt.spec.in | 2 + src/Makefile.am | 2 + src/internal.h | 1 + src/libvirt_private.syms | 4 - src/lxc/Makefile.inc.am | 2 + src/remote/Makefile.inc.am | 1 + src/util/Makefile.inc.am | 1 + src/util/viralloc.c | 313 ++++-------------------------- src/util/viralloc.h | 204 ++++--------------- src/util/virstring.c | 93 +++------ src/util/virstring.h | 79 +++----- tests/Makefile.am | 4 +- tests/oomtrace.pl | 41 ---- tests/qemuxml2argvtest.c | 12 +- tests/testutils.c | 189 +----------------- tests/testutils.h | 2 - tests/virfirewalltest.c | 12 -- tools/Makefile.am | 1 + 23 files changed, 179 insertions(+), 1050 deletions(-) delete mode 100644 docs/internals/oomtesting.html.in create mode 100644 m4/virt-glib.m4 delete mode 100755 tests/oomtrace.pl -- 2.21.0

4 21

[libvirt] [dockerfiles PATCH] Add 'trigger' and 'monitor' scripts
by Andrea Bolognani 12 Sep '19

12 Sep '19

These are extremely crude scripts that are nonetheless useful when it's time to rebuild all images. Usage is along these lines: $ ls libvirt-debian-10* >in $ ./trigger in out $ ./monitor out 3 Error handling is almost non-existent, but realistically speaking at most three people will ever run these scripts anyway :) Quay has limits on both the number of jobs that can be running at the same time and the rate of job submission: rebuilding containers in batches, eg. all Debian 10 containers, followed by all Debian 9 containers, and so on, allows us to remain within those limits. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- monitor | 40 ++++++++++++++++++++++++++++++++++++++++ trigger | 23 +++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100755 monitor create mode 100755 trigger diff --git a/monitor b/monitor new file mode 100755 index 0000000..fd27140 --- /dev/null +++ b/monitor @@ -0,0 +1,40 @@ +#!/bin/sh + +QUAYADMIN="../libvirt-jenkins-ci/guests/quayadmin" + +usage() { + echo "Usage: monitor INFILE INTERVAL" >&2 + exit 1 +} + +infile="$1" +interval="$2" + +test "$infile" || usage +test "$interval" || usage + +while true; do + reset + output=no + + while read _ build _ _ _ repository; do + repository="${repository#*/}" + + out=$("$QUAYADMIN" show-build libvirt "$repository" "$build") + phase=$(echo "$out" | grep phase: | sed -E 's/.*: //g') + + if test "$phase" = "complete"; then + continue + fi + + echo "libvirt/$repository: $phase" + output=yes + + done <"$infile" + + if test "$output" == "no"; then + break + fi + + sleep "$interval" +done diff --git a/trigger b/trigger new file mode 100755 index 0000000..d2e853d --- /dev/null +++ b/trigger @@ -0,0 +1,23 @@ +#!/bin/sh + +QUAYADMIN="../libvirt-jenkins-ci/guests/quayadmin" + +usage() { + echo "Usage: trigger INFILE OUTFILE" >&2 + exit 1 +} + +infile="$1" +outfile="$2" + +test "$infile" || usage +test "$outfile" || usage + +while read zip +do + repository="${zip%.zip}" + url="https://github.com/libvirt/libvirt-dockerfiles/raw/master/$zip" + + "$QUAYADMIN" create-build libvirt "$repository" "$url" + +done <"$infile" | tee "$outfile" -- 2.21.0

2 2

[libvirt] [PATCH v2 00/10] Adding resolution properties for video models
by jcfaracco＠gmail.com 11 Sep '19

11 Sep '19

From: Julio Faracco <jcfaracco(a)gmail.com> This serie adds 'xres' and 'yres' QEMU display properties into a new element called 'resolution'. This element is covered by model element: <model type='foo'> <resolution x='800' y='600'/> </model> Only types VGA, QXL, Virtio and Bochs support passing resolution to driver. That's why some test cases were added too. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1485793 Julio Faracco (10): docs: Adding 'xres' and 'yres' into qxl XML definition qemu: Include {xres,yres} QEMU capabilities for video models conf: Adding resolution property for model element qemu: Include {xres,yres} for QEMU command line tests: Include {xres,yres} QEMU capabilities into tests tests: Include bochs-display as capability test too tests: Introduce resolution test for QXL model tests: Introduce resolution test for Virtio model tests: Introduce resolution test for Bochs model tests: Introduce resolution test for VGA model docs/schemas/domaincommon.rng | 10 ++ src/conf/domain_conf.c | 75 +++++++- src/conf/domain_conf.h | 5 + src/conf/virconftypes.h | 3 + src/qemu/qemu_capabilities.c | 16 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 20 +++ .../caps_2.10.0.aarch64.xml | 2 + .../caps_2.10.0.ppc64.xml | 2 + .../caps_2.10.0.s390x.xml | 2 + .../caps_2.10.0.x86_64.xml | 2 + .../caps_2.11.0.s390x.xml | 2 + .../caps_2.11.0.x86_64.xml | 2 + .../caps_2.12.0.aarch64.xml | 2 + .../caps_2.12.0.ppc64.xml | 2 + .../caps_2.12.0.s390x.xml | 2 + .../caps_2.12.0.x86_64.xml | 2 + .../caps_3.0.0.ppc64.replies | 139 +++++++++++---- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 + .../caps_3.0.0.riscv32.xml | 2 + .../caps_3.0.0.riscv64.xml | 2 + .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 2 + .../caps_3.0.0.x86_64.replies | 167 +++++++++++++----- .../caps_3.0.0.x86_64.xml | 2 + .../caps_3.1.0.ppc64.replies | 139 +++++++++++---- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 2 + .../caps_3.1.0.x86_64.replies | 167 +++++++++++++----- .../caps_3.1.0.x86_64.xml | 2 + .../caps_4.0.0.aarch64.replies | 139 +++++++++++---- .../caps_4.0.0.aarch64.xml | 2 + .../caps_4.0.0.ppc64.replies | 139 +++++++++++---- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 2 + .../caps_4.0.0.riscv32.replies | 131 +++++++++++--- .../caps_4.0.0.riscv32.xml | 2 + .../caps_4.0.0.riscv64.replies | 131 +++++++++++--- .../caps_4.0.0.riscv64.xml | 2 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2 + .../caps_4.0.0.x86_64.replies | 167 +++++++++++++----- .../caps_4.0.0.x86_64.xml | 2 + .../caps_4.1.0.x86_64.replies | 159 ++++++++++++----- .../caps_4.1.0.x86_64.xml | 2 + ...ochs-display-resolution.x86_64-latest.args | 35 ++++ .../video-bochs-display-resolution.xml | 33 ++++ .../video-qxl-resolution.x86_64-latest.args | 35 ++++ .../qemuxml2argvdata/video-qxl-resolution.xml | 33 ++++ ...o-virtio-gpu-resolution.x86_64-latest.args | 35 ++++ .../video-virtio-gpu-resolution.xml | 33 ++++ tests/qemuxml2argvtest.c | 4 + ...bochs-display-resolution.x86_64-latest.xml | 33 ++++ .../video-qxl-resolution.x86_64-latest.xml | 33 ++++ ...eo-virtio-gpu-resolution.x86_64-latest.xml | 33 ++++ tests/qemuxml2xmltest.c | 5 + 52 files changed, 1604 insertions(+), 365 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-bochs-display-resolution.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-bochs-display-resolution.xml create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-resolution.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-resolution.xml create mode 100644 tests/qemuxml2xmloutdata/video-bochs-display-resolution.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/video-qxl-resolution.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-resolution.x86_64-latest.xml -- 2.20.1

3 13

[libvirt] [PATCH 1/2] libxl: add acpi slic table support
by Marek Marczykowski-Górecki 11 Sep '19

11 Sep '19

From: Ivan Kardykov <kardykov(a)tabit.pro> Libxl driver did not support setup additional acpi firmware to xen guest. It is necessary to activate OEM Windows installs. This patch allow to define in OS section acpi table param (which supported domain common schema). Signed-off-by: Ivan Kardykov <kardykov(a)tabit.pro> [added info to docs/formatdomain.html.in] Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- docs/formatdomain.html.in | 3 ++- src/libxl/libxl_conf.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index fcb7c59c00..de612ae870 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -363,7 +363,8 @@ <dd>The <code>table</code> element contains a fully-qualified path to the ACPI table. The <code>type</code> attribute contains the ACPI table type (currently only <code>slic</code> is supported) - <span class="since">Since 1.3.5 (QEMU only)</span></dd> + <span class="since">Since 1.3.5 (QEM)</span> + <span class="since">Since 5.8.0 (Xen)</span></dd> </dl> <h4><a id="elementsOSContainer">Container boot</a></h4> diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 766a726ebc..c1e248d98c 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -506,6 +506,11 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, def->features[VIR_DOMAIN_FEATURE_ACPI] == VIR_TRISTATE_SWITCH_ON); + /* copy SLIC table path to acpi_firmware */ + if (def->os.slic_table && + VIR_STRDUP(b_info->u.hvm.acpi_firmware, def->os.slic_table) < 0) + return -1; + if (def->nsounds > 0) { /* * Use first sound device. man xl.cfg(5) describes soundhw as -- 2.21.0

2 8

[libvirt] [PATCH v1] docs: Expand the "BIOS bootloader" documentation for domainCaps
by Kashyap Chamarthy 11 Sep '19

11 Sep '19

Rewrite some parts for clarity, elaborate the meaning of some of the XML attributes. And where necessary, distinguish that we're dealing with two different XML documents here: - the domainCapabilities XML, to detect the host "hypervisor" (QEMU/KVM) capabilities, and what libvirt knows about them. - the guest XML definition, i.e. what features a guest can use, based on the capabilities (of QEMU and libvirt and the host) reported in the domainCapabilities XML. Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- docs/formatdomaincaps.html.in | 53 ++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in index bc99d378567a553afe682bc522e7a753b2d805fc..a8d970934df2c0ce8c41eb4958c94fbdf96ef8e0 100644 --- a/docs/formatdomaincaps.html.in +++ b/docs/formatdomaincaps.html.in @@ -127,7 +127,7 @@ <value>/usr/share/OVMF/OVMF_CODE.fd</value> <enum name='type'> <value>rom</value> - <value>pflash</value> + <value>pflapsh</value> </enum> <enum name='readonly'> <value>yes</value> @@ -143,38 +143,53 @@ <domainCapabilities> </pre> - <p>The <code>firmware</code> enum corresponds to - <code>firmware</code> attribute of the <code>os</code> element. - Plain presence of this enum means that libvirt is capable of so - called firmware auto selection. The listed values then represent - accepted values for the domain attribute. Only values for which - there exists a firmware descriptor that matches machine type and - architecture are listed, i.e. those which won't cause a failure - on domain startup. + <p>The <code>firmware</code> enum corresponds to the + <code>firmware</code> attribute of the <code>os</code> element in + the domain XML. The presence of this enum means libvirt is capable + of the so-called firmware auto-selection feature. And the listed + firmware values represent the accepted input in the domain + XML. Note that the <code>firmware</code> enum reports only those + values for which a firmware "descriptor file" exists on the host + -- a small JSON document that describes details about a given UEFI + binary on the host, e.g. the fimware binary path, its + architecture, supported machine type, NVRAM template, etc. This + ensures that the reported values won't cause a failure on guest + boot. (The firmware "descriptor files" are typically shipped + Linux distribution as part of the firmware package, + e.g. EDK2/OVMF.) </p> <p>For the <code>loader</code> element, the following can occur:</p> <dl> <dt><code>value</code></dt> - <dd>List of known loader paths. Currently this is only used - to advertise known locations of OVMF binaries for qemu. Binaries - will only be listed if they actually exist on disk.</dd> + <dd>List of known firmware binary paths. Currently this is used + only to advertise the known location of OVMF binaries for + QEMU. OVMF binaries will only be listed if they actually exist on + host.</dd> <dt><code>type</code></dt> - <dd>Whether loader is a typical BIOS (<code>rom</code>) or - an UEFI binary (<code>pflash</code>). This refers to - <code>type</code> attribute of the <loader/> - element.</dd> + <dd>Whether the boot loader is a typical BIOS (<code>rom</code>) + or a UEFI firmware (<code>pflash</code>). Each <code>value</code> + sub-element under the <code>type</code> enum represents a possible + value for the <code>type</code> attribute for the <loader/> + element in the domain XML. E.g. the presence + of <code>pfalsh</code> under the <code>type</code> enum means that + a domain XML can use UEFI firmware via: <loader/> + type="pflash" ...>/path/to/the/firmware/binary/</loader>. + </dd> <dt><code>readonly</code></dt> <dd>Options for the <code>readonly</code> attribute of the - <loader/> element.</dd> + <loader/> element in the domain XML.</dd> <dt><code>secure</code></dt> <dd>Options for the <code>secure</code> attribute of the - <loader/> element. Note, that <code>yes</code> is listed - only if there is a firmware that supports it.</dd> + <loader/> element in the domain XML. Note that the + value <code>yes</code> is listed only if libvirt detects a + firmware descriptor file that has path to an OVMF binary that + supports Secure boot, and lists its architecture and supported + machine type.</dd> </dl> <h3><a id="elementsCPU">CPU configuration</a></h3> -- 2.21.0

2 3

[libvirt] [PATCH] libvirt.spec.in: Add the Secure Boot-variant OVMF binaries
by Kashyap Chamarthy 11 Sep '19

11 Sep '19

Currently the RPM spec doesn't add the 'secboot'-variant OVMF binaries (an unintentional omission, checking with Cole on #virt, OFTC) for 'x86_64' and 'ia32'. Add them. This way, getDomainCapabilities() will report all the OVMF binaries that are present on the system. E.g. on Fedora 29, if you only have the edk2-ovmf-20190308stable-1.fc29.noarch package installed, then running `virsh domcapabilities` will enumerate _both_ the OVMF binaries (instead of just the OVMF_CODE.fd): $> virsh getdomcapabilities ... <loader supported='yes'> <value>/usr/share/edk2/ovmf/OVMF_CODE.fd</value> <value>/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd</value> ... ( Learnt this from a discussion with Michal Privoznik in this bug, comment#2: https://bugzilla.redhat.com/show_bug.cgi?id=1733940 -- RFE: Report firmware (FW) paths in domainCapabilities based on FW descriptor files ) Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- I only did a cursory check on if I missed to add any other valid paths for other architectures. --- libvirt.spec.in | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b13b863928..99950495a7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1135,10 +1135,17 @@ exit 1 # Nightly edk2.git-arm LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw" - # Fedora edk2-ovmf + # Fedora edk2-ovmf, x86_64 LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" + # Fedora edk2-ovmf, x86_64, with Secure Boot + LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd" # Fedora edk2-ovmf-ia32 LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" + # Fedora edk2-ovmf-ia32, with Secure Boot. (NB: Unlike x86_64, for + # 'ia32', there is no secboot-variant "VARS" file (NVRAM template). + # So the NVRAM template for 'ovmf-ia32/OVMF_CODE.secboot.fd' is the + # same as the one for the non-secboot variant.) + LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" # Fedora edk2-aarch64 LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" # Fedora edk2-arm -- 2.20.1

3 2

[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

[libvirt] [PATCH v2] util: Set backing file name for LOOP_GET_STATUS64 queries.
by jcfaracco＠gmail.com 06 Sep '19

06 Sep '19

From: Julio Faracco <jcfaracco(a)gmail.com> This is an issue for LXC loop devices when you are trying to get loop devices info using `ioctl`. Modern apps uses `/sys/dev/block` to grab information about devices, but if you use the method mention you won't be able to retrive the associated file with that loop device. See example below from cryptsetup sources: static char *_ioctl_backing_file(const char *loop) { struct loop_info64 lo64 = {0}; int loop_fd; loop_fd = open(loop, O_RDONLY); if (loop_fd < 0) return NULL; if (ioctl(loop_fd, LOOP_GET_STATUS64, &lo64) < 0) { close(loop_fd); return NULL; } lo64.lo_file_name[LO_NAME_SIZE-2] = '*'; lo64.lo_file_name[LO_NAME_SIZE-1] = 0; close(loop_fd); return strdup((char*)lo64.lo_file_name); } It will return an empty string because lo_file_name was not set. Function `virFileLoopDeviceOpenSearch()` is using `ioctl` to query data, but it is not checking `lo_file_name` field. v1: I accidentally committed two wrong lines. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virfile.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index 81a3c096eb..dbfe74e24f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -781,6 +781,14 @@ int virFileLoopDeviceAssociate(const char *file, memset(&lo, 0, sizeof(lo)); lo.lo_flags = LO_FLAGS_AUTOCLEAR; + /* Set backing file name for LOOP_GET_STATUS64 queries */ + if (virStrncpy((char *) lo.lo_file_name, file, + strlen(file), LO_NAME_SIZE) < 0) { + virReportSystemError(errno, + _("Unable to set backing file %s"), file); + goto cleanup; + } + if ((fsfd = open(file, O_RDWR)) < 0) { virReportSystemError(errno, _("Unable to open %s"), file); -- 2.20.1

3 2

[libvirt] [PATCH] libxl: Fix libxlDomainPMSuspendForDuration domain active check
by Marek Marczykowski-Górecki 06 Sep '19

06 Sep '19

virDomainObjCheckActive() returns -1 if domain is not active, not 0. Fixes cb50436c6f "libxl: implement virDomainPM* functions" Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/libxl/libxl_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d0396e4781..215471fa0d 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1459,7 +1459,7 @@ libxlDomainPMSuspendForDuration(virDomainPtr dom, if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) goto cleanup; - if (!virDomainObjCheckActive(vm)) + if (virDomainObjCheckActive(vm) < 0) goto endjob; /* Unlock virDomainObjPtr to not deadlock with even handler, which will try -- 2.21.0

2 1

[libvirt] [PATCH v2 00/23] Use a slirp helper process
by marcandre.lureau＠redhat.com 06 Sep '19

06 Sep '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Hi, SLIRP networking can be running in a separate process. This allows for stricter security policies for QEMU & SLIRP, as SLIRP is notoriously not very safe (discussed on ML, various CVEs, and even the code says so explicitly in the comments), yet people rely on it for various reasons. With this series, for a network interface "user", libvirt will: - check the slirp-helper presence and capabilites (see [1]) - setup a socket pair between qemu and the helper - use -net socket - setup migration thanks to dbus-vmstate There are no changes required to domain configuration to benefit it. "guestfwd" isn't supported at this point, but it is known to be in a broken state with libvirt+qemu anyway. The dbus-vmstate is being proposed to QEMU. The libslirp-rs slirp-helper hasn't yet received a release. The current DBus p2p mode works ok, but is a hack. This is due to poor DBus support in Rust, and also relatively poor DBus p2p mode support in libdbus. fwiw, I have been working on an alternative rust-only implementation of a slirp-helper that will also follow [1], but I am now wondering if netstack or vpnkit could do the job. [1] https://gitlab.freedesktop.org/slirp/libslirp-rs/blob/master/src/bin/README… Marc-André Lureau (23): Add .editorconfig tests: fix xml2xml tpm-emulator.xml test dbus: correctly build reply message qemu: replace logCtxt with qemuDomainLogAppendMessage() qemu: add socket datagram capability qemu: add dbus-vmstate capability qemu: reset VM id after external devices stop qemu-security: add qemuSecurityCommandRun() qemu: add dbus-vmstate domain-conf: add network def private data qemu: add qemuDomainNetworkPrivate qemu-conf: add configurable slirp-helper location qemu-conf: add slirp state dir qemu: add slirp helper unit qemu-domain: save and restore slirp state qemu: add a flag to the cookie to prevent slirp-helper setup qemu-migration: prevent migration if dbus-vmstate is required qemu-migration: prevent migration if slirp cannot be migrated qemu-extdevice: prepare, start and stop slirp-helper qemu-command: use -net socket,fd= with slirp-helper qemu-process: prepare slirp-helper qemu-hotplug: handle hotplugging of slirp-helper tests: add slirp-helper qemuxml2argv test .editorconfig | 21 + m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 21 +- src/conf/domain_conf.h | 6 + src/qemu/Makefile.inc.am | 4 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 3 + src/qemu/qemu_alias.c | 17 + src/qemu/qemu_alias.h | 3 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 118 ++++- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 11 +- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_dbus.c | 94 ++++ src/qemu/qemu_dbus.h | 42 ++ src/qemu/qemu_domain.c | 220 ++++++++- src/qemu/qemu_domain.h | 20 + src/qemu/qemu_driver.c | 8 + src/qemu/qemu_extdevice.c | 82 ++-- src/qemu/qemu_extdevice.h | 10 +- src/qemu/qemu_hotplug.c | 112 ++++- src/qemu/qemu_hotplug.h | 11 + src/qemu/qemu_interface.c | 27 ++ src/qemu/qemu_interface.h | 4 + src/qemu/qemu_migration.c | 19 + src/qemu/qemu_monitor.c | 13 +- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_process.c | 24 +- src/qemu/qemu_security.c | 22 + src/qemu/qemu_security.h | 6 + src/qemu/qemu_slirp.c | 448 ++++++++++++++++++ src/qemu/qemu_slirp.h | 81 ++++ src/qemu/qemu_tpm.c | 4 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virdbus.c | 18 +- src/util/virdbus.h | 6 +- .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../caps_4.0.0.riscv32.xml | 1 + .../caps_4.0.0.riscv64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../net-user.x86_64-4.0.0.args | 34 ++ tests/qemuxml2argvdata/tpm-emulator.xml | 2 +- tests/qemuxml2argvtest.c | 16 + tests/testutilsqemu.h | 1 + tests/virfirewalltest.c | 9 +- tests/virpolkittest.c | 3 +- 51 files changed, 1498 insertions(+), 77 deletions(-) create mode 100644 .editorconfig create mode 100644 src/qemu/qemu_dbus.c create mode 100644 src/qemu/qemu_dbus.h create mode 100644 src/qemu/qemu_slirp.c create mode 100644 src/qemu/qemu_slirp.h create mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args -- 2.23.0.rc1

3 48

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

06 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..90ac611 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -431,6 +431,12 @@ mappings: rpm: libxslt-devel cross-policy-deb: foreign + locales: + CentOS: 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

1 1

[libvirt] [PATCH 0/2] test_driver: implement PM suspend/wakeup APIs
by Ilias Stamatis 06 Sep '19

06 Sep '19

Ilias Stamatis (2): test_driver: implement virDomainPMSuspendForDuration test_driver: implement virDomainPMWakeup src/test/test_driver.c | 116 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) -- 2.22.0

2 6

[libvirt] [PATCH] qemu: qapi: Limit traversal depth for QAPI schema queries
by Peter Krempa 06 Sep '19

06 Sep '19

Implicitly the query depth is limited by the length of the QAPI schema query, but 'alternate' and 'array' QAPI meta-types don't consume a part of the query string thus a loop on such types would get our traversal code stuck in an infinite loop. Prevent this from happening by limiting the nesting depth to 1000. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_qapi.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 0226d6c659..93fcae0d44 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -74,9 +74,23 @@ struct virQEMUQAPISchemaTraverseContext { virHashTablePtr schema; char **queries; virJSONValuePtr returnType; + size_t depth; }; +static int +virQEMUQAPISchemaTraverseContextValidateDepth(struct virQEMUQAPISchemaTraverseContext *ctxt) +{ + if (ctxt->depth++ > 1000) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("possible loop in QMP schema")); + return -1; + } + + return 0; +} + + static void virQEMUQAPISchemaTraverseContextInit(struct virQEMUQAPISchemaTraverseContext *ctxt, char **queries, @@ -329,6 +343,9 @@ virQEMUQAPISchemaTraverse(const char *baseName, const char *metatype; size_t i; + if (virQEMUQAPISchemaTraverseContextValidateDepth(ctxt) < 0) + return -2; + if (!(cur = virHashLookup(ctxt->schema, baseName))) return -2; -- 2.21.0

2 3

[libvirt] [PATCH] qemu: maintain user alias for video type 'none'
by Jonathon Jongsma 06 Sep '19

06 Sep '19

After parsing a video device with a model type of VIR_DOMAIN_VIDEO_TYPE_NONE, all device info is cleared (see virDomainDefPostParseVideo()) in order to avoid formatting any auto-generated values for the XML. Subsequently, however, an alias is generated for the video device (e.g. 'video0'), which results in an alias property being formatted in the XML output anyway. This creates confusion if the user has explicitly provided an alias for the video device since the alias will change. To avoid this, don't clear the user-defined alias for video devices of type "none". See https://bugzilla.redhat.com/show_bug.cgi?id=1720612 Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++-- tests/qemuxml2argvdata/video-none-device.xml | 1 + tests/qemuxml2xmloutdata/video-none-device.xml | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6c429cd593..d11d1fb903 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5635,11 +5635,14 @@ virDomainDefPostParseVideo(virDomainDefPtr def, return 0; if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_NONE) { + char *alias; /* we don't want to format any values we automatically fill in for - * videos into the XML, so clear them - */ + * videos into the XML, so clear them, but retain any user-assigned + * alias */ + VIR_STEAL_PTR(alias, def->videos[0]->info.alias); virDomainVideoDefClear(def->videos[0]); def->videos[0]->type = VIR_DOMAIN_VIDEO_TYPE_NONE; + VIR_STEAL_PTR(def->videos[0]->info.alias, alias); } else { virDomainDeviceDef device = { .type = VIR_DOMAIN_DEVICE_VIDEO, diff --git a/tests/qemuxml2argvdata/video-none-device.xml b/tests/qemuxml2argvdata/video-none-device.xml index 4b591562b7..c1c60c1d9e 100644 --- a/tests/qemuxml2argvdata/video-none-device.xml +++ b/tests/qemuxml2argvdata/video-none-device.xml @@ -31,6 +31,7 @@ <graphics type='vnc'/> <video> <model type='none'/> + <alias name='ua-user-video-alias'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.xml index 6e76b394fe..82615f5125 100644 --- a/tests/qemuxml2xmloutdata/video-none-device.xml +++ b/tests/qemuxml2xmloutdata/video-none-device.xml @@ -34,6 +34,7 @@ </graphics> <video> <model type='none'/> + <alias name='ua-user-video-alias'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> -- 2.21.0

3 2

[libvirt] [PATCH] vircgroupv2: fix setting cpu.max period
by Pavel Hrdina 06 Sep '19

06 Sep '19

When we set cpu.max period we need to parse the cpu.max file first as it contains both quota and period values separated by space. When only a single number is written to that file it will set quota, in order to change period we need to write both values. The code was prepared for that but mistakenly used new line to end the string with the first value. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749227 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/util/vircgroupv2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 2aca4e5d62..0663c67190 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -1508,7 +1508,7 @@ virCgroupV2SetCpuCfsPeriod(virCgroupPtr group, _("Invalid 'cpu.max' data.")); return -1; } - *tmp = '\n'; + *tmp = '\0'; if (virAsprintf(&value, "%s %llu", str, cfs_period) < 0) return -1; -- 2.21.0

2 1

[libvirt] [PATCH] qemu: Fix qemuDomainObjTaint with virtlogd
by Jiri Denemark 05 Sep '19

05 Sep '19

When virtlogd is used to capture QEMU's stdout, qemuDomainObjTaint would always fail to write the message to the log file when QEMU is already running (i.e., outside qemuProcessLaunch). This can happen during device hotplug or by sending a custom QEMU guest agent command: warning : qemuDomainObjTaint:8757 : Domain id=9 name='blaf' uuid=9cfa4e37-2930-405b-bcb4-faac1829dad8 is tainted: custom-ga-command error : virLogHandlerDomainOpenLogFile:388 : Cannot open log file: '/var/log/libvirt/qemu/blaf.log': Device or resource busy error : virNetClientProgramDispatchError:172 : Cannot open log file: '/var/log/libvirt/qemu/blaf.log': Device or resource busy The fix is easy, we just need to use the right API for appending a message to QEMU log file instead of creating a new log context. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_domain.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c7eb0b5e9a..709e4e568b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8783,9 +8783,9 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, qemuDomainLogContextPtr logCtxt) { virErrorPtr orig_err = NULL; - bool closeLog = false; char *timestamp = NULL; char uuidstr[VIR_UUID_STRING_BUFLEN]; + int rc; if (!virDomainObjTaint(obj, taint)) return; @@ -8806,27 +8806,25 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, if (!(timestamp = virTimeStringNow())) goto cleanup; - if (logCtxt == NULL) { - logCtxt = qemuDomainLogContextNew(driver, obj, - QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH); - if (!logCtxt) { - VIR_WARN("Unable to open domainlog"); - goto cleanup; - } - closeLog = true; + if (logCtxt) { + rc = qemuDomainLogContextWrite(logCtxt, + "%s: Domain id=%d is tainted: %s\n", + timestamp, + obj->def->id, + virDomainTaintTypeToString(taint)); + } else { + rc = qemuDomainLogAppendMessage(driver, obj, + "%s: Domain id=%d is tainted: %s\n", + timestamp, + obj->def->id, + virDomainTaintTypeToString(taint)); } - if (qemuDomainLogContextWrite(logCtxt, - "%s: Domain id=%d is tainted: %s\n", - timestamp, - obj->def->id, - virDomainTaintTypeToString(taint)) < 0) + if (rc < 0) virResetLastError(); cleanup: VIR_FREE(timestamp); - if (closeLog) - virObjectUnref(logCtxt); if (orig_err) { virSetError(orig_err); virFreeError(orig_err); -- 2.23.0

2 1

[libvirt] [PATCH 0/3] qemu: Fix disk IO tuning on hotplug with -blockdev (blockdev-add saga)
by Peter Krempa 05 Sep '19

05 Sep '19

Few cleanups and a bugfix as with blockdev we need to issue an extra command to honour disk throttling config. Peter Krempa (3): qemu: hotplug: Simplify cleanup in qemuDomainChangeMediaLegacy qemu: hotplug: Use VIR_AUTOFREE in qemuDomainAttachDiskGeneric qemu: hotplug: Setup disk throttling with blockdev src/qemu/qemu_hotplug.c | 52 ++++++++++++++++++++++++----------------- src/qemu/qemu_process.c | 1 + 2 files changed, 32 insertions(+), 21 deletions(-) -- 2.21.0

2 6