December 2019 - Devel - libvirt List Archives

[libvirt] [jenkins-ci PATCH 0/2] Add glibc-langpack-en to the mappings & to the base project
by Fabiano Fidêncio 12 Dec '19

12 Dec '19

As done for locales, lets also add glibc-langpack-en to the mappings and to the base project. The reasoning for that is that (at least) osinfo-db tests set the locale to en_US causing errors like: 1215 INTERNALERROR> Traceback (most recent call last): 1216 INTERNALERROR> File "/usr/lib/python3.6/site-packages/_pytest/main.py", line 96, in wrap_session 1217 INTERNALERROR> config._do_configure() 1218 INTERNALERROR> File "/usr/lib/python3.6/site-packages/_pytest/config.py", line 922, in _do_configure 1219 INTERNALERROR> self.hook.pytest_configure.call_historic(kwargs=dict(config=self)) 1220 INTERNALERROR> File "/usr/lib/python3.6/site-packages/pluggy/__init__.py", line 628, in call_historic 1221 INTERNALERROR> res = self._hookexec(self, self._nonwrappers + self._wrappers, kwargs) 1222 INTERNALERROR> File "/usr/lib/python3.6/site-packages/pluggy/__init__.py", line 222, in _hookexec 1223 INTERNALERROR> return self._inner_hookexec(hook, methods, kwargs) 1224 INTERNALERROR> File "/usr/lib/python3.6/site-packages/pluggy/__init__.py", line 216, in <lambda> 1225 INTERNALERROR> firstresult=hook.spec_opts.get('firstresult'), 1226 INTERNALERROR> File "/usr/lib/python3.6/site-packages/pluggy/callers.py", line 201, in _multicall 1227 INTERNALERROR> return outcome.get_result() 1228 INTERNALERROR> File "/usr/lib/python3.6/site-packages/pluggy/callers.py", line 76, in get_result 1229 INTERNALERROR> raise ex[1].with_traceback(ex[2]) 1230 INTERNALERROR> File "/usr/lib/python3.6/site-packages/pluggy/callers.py", line 180, in _multicall 1231 INTERNALERROR> res = hook_impl.function(*args) 1232 INTERNALERROR> File "/builds/fidencio/osinfo-db/tests/conftest.py", line 27, in pytest_configure 1233 INTERNALERROR> locale.setlocale(locale.LC_CTYPE, 'en_US.UTF-8') 1234 INTERNALERROR> File "/usr/lib64/python3.6/locale.py", line 598, in setlocale 1235 INTERNALERROR> return _setlocale(category, locale) 1236 INTERNALERROR> locale.Error: unsupported locale setting 1237 make: *** [../Makefile:124: check] Error 3 Fabiano Fidêncio (2): mappings: Add glibc-langpack-en guests: Add glibc-langpack-en to the base project guests/vars/mappings.yml | 5 +++++ guests/vars/projects/base.yml | 1 + 2 files changed, 6 insertions(+) -- 2.23.0

2 4

[libvirt] [jenkins-ci PATCH] jenkins: Don't build on CentOS 8 just yet
by Andrea Bolognani 12 Dec '19

12 Dec '19

We're currently waiting to see whether we can get more capacity for our CI environment, and in the meantime we've decided not do create additional builders on the existing machine. In order to be able to deploy other configuration changes without enabling CentOS 8 jobs at the same time, we need to temporarily drop all mentions of the target from the Jenkins configuration: once we've figured out where to create the CentOS 8 builder, we can simply revert this patch. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- jenkins/jobs/defaults.yaml | 2 -- jenkins/projects/libosinfo.yaml | 1 - jenkins/projects/libvirt-dbus.yaml | 2 -- jenkins/projects/libvirt.yaml | 1 - jenkins/projects/osinfo-db-tools.yaml | 1 - jenkins/projects/virt-manager.yaml | 3 --- 6 files changed, 10 deletions(-) diff --git a/jenkins/jobs/defaults.yaml b/jenkins/jobs/defaults.yaml index 9232d42..676ecbf 100644 --- a/jenkins/jobs/defaults.yaml +++ b/jenkins/jobs/defaults.yaml @@ -4,7 +4,6 @@ node: libvirt all_machines: - libvirt-centos-7 - - libvirt-centos-8 - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-30 @@ -14,7 +13,6 @@ - libvirt-freebsd-12 rpm_machines: - libvirt-centos-7 - - libvirt-centos-8 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide diff --git a/jenkins/projects/libosinfo.yaml b/jenkins/projects/libosinfo.yaml index cc7e024..819c5ac 100644 --- a/jenkins/projects/libosinfo.yaml +++ b/jenkins/projects/libosinfo.yaml @@ -15,7 +15,6 @@ # RPM build is still not possible on CentOS7 as it does not # have the needed RPM macros for meson. machines: - - libvirt-centos-8 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide diff --git a/jenkins/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml index e71e2f9..dfc159c 100644 --- a/jenkins/projects/libvirt-dbus.yaml +++ b/jenkins/projects/libvirt-dbus.yaml @@ -15,7 +15,6 @@ # Python3 version in Ubuntu 16.04 and python3-pytest version # in CentOS 7 are too old. machines: - - libvirt-centos-8 - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-30 @@ -26,7 +25,6 @@ # RPM build is still not possible on CentOS7 as it does not # have the needed RPM macros for meson. machines: - - libvirt-centos-8 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide diff --git a/jenkins/projects/libvirt.yaml b/jenkins/projects/libvirt.yaml index fa8fb89..fdc24bc 100644 --- a/jenkins/projects/libvirt.yaml +++ b/jenkins/projects/libvirt.yaml @@ -14,7 +14,6 @@ # commands with more arguments than FreeBSD supports machines: - libvirt-centos-7 - - libvirt-centos-8 - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-30 diff --git a/jenkins/projects/osinfo-db-tools.yaml b/jenkins/projects/osinfo-db-tools.yaml index 7831df4..f28e72f 100644 --- a/jenkins/projects/osinfo-db-tools.yaml +++ b/jenkins/projects/osinfo-db-tools.yaml @@ -15,7 +15,6 @@ # RPM build is still not possible on CentOS7 as it does not # have the needed RPM macros for meson. machines: - - libvirt-centos-8 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml index 9c4c3bf..4524831 100644 --- a/jenkins/projects/virt-manager.yaml +++ b/jenkins/projects/virt-manager.yaml @@ -3,7 +3,6 @@ name: virt-manager # CentOS 7 and Ubuntu 16.04 have Python 3 but not the libxml2 bindings machines: - - libvirt-centos-8 - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-30 @@ -27,7 +26,6 @@ # so skip the test suite there for the time being. See # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 machines: - - libvirt-centos-8 - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-30 @@ -36,7 +34,6 @@ - python-distutils-rpm-job: parent_jobs: 'virt-manager-check' machines: - - libvirt-centos-8 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide -- 2.23.0

3 5

[libvirt] [PATCH v2 0/1] qemu: fix crash bug in snapshot revert
by Pavel Mores 12 Dec '19

12 Dec '19

This is a significant rework of v1 as - patch 1 was dropped because an equivalent change was accidentally committed in the meantime in 4c53267b70fc5c548b6530113c3f96870d8d7fc1 - patch 2 was dropped as it was just a mostly formal clean-up of patch 1 - patch 3 was redone using a different approach. Patch 3 now takes the approach that was hinted at in the last paragraph of v1's cover letter, more specifically it now fixes qemuProcessStop() rather than its caller. Digging into git history I located the commit that introduced qemuProcessStop()'s problematic behaviour and after consulting with Michal, we agreed that fixing qemuProcessStop() seems safe enough, and definitely a better solution conceptually. Pavel Mores (1): qemu: fix concurrency crash bug in snapshot revert src/qemu/qemu_domain.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.21.0

3 3

[libvirt] [libvirt-tck PATCH] Add cases for nvram
by Dan Zheng 12 Dec '19

12 Dec '19

This is to add the tests for below flags: - Sys::Virt::Domain::UNDEFINE_KEEP_NVRAM - Sys::Virt::Domain::UNDEFINE_NVRAM Signed-off-by: Dan Zheng <dzheng(a)redhat.com> --- scripts/domain/401-ovmf-nvram.t | 143 ++++++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 scripts/domain/401-ovmf-nvram.t diff --git a/scripts/domain/401-ovmf-nvram.t b/scripts/domain/401-ovmf-nvram.t new file mode 100644 index 0000000..5310dd0 --- /dev/null +++ b/scripts/domain/401-ovmf-nvram.t @@ -0,0 +1,143 @@ +# -*- perl -*- +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2018 Dan Zheng (dzheng(a)redhat.com) +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/401-ovmf-nvram.t - Test OVMF related functions and flags + +=head1 DESCRIPTION + +The test cases validates OVMF related APIs and flags + +Sys::Virt::Domain::UNDEFINE_KEEP_NVRAM +Sys::Virt::Domain::UNDEFINE_NVRAM + +=cut + +use strict; +use warnings; + +use Test::More tests => 8; + +use Sys::Virt::TCK; +use File::stat; +use File::Copy; + + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + + +sub setup_nvram { + +my $loader_path = shift; +my $nvram_template = shift; +my $nvram_path = shift; + +# Install OVMF and check the two files should exist +# - /usr/share/OVMF/OVMF_CODE.secboot.fd +# - /usr/share/OVMF/OVMF_VARS.fd + +my $ret = `yum install -y OVMF`; +diag "yum install OVMF: $ret"; +my $st = stat($loader_path); +ok($st, "path $loader_path exists after OVMF is installed"); +$st = stat($nvram_template); +ok($st, "path $nvram_template exists after OVMF is installed"); + +# Ensure the sample nvram file exists +copy($nvram_template, $nvram_path) or die "Copy failed: $!"; + +# Use 'q35' as machine type and add below lines to guest xml +# <loader readonly='yes' secure='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.secboot.fd</loader> +# <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/qemu/nvram/test_VARS.fd</nvram> + +my $xml = $tck->generic_domain(name => "tck")->as_xml; +my $xp = XML::XPath->new($xml); +diag $xp->getNodeText("/domain/os/type/\@machine"); + +diag "Changing guest machine type to q35"; +$xp->setNodeText("/domain/os/type/\@machine", "q35"); + +my $loader_node = XML::XPath::Node::Element->new('loader'); +my $loader_text = XML::XPath::Node::Text->new($loader_path); +my $attr_ro = XML::XPath::Node::Attribute->new('readonly'); +my $attr_secure = XML::XPath::Node::Attribute->new('secure'); +my $attr_type = XML::XPath::Node::Attribute->new('type'); + +$attr_ro -> setNodeValue('yes'); +$attr_secure -> setNodeValue('yes'); +$attr_type -> setNodeValue('pflash'); + +$loader_node->appendChild($loader_text); +$loader_node->appendAttribute($attr_ro); +$loader_node->appendAttribute($attr_secure); +$loader_node->appendAttribute($attr_type); + +my $nvram_node = XML::XPath::Node::Element->new('nvram'); +my $nvram_text = XML::XPath::Node::Text->new($nvram_path); +my $attr_template = XML::XPath::Node::Attribute->new('template'); + +$attr_template -> setNodeValue($nvram_template); + +$nvram_node->appendChild($nvram_text); +$nvram_node->appendAttribute($attr_template); + +my $smm_node = XML::XPath::Node::Element->new('smm'); +my $attr_state = XML::XPath::Node::Attribute->new('state'); +$attr_state -> setNodeValue("on"); +$smm_node -> appendAttribute($attr_state); + +my ($root) = $xp->findnodes('/domain/os'); +$root->appendChild($loader_node); +$root->appendChild($nvram_node); +($root) = $xp->findnodes('/domain/features'); +$root->appendChild($smm_node); + +$xml = $xp->findnodes_as_string('/'); +diag $xml; +return $xml; +} + +diag "Defining an inactive domain config with nvram"; +my $loader_file_path = '/usr/share/OVMF/OVMF_CODE.secboot.fd'; +my $nvram_file_template = '/usr/share/OVMF/OVMF_VARS.fd'; +my $nvram_file_path = '/var/lib/libvirt/qemu/nvram/test_VARS.fd'; + +my $xml = setup_nvram($loader_file_path, $nvram_file_template, $nvram_file_path); +my $dom; + +diag "Test Sys::Virt::Domain::UNDEFINE_KEEP_NVRAM"; +ok_domain(sub { $dom = $conn->define_domain($xml) }, "defined domain with nvram configure"); +diag "Checking nvram file already exists"; +my $st = stat($nvram_file_path); +ok($st, "File '$nvram_file_path' exists as expected"); +$dom->undefine(Sys::Virt::Domain::UNDEFINE_KEEP_NVRAM); +diag "Checking nvram file still exists"; +$st = stat($nvram_file_path); +ok($st, "File '$nvram_file_path' still exists as expected"); + +diag "Test Sys::Virt::Domain::UNDEFINE_NVRAM"; +ok_domain(sub { $dom = $conn->define_domain($xml) }, "defined domain with nvram configure"); +$dom->undefine(Sys::Virt::Domain::UNDEFINE_NVRAM); +diag "Checking nvram file removed"; +$st = stat($nvram_file_path); +ok(!$st, "File '$nvram_file_path' is removed"); + +ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", + Sys::Virt::Error::ERR_NO_DOMAIN); -- 2.18.1

1 0

[libvirt] [PATCH] ci: Fix VPATH builds
by Andrea Bolognani 12 Dec '19

12 Dec '19

The CI build machinery is intentionally not handled by autotools, so for VPATH builds - which are mandatory now - we need to make sure we're looking into $(srcdir). Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 15df6ed68e..4edb3fdd43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -148,4 +148,4 @@ gen-AUTHORS: fi ci-%: - $(MAKE) -C ci/ $@ + $(MAKE) -C $(srcdir)/ci/ $@ -- 2.23.0

2 1

[libvirt] [dockerfiles PATCH] Add CentOS 8 Dockerfiles
by Andrea Bolognani 12 Dec '19

12 Dec '19

The corresponding libvirt-jenkins-ci commit is b7cd4b07a064. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. Text diff follows. buildenv-libosinfo-centos-8.zip | Bin 0 -> 578 bytes buildenv-libvirt-centos-8.zip | Bin 0 -> 781 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 buildenv-libosinfo-centos-8.zip create mode 100644 buildenv-libvirt-centos-8.zip diff --git a/buildenv-libosinfo-centos-8.zip b/buildenv-libosinfo-centos-8.zip new file mode 100644 index 0000000..e739059 --- /dev/null +++ b/buildenv-libosinfo-centos-8.zip @@ -0,0 +1,55 @@ +FROM centos:centos8 + +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled PowerTools -y && \ + dnf install -y epel-release && \ + dnf install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + check-devel \ + chrony \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + gobject-introspection-devel \ + gtk-doc \ + hwdata \ + intltool \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libtool \ + libxml2 \ + libxml2-devel \ + libxslt-devel \ + lsof \ + make \ + meson \ + net-tools \ + ninja-build \ + patch \ + perl \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + python3-setuptools \ + rpm-build \ + screen \ + strace \ + sudo \ + vala \ + vim && \ + dnf autoremove -y && \ + dnf clean all -y + +ENV LANG "en_US.UTF-8" diff --git a/buildenv-libvirt-centos-8.zip b/buildenv-libvirt-centos-8.zip new file mode 100644 index 0000000..5410201 --- /dev/null +++ b/buildenv-libvirt-centos-8.zip @@ -0,0 +1,93 @@ +FROM centos:centos8 + +RUN dnf update -y && \ + dnf install 'dnf-command(config-manager)' -y && \ + dnf config-manager --set-enabled PowerTools -y && \ + dnf install -y epel-release && \ + dnf install -y \ + audit-libs-devel \ + augeas \ + autoconf \ + automake \ + avahi-devel \ + bash \ + bash-completion \ + ca-certificates \ + chrony \ + cyrus-sasl-devel \ + dbus-devel \ + device-mapper-devel \ + dnsmasq \ + ebtables \ + fuse-devel \ + gcc \ + gdb \ + gettext \ + gettext-devel \ + git \ + glib2-devel \ + glibc-devel \ + glusterfs-api-devel \ + gnutls-devel \ + iproute \ + iproute-tc \ + iscsi-initiator-utils \ + kmod \ + libacl-devel \ + libattr-devel \ + libblkid-devel \ + libcap-ng-devel \ + libcurl-devel \ + libiscsi-devel \ + libnl3-devel \ + libpcap-devel \ + libpciaccess-devel \ + librbd-devel \ + libselinux-devel \ + libssh-devel \ + libtirpc-devel \ + libtool \ + libudev-devel \ + libwsman-devel \ + libxml2 \ + libxml2-devel \ + libxslt \ + lsof \ + lvm2 \ + make \ + meson \ + ncurses-devel \ + net-tools \ + netcf-devel \ + nfs-utils \ + ninja-build \ + numactl-devel \ + numad \ + parted \ + parted-devel \ + patch \ + perl \ + pkgconfig \ + polkit \ + python3 \ + python3-docutils \ + python3-flake8 \ + python3-setuptools \ + qemu-img \ + radvd \ + readline-devel \ + rpcgen \ + rpm-build \ + sanlock-devel \ + screen \ + scrub \ + strace \ + sudo \ + systemtap-sdt-devel \ + vim \ + xfsprogs-devel \ + yajl-devel && \ + dnf autoremove -y && \ + dnf clean all -y + +ENV LANG "en_US.UTF-8" -- 2.23.0

1 0

[libvirt] [dockerfiles PATCH] Refresh Dockerfiles after dropping Python 2 support
by Andrea Bolognani 12 Dec '19

12 Dec '19

The corresponding libvirt-jenkins-ci commit is 8c30b5e1782b. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. Text diff follows. buildenv-libosinfo-centos-7.zip | Bin 575 -> 572 bytes buildenv-libvirt-centos-7.zip | Bin 765 -> 761 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/buildenv-libosinfo-centos-7.zip b/buildenv-libosinfo-centos-7.zip index c9dd791..b91f3aa 100644 --- a/buildenv-libosinfo-centos-7.zip +++ b/buildenv-libosinfo-centos-7.zip @@ -36,7 +36,6 @@ RUN yum update -y && \ patch \ perl \ pkgconfig \ - python2-setuptools \ python3 \ python3-pip \ python3-setuptools \ diff --git a/buildenv-libvirt-centos-7.zip b/buildenv-libvirt-centos-7.zip index 5fc4f71..4e9c3db 100644 --- a/buildenv-libvirt-centos-7.zip +++ b/buildenv-libvirt-centos-7.zip @@ -67,7 +67,6 @@ RUN yum update -y && \ perl \ pkgconfig \ polkit \ - python2-setuptools \ python3 \ python3-pip \ python3-setuptools \ -- 2.23.0

1 0

[libvirt] [jenkins-ci PATCH] Run the virt-manager test suite on FreeBSD
by Andrea Bolognani 12 Dec '19

12 Dec '19

The bug affecting python3-libxml2 has been fixed in FreeBSD, and virt-manager itself has recently tweaked its test suite so that it works correctly on that platform as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/playbooks/build/projects/virt-manager.yml | 6 +++--- jenkins/projects/virt-manager.yaml | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/guests/playbooks/build/projects/virt-manager.yml b/guests/playbooks/build/projects/virt-manager.yml index 9184a74..9286931 100644 --- a/guests/playbooks/build/projects/virt-manager.yml +++ b/guests/playbooks/build/projects/virt-manager.yml @@ -23,9 +23,6 @@ $PYTHON ./setup.py configure --prefix=$VIRT_PREFIX - include: '{{ playbook_base }}/jobs/python-distutils-check-job.yml' vars: - # libxml2's Python 3 bindings don't work properly on FreeBSD, - # so skip the test suite there for the time being. See - # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 machines: - libvirt-debian-9 - libvirt-debian-10 @@ -33,6 +30,9 @@ - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide + - libvirt-freebsd-11 + - libvirt-freebsd-12 + - libvirt-freebsd-current - libvirt-ubuntu-1804 - include: '{{ playbook_base }}/jobs/python-distutils-rpm-job.yml' vars: diff --git a/jenkins/projects/virt-manager.yaml b/jenkins/projects/virt-manager.yaml index 4524831..b027f21 100644 --- a/jenkins/projects/virt-manager.yaml +++ b/jenkins/projects/virt-manager.yaml @@ -22,15 +22,14 @@ $PYTHON ./setup.py configure --prefix=$VIRT_PREFIX - python-distutils-check-job: parent_jobs: 'virt-manager-build' - # libxml2's Python 3 bindings don't work properly on FreeBSD, - # so skip the test suite there for the time being. See - # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 machines: - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-30 - libvirt-fedora-31 - libvirt-fedora-rawhide + - libvirt-freebsd-11 + - libvirt-freebsd-12 - python-distutils-rpm-job: parent_jobs: 'virt-manager-check' machines: -- 2.23.0

2 1

[libvirt] [PATCH] docs: ensure outputfile is deleted if rst2html/rst2man fail
by Daniel P. Berrangé 11 Dec '19

11 Dec '19

This avoids leaving a zero length or partially generated output file on errors. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index eb8de80b9c..9a1f7a6117 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -259,21 +259,21 @@ man8_MANS = $(manpages8_rst:%.rst=%.8) grep -v '^\.\. contents::' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) > $@ + $(RST2MAN) > $@ || { rm $@ && exit 1; } %.7: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^\.\. contents::' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) > $@ + $(RST2MAN) > $@ || { rm $@ && exit 1; } %.8: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ grep -v '^\.\. contents::' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2MAN) > $@ + $(RST2MAN) > $@ || { rm $@ && exit 1; } manpages/virkeycode-%.rst: $(top_srcdir)/src/keycodemapdb/data/keymaps.csv \ $(top_srcdir)/src/keycodemapdb/tools/keymap-gen Makefile.am @@ -414,11 +414,11 @@ manpages/%.html.in: manpages/%.rst grep -v '^:Manual ' < $< | \ sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \ -e 's|RUNSTATEDIR|$(runstatedir)|g' | \ - $(RST2HTML) > $@ + $(RST2HTML) > $@ || { rm $@ && exit 1; } %.html.in: %.rst $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \ - $(RST2HTML) $< > $@ + $(RST2HTML) $< > $@ || { rm $@ && exit 1; } %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \ $(acl_generated) -- 2.23.0

2 3

[libvirt] [PATCH] doc: vtpm only support secrets by UUID at this point
by marcandre.lureau＠redhat.com 11 Dec '19

11 Dec '19

From: Marc-André Lureau <marcandre.lureau(a)redhat.com> Support by usage name can be considered separately (with a 'usage' attribute?). Cc: Stefan Berger <stefanb(a)linux.ibm.com> Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/formatsecret.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatsecret.html.in b/docs/formatsecret.html.in index 8d0630a7c3..8f5383cf64 100644 --- a/docs/formatsecret.html.in +++ b/docs/formatsecret.html.in @@ -334,8 +334,8 @@ Secret value set of the vTPM. The <code><usage type='vtpm'></code> element must contain a single <code>name</code> element that specifies a usage name - for the secret. The vTPM secret can then be used by UUID or by - this usage name via the <code><encryption></code> element of + for the secret. The vTPM secret can then be used by UUID + via the <code><encryption></code> element of a <a href="formatdomain.html#elementsTpm">tpm</a> when using an emulator. <span class="since">Since 5.6.0</span>. The following is an example -- 2.24.0.308.g228f53135a

4 3