- Devel - libvirt List Archives

[libvirt] [jenkins-ci PATCH 0/8] guests: Various fixes and improvements
by Andrea Bolognani 16 May '18

16 May '18

Andrea Bolognani (8): guests: Fix PERL5LIB on Debian sid guests: Simplify mapping for libtool guests: Prepare Debian and Ubuntu to build more projects guests: libosinfo needs libcurl and wget guests: libvirt-dbus needs python3-gi guests: virt-manager needs gtk-update-icon-cache guests: Remove duplicate native packages guests: Move native packages out of MinGW packages guests/host_vars/libvirt-debian-8/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 2 +- guests/host_vars/libvirt-ubuntu-14/main.yml | 1 + guests/host_vars/libvirt-ubuntu-16/main.yml | 2 ++ guests/vars/mappings.yml | 10 ++++++++-- guests/vars/projects/libosinfo+mingw.yml | 2 ++ guests/vars/projects/libosinfo.yml | 2 ++ guests/vars/projects/libvirt+mingw.yml | 2 -- guests/vars/projects/libvirt-dbus.yml | 1 + guests/vars/projects/libvirt-glib+mingw.yml | 4 ---- guests/vars/projects/virt-manager.yml | 1 + guests/vars/projects/virt-viewer+mingw.yml | 3 --- guests/vars/projects/virt-viewer.yml | 1 + 13 files changed, 20 insertions(+), 12 deletions(-) -- 2.17.0

2 23

[libvirt] [dbus PATCH 0/4] API name fixes
by Pavel Hrdina 16 May '18

16 May '18

Pavel Hrdina (4): domain: Rename (Get|Set)BlkioParameters events: Rename AgentLifecycle event events: Rename all lifecycle event functions to follow the signal name events: Rename IOErrorReason event data/org.libvirt.Domain.xml | 8 +++--- src/domain.c | 32 ++++++++++----------- src/events.c | 56 ++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 48 deletions(-) -- 2.17.0

3 8

[libvirt] [PATCH] log: actually do substring matches with fnmatch
by Daniel P. Berrangé 16 May '18

16 May '18

Historically we matched log filters with strstr(), and when switching to fnmatch in cbb0fd3cfdc287f6f4653ef1f04a7cfb2ea51b27, it was stated that we would continue to match substrings, with "foo" being equivalent to "*foo*". Unfortuntely I forget to provide the code to actually make that happen. This fixes it to prepend and append "*" if not already present in the user's pattern. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virlog.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index be9fc0cf78..d548010b10 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1409,6 +1409,8 @@ virLogFilterNew(const char *match, { virLogFilterPtr ret = NULL; char *mdup = NULL; + size_t mlen = strlen(match); + size_t off = 0; virCheckFlags(VIR_LOG_STACK_TRACE, NULL); @@ -1418,9 +1420,19 @@ virLogFilterNew(const char *match, return NULL; } - if (VIR_STRDUP_QUIET(mdup, match) < 0) + if (VIR_ALLOC_N_QUIET(mdup, mlen + 3) < 0) return NULL; + if (match[0] != '*') { + mdup[off++] = '*'; + } + memcpy(mdup + off, match, mlen + 1); + off += mlen; + if (match[mlen - 1] != '*') { + mdup[off++] = '*'; + mdup[off++] = '\0'; + } + if (VIR_ALLOC_QUIET(ret) < 0) { VIR_FREE(mdup); return NULL; -- 2.17.0

2 2

[libvirt] [perl PATCH] Switch over to using Module::Build
by Daniel P. Berrangé 16 May '18

16 May '18

The Module::Build system is nicer than ExtUtils::MakeMaker as it allows for better cross-platform portability by only relying on Perl, rather than both Perl and system 'make' binary. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitignore | 17 +++---- Build.PL | 102 +++++++++++++++++++++++++++++++++++++ MANIFEST | 73 ++++++++++++++++++++++++++ MANIFEST.SKIP | 20 -------- META.yml.PL | 55 -------------------- Makefile.PL | 85 ------------------------------- autobuild.sh | 55 +++----------------- Virt.xs => lib/Sys/Virt.xs | 0 perl-Sys-Virt.spec.PL | 45 ++++++++-------- t/030-api-coverage.t | 2 +- 10 files changed, 210 insertions(+), 244 deletions(-) create mode 100755 Build.PL create mode 100644 MANIFEST delete mode 100644 MANIFEST.SKIP delete mode 100644 META.yml.PL delete mode 100644 Makefile.PL rename Virt.xs => lib/Sys/Virt.xs (100%) diff --git a/.gitignore b/.gitignore index dc0ba62..3f08c79 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,12 @@ -*.swp *~ -MANIFEST META.yml +META.json MYMETA.* -Makefile -Makefile.old +Makefile.PL Sys-Virt-*.tar.gz -Virt.bs -Virt.c -Virt.o blib/ -cover_db perl-Sys-Virt.spec -pm_to_blib -results.log -tags +lib/Sys/Virt\.c +lib/Sys/Virt\.o +_build/ +Build diff --git a/Build.PL b/Build.PL new file mode 100755 index 0000000..13a0e4f --- /dev/null +++ b/Build.PL @@ -0,0 +1,102 @@ +#!/usr/bin/perl +# +# Copyright (C) 2009-2018 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# 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 +# + +use Module::Build; + +use strict; +use warnings; + +my $libvirtver = "4.4.0"; +my $stat = system "pkg-config --atleast-version=$libvirtver libvirt"; +die "cannot run pkg-config to check libvirt version" if $stat == -1; +die "libvirt >= $libvirtver is required\n" unless $stat == 0; + +my $LIBVIRT_LIBS = `pkg-config --libs libvirt`; +my $LIBVIRT_CFLAGS = `pkg-config --cflags libvirt`; + +my $GCC_CFLAGS = ""; +if ($ENV{TEST_MAINTAINER}) { + $GCC_CFLAGS = qq( + -W -Waddress -Wall -Warray-bounds -Wattributes + -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align + -Wchar-subscripts -Wclobbered -Wcomment -Wcomments + -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations + -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion + -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul + -Wformat-extra-args -Wformat-security -Wformat-y2k + -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object + -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration + -Wimplicit-int -Winit-self -Wint-to-pointer-cast + -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init + -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces + -Wmissing-declarations -Wmissing-field-initializers + -Wmissing-format-attribute -Wmissing-include-dirs + -Wmissing-noreturn -Wmissing-parameter-type + -Wmultichar -Wnarrowing -Wnonnull + -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition + -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses + -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas + -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing + -Wstrict-prototypes -Wsuggest-attribute=const + -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch + -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized + -Wunknown-pragmas -Wunused -Wunused-but-set-parameter + -Wunused-but-set-variable -Wunused-function -Wunused-label + -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result + -Wunused-value -Wunused-variable -Wvariadic-macros + -Wvector-operation-performance -Wvolatile-register-var + -Wwrite-strings -Wno-sign-compare -Wjump-misses-init + -Wno-format-nonliteral -Wframe-larger-than=8192 + -Wno-suggest-attribute=pure -Wno-suggest-attribute=const + -Wno-cast-function-type + ); +} + +my $b = Module::Build->new( + module_name => "Sys::Virt", + license => 'gpl', + configure_requires => { + 'Module::Build' => 0, + }, + create_makefile_pl => 'small', + dist_author => 'Daniel Berrange <dan(a)berrange.com>', + dist_abstract => 'libvirt Perl API', + requires => { + 'perl' => '5.8.0', + }, + extra_compiler_flags => $GCC_CFLAGS . $LIBVIRT_CFLAGS, + extra_linker_flags => $LIBVIRT_LIBS, + build_requires => { + 'ExtUtils::CBuilder' => 0, + 'Sys::Hostname' => 0, + 'Test::CPAN::Changes' => 0, + 'Test::More' => 0, + 'Test::Pod' => '0', + 'Test::Pod::Coverage' => '0', + 'Time::HiRes' => 0, + 'XML::XPath' => 0, + 'XML::XPath::XMLParser' => 0, + }, + script_files => [], + meta_add => { + resources => { + license => "http://www.gnu.org/licenses/gpl.html", + homepage => "http://libvirt.org/", + repository => "https://libvirt.org/git/?p=libvirt-perl.git;a=summary", + MailingList => "http://www.redhat.com/mailman/listinfo/libvir-list", + }, + }, + PL_files => { 'perl-Sys-Virt.spec.PL' => 'perl-Sys-Virt.spec' }, + ); +$b->create_build_script; diff --git a/MANIFEST b/MANIFEST new file mode 100644 index 0000000..d425ef1 --- /dev/null +++ b/MANIFEST @@ -0,0 +1,73 @@ +.gitignore +.gitpublish +AUTHORS +Build.PL +Changes +HACKING +INSTALL +LICENSE +README +autobuild.sh +examples/auth.pl +examples/devices.pl +examples/dhcp-leases.pl +examples/dom-fsinfo.pl +examples/dom-ifinfo.pl +examples/dom-migrate.pl +examples/dom-stats.pl +examples/dump-info.pl +examples/dump-xml.pl +examples/emulator-pin.pl +examples/events.pl +examples/fs-freeze.pl +examples/hv-stat.pl +examples/iothreadinfo.pl +examples/node-alloc.pl +examples/node-cpu.pl +examples/node-devlist.pl +examples/node-info.pl +examples/node-ksm.pl +examples/open-console.pl +examples/save-restore.pl +examples/send-key.pl +examples/vcpuinfo.pl +examples/vol-download-all.pl +examples/vol-download-nonblock.pl +examples/vol-download.pl +examples/vol-sparse.pl +examples/vol-upload-all.pl +examples/vol-upload-nonblock.pl +examples/vol-upload.pl +lib/Sys/Virt.pm +lib/Sys/Virt.xs +lib/Sys/Virt/Domain.pm +lib/Sys/Virt/DomainSnapshot.pm +lib/Sys/Virt/Error.pm +lib/Sys/Virt/Event.pm +lib/Sys/Virt/Interface.pm +lib/Sys/Virt/NWFilter.pm +lib/Sys/Virt/Network.pm +lib/Sys/Virt/NodeDevice.pm +lib/Sys/Virt/Secret.pm +lib/Sys/Virt/StoragePool.pm +lib/Sys/Virt/StorageVol.pm +lib/Sys/Virt/Stream.pm +perl-Sys-Virt.spec +perl-Sys-Virt.spec.PL +Makefile.PL +t/005-pod.t +t/010-pod-coverage.t +t/015-changes.t +t/020-constants.t +t/030-api-coverage.t +t/100-connect.t +t/200-domains.t +t/300-networks.t +t/400-storage-pools.t +t/500-storage-vols.t +t/600-interfaces.t +t/800-events.t +typemap +Makefile.PL +META.yml +META.json diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP deleted file mode 100644 index ebce958..0000000 --- a/MANIFEST.SKIP +++ /dev/null @@ -1,20 +0,0 @@ -pm_to_blib -Virt\.o -Virt\.c -Virt\.bs -Virt\.xsc -.*.old -Sys-Virt- -blib -.*\.bak -CVS -.cvsignore -.*~ -.#.* -#.* -^Makefile$ -^cover_db/ -.hg -.*\.orig -.*\.sh -\.git diff --git a/META.yml.PL b/META.yml.PL deleted file mode 100644 index 0467309..0000000 --- a/META.yml.PL +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright (C) 2008 Daniel Berrange <dan(a)berrange.com> - -use strict; -use warnings; - -die unless (scalar @ARGV == 1); - -open SRC, "lib/Sys/Virt.pm" - or die "lib/Sys/Virt.pm: $!"; - -our $VERSION; -while (<SRC>) { - if (/\$VERSION\s*=\s*'(.*)'/) { - $VERSION=$1; - } -} -close SRC; - -local $/ = undef; -$_ = <DATA>; -s/\@VERSION\@/$VERSION/g; - -open SPEC, ">$ARGV[0]" or die "$!"; -print SPEC $_; -close SPEC; -__DATA__ ---- #YAML:1.0 -name: Sys-Virt -abstract: Extension for the libvirt library -version: @VERSION@ -author: - - Daniel P. Berrange <dan(a)berrange.com> -license: perl -generated_by: ExtUtils::MakeMaker version 6.30 -build_requires: - Test::More: 0 - Test::Pod: 0 - Test::Pod::Coverage: 0 - Test::CPAN::Changes: 0 - XML::XPath: 0 - XML::XPath::XMLParser: 0 - Sys::Hostname: 0 - Time::HiRes: 0 - -resources: - license: http://dev.perl.org/licenses/ - homepage: http://libvirt.org/ - repository: http://libvirt.org/git/?p=libvirt-perl.git;a=summary - MailingList: http://www.redhat.com/mailman/listinfo/libvir-list - -distribution_type: module - -meta-spec: - version: 1.3 - url: http://module-build.sourceforge.net/META-spec-v1.3.html diff --git a/Makefile.PL b/Makefile.PL deleted file mode 100644 index f72e210..0000000 --- a/Makefile.PL +++ /dev/null @@ -1,85 +0,0 @@ -use 5.006; -use ExtUtils::MakeMaker; -# See lib/ExtUtils/MakeMaker.pm for details of how to influence -# the contents of the Makefile that is written. - -my $libvirtver = "4.4.0"; -my $stat = system "pkg-config --atleast-version=$libvirtver libvirt"; -die "cannot run pkg-config to check libvirt version" if $stat == -1; -die "libvirt >= $libvirtver is required\n" unless $stat == 0; - -my $LIBVIRT_LIBS = `pkg-config --libs libvirt`; -my $LIBVIRT_CFLAGS = `pkg-config --cflags libvirt`; - -my $gccflags = "-W -Waddress -Wall -Warray-bounds -Wattributes \\ - -Wbad-function-cast -Wbuiltin-macro-redefined -Wcast-align \\ - -Wchar-subscripts -Wclobbered -Wcomment -Wcomments \\ - -Wcoverage-mismatch -Wcpp -Wdeprecated-declarations \\ - -Wdisabled-optimization -Wdiv-by-zero -Wdouble-promotion \\ - -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul \\ - -Wformat-extra-args -Wformat-security -Wformat-y2k \\ - -Wformat-zero-length -Wformat=2 -Wfree-nonheap-object \\ - -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration \\ - -Wimplicit-int -Winit-self -Wint-to-pointer-cast \\ - -Winvalid-memory-model -Winvalid-pch -Wjump-misses-init \\ - -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmissing-braces \\ - -Wmissing-declarations -Wmissing-field-initializers \\ - -Wmissing-format-attribute -Wmissing-include-dirs \\ - -Wmissing-noreturn -Wmissing-parameter-type \\ - -Wmultichar -Wnarrowing -Wnonnull \\ - -Wnormalized=nfc -Wold-style-declaration -Wold-style-definition \\ - -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses \\ - -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas \\ - -Wreturn-type -Wsequence-point -Wno-shadow -Wstrict-aliasing \\ - -Wstrict-prototypes -Wsuggest-attribute=const \\ - -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wswitch \\ - -Wsync-nand -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized \\ - -Wunknown-pragmas -Wunused -Wunused-but-set-parameter \\ - -Wunused-but-set-variable -Wunused-function -Wunused-label \\ - -Wunused-local-typedefs -Wno-unused-parameter -Wunused-result \\ - -Wunused-value -Wunused-variable -Wvariadic-macros \\ - -Wvector-operation-performance -Wvolatile-register-var \\ - -Wwrite-strings -Wno-sign-compare -Wjump-misses-init \\ - -Wno-format-nonliteral -Wframe-larger-than=8192 \\ - -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Werror"; - -my $cflags; -if ($ENV{TEST_MAINTAINER}) { - $cflags = $gccflags; -} else { - $cflags = "-Wall"; -} - -WriteMakefile( - 'NAME' => 'Sys::Virt', - 'VERSION_FROM' => 'lib/Sys/Virt.pm', - 'PREREQ_PM' => { - 'Test::More' => 0, - 'Test::Pod' => 0, - 'Test::Pod::Coverage' => 0, - 'Test::CPAN::Changes' => 0, - 'Time::HiRes' => 0, - 'XML::XPath' => 0, - }, - 'AUTHOR' => 'Daniel Berrange <dan(a)berrange.com>', - 'LIBS' => [$LIBVIRT_LIBS], - 'INC' => "$cflags $LIBVIRT_CFLAGS", - 'depend' => { - Sys-Virt.spec => '$(VERSION_FROM)', - Makefile => '$(VERSION_FROM)', - }, - 'NO_META' => 1, - 'realclean' => { - FILES => 'Sys-Virt.spec', - }, -); - -package MY; - -sub libscan - { - my ($self, $path) = @_; - ($path =~ /\~$/ || $path =~ m,/CVS/,) ? undef : $path; - } - -__END__ diff --git a/autobuild.sh b/autobuild.sh index 8a6d102..597b9bf 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -7,53 +7,18 @@ NAME=Sys-Virt set -e -test -n "$1" && RESULTS=$1 || RESULTS=results.log -: ${AUTOBUILD_INSTALL_ROOT=$HOME/builder} +rm -rf blib _build Build $NAME-*.tar.gz -make -k realclean ||: -rm -rf MANIFEST blib pm_to_blib +test -z "$AUTOBUILD_INSTALL_ROOT" && AUTOBUILD_INSTALL_ROOT=$HOME/builder export TEST_MAINTAINER=1 -perl Makefile.PL PREFIX=$AUTOBUILD_INSTALL_ROOT +perl Build.PL install_base=$AUTOBUILD_INSTALL_ROOT -rm -f MANIFEST - -# Build the RPM. -make -make manifest - -if [ -z "$USE_COVER" ]; then - perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=1 || USE_COVER=0 -fi - -if [ -z "$SKIP_TESTS" -o "$SKIP_TESTS" = "0" ]; then - if [ "$USE_COVER" = "1" ]; then - cover -delete - export HARNESS_PERL_SWITCHES=-MDevel::Cover - fi - - # set -o pipefail is a bashism; this use of exec is the POSIX alternative - exec 3>&1 - st=$( - exec 4>&1 >&3 - { make test 2>&1 3>&- 4>&-; echo $? >&4; } | tee "$RESULTS" - ) - exec 3>&- - test "$st" = 0 - - if [ "$USE_COVER" = "1" ]; then - cover - mkdir blib/coverage - cp -a cover_db/*.html cover_db/*.css blib/coverage - mv blib/coverage/coverage.html blib/coverage/index.html - fi -fi - -make install - -rm -f $NAME-*.tar.gz -make dist +./Build +./Build test +./Build install +./Build dist if [ -f /usr/bin/rpmbuild ]; then if [ -n "$AUTOBUILD_COUNTER" ]; then @@ -65,10 +30,4 @@ if [ -f /usr/bin/rpmbuild ]; then rpmbuild --nodeps -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz fi -# Skip debian pkg for now exit 0 - -if [ -f /usr/bin/fakeroot ]; then - fakeroot debian/rules clean - fakeroot debian/rules DESTDIR=$HOME/packages/debian binary -fi diff --git a/Virt.xs b/lib/Sys/Virt.xs similarity index 100% rename from Virt.xs rename to lib/Sys/Virt.xs diff --git a/perl-Sys-Virt.spec.PL b/perl-Sys-Virt.spec.PL index dbb749d..e5140b6 100644 --- a/perl-Sys-Virt.spec.PL +++ b/perl-Sys-Virt.spec.PL @@ -6,15 +6,19 @@ use strict; die unless (scalar @ARGV == 1); -unless (do './lib/Sys/Virt.pm') - { - if ($@) { die $@ }; - die "lib/Sys/Virt.pm: $!"; - } +open PM, './lib/Sys/Virt.pm' or die "lib/Sys/Virt.pm: $!"; +my $ver; +while (<PM>) { + if (/our \$VERSION = '(.*)'/) { + $ver = $1; + last; + } +} +die "cannot find version" unless $ver; local $/ = undef; $_ = <DATA>; -s/\@VERSION\@/$Sys::Virt::VERSION/g; +s/\@VERSION\@/$ver/g; open SPEC, ">$ARGV[0]" or die "$!"; print SPEC $_; @@ -29,9 +33,10 @@ Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Sys-Virt/ -Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DA/DANBERR/Sys-Virt-v%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(ExtUtils::CBuilder) +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod) BuildRequires: perl(Test::Pod::Coverage) BuildRequires: perl(Test::CPAN::Changes) @@ -46,32 +51,24 @@ machine management APIs. This allows machines running within arbitrary virtualization containers to be managed with a consistent API. %prep -%setup -q -n Sys-Virt-%{version} +%setup -q -n Sys-Virt-v%{version} -sed -i -e '/Sys-Virt\.spec/d' Makefile.PL -sed -i -e '/\.spec\.PL$/d' MANIFEST -rm -f *.spec.PL %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %install -rm -rf $RPM_BUILD_ROOT +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f $ -name .packlist -o -name '*.bs' -empty $ | - xargs rm -f -find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; +#find $RPM_BUILD_ROOT -type f $ -name .packlist -o -name '*.bs' -empty $ | +# xargs rm -f +#find $RPM_BUILD_ROOT -depth -type d -empty -exec rmdir {} \; %{_fixperms} $RPM_BUILD_ROOT/* %check -make test - -%clean -rm -rf $RPM_BUILD_ROOT +./Build test %files %defattr(-,root,root,-) diff --git a/t/030-api-coverage.t b/t/030-api-coverage.t index 95bbd11..39d6146 100644 --- a/t/030-api-coverage.t +++ b/t/030-api-coverage.t @@ -48,7 +48,7 @@ foreach my $n ($set->get_nodelist) { push @macros, $n->getData(); } -open XS, "<Virt.xs" or die "cannot read Virt.xs: $!"; +open XS, "<lib/Sys/Virt.xs" or die "cannot read lib/Sys/Virt.xs: $!"; my $xs; { -- 2.17.0

2 6

[libvirt] [jenkins-ci PATCH] projects: Temporarily skip expensive tests on FreeBSD
by Andrea Bolognani 16 May '18

16 May '18

The gnulib issue has been reported upstream, but solving it is taking a bit and all jobs downstream of libvirt-master-check are blocked in the meantime, which is less than ideal. Put a temporary workaround in place. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 6f5464b..3273ebf 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -19,7 +19,11 @@ - autotools-check-job: parent_jobs: 'libvirt-master-syntax-check' local_env: | - export VIR_TEST_EXPENSIVE=1 + # gnulib's test-poll is broken on FreeBSD, so disable expensive + # tests (which include gnulib's test suite) until it's fixed + if [ "$(uname)" != "FreeBSD" ]; then + export VIR_TEST_EXPENSIVE=1 + fi export VIR_TEST_DEBUG=2 - autotools-rpm-job: parent_jobs: 'libvirt-master-check' -- 2.17.0

2 1

[libvirt] [PATCH 0/8] GnuTLS fixes and requirements
by Ján Tomko 16 May '18

16 May '18

The first two patches fix the build and tests without GnuTLS. The third requires GnuTLS 3.2.0 or newer. That means we don't have to worry about gnutls_hash_fast not being present (introduced in GnuTLS 2.10.0). The rest of the patches cleans up the code that deals with older GnuTLS. Ján Tomko (8): virCryptoHashBuf: return the length of the hash in bytes Skip vircryptotest and virfilecachetest without gnutls Require GnuTLS >= 3.2.0 Deprecate GNUTLS_GCRYPT Remove explicit check for gnutls_rnd Remove explicit check for gnutls_cipher_encrypt Fix indentation in virCryptoHaveCipher Remove check for gnutls/crypto.h config-post.h | 2 -- m4/virt-gnutls.m4 | 50 +++------------------------- src/libvirt.c | 83 ---------------------------------------------- src/rpc/virnettlscontext.c | 4 +-- src/util/vircrypto.c | 28 ++++++++-------- src/util/vircrypto.h | 2 +- tests/qemuxml2argvtest.c | 8 ++--- tests/vircryptotest.c | 26 ++++++++++----- tests/virfilecachetest.c | 19 ++++++++--- 9 files changed, 58 insertions(+), 164 deletions(-) -- 2.16.1

2 9

[libvirt] [PATCH] Add a MAINTAINERS file to suggest reviewers for patches
by Daniel P. Berrangé 16 May '18

16 May '18

Currently all patches are simply sent to the main libvirt development mailing list. Sometimes individual developers are also CC'd but this is typically the exception. Libvirt does not follow a subsystem maintainer model, so there is no notion of owners for the different areas of code, but there certainly are people with high levels of expertize in specific areas. This patch thus proposes pulling in QEMU's get_maintainer.pl script and creating MAINTAINERS file to list who the experts are for specific areas. Combined with git-pubish, this will help ensure that patches are brought to the attention of people with direct expertize. For example: $ git show b04629b62934caa8786e73c3db985672422fc662 | \ ./build-aux/get_maintainer.pl Jim Fehlig <jfehlig(a)suse.com> (maintainer:libxl) libvir-list(a)redhat.com (open list:All patches) Or $ git show e7cb9c4e230c3c77e35e72334c261b5b0a2211c6 | \ ./build-aux/get_maintainer.pl Jiri Denemar <jdenemar(a)redhat.com> (maintainer:CPU modelling) libvir-list(a)redhat.com (open list:All patches) Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .gitpublish | 1 + MAINTAINERS | 67 ++ build-aux/get_maintainer.pl | 2143 +++++++++++++++++++++++++++++++++++ 3 files changed, 2211 insertions(+) create mode 100644 MAINTAINERS create mode 100755 build-aux/get_maintainer.pl diff --git a/.gitpublish b/.gitpublish index 857f0d552c..6f2f9d11fa 100644 --- a/.gitpublish +++ b/.gitpublish @@ -1,3 +1,4 @@ [gitpublishprofile "default"] base = master to = libvir-list(a)redhat.com +cccmd = build-aux/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null diff --git a/MAINTAINERS b/MAINTAINERS new file mode 100644 index 0000000000..5756fd8b00 --- /dev/null +++ b/MAINTAINERS @@ -0,0 +1,67 @@ +Libvirt Maintainers +=================== + +The intention of this file is NOT to establish who owns what portions of the +code base, but to provide a set of names that developers can consult when they +have a question about a particular subset and also to provide a set of names +to be CC'd when submitting a patch to obtain appropriate review. + +In general, if you have a question about inclusion of a patch, you should +consult libvir-list(a)redhat.com and not any specific individual privately. + +Descriptions of section entries: + + M: Mail patches to: FullName <address@domain> + S: Status, one of the following: + Supported: Someone is actually paid to look after this. + Maintained: Someone actually looks after it. + Odd Fixes: It has a maintainer but they don't have time to do + much other than throw the odd patch in. See below. + Orphan: No current maintainer [but maybe you could take the + role as you write your new code]. + Obsolete: Old code. Something tagged obsolete generally means + it has been replaced by a better system and you + should be using that. + F: Files and directories with wildcard patterns. + A trailing slash includes all files and subdirectory files. + F: drivers/net/ all files in and below drivers/net + F: drivers/net/* all files in drivers/net, but not below + F: */net/* all files in "any top level directory"/net + One pattern per line. Multiple F: lines acceptable. + X: Files and directories that are NOT maintained, same rules as F: + Files exclusions are tested before file matches. + Can be useful for excluding a specific subdirectory, for instance: + F: net/ + X: net/ipv6/ + matches all files in and below net excluding net/ipv6/ + K: Keyword perl extended regex pattern to match content in a + patch or file. For instance: + K: of_get_profile + matches patches or files that contain "of_get_profile" + K: \b(printk|pr_(info|err))\b + matches patches or files that contain one or more of the words + printk, pr_info or pr_err + One regex pattern per line. Multiple K: lines acceptable. + + +All patches +L: libvir-list(a)redhat.com +F: * +F: */ + +Common code +----------- + +CPU modelling +M: Jiri Denemar <jdenemar(a)redhat.com> +S: Maintained +F: src/cpu/ + +Driver code +----------- +libxl +M: Jim Fehlig <jfehlig(a)suse.com> +S: Maintained +F: src/libxl/ +F: tests/*libxl* + diff --git a/build-aux/get_maintainer.pl b/build-aux/get_maintainer.pl new file mode 100755 index 0000000000..c94929d4f8 --- /dev/null +++ b/build-aux/get_maintainer.pl @@ -0,0 +1,2143 @@ +#!/usr/bin/env perl +# (c) 2007, Joe Perches <joe(a)perches.com> +# created from checkpatch.pl +# +# Print selected MAINTAINERS information for +# the files modified in a patch or for a file +# +# usage: perl scripts/get_maintainer.pl [OPTIONS] <patch> +# perl scripts/get_maintainer.pl [OPTIONS] -f <file> +# +# Licensed under the terms of the GNU GPL License version 2 + +use strict; +use warnings; + +my $P = $0; +my $V = '0.26'; + +use Getopt::Long qw(:config no_auto_abbrev); + +my $lk_path = "./"; +my $email = 1; +my $email_usename = 1; +my $email_maintainer = 1; +my $email_reviewer = 1; +my $email_list = 1; +my $email_subscriber_list = 0; +my $email_git = 0; +my $email_git_all_signature_types = 0; +my $email_git_blame = 0; +my $email_git_blame_signatures = 1; +my $email_git_fallback = 1; +my $email_git_min_signatures = 1; +my $email_git_max_maintainers = 5; +my $email_git_min_percent = 5; +my $email_git_since = "1-year-ago"; +my $email_hg_since = "-365"; +my $interactive = 0; +my $email_remove_duplicates = 1; +my $email_use_mailmap = 1; +my $output_multiline = 1; +my $output_separator = ", "; +my $output_roles = 0; +my $output_rolestats = 1; +my $scm = 0; +my $web = 0; +my $subsystem = 0; +my $status = 0; +my $keywords = 1; +my $sections = 0; +my $file_emails = 0; +my $from_filename = 0; +my $pattern_depth = 0; +my $version = 0; +my $help = 0; + +my $vcs_used = 0; + +my $exit = 0; + +my %commit_author_hash; +my %commit_signer_hash; + +# Signature types of people who are either +# a) responsible for the code in question, or +# b) familiar enough with it to give relevant feedback +my @signature_tags = (); +push(@signature_tags, "Signed-off-by:"); +push(@signature_tags, "Reviewed-by:"); +push(@signature_tags, "Acked-by:"); + +my $signature_pattern = "$" . join("|", @signature_tags) . "$"; + +# rfc822 email address - preloaded methods go here. +my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])"; +my $rfc822_char = '[\\000-\\377]'; + +# VCS command support: class-like functions and strings + +my %VCS_cmds; + +my %VCS_cmds_git = ( + "execute_cmd" => \&git_execute_cmd, + "available" => '(which("git") ne "") && (-d ".git")', + "find_signers_cmd" => + "git log --no-color --follow --since=\$email_git_since " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -- \$file", + "find_commit_signers_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n' . + '%b%n"' . + " -1 \$commit", + "find_commit_author_cmd" => + "git log --no-color " . + '--format="GitCommit: %H%n' . + 'GitAuthor: %an <%ae>%n' . + 'GitDate: %aD%n' . + 'GitSubject: %s%n"' . + " -1 \$commit", + "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file", + "blame_file_cmd" => "git blame -l \$file", + "commit_pattern" => "^GitCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([0-9a-f]+) ", + "author_pattern" => "^GitAuthor: (.*)", + "subject_pattern" => "^GitSubject: (.*)", +); + +my %VCS_cmds_hg = ( + "execute_cmd" => \&hg_execute_cmd, + "available" => '(which("hg") ne "") && (-d ".hg")', + "find_signers_cmd" => + "hg log --date=\$email_hg_since " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc}\\n'" . + " -- \$file", + "find_commit_signers_cmd" => + "hg log " . + "--template='HgSubject: {desc}\\n'" . + " -r \$commit", + "find_commit_author_cmd" => + "hg log " . + "--template='HgCommit: {node}\\n" . + "HgAuthor: {author}\\n" . + "HgSubject: {desc|firstline}\\n'" . + " -r \$commit", + "blame_range_cmd" => "", # not supported + "blame_file_cmd" => "hg blame -n \$file", + "commit_pattern" => "^HgCommit: ([0-9a-f]{40,40})", + "blame_commit_pattern" => "^([ 0-9a-f]+):", + "author_pattern" => "^HgAuthor: (.*)", + "subject_pattern" => "^HgSubject: (.*)", +); + +my $conf = which_conf(".get_maintainer.conf"); +if (-f $conf) { + my @conf_args; + open(my $conffile, '<', "$conf") + or warn "$P: Can't find a readable .get_maintainer.conf file $!\n"; + + while (<$conffile>) { + my $line = $_; + + $line =~ s/\s*\n?$//g; + $line =~ s/^\s*//g; + $line =~ s/\s+/ /g; + + next if ($line =~ m/^\s*#/); + next if ($line =~ m/^\s*$/); + + my @words = split(" ", $line); + foreach my $word (@words) { + last if ($word =~ m/^#/); + push (@conf_args, $word); + } + } + close($conffile); + unshift(@ARGV, @conf_args) if @conf_args; +} + +if (!GetOptions( + 'email!' => \$email, + 'git!' => \$email_git, + 'git-all-signature-types!' => \$email_git_all_signature_types, + 'git-blame!' => \$email_git_blame, + 'git-blame-signatures!' => \$email_git_blame_signatures, + 'git-fallback!' => \$email_git_fallback, + 'git-min-signatures=i' => \$email_git_min_signatures, + 'git-max-maintainers=i' => \$email_git_max_maintainers, + 'git-min-percent=i' => \$email_git_min_percent, + 'git-since=s' => \$email_git_since, + 'hg-since=s' => \$email_hg_since, + 'i|interactive!' => \$interactive, + 'remove-duplicates!' => \$email_remove_duplicates, + 'mailmap!' => \$email_use_mailmap, + 'm!' => \$email_maintainer, + 'r!' => \$email_reviewer, + 'n!' => \$email_usename, + 'l!' => \$email_list, + 's!' => \$email_subscriber_list, + 'multiline!' => \$output_multiline, + 'roles!' => \$output_roles, + 'rolestats!' => \$output_rolestats, + 'separator=s' => \$output_separator, + 'subsystem!' => \$subsystem, + 'status!' => \$status, + 'scm!' => \$scm, + 'web!' => \$web, + 'pattern-depth=i' => \$pattern_depth, + 'k|keywords!' => \$keywords, + 'sections!' => \$sections, + 'fe|file-emails!' => \$file_emails, + 'f|file' => \$from_filename, + 'v|version' => \$version, + 'h|help|usage' => \$help, + )) { + die "$P: invalid argument - use --help if necessary\n"; +} + +if ($help != 0) { + usage(); + exit 0; +} + +if ($version != 0) { + print("${P} ${V}\n"); + exit 0; +} + +if (-t STDIN && !@ARGV) { + # We're talking to a terminal, but have no command line arguments. + die "$P: missing patchfile or -f file - use --help if necessary\n"; +} + +$output_multiline = 0 if ($output_separator ne ", "); +$output_rolestats = 1 if ($interactive); +$output_roles = 1 if ($output_rolestats); + +if ($sections) { + $email = 0; + $email_list = 0; + $scm = 0; + $status = 0; + $subsystem = 0; + $web = 0; + $keywords = 0; + $interactive = 0; +} else { + my $selections = $email + $scm + $status + $subsystem + $web; + if ($selections == 0) { + die "$P: Missing required option: email, scm, status, subsystem or web\n"; + } +} + +if ($email && + ($email_maintainer + $email_reviewer + + $email_list + $email_subscriber_list + + $email_git + $email_git_blame) == 0) { + die "$P: Please select at least 1 email option\n"; +} + +if (!top_of_tree($lk_path)) { + die "$P: The current directory does not appear to be " + . "a libvirt source tree.\n"; +} + +## Read MAINTAINERS for type/value pairs + +my @typevalue = (); +my %keyword_hash; + +open (my $maint, '<', "${lk_path}MAINTAINERS") + or die "$P: Can't open MAINTAINERS: $!\n"; +while (<$maint>) { + my $line = $_; + + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + + ##Filename pattern matching + if ($type eq "F" || $type eq "X") { + $value =~ s@\.@\\\.@g; ##Convert . to \. + $value =~ s/\*/\.\*/g; ##Convert * to .* + $value =~ s/\?/\./g; ##Convert ? to . + ##if pattern is a directory and it lacks a trailing slash, add one + if ((-d $value)) { + $value =~ s@([^/])$@$1/@; + } + } elsif ($type eq "K") { + $keyword_hash{@typevalue} = $value; + } + push(@typevalue, "$type:$value"); + } elsif (!/^(\s)*$/) { + $line =~ s/\n$//g; + push(@typevalue, $line); + } +} +close($maint); + + +# +# Read mail address map +# + +my $mailmap; + +read_mailmap(); + +sub read_mailmap { + $mailmap = { + names => {}, + addresses => {} + }; + + return if (!$email_use_mailmap || !(-f "${lk_path}.mailmap")); + + open(my $mailmap_file, '<', "${lk_path}.mailmap") + or warn "$P: Can't open .mailmap: $!\n"; + + while (<$mailmap_file>) { + s/#.*$//; #strip comments + s/^\s+|\s+$//g; #trim + + next if (/^\s*$/); #skip empty lines + #entries have one of the following formats: + # name1 <mail1> + # <mail1> <mail2> + # name1 <mail1> <mail2> + # name1 <mail1> name2 <mail2> + # (see man git-shortlog) + + if (/^([^<]+)<([^>]+)>$/) { + my $real_name = $1; + my $address = $2; + + $real_name =~ s/\s+$//; + ($real_name, $address) = parse_email("$real_name <$address>"); + $mailmap->{names}->{$address} = $real_name; + + } elsif (/^<([^>]+)>\s*<([^>]+)>$/) { + my $real_address = $1; + my $wrong_address = $2; + + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_address = $3; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + $mailmap->{names}->{$wrong_address} = $real_name; + $mailmap->{addresses}->{$wrong_address} = $real_address; + + } elsif (/^(.+)<([^>]+)>\s*(.+)\s*<([^>]+)>$/) { + my $real_name = $1; + my $real_address = $2; + my $wrong_name = $3; + my $wrong_address = $4; + + $real_name =~ s/\s+$//; + ($real_name, $real_address) = + parse_email("$real_name <$real_address>"); + + $wrong_name =~ s/\s+$//; + ($wrong_name, $wrong_address) = + parse_email("$wrong_name <$wrong_address>"); + + my $wrong_email = format_email($wrong_name, $wrong_address, 1); + $mailmap->{names}->{$wrong_email} = $real_name; + $mailmap->{addresses}->{$wrong_email} = $real_address; + } + } + close($mailmap_file); +} + +## use the filenames on the command line or find the filenames in the patchfiles + +my @files = (); +my @range = (); +my @keyword_tvi = (); +my @file_emails = (); + +if (!@ARGV) { + push(@ARGV, "&STDIN"); +} + +foreach my $file (@ARGV) { + if ($file ne "&STDIN") { + ##if $file is a directory and it lacks a trailing slash, add one + if ((-d $file)) { + $file =~ s@([^/])$@$1/@; + } elsif (!(stat $file)) { + die "$P: file '${file}' not found: $!\n"; + } + } + if ($from_filename) { + push(@files, $file); + if ($file ne "MAINTAINERS" && -f $file && ($keywords || $file_emails)) { + open(my $f, '<', $file) + or die "$P: Can't open $file: $!\n"; + my $text = do { local($/) ; <$f> }; + close($f); + if ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($text =~ m/$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + if ($file_emails) { + my @poss_addr = $text =~ m$[A-Za-zÀ-ÿ\"\' \,\.\+-]*\s*[\,]*\s*[$\<\{]{0,1}[A-Za-z0-9_\.\+-]+\(a)[A-Za-z0-9\.-]+\.[A-Za-z0-9]+[$\>\}]{0,1}$g; + push(@file_emails, clean_file_emails(@poss_addr)); + } + } + } else { + my $file_cnt = @files; + my $lastfile; + + open(my $patch, "< $file") + or die "$P: Can't open $file: $!\n"; + + # We can check arbitrary information before the patch + # like the commit message, mail headers, etc... + # This allows us to match arbitrary keywords against any part + # of a git format-patch generated file (subject tags, etc...) + + my $patch_prefix = ""; #Parsing the intro + + while (<$patch>) { + my $patch_line = $_; + if (m/^\+\+\+\s+(\S+)/) { + my $filename = $1; + $filename =~ s@^[^/]*/@@; + $filename =~ s@\n@@; + $lastfile = $filename; + push(@files, $filename); + $patch_prefix = "^[+-].*"; #Now parsing the actual patch + } elsif (m/^\@\@ -(\d+),(\d+)/) { + if ($email_git_blame) { + push(@range, "$lastfile:$1:$2"); + } + } elsif ($keywords) { + foreach my $line (keys %keyword_hash) { + if ($patch_line =~ m/${patch_prefix}$keyword_hash{$line}/x) { + push(@keyword_tvi, $line); + } + } + } + } + close($patch); + + if ($file_cnt == @files) { + warn "$P: file '${file}' doesn't appear to be a patch. " + . "Add -f to options?\n"; + } + @files = sort_and_uniq(@files); + } +} + +@file_emails = uniq(@file_emails); + +my %email_hash_name; +my %email_hash_address; +my @email_to = (); +my %hash_list_to; +my @list_to = (); +my @scm = (); +my @web = (); +my @subsystem = (); +my @status = (); +my %deduplicate_name_hash = (); +my %deduplicate_address_hash = (); + +my @maintainers = get_maintainers(); + +if (@maintainers) { + @maintainers = merge_email(@maintainers); + output(@maintainers); +} + +if ($scm) { + @scm = uniq(@scm); + output(@scm); +} + +if ($status) { + @status = uniq(@status); + output(@status); +} + +if ($subsystem) { + @subsystem = uniq(@subsystem); + output(@subsystem); +} + +if ($web) { + @web = uniq(@web); + output(@web); +} + +exit($exit); + +sub range_is_maintained { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'S') { + if ($value =~ /(maintain|support)/i) { + return 1; + } + } + } + } + return 0; +} + +sub range_has_maintainer { + my ($start, $end) = @_; + + for (my $i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'M') { + return 1; + } + } + } + return 0; +} + +sub get_maintainers { + %email_hash_name = (); + %email_hash_address = (); + %commit_author_hash = (); + %commit_signer_hash = (); + @email_to = (); + %hash_list_to = (); + @list_to = (); + @scm = (); + @web = (); + @subsystem = (); + @status = (); + %deduplicate_name_hash = (); + %deduplicate_address_hash = (); + if ($email_git_all_signature_types) { + $signature_pattern = "(.+?)[Bb][Yy]:"; + } else { + $signature_pattern = "$" . join("|", @signature_tags) . "$"; + } + + # Find responsible parties + + my %exact_pattern_match_hash = (); + + foreach my $file (@files) { + + my %hash; + my $tvi = find_first_section(); + while ($tvi < @typevalue) { + my $start = find_starting_index($tvi); + my $end = find_ending_index($tvi); + my $exclude = 0; + my $i; + + #Do not match excluded file patterns + + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'X') { + if (file_match_pattern($file, $value)) { + $exclude = 1; + last; + } + } + } + } + + if (!$exclude) { + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ m/^(.):\s*(.*)/) { + my $type = $1; + my $value = $2; + if ($type eq 'F') { + if (file_match_pattern($file, $value)) { + my $value_pd = ($value =~ tr@/@@); + my $file_pd = ($file =~ tr@/@@); + $value_pd++ if (substr($value,-1,1) ne "/"); + $value_pd = -1 if ($value =~ /^\.\*/); + if ($value_pd >= $file_pd && + range_is_maintained($start, $end) && + range_has_maintainer($start, $end)) { + $exact_pattern_match_hash{$file} = 1; + } + if ($pattern_depth == 0 || + (($file_pd - $value_pd) < $pattern_depth)) { + $hash{$tvi} = $value_pd; + } + } + } + } + } + } + $tvi = $end + 1; + } + + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + add_categories($line); + if ($sections) { + my $i; + my $start = find_starting_index($line); + my $end = find_ending_index($line); + for ($i = $start; $i < $end; $i++) { + my $line = $typevalue[$i]; + if ($line =~ /^[FX]:/) { ##Restore file patterns + $line =~ s/([^\\])\.([^\*])/$1\?$2/g; + $line =~ s/([^\\])\.$/$1\?/g; ##Convert . back to ? + $line =~ s/\\\./\./g; ##Convert \. to . + $line =~ s/\.\*/\*/g; ##Convert .* to * + } + $line =~ s/^([A-Z]):/$1:\t/g; + print("$line\n"); + } + print("\n"); + } + } + } + + if ($keywords) { + @keyword_tvi = sort_and_uniq(@keyword_tvi); + foreach my $line (@keyword_tvi) { + add_categories($line); + } + } + + foreach my $email (@email_to, @list_to) { + $email->[0] = deduplicate_email($email->[0]); + } + + if ($email) { + if (! $interactive) { + $email_git_fallback = 0 if @email_to > 0 || $email_git || $email_git_blame; + if ($email_git_fallback) { + print STDERR "get_maintainer.pl: No maintainers found, printing recent contributors.\n"; + print STDERR "get_maintainer.pl: Do not blindly cc: them on patches! Use common sense.\n"; + print STDERR "\n"; + } + } + + foreach my $file (@files) { + if ($email_git || ($email_git_fallback && + !$exact_pattern_match_hash{$file})) { + vcs_file_signoffs($file); + } + if ($email_git_blame) { + vcs_file_blame($file); + } + } + + foreach my $email (@file_emails) { + my ($name, $address) = parse_email($email); + + my $tmp_email = format_email($name, $address, $email_usename); + push_email_address($tmp_email, ''); + add_role($tmp_email, 'in file'); + } + } + + my @to = (); + if ($email || $email_list) { + if ($email) { + @to = (@to, @email_to); + } + if ($email_list) { + @to = (@to, @list_to); + } + } + + if ($interactive) { + @to = interactive_get_maintainers(\@to); + } + + return @to; +} + +sub file_match_pattern { + my ($file, $pattern) = @_; + if (substr($pattern, -1) eq "/") { + if ($file =~ m@^$pattern@) { + return 1; + } + } else { + if ($file =~ m@^$pattern@) { + my $s1 = ($file =~ tr@/@@); + my $s2 = ($pattern =~ tr@/@@); + if ($s1 == $s2) { + return 1; + } + } + } + return 0; +} + +sub usage { + print <<EOT; +usage: $P [options] patchfile + $P [options] -f file|directory +version: $V + +MAINTAINER field selection options: + --email => print email address(es) if any + --git => include recent git \*-by: signers + --git-all-signature-types => include signers regardless of signature type + or use only ${signature_pattern} signers (default: $email_git_all_signature_types) + --git-fallback => use git when no exact MAINTAINERS pattern (default: $email_git_fallback) + --git-min-signatures => number of signatures required (default: $email_git_min_signatures) + --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers) + --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent) + --git-blame => use git blame to find modified commits for patch or file + --git-since => git history to use (default: $email_git_since) + --hg-since => hg history to use (default: $email_hg_since) + --interactive => display a menu (mostly useful if used with the --git option) + --m => include maintainer(s) if any + --r => include reviewer(s) if any + --n => include name 'Full Name <addr\(a)domain.tld>' + --l => include list(s) if any + --s => include subscriber only list(s) if any + --remove-duplicates => minimize duplicate email names/addresses + --roles => show roles (status:subsystem, git-signer, list, etc...) + --rolestats => show roles and statistics (commits/total_commits, %) + --file-emails => add email addresses found in -f file (default: 0 (off)) + --scm => print SCM tree(s) if any + --status => print status if any + --subsystem => print subsystem name if any + --web => print website(s) if any + +Output type options: + --separator [, ] => separator for multiple entries on 1 line + using --separator also sets --nomultiline if --separator is not [, ] + --multiline => print 1 entry per line + +Other options: + --pattern-depth => Number of pattern directory traversals (default: 0 (all)) + --keywords => scan patch for keywords (default: $keywords) + --sections => print all of the subsystem sections with pattern matches + --mailmap => use .mailmap file (default: $email_use_mailmap) + --version => show version + --help => show this help information + +Default options: + [--email --nogit --git-fallback --m --r --n --l --multiline --pattern-depth=0 + --remove-duplicates --rolestats] + +Notes: + Using "-f directory" may give unexpected results: + Used with "--git", git signators for _all_ files in and below + directory are examined as git recurses directories. + Any specified X: (exclude) pattern matches are _not_ ignored. + Used with "--nogit", directory is used as a pattern match, + no individual file within the directory or subdirectory + is matched. + Used with "--git-blame", does not iterate all files in directory + Using "--git-blame" is slow and may add old committers and authors + that are no longer active maintainers to the output. + Using "--roles" or "--rolestats" with git send-email --cc-cmd or any + other automated tools that expect only ["name"] <email address> + may not work because of additional output after <email address>. + Using "--rolestats" and "--git-blame" shows the #/total=% commits, + not the percentage of the entire file authored. # of commits is + not a good measure of amount of code authored. 1 major commit may + contain a thousand lines, 5 trivial commits may modify a single line. + If git is not installed, but mercurial (hg) is installed and an .hg + repository exists, the following options apply to mercurial: + --git, + --git-min-signatures, --git-max-maintainers, --git-min-percent, and + --git-blame + Use --hg-since not --git-since to control date selection + File ".get_maintainer.conf", if it exists in the libvirt source root + directory, can change whatever get_maintainer defaults are desired. + Entries in this file can be any command line argument. + This file is prepended to any additional command line arguments. + Multiple lines and # comments are allowed. +EOT +} + +sub top_of_tree { + my ($lk_path) = @_; + + if ($lk_path ne "" && substr($lk_path,length($lk_path)-1,1) ne "/") { + $lk_path .= "/"; + } + if ( (-f "${lk_path}COPYING") + && (-f "${lk_path}MAINTAINERS") + && (-f "${lk_path}Makefile.am") + && (-d "${lk_path}docs") + && (-f "${lk_path}m4/virt-lib.m4") + && (-f "${lk_path}src/libvirt.c")) { + return 1; + } + return 0; +} + +sub parse_email { + my ($formatted_email) = @_; + + my $name = ""; + my $address = ""; + + if ($formatted_email =~ /^([^<]+)<(.+\@.*)>.*$/) { + $name = $1; + $address = $2; + } elsif ($formatted_email =~ /^\s*<(.+\@\S*)>.*$/) { + $address = $1; + } elsif ($formatted_email =~ /^(.+$a)\S*).*$/) { + $address = $1; + } + + $name =~ s/^\s+|\s+$//g; + $name =~ s/^\"|\"$//g; + $address =~ s/^\s+|\s+$//g; + + if ($name =~ /[^\w \-]/i) { ##has "must quote" chars + $name =~ s/(?<!\$"/\\"/g; ##escape quotes + $name = "\"$name\""; + } + + return ($name, $address); +} + +sub format_email { + my ($name, $address, $usename) = @_; + + my $formatted_email; + + $name =~ s/^\s+|\s+$//g; + $name =~ s/^\"|\"$//g; + $address =~ s/^\s+|\s+$//g; + + if ($name =~ /[^\w \-]/i) { ##has "must quote" chars + $name =~ s/(?<!\\)"/\\"/g; ##escape quotes + $name = "\"$name\""; + } + + if ($usename) { + if ("$name" eq "") { + $formatted_email = "$address"; + } else { + $formatted_email = "$name <$address>"; + } + } else { + $formatted_email = $address; + } + + return $formatted_email; +} + +sub find_first_section { + my $index = 0; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (($tv =~ m/^(.):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub find_starting_index { + my ($index) = @_; + + while ($index > 0) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(.):\s*(.*)/)) { + last; + } + $index--; + } + + return $index; +} + +sub find_ending_index { + my ($index) = @_; + + while ($index < @typevalue) { + my $tv = $typevalue[$index]; + if (!($tv =~ m/^(.):\s*(.*)/)) { + last; + } + $index++; + } + + return $index; +} + +sub get_subsystem_name { + my ($index) = @_; + + my $start = find_starting_index($index); + + my $subsystem = $typevalue[$start]; + if (length($subsystem) > 20) { + $subsystem = substr($subsystem, 0, 17); + $subsystem =~ s/\s*$//; + $subsystem = $subsystem . "..."; + } + return $subsystem; +} + +sub get_maintainer_role { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + my $role = "unknown"; + my $subsystem = get_subsystem_name($index); + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(.):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "S") { + $role = $pvalue; + } + } + } + + $role = lc($role); + if ($role eq "supported") { + $role = "supporter"; + } elsif ($role eq "maintained") { + $role = "maintainer"; + } elsif ($role eq "odd fixes") { + $role = "odd fixer"; + } elsif ($role eq "orphan") { + $role = "orphan minder"; + } elsif ($role eq "obsolete") { + $role = "obsolete minder"; + } elsif ($role eq "buried alive in reporters") { + $role = "chief penguin"; + } + + return $role . ":" . $subsystem; +} + +sub get_list_role { + my ($index) = @_; + + my $subsystem = get_subsystem_name($index); + + if ($subsystem eq "THE REST") { + $subsystem = ""; + } + + return $subsystem; +} + +sub add_categories { + my ($index) = @_; + + my $i; + my $start = find_starting_index($index); + my $end = find_ending_index($index); + + push(@subsystem, $typevalue[$start]); + + for ($i = $start + 1; $i < $end; $i++) { + my $tv = $typevalue[$i]; + if ($tv =~ m/^(.):\s*(.*)/) { + my $ptype = $1; + my $pvalue = $2; + if ($ptype eq "L") { + my $list_address = $pvalue; + my $list_additional = ""; + my $list_role = get_list_role($i); + + if ($list_role ne "") { + $list_role = ":" . $list_role; + } + if ($list_address =~ m/([^\s]+)\s+(.*)$/) { + $list_address = $1; + $list_additional = $2; + } + if ($list_additional =~ m/subscribers-only/) { + if ($email_subscriber_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + push(@list_to, [$list_address, + "subscriber list${list_role}"]); + } + } + } else { + if ($email_list) { + if (!$hash_list_to{lc($list_address)}) { + $hash_list_to{lc($list_address)} = 1; + if ($list_additional =~ m/moderated/) { + push(@list_to, [$list_address, + "moderated list${list_role}"]); + } else { + push(@list_to, [$list_address, + "open list${list_role}"]); + } + } + } + } + } elsif ($ptype eq "M") { + my ($name, $address) = parse_email($pvalue); + if ($name eq "") { + if ($i > 0) { + my $tv = $typevalue[$i - 1]; + if ($tv =~ m/^(.):\s*(.*)/) { + if ($1 eq "P") { + $name = $2; + $pvalue = format_email($name, $address, $email_usename); + } + } + } + } + if ($email_maintainer) { + my $role = get_maintainer_role($i); + push_email_addresses($pvalue, $role); + } + } elsif ($ptype eq "R") { + my ($name, $address) = parse_email($pvalue); + if ($name eq "") { + if ($i > 0) { + my $tv = $typevalue[$i - 1]; + if ($tv =~ m/^(.):\s*(.*)/) { + if ($1 eq "P") { + $name = $2; + $pvalue = format_email($name, $address, $email_usename); + } + } + } + } + if ($email_reviewer) { + my $subsystem = get_subsystem_name($i); + push_email_addresses($pvalue, "reviewer:$subsystem"); + } + } elsif ($ptype eq "T") { + push(@scm, $pvalue); + } elsif ($ptype eq "W") { + push(@web, $pvalue); + } elsif ($ptype eq "S") { + push(@status, $pvalue); + } + } + } +} + +sub email_inuse { + my ($name, $address) = @_; + + return 1 if (($name eq "") && ($address eq "")); + return 1 if (($name ne "") && exists($email_hash_name{lc($name)})); + return 1 if (($address ne "") && exists($email_hash_address{lc($address)})); + + return 0; +} + +sub push_email_address { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + + if ($address eq "") { + return 0; + } + + if (!$email_remove_duplicates) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + } elsif (!email_inuse($name, $address)) { + push(@email_to, [format_email($name, $address, $email_usename), $role]); + $email_hash_name{lc($name)}++ if ($name ne ""); + $email_hash_address{lc($address)}++; + } + + return 1; +} + +sub push_email_addresses { + my ($address, $role) = @_; + + my @address_list = (); + + if (rfc822_valid($address)) { + push_email_address($address, $role); + } elsif (@address_list = rfc822_validlist($address)) { + my $array_count = shift(@address_list); + while (my $entry = shift(@address_list)) { + push_email_address($entry, $role); + } + } else { + if (!push_email_address($address, $role)) { + warn("Invalid MAINTAINERS address: '" . $address . "'\n"); + } + } +} + +sub add_role { + my ($line, $role) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, $email_usename); + + foreach my $entry (@email_to) { + if ($email_remove_duplicates) { + my ($entry_name, $entry_address) = parse_email($entry->[0]); + if (($name eq $entry_name || $address eq $entry_address) + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } else { + if ($email eq $entry->[0] + && ($role eq "" || !($entry->[1] =~ m/$role/)) + ) { + if ($entry->[1] eq "") { + $entry->[1] = "$role"; + } else { + $entry->[1] = "$entry->[1],$role"; + } + } + } + } +} + +sub which { + my ($bin) = @_; + + foreach my $path (split(/:/, $ENV{PATH})) { + if (-e "$path/$bin") { + return "$path/$bin"; + } + } + + return ""; +} + +sub which_conf { + my ($conf) = @_; + + foreach my $path (split(/:/, ".:$ENV{HOME}:.scripts")) { + if (-e "$path/$conf") { + return "$path/$conf"; + } + } + + return ""; +} + +sub mailmap_email { + my ($line) = @_; + + my ($name, $address) = parse_email($line); + my $email = format_email($name, $address, 1); + my $real_name = $name; + my $real_address = $address; + + if (exists $mailmap->{names}->{$email} || + exists $mailmap->{addresses}->{$email}) { + if (exists $mailmap->{names}->{$email}) { + $real_name = $mailmap->{names}->{$email}; + } + if (exists $mailmap->{addresses}->{$email}) { + $real_address = $mailmap->{addresses}->{$email}; + } + } else { + if (exists $mailmap->{names}->{$address}) { + $real_name = $mailmap->{names}->{$address}; + } + if (exists $mailmap->{addresses}->{$address}) { + $real_address = $mailmap->{addresses}->{$address}; + } + } + return format_email($real_name, $real_address, 1); +} + +sub mailmap { + my (@addresses) = @_; + + my @mapped_emails = (); + foreach my $line (@addresses) { + push(@mapped_emails, mailmap_email($line)); + } + merge_by_realname(@mapped_emails) if ($email_use_mailmap); + return @mapped_emails; +} + +sub merge_by_realname { + my %address_map; + my (@emails) = @_; + + foreach my $email (@emails) { + my ($name, $address) = parse_email($email); + if (exists $address_map{$name}) { + $address = $address_map{$name}; + $email = format_email($name, $address, 1); + } else { + $address_map{$name} = $address; + } + } +} + +sub git_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + $output =~ s/^\s*//gm; + @lines = split("\n", $output); + + return @lines; +} + +sub hg_execute_cmd { + my ($cmd) = @_; + my @lines = (); + + my $output = `$cmd`; + @lines = split("\n", $output); + + return @lines; +} + +sub extract_formatted_signatures { + my (@signature_lines) = @_; + + my @type = @signature_lines; + + s/\s*(.*):.*/$1/ for (@type); + + # cut -f2- -d":" + s/\s*.*:\s*(.+)\s*/$1/ for (@signature_lines); + +## Reformat email addresses (with names) to avoid badly written signatures + + foreach my $signer (@signature_lines) { + $signer = deduplicate_email($signer); + } + + return (\@type, \@signature_lines); +} + +sub vcs_find_signers { + my ($cmd) = @_; + my $commits; + my @lines = (); + my @signatures = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + my $pattern = $VCS_cmds{"commit_pattern"}; + + $commits = grep(/$pattern/, @lines); # of commits + + @signatures = grep(/^[ \t]*${signature_pattern}.*\@.*$/, @lines); + + return (0, @signatures) if !@signatures; + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + + return ($commits, @$signers_ref); +} + +sub vcs_find_author { + my ($cmd) = @_; + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + return @lines if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + my ($name, $address) = parse_email($author); + $author = format_email($name, $address, 1); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + return @authors; +} + +sub vcs_save_commits { + my ($cmd) = @_; + my @lines = (); + my @commits = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"blame_commit_pattern"}/) { + push(@commits, $1); + } + } + + return @commits; +} + +sub vcs_blame { + my ($file) = @_; + my $cmd; + my @commits = (); + + return @commits if (!(-f $file)); + + if (@range && $VCS_cmds{"blame_range_cmd"} eq "") { + my @all_commits = (); + + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @all_commits = vcs_save_commits($cmd); + + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + for (my $i = $diff_start; $i < $diff_start + $diff_length; $i++) { + push(@commits, $all_commits[$i]); + } + } + } elsif (@range) { + foreach my $file_range_diff (@range) { + next if (!($file_range_diff =~ m/(.+):(.+):(.+)/)); + my $diff_file = $1; + my $diff_start = $2; + my $diff_length = $3; + next if ("$file" ne "$diff_file"); + $cmd = $VCS_cmds{"blame_range_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + push(@commits, vcs_save_commits($cmd)); + } + } else { + $cmd = $VCS_cmds{"blame_file_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + @commits = vcs_save_commits($cmd); + } + + foreach my $commit (@commits) { + $commit =~ s/^\^//g; + } + + return @commits; +} + +my $printed_novcs = 0; +sub vcs_exists { + %VCS_cmds = %VCS_cmds_git; + return 1 if eval $VCS_cmds{"available"}; + %VCS_cmds = %VCS_cmds_hg; + return 2 if eval $VCS_cmds{"available"}; + %VCS_cmds = (); + if (!$printed_novcs) { + warn("$P: No supported VCS found. Add --nogit to options?\n"); + warn("Using a git repository produces better results.\n"); + warn("Try latest git repository using:\n"); + warn("git clone git://libvirt.org/libvirt.git\n"); + $printed_novcs = 1; + } + return 0; +} + +sub vcs_is_git { + vcs_exists(); + return $vcs_used == 1; +} + +sub vcs_is_hg { + return $vcs_used == 2; +} + +sub interactive_get_maintainers { + my ($list_ref) = @_; + my @list = @$list_ref; + + vcs_exists(); + + my %selected; + my %authored; + my %signed; + my $count = 0; + my $maintained = 0; + foreach my $entry (@list) { + $maintained = 1 if ($entry->[1] =~ /^(maintainer|supporter)/i); + $selected{$count} = 1; + $authored{$count} = 0; + $signed{$count} = 0; + $count++; + } + + #menu loop + my $done = 0; + my $print_options = 0; + my $redraw = 1; + while (!$done) { + $count = 0; + if ($redraw) { + printf STDERR "\n%1s %2s %-65s", + "*", "#", "email/list and role:stats"; + if ($email_git || + ($email_git_fallback && !$maintained) || + $email_git_blame) { + print STDERR "auth sign"; + } + print STDERR "\n"; + foreach my $entry (@list) { + my $email = $entry->[0]; + my $role = $entry->[1]; + my $sel = ""; + $sel = "*" if ($selected{$count}); + my $commit_author = $commit_author_hash{$email}; + my $commit_signer = $commit_signer_hash{$email}; + my $authored = 0; + my $signed = 0; + $authored++ for (@{$commit_author}); + $signed++ for (@{$commit_signer}); + printf STDERR "%1s %2d %-65s", $sel, $count + 1, $email; + printf STDERR "%4d %4d", $authored, $signed + if ($authored > 0 || $signed > 0); + printf STDERR "\n %s\n", $role; + if ($authored{$count}) { + my $commit_author = $commit_author_hash{$email}; + foreach my $ref (@{$commit_author}) { + print STDERR " Author: @{$ref}[1]\n"; + } + } + if ($signed{$count}) { + my $commit_signer = $commit_signer_hash{$email}; + foreach my $ref (@{$commit_signer}) { + print STDERR " @{$ref}[2]: @{$ref}[1]\n"; + } + } + + $count++; + } + } + my $date_ref = \$email_git_since; + $date_ref = \$email_hg_since if (vcs_is_hg()); + if ($print_options) { + $print_options = 0; + if (vcs_exists()) { + print STDERR <<EOT + +Version Control options: +g use git history [$email_git] +gf use git-fallback [$email_git_fallback] +b use git blame [$email_git_blame] +bs use blame signatures [$email_git_blame_signatures] +c# minimum commits [$email_git_min_signatures] +%# min percent [$email_git_min_percent] +d# history to use [$$date_ref] +x# max maintainers [$email_git_max_maintainers] +t all signature types [$email_git_all_signature_types] +m use .mailmap [$email_use_mailmap] +EOT + } + print STDERR <<EOT + +Additional options: +0 toggle all +tm toggle maintainers +tg toggle git entries +tl toggle open list entries +ts toggle subscriber list entries +f emails in file [$file_emails] +k keywords in file [$keywords] +r remove duplicates [$email_remove_duplicates] +p# pattern match depth [$pattern_depth] +EOT + } + print STDERR +"\n#(toggle), A#(author), S#(signed) *(all), ^(none), O(options), Y(approve): "; + + my $input = <STDIN>; + chomp($input); + + $redraw = 1; + my $rerun = 0; + my @wish = split(/[, ]+/, $input); + foreach my $nr (@wish) { + $nr = lc($nr); + my $sel = substr($nr, 0, 1); + my $str = substr($nr, 1); + my $val = 0; + $val = $1 if $str =~ /^(\d+)$/; + + if ($sel eq "y") { + $interactive = 0; + $done = 1; + $output_rolestats = 0; + $output_roles = 0; + last; + } elsif ($nr =~ /^\d+$/ && $nr > 0 && $nr <= $count) { + $selected{$nr - 1} = !$selected{$nr - 1}; + } elsif ($sel eq "*" || $sel eq '^') { + my $toggle = 0; + $toggle = 1 if ($sel eq '*'); + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = $toggle; + } + } elsif ($sel eq "0") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i}; + } + } elsif ($sel eq "t") { + if (lc($str) eq "m") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(maintainer|supporter)/i); + } + } elsif (lc($str) eq "g") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(author|commit|signer)/i); + } + } elsif (lc($str) eq "l") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(open list)/i); + } + } elsif (lc($str) eq "s") { + for (my $i = 0; $i < $count; $i++) { + $selected{$i} = !$selected{$i} + if ($list[$i]->[1] =~ /^(subscriber list)/i); + } + } + } elsif ($sel eq "a") { + if ($val > 0 && $val <= $count) { + $authored{$val - 1} = !$authored{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $authored{$i} = $toggle; + } + } + } elsif ($sel eq "s") { + if ($val > 0 && $val <= $count) { + $signed{$val - 1} = !$signed{$val - 1}; + } elsif ($str eq '*' || $str eq '^') { + my $toggle = 0; + $toggle = 1 if ($str eq '*'); + for (my $i = 0; $i < $count; $i++) { + $signed{$i} = $toggle; + } + } + } elsif ($sel eq "o") { + $print_options = 1; + $redraw = 1; + } elsif ($sel eq "g") { + if ($str eq "f") { + bool_invert(\$email_git_fallback); + } else { + bool_invert(\$email_git); + } + $rerun = 1; + } elsif ($sel eq "b") { + if ($str eq "s") { + bool_invert(\$email_git_blame_signatures); + } else { + bool_invert(\$email_git_blame); + } + $rerun = 1; + } elsif ($sel eq "c") { + if ($val > 0) { + $email_git_min_signatures = $val; + $rerun = 1; + } + } elsif ($sel eq "x") { + if ($val > 0) { + $email_git_max_maintainers = $val; + $rerun = 1; + } + } elsif ($sel eq "%") { + if ($str ne "" && $val >= 0) { + $email_git_min_percent = $val; + $rerun = 1; + } + } elsif ($sel eq "d") { + if (vcs_is_git()) { + $email_git_since = $str; + } elsif (vcs_is_hg()) { + $email_hg_since = $str; + } + $rerun = 1; + } elsif ($sel eq "t") { + bool_invert(\$email_git_all_signature_types); + $rerun = 1; + } elsif ($sel eq "f") { + bool_invert(\$file_emails); + $rerun = 1; + } elsif ($sel eq "r") { + bool_invert(\$email_remove_duplicates); + $rerun = 1; + } elsif ($sel eq "m") { + bool_invert(\$email_use_mailmap); + read_mailmap(); + $rerun = 1; + } elsif ($sel eq "k") { + bool_invert(\$keywords); + $rerun = 1; + } elsif ($sel eq "p") { + if ($str ne "" && $val >= 0) { + $pattern_depth = $val; + $rerun = 1; + } + } elsif ($sel eq "h" || $sel eq "?") { + print STDERR <<EOT + +Interactive mode allows you to select the various maintainers, submitters, +commit signers and mailing lists that could be CC'd on a patch. + +Any *'d entry is selected. + +If you have git or hg installed, you can choose to summarize the commit +history of files in the patch. Also, each line of the current file can +be matched to its commit author and that commits signers with blame. + +Various knobs exist to control the length of time for active commit +tracking, the maximum number of commit authors and signers to add, +and such. + +Enter selections at the prompt until you are satisfied that the selected +maintainers are appropriate. You may enter multiple selections separated +by either commas or spaces. + +EOT + } else { + print STDERR "invalid option: '$nr'\n"; + $redraw = 0; + } + } + if ($rerun) { + print STDERR "git-blame can be very slow, please have patience..." + if ($email_git_blame); + goto &get_maintainers; + } + } + + #drop not selected entries + $count = 0; + my @new_emailto = (); + foreach my $entry (@list) { + if ($selected{$count}) { + push(@new_emailto, $list[$count]); + } + $count++; + } + return @new_emailto; +} + +sub bool_invert { + my ($bool_ref) = @_; + + if ($$bool_ref) { + $$bool_ref = 0; + } else { + $$bool_ref = 1; + } +} + +sub deduplicate_email { + my ($email) = @_; + + my $matched = 0; + my ($name, $address) = parse_email($email); + $email = format_email($name, $address, 1); + $email = mailmap_email($email); + + return $email if (!$email_remove_duplicates); + + ($name, $address) = parse_email($email); + + if ($name ne "" && $deduplicate_name_hash{lc($name)}) { + $name = $deduplicate_name_hash{lc($name)}->[0]; + $address = $deduplicate_name_hash{lc($name)}->[1]; + $matched = 1; + } elsif ($deduplicate_address_hash{lc($address)}) { + $name = $deduplicate_address_hash{lc($address)}->[0]; + $address = $deduplicate_address_hash{lc($address)}->[1]; + $matched = 1; + } + if (!$matched) { + $deduplicate_name_hash{lc($name)} = [ $name, $address ]; + $deduplicate_address_hash{lc($address)} = [ $name, $address ]; + } + $email = format_email($name, $address, 1); + $email = mailmap_email($email); + return $email; +} + +sub save_commits_by_author { + my (@lines) = @_; + + my @authors = (); + my @commits = (); + my @subjects = (); + + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + push(@commits, $1) if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + push(@subjects, $1) if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + } + + for (my $i = 0; $i < @authors; $i++) { + my $exists = 0; + foreach my $ref(@{$commit_author_hash{$authors[$i]}}) { + if (@{$ref}[0] eq $commits[$i] && + @{$ref}[1] eq $subjects[$i]) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_author_hash{$authors[$i]}}, + [ ($commits[$i], $subjects[$i]) ]); + } + } +} + +sub save_commits_by_signer { + my (@lines) = @_; + + my $commit = ""; + my $subject = ""; + + foreach my $line (@lines) { + $commit = $1 if ($line =~ m/$VCS_cmds{"commit_pattern"}/); + $subject = $1 if ($line =~ m/$VCS_cmds{"subject_pattern"}/); + if ($line =~ /^[ \t]*${signature_pattern}.*\@.*$/) { + my @signatures = ($line); + my ($types_ref, $signers_ref) = extract_formatted_signatures(@signatures); + my @types = @$types_ref; + my @signers = @$signers_ref; + + my $type = $types[0]; + my $signer = $signers[0]; + + $signer = deduplicate_email($signer); + + my $exists = 0; + foreach my $ref(@{$commit_signer_hash{$signer}}) { + if (@{$ref}[0] eq $commit && + @{$ref}[1] eq $subject && + @{$ref}[2] eq $type) { + $exists = 1; + last; + } + } + if (!$exists) { + push(@{$commit_signer_hash{$signer}}, + [ ($commit, $subject, $type) ]); + } + } + } +} + +sub vcs_assign { + my ($role, $divisor, @lines) = @_; + + my %hash; + my $count = 0; + + return if (@lines <= 0); + + if ($divisor <= 0) { + warn("Bad divisor in " . (caller(0))[3] . ": $divisor\n"); + $divisor = 1; + } + + @lines = mailmap(@lines); + + return if (@lines <= 0); + + @lines = sort(@lines); + + # uniq -c + $hash{$_}++ for @lines; + + # sort -rn + foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) { + my $sign_offs = $hash{$line}; + my $percent = $sign_offs * 100 / $divisor; + + $percent = 100 if ($percent > 100); + $count++; + last if ($sign_offs < $email_git_min_signatures || + $count > $email_git_max_maintainers || + $percent < $email_git_min_percent); + push_email_address($line, ''); + if ($output_rolestats) { + my $fmt_percent = sprintf("%.0f", $percent); + add_role($line, "$role:$sign_offs/$divisor=$fmt_percent%"); + } else { + add_role($line, $role); + } + } +} + +sub vcs_file_signoffs { + my ($file) = @_; + + my @signers = (); + my $commits; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + my $cmd = $VCS_cmds{"find_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; # interpolate $cmd + + ($commits, @signers) = vcs_find_signers($cmd); + + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + + vcs_assign("commit_signer", $commits, @signers); +} + +sub vcs_file_blame { + my ($file) = @_; + + my @signers = (); + my @all_commits = (); + my @commits = (); + my $total_commits; + my $total_lines; + + $vcs_used = vcs_exists(); + return if (!$vcs_used); + + @all_commits = vcs_blame($file); + @commits = uniq(@all_commits); + $total_commits = @commits; + $total_lines = @all_commits; + + if ($email_git_blame_signatures) { + if (vcs_is_hg()) { + my $commit_count; + my @commit_signers = (); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } else { + foreach my $commit (@commits) { + my $commit_count; + my @commit_signers = (); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_signers_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + ($commit_count, @commit_signers) = vcs_find_signers($cmd); + + push(@signers, @commit_signers); + } + } + } + + if ($from_filename) { + if ($output_rolestats) { + my @blame_signers; + if (vcs_is_hg()) {{ # Double brace for last exit + my $commit_count; + my @commit_signers = (); + @commits = uniq(@commits); + @commits = sort(@commits); + my $commit = join(" -r ", @commits); + my $cmd; + + $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #substitute variables in $cmd + + my @lines = (); + + @lines = &{$VCS_cmds{"execute_cmd"}}($cmd); + + last if !@lines; + + my @authors = (); + foreach my $line (@lines) { + if ($line =~ m/$VCS_cmds{"author_pattern"}/) { + my $author = $1; + $author = deduplicate_email($author); + push(@authors, $author); + } + } + + save_commits_by_author(@lines) if ($interactive); + save_commits_by_signer(@lines) if ($interactive); + + push(@signers, @authors); + }} + else { + foreach my $commit (@commits) { + my $i; + my $cmd = $VCS_cmds{"find_commit_author_cmd"}; + $cmd =~ s/(\$\w+)/$1/eeg; #interpolate $cmd + my @author = vcs_find_author($cmd); + next if !@author; + + my $formatted_author = deduplicate_email($author[0]); + + my $count = grep(/$commit/, @all_commits); + for ($i = 0; $i < $count ; $i++) { + push(@blame_signers, $formatted_author); + } + } + } + if (@blame_signers) { + vcs_assign("authored lines", $total_lines, @blame_signers); + } + } + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("commits", $total_commits, @signers); + } else { + foreach my $signer (@signers) { + $signer = deduplicate_email($signer); + } + vcs_assign("modified commits", $total_commits, @signers); + } +} + +sub uniq { + my (@parms) = @_; + + my %saw; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub sort_and_uniq { + my (@parms) = @_; + + my %saw; + @parms = sort @parms; + @parms = grep(!$saw{$_}++, @parms); + return @parms; +} + +sub clean_file_emails { + my (@file_emails) = @_; + my @fmt_emails = (); + + foreach my $email (@file_emails) { + $email =~ s/[$\<\{]{0,1}([A-Za-z0-9_\.\+-]+\(a)[A-Za-z0-9\.-]+)[$\>\}]{0,1}/\<$1\>/g; + my ($name, $address) = parse_email($email); + if ($name eq '"[,\.]"') { + $name = ""; + } + + my @nw = split(/[^A-Za-zÀ-ÿ\'\,\.\+-]/, $name); + if (@nw > 2) { + my $first = $nw[@nw - 3]; + my $middle = $nw[@nw - 2]; + my $last = $nw[@nw - 1]; + + if (((length($first) == 1 && $first =~ m/[A-Za-z]/) || + (length($first) == 2 && substr($first, -1) eq ".")) || + (length($middle) == 1 || + (length($middle) == 2 && substr($middle, -1) eq "."))) { + $name = "$first $middle $last"; + } else { + $name = "$middle $last"; + } + } + + if (substr($name, -1) =~ /[,\.]/) { + $name = substr($name, 0, length($name) - 1); + } elsif (substr($name, -2) =~ /[,\.]"/) { + $name = substr($name, 0, length($name) - 2) . '"'; + } + + if (substr($name, 0, 1) =~ /[,\.]/) { + $name = substr($name, 1, length($name) - 1); + } elsif (substr($name, 0, 2) =~ /"[,\.]/) { + $name = '"' . substr($name, 2, length($name) - 2); + } + + my $fmt_email = format_email($name, $address, $email_usename); + push(@fmt_emails, $fmt_email); + } + return @fmt_emails; +} + +sub merge_email { + my @lines; + my %saw; + + for (@_) { + my ($address, $role) = @$_; + if (!$saw{$address}) { + if ($output_roles) { + push(@lines, "$address ($role)"); + } else { + push(@lines, $address); + } + $saw{$address} = 1; + } + } + + return @lines; +} + +sub output { + my (@parms) = @_; + + if ($output_multiline) { + foreach my $line (@parms) { + print("${line}\n"); + } + } else { + print(join($output_separator, @parms)); + print("\n"); + } +} + +my $rfc822re; + +sub make_rfc822re { +# Basic lexical tokens are specials, domain_literal, quoted_string, atom, and +# comment. We must allow for rfc822_lwsp (or comments) after each of these. +# This regexp will only work on addresses which have had comments stripped +# and replaced with rfc822_lwsp. + + my $specials = '()<>@,;:\\\\".\\[\\]'; + my $controls = '\\000-\\037\\177'; + + my $dtext = "[^\\[\\]\\r\\\\]"; + my $domain_literal = "\\[(?:$dtext|\\\\.)*\\]$rfc822_lwsp*"; + + my $quoted_string = "\"(?:[^\\\"\\r\\\\]|\\\\.|$rfc822_lwsp)*\"$rfc822_lwsp*"; + +# Use zero-width assertion to spot the limit of an atom. A simple +# $rfc822_lwsp* causes the regexp engine to hang occasionally. + my $atom = "[^$specials $controls]+(?:$rfc822_lwsp+|\\Z|(?=[\\[\"$specials]))"; + my $word = "(?:$atom|$quoted_string)"; + my $localpart = "$word(?:\\.$rfc822_lwsp*$word)*"; + + my $sub_domain = "(?:$atom|$domain_literal)"; + my $domain = "$sub_domain(?:\\.$rfc822_lwsp*$sub_domain)*"; + + my $addr_spec = "$localpart\@$rfc822_lwsp*$domain"; + + my $phrase = "$word*"; + my $route = "(?:\@$domain(?:,\@$rfc822_lwsp*$domain)*:$rfc822_lwsp*)"; + my $route_addr = "\\<$rfc822_lwsp*$route?$addr_spec\\>$rfc822_lwsp*"; + my $mailbox = "(?:$addr_spec|$phrase$route_addr)"; + + my $group = "$phrase:$rfc822_lwsp*(?:$mailbox(?:,\\s*$mailbox)*)?;\\s*"; + my $address = "(?:$mailbox|$group)"; + + return "$rfc822_lwsp*$address"; +} + +sub rfc822_strip_comments { + my $s = shift; +# Recursively remove comments, and replace with a single space. The simpler +# regexps in the Email Addressing FAQ are imperfect - they will miss escaped +# chars in atoms, for example. + + while ($s =~ s/^((?:[^"\\]|\\.)* + (?:"(?:[^"\\]|\\.)*"(?:[^"\\]|\\.)*)*) + $(?:[^()\\]|\\.)*$/$1 /osx) {} + return $s; +} + +# valid: returns true if the parameter is an RFC822 valid address +# +sub rfc822_valid { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + + return $s =~ m/^$rfc822re$/so && $s =~ m/^$rfc822_char*$/; +} + +# validlist: In scalar context, returns true if the parameter is an RFC822 +# valid list of addresses. +# +# In list context, returns an empty list on failure (an invalid +# address was found); otherwise a list whose first element is the +# number of addresses found and whose remaining elements are the +# addresses. This is needed to disambiguate failure (invalid) +# from success with no addresses found, because an empty string is +# a valid list. + +sub rfc822_validlist { + my $s = rfc822_strip_comments(shift); + + if (!$rfc822re) { + $rfc822re = make_rfc822re(); + } + # * null list items are valid according to the RFC + # * the '1' business is to aid in distinguishing failure from no results + + my @r; + if ($s =~ m/^(?:$rfc822re)?(?:,(?:$rfc822re)?)*$/so && + $s =~ m/^$rfc822_char*$/) { + while ($s =~ m/(?:^|,$rfc822_lwsp*)($rfc822re)/gos) { + push(@r, $1); + } + return wantarray ? (scalar(@r), @r) : 1; + } + return wantarray ? () : 0; +} -- 2.17.0

5 5

[libvirt] [PATCH 5/9] virsh-network: Add network name completion to 'net-event' command
by Lin Ma 16 May '18

16 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-network.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 7a8bcb1beb..bcf322a5ae 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1202,10 +1202,7 @@ static const vshCmdInfo info_network_event[] = { }; static const vshCmdOptDef opts_network_event[] = { - {.name = "network", - .type = VSH_OT_STRING, - .help = N_("filter by network name or uuid") - }, + VIRSH_COMMON_OPT_NETWORK_OT_STRING(N_("filter by network name or uuid"), 0), {.name = "event", .type = VSH_OT_STRING, .help = N_("which event type to wait for") -- 2.16.2

2 6

[libvirt] [PATCH 0/9] Some virsh completion fixes
by Lin Ma 16 May '18

16 May '18

patch 1 is not about completion, I merge it into this patch set for easy review because it's a tiny fix. Lin Ma (9): virsh: Remove 'id' text from help message for 'domrename' command virsh: Only return active domain names for 'reset' command virsh: Only return active domain names for block* command virsh-network: Create macros for VSH_OT_STRING "network" option virsh-network: Add network name completion to 'net-event' command virsh-network: Add macro VIRSH_COMMON_OPT_NETWORK_FULL virsh-network: Add network name completion to 'net-uuid' command virsh: Introduce virshDomainBlockTargetCompleter virsh: Add target name completion for block device options tools/virsh-completer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-domain-monitor.c | 2 ++ tools/virsh-domain.c | 23 ++++++++++++++------- tools/virsh-network.c | 47 +++++++++++++++++++++++++------------------ 5 files changed, 97 insertions(+), 27 deletions(-) -- 2.16.2

2 5

[libvirt] [PATCH v2 0/5] Add QEMU SDL OpenGL support
by Maciej Wolny 16 May '18

16 May '18

This patch set adds support for accelerated graphics rendering with OpenGL when using the SDL backend with QEMU. This takes advantage of the `-sdl gl` option in QEMU. Maciej Wolny (5): qemu_command: Move SDL command line building into helper qemu_command: Remove outdated comment qemu: Add gl property to graphics of type sdl in domain config qemu: Add QEMU_CAPS_SDL_GL to qemu capabilities qemu: Add gl option to SDL graphics command line docs/formatdomain.html.in | 6 ++ docs/schemas/domaincommon.rng | 8 +++ src/conf/domain_conf.c | 44 +++++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 69 +++++++++++++++------- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 9 +++ tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 +- .../qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 28 +++++++++ tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml | 38 ++++++++++++ tests/qemuxml2argvtest.c | 5 ++ .../qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml | 45 ++++++++++++++ tests/qemuxml2xmltest.c | 1 + 14 files changed, 237 insertions(+), 23 deletions(-) create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml -- 2.11.0

3 29

[libvirt] [PATCH v4 00/11] Add support for TPM emulator
by Stefan Berger 16 May '18

16 May '18

This series of patches adds support for the TPM emulator backend that is available in QEMU and based on swtpm + libtpms. It allows to attach a TPM 1.2 or 2 to a QEMU VM. sVirt labels are used for labeling the swtpm process, its Unix socket, and log file with the same label that the QEMU process gets. Besides that swtpm is added to the emulator cgroup to restrict its CPU usage. The device XML can be changed from a TPM 1.2 to a TPM 2 and back to a TPM 1.2. The device state is not removed during those changes but only when the domain is undefined. The swtpm needs persistent storage to store its state. For that I am using the uuid of the VM as part of the path since the name of the VM can be changed. Logfiles, PID files, and socket names are based on the name of the VM, though. Stefan v3->v4: - Addressed John Ferlan's comments - Fixed bugs I found while testing - rebased on latest tip Stefan Berger (11): conf: Add support for external swtpm TPM emulator to domain XML qemu: Extend QEMU capabilities with 'tpm-emulator' util: Implement virFileChownFiles() security: Add DAC and SELinux security for tpm-emulator qemu: Extend qemu_conf with tpm-emulator support qemu: Extend QEMU with external TPM support qemu: Add support for external swtpm TPM emulator tests: Add test cases for external swtpm TPM emulator security: Label the external swtpm with SELinux labels tpm: Add support for choosing emulation of a TPM 2 qemu: Add swtpm to emulator cgroup docs/formatdomain.html.in | 43 + docs/schemas/domaincommon.rng | 17 + libvirt.spec.in | 2 + src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 53 +- src/conf/domain_conf.h | 13 + src/libvirt_private.syms | 3 + src/qemu/Makefile.inc.am | 10 + src/qemu/libvirtd_qemu.aug | 5 + src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 36 + src/qemu/qemu_cgroup.h | 2 + src/qemu/qemu_command.c | 34 +- src/qemu/qemu_conf.c | 43 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 3 + src/qemu/qemu_driver.c | 5 + src/qemu/qemu_extdevice.c | 177 ++++ src/qemu/qemu_extdevice.h | 59 ++ src/qemu/qemu_migration.c | 3 + src/qemu/qemu_process.c | 16 + src/qemu/qemu_tpm.c | 962 +++++++++++++++++++++ src/qemu/qemu_tpm.h | 56 ++ src/qemu/test_libvirtd_qemu.aug.in | 2 + src/security/security_dac.c | 7 + src/security/security_driver.h | 7 + src/security/security_manager.c | 36 + src/security/security_manager.h | 6 + src/security/security_selinux.c | 172 ++++ src/security/security_stack.c | 40 + src/util/virfile.c | 55 ++ src/util/virfile.h | 3 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + .../tpm-emulator-tpm2.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 30 + .../tpm-emulator.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator.xml | 30 + tests/qemuxml2argvtest.c | 16 +- tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml | 34 + tests/qemuxml2xmloutdata/tpm-emulator.xml | 34 + tests/qemuxml2xmltest.c | 1 + 47 files changed, 2098 insertions(+), 10 deletions(-) create mode 100644 src/qemu/qemu_extdevice.c create mode 100644 src/qemu/qemu_extdevice.h create mode 100644 src/qemu/qemu_tpm.c create mode 100644 src/qemu/qemu_tpm.h create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator.xml -- 2.5.5

5 37

[libvirt] [PATCH 00/12] Various storage_util adjustments
by John Ferlan 16 May '18

16 May '18

Essentially fallout and preparatory steps needed in order to alter the code to allow using qemu-img for creation of qcow[2] encrypted volume. The following series: https://www.redhat.com/archives/libvir-list/2018-April/msg01578.html is the impetus for these changes. What will follow once more testing is done are the adjustments to be able to qemu-img create a qcow[2] encrypted volume and changes to allow qemu-img convert to also work. Currently create is broken for qcow[2] encryption and convert is broken for both qcow[2] and luks encryption. Patches 1&2 could be combined, but since some like separated adjustments like that, I kept them separate. John Ferlan (12): storage_util: Some code cleanup storage_util: Cleanup usage of target.encryption storage_util: Remove unnecessary check storage_util: Rename virQEMUBuildLuksOpts storage_util: Generate the qcow secret earlier storage_util: Move secretPath generation storage_util: Remove luks distinction from secret path and alias storage_util: Split backing_fmt set in storageBackendCreateQemuImgOpts storage_util: Split preallocate set in storageBackendCreateQemuImgOpts storage_util: Move @type into _virStorageBackendQemuImgInfo storage_util: Introduce storageBackendCreateQemuImgSetInput storage_util: Introduce storageBackendDoCreateQemuImg src/libvirt_private.syms | 2 +- src/storage/storage_util.c | 252 +++++++++++++++++++++++++++------------------ src/util/virqemu.c | 8 +- src/util/virqemu.h | 6 +- 4 files changed, 158 insertions(+), 110 deletions(-) -- 2.14.3

3 30

[libvirt] [PATCH 00/13] Fix XML for persistent reservations and refactor
by Peter Krempa 16 May '18

16 May '18

The XML design for the PR stuff is slightly weird so fix it and refactor the code so that it will be much easier to use it with the blockdev infrastructure. Peter Krempa (13): qemu: hotplug: Fix spacing around addition operator qemu: alias: Allow passing alias of parent when generating PR manager alias qemu: command: Fix comment for qemuBuildPRManagerInfoProps qemu: Move validation of PR manager support util: storage: Drop pointless 'enabled' form PR definition util: storage: Drop virStoragePRDefIsEnabled util: storage: Allow passing <source> also for managed PR case qemu: Assign managed PR path when preparing storage source qemu: process: Change semantics of functions starting PR daemon qemu: command: Move check whether PR manager object props need to be built conf: domain: Add helper to check whether a domain def requires use of PR util: storage: Store PR manager alias in the definition qemu: hotplug: Replace qemuDomainDiskNeedRemovePR docs/formatdomain.html.in | 21 ++-- docs/schemas/storagecommon.rng | 3 - src/conf/domain_conf.c | 21 ++++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 2 +- src/qemu/qemu_alias.c | 4 +- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_command.c | 61 +++------- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_domain.c | 66 ++++++++--- src/qemu/qemu_domain.h | 3 +- src/qemu/qemu_hotplug.c | 83 +++----------- src/qemu/qemu_process.c | 40 ++----- src/qemu/qemu_process.h | 5 +- src/util/virstoragefile.c | 124 ++++++++------------- src/util/virstoragefile.h | 5 +- tests/qemustatusxml2xmldata/modern-in.xml | 4 + .../disk-virtio-scsi-reservations.xml | 4 +- tests/qemuxml2xmltest.c | 2 +- 19 files changed, 191 insertions(+), 268 deletions(-) -- 2.16.2

3 26

[libvirt] [dbus PATCH] tests: Add test_storage.py into test_programs
by Pavel Hrdina 15 May '18

15 May '18

Commit <bc58af85e6> forgot to list the test. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 089ade5..5e224f8 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,8 @@ test_helpers = \ test_programs = \ test_connect.py \ test_domain.py \ - test_network.py + test_network.py \ + test_storage.py EXTRA_DIST = \ $(test_helpers) \ -- 2.17.0

1 0

[libvirt] [jenkins-ci PATCH v2 0/3] Enable out-of-the-box parallel make
by Andrea Bolognani 15 May '18

15 May '18

Changes from [v1]: * turns out some versions of ExtUtils::MakeMaker output Makefiles that are not entirely compatible with parallel make, which forces us to introduce an exception in the relevant template and shuffle patches around. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00732.html Andrea Bolognani (3): jobs: Enable parallel make everywhere jobs: Drop explicit parallel make usage guests: Set MAKEFLAGS for out-of-the-box parallel make guests/templates/bashrc | 2 ++ jobs/autotools.yaml | 10 +++++----- jobs/defaults.yaml | 1 - jobs/perl-makemaker.yaml | 12 +++++++----- projects/libvirt.yaml | 4 ++-- projects/osinfo-db.yaml | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) -- 2.17.0

2 5

[libvirt] [PATCH] xenconfig: xm: Fix checking for extra in parser
by Filip Alac 15 May '18

15 May '18

Parser assumed extra was always present when root was specified. Fixed by handling root and extra separately. --- src/xenconfig/xen_xm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c index 8ef68bbc..4becb40b 100644 --- a/src/xenconfig/xen_xm.c +++ b/src/xenconfig/xen_xm.c @@ -91,10 +91,13 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def) if (xenConfigGetString(conf, "root", &root, NULL) < 0) return -1; - if (root) { + if (root && extra) { if (virAsprintf(&def->os.cmdline, "root=%s %s", root, extra) < 0) return -1; - } else { + } else if (root) { + if (virAsprintf(&def->os.cmdline, "root=%s", root) < 0) + return -1; + } else if (extra) { if (VIR_STRDUP(def->os.cmdline, extra) < 0) return -1; } -- 2.17.0

3 4

[libvirt] [PATCH] virDomainMemoryDefParseXML: Don't leak discard
by Michal Privoznik 15 May '18

15 May '18

==1589== 7 bytes in 2 blocks are definitely lost in loss record 34 of 261 ==1589== at 0x4C2AF0F: malloc (vg_replace_malloc.c:299) ==1589== by 0x8A82794: xmlStrndup (in /usr/lib64/libxml2.so.2.9.8) ==1589== by 0x5DD8392: virXMLPropString (virxml.c:510) ==1589== by 0x5E12427: virDomainMemoryDefParseXML (domain_conf.c:15704) ==1589== by 0x5E207DE: virDomainDefParseXML (domain_conf.c:20351) ==1589== by 0x5E2184F: virDomainDefParseNode (domain_conf.c:20636) ==1589== by 0x5E216A1: virDomainDefParse (domain_conf.c:20580) ==1589== by 0x5E21747: virDomainDefParseFile (domain_conf.c:20606) ==1589== by 0x112F5F: testCompareXMLToArgv (qemuxml2argvtest.c:493) ==1589== by 0x138780: virTestRun (testutils.c:180) ==1589== by 0x117129: mymain (qemuxml2argvtest.c:937) ==1589== by 0x13A83C: virTestMain (testutils.c:1120) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d38a775f21..338fbc0e61 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15710,6 +15710,7 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt, def->discard = val; } + VIR_FREE(tmp); /* source */ if ((node = virXPathNode("./source", ctxt)) && -- 2.16.1

2 1

[libvirt] [PATCH] util: fix misleading command for virObjectLock
by Daniel P. Berrangé 15 May '18

15 May '18

It only accepts a virObjecLockable, not a virObjecRWLockable Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virobject.c b/src/util/virobject.c index 9fb0328d58..a597ff4f54 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -408,7 +408,7 @@ virObjectGetRWLockableObj(void *anyobj) /** * virObjectLock: - * @anyobj: any instance of virObjectLockable or virObjectRWLockable + * @anyobj: any instance of virObjectLockable * * Acquire a lock on @anyobj. The lock must be released by * virObjectUnlock. -- 2.17.0

2 1

[libvirt] [PATCH] tests: Link mocks with libvirt.so
by Michal Privoznik 15 May '18

15 May '18

In a lot of our mocks (if not all of them) we use our internal APIs (e.g. VIR_ALLOC). So far, we're relying on test binary that links with the mock to drag in libvirt.so. Well, this works only partially. Firstly, whatever binary we execute from tests will fail (e.g. as Martin reported on the list ./qemucapsprobe fails to execute qemu). Secondly, if there's a program that tries to validate linking (like valgrind is doing) it fails because of unresolved symbols. Because of that we have to link our mocks with libvirt.so. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 621480dd0c..ac92190845 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -81,7 +81,8 @@ LDADDS = \ ../src/libvirt.la MOCKLIBS_LIBS = \ - $(GNULIB_LIBS) + $(GNULIB_LIBS) \ + ../src/libvirt.la EXTRA_DIST = \ .valgrind.supp \ -- 2.16.1

2 2

[libvirt] [PATCH v2 00/12] Some fixes and improvement for virsh completion in non interactive mode
by Lin Ma 15 May '18

15 May '18

This patch series is about some fixes and improvement for virsh completion in non interactive mode. Some of them probably don't make sense, I sent them out for suggestions. v2->v1: * Add a new patch for centralize the definition of macro VIRSH_COMMON_OPT_DOMAIN_FULL to virsh.h * rename the helper function from virDomainEventGetName virshDomainEventGetName Follow Peter Krempa's suggestion: * Drop the original patch#10 which about introduce some VIR_DOMAIN_EVENT_* macros * code formatting fix * centralize the definition of macro VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL * centralize the definition of macro VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL * refactor some code in patch#10 for using same array, handle the case when '--event' and '--all' are provided together through command line. * Due to the helper function is only used for virsh, unnecessary to be publiced, I move it from src/conf/domain_event.c to tools/virsh-util.c Lin Ma (12): virsh: Move the definition of macro VIRSH_COMMON_OPT_DOMAIN_FULL to virsh.h virsh: Add domain name completion to 'migrate-postcopy' command virsh: Conditionally Ignore the first entry in list of completions virsh: Create macros for VSH_OT_STRING "domain" option virsh: Apply macro for current VSH_OT_STRING "domain" options vshReadlineParse: Ignore vshReadlineOptionsGenerator for VSH_OT_ARGV options virsh: Create macros for VSH_OT_ARGV "domain" option virsh: Apply macro for current VSH_OT_ARGV "domain" options vshReadlineOptionsGenerator: Add already provided VSH_OT_ARGV options to list virsh: Enable multiple --event flags to 'event' command virsh: add helper for returning event name string virsh: Add event name completion to 'event' command tools/virsh-completer.c | 37 ++++++++++++ tools/virsh-completer.h | 3 + tools/virsh-domain-monitor.c | 9 +-- tools/virsh-domain.c | 135 ++++++++++++++++++++----------------------- tools/virsh-snapshot.c | 3 - tools/virsh-util.c | 60 +++++++++++++++++++ tools/virsh-util.h | 3 + tools/virsh.h | 26 +++++++++ tools/vsh.c | 12 +++- 9 files changed, 203 insertions(+), 85 deletions(-) -- 2.15.1

2 32

[libvirt] [PATCH 0/9] Some virsh completion fixes
by Lin Ma 15 May '18

15 May '18

patch 1 is not about completion, I merge it into this patch set for easy review because it's a tiny fix. Lin Ma (9): virsh: Remove 'id' text from help message for 'domrename' command virsh: Only return active domain names for 'reset' command virsh: Only return active domain names for block* command virsh-network: Create macros for VSH_OT_STRING "network" option virsh-network: Add network name completion to 'net-event' command virsh-network: Add macro VIRSH_COMMON_OPT_NETWORK_FULL virsh-network: Add network name completion to 'net-uuid' command virsh: Introduce virshDomainBlockTargetCompleter virsh: Add target name completion for block device options tools/virsh-completer.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-completer.h | 4 ++++ tools/virsh-domain-monitor.c | 2 ++ tools/virsh-domain.c | 23 ++++++++++++++------- tools/virsh-network.c | 47 +++++++++++++++++++++++++------------------ 5 files changed, 97 insertions(+), 27 deletions(-) -- 2.16.2

1 0

[libvirt] gnutls regression in vircrypto
by Olaf Hering 15 May '18

15 May '18

Since commit 799011bbe7 ("vircrypto: Rely on GnuTLS for hash functions") the function "gnutls_hash_fast" is used. According to the documentation at https://www.gnutls.org/manual/html_node/Cryptographic-API.html this function is only available since version 2.10.0. But m4/virt-gnutls.m4 expects at least 2.2.0. Please either revert that change, or bump also the required gnutls version. Olaf

3 4

[libvirt] [PATCH] libxl: don't set hasManagedSave when performing save
by Jim Fehlig 15 May '18

15 May '18

libxlDoDomainSave() is used in both the save and managedsave code paths but was unconditionally setting hasManagedSave to true on success. As a result, undefine would fail after a non-managed save/restore operation. E.g. virsh define; virsh start virsh save; virsh restore virsh shutdown virsh undefine error: Refusing to undefine while domain managed save image exists Modify libxlDoDomainSave() to take an additional parameter to specify managed vs non-managed save, and change callers to use it. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 34adef8d48..df53dead0a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1653,8 +1653,10 @@ libxlDomainGetState(virDomainPtr dom, * virDomainObjPtr must be locked on invocation */ static int -libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - const char *to) +libxlDoDomainSave(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *to, + bool managed) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlSavefileHeader hdr; @@ -1725,7 +1727,7 @@ libxlDoDomainSave(libxlDriverPrivatePtr driver, virDomainObjPtr vm, } libxlDomainCleanup(driver, vm); - vm->hasManagedSave = true; + vm->hasManagedSave = managed; ret = 0; cleanup: @@ -1772,7 +1774,7 @@ libxlDomainSaveFlags(virDomainPtr dom, const char *to, const char *dxml, if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (libxlDoDomainSave(driver, vm, to) < 0) + if (libxlDoDomainSave(driver, vm, to, false) < 0) goto endjob; if (!vm->persistent) @@ -1989,7 +1991,7 @@ libxlDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state to %s", name); - if (libxlDoDomainSave(driver, vm, name) < 0) + if (libxlDoDomainSave(driver, vm, name, true) < 0) goto endjob; if (!vm->persistent) -- 2.16.3

2 1

[libvirt] [PATCH v2 0/8] vfio-ccw passthrough support
by Boris Fiuczynski 15 May '18

15 May '18

Let us support the basic channel I/O passthrough infrastructure based on vfio, which have been introduced in QEMU 2.10. The current focus is to support dasd-eckd (cu_type/dev_type = 0x3990/0x3390) as the target device. Shalini Chellathurai Saroja (8): qemu: introduce capability for virtual-css-bridge qemu: introduce vfio-ccw capability util: virhostdev: add virHostdevIsMdevDevice() qemu: vfio-ccw device address generation qemu: command line generation for vfio-ccw device tests: tests for vfio-ccw passthrough docs: documentation for vfio-ccw passthrough news: documentation of new feature docs/drvnodedev.html.in | 21 ++++- docs/formatdomain.html.in | 20 +++- docs/news.xml | 9 ++ docs/schemas/domaincommon.rng | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 23 +++++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 37 ++++++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 32 +++++-- src/qemu/qemu_hostdev.c | 3 +- src/qemu/qemu_hotplug.c | 4 +- src/util/virhostdev.c | 26 ++++-- src/util/virhostdev.h | 3 + src/util/virmdev.c | 3 +- src/util/virmdev.h | 1 + .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 31 +++++-- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 + .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 24 +++-- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- tests/qemuhotplugtest.c | 2 +- ...tdev-subsys-mdev-vfio-ccw-duplicate-address.xml | 29 ++++++ ...ostdev-subsys-mdev-vfio-ccw-invalid-address.xml | 23 +++++ .../hostdev-subsys-mdev-vfio-ccw.args | 26 ++++++ .../hostdev-subsys-mdev-vfio-ccw.xml | 22 +++++ tests/qemuxml2argvtest.c | 102 ++++++++++++--------- .../hostdev-subsys-mdev-vfio-ccw.xml | 28 ++++++ tests/qemuxml2xmltest.c | 31 ++++--- 36 files changed, 494 insertions(+), 149 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml -- 2.9.4

3 22

[libvirt] [PATCH 0/3] bhyve: allow locking memory
by Fabian Freyer 15 May '18

15 May '18

This patch series adds support for locking guest memory to the bhyve driver using the following elements <memoryBacking> <locked/> </memoryBacking> When specified, the -S flag is passed to the bhyve binary. Fabian Freyer (3): bhyve: add support for wiring memory bhyve: add tests for wiring memory bhyve: document support for wiring guest memory docs/drvbhyve.html.in | 14 +++++++++ docs/news.xml | 10 ++++++ src/bhyve/bhyve_command.c | 3 ++ src/bhyve/bhyve_parse_command.c | 3 ++ tests/bhyveargv2xmldata/bhyveargv2xml-wired.args | 7 +++++ tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml | 19 ++++++++++++ tests/bhyveargv2xmltest.c | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-wired.args | 10 ++++++ tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs | 3 ++ tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml | 26 ++++++++++++++++ tests/bhyvexml2argvtest.c | 1 + .../bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml | 36 ++++++++++++++++++++++ tests/bhyvexml2xmltest.c | 1 + 13 files changed, 134 insertions(+) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-wired.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-wired.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-wired.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-wired.xml -- 2.15.1

3 7

[libvirt] [PATCH 0/5] Rely on GnuTLS for md5/sha256 functions
by Ján Tomko 15 May '18

15 May '18

Ján Tomko (5): vircrypto: provide constants for hash sizes Introduce virCryptoHashBuf esx: use virCryptoHashBuf esx: Use VIR_CRYPTO_HASH_SIZE_MD5 vircrypto: Rely on GnuTLS for hash functions bootstrap.conf | 2 -- src/esx/esx_network_driver.c | 22 ++++++++------ src/esx/esx_storage_backend_iscsi.c | 46 +++++++++++++++++------------- src/esx/esx_storage_backend_vmfs.c | 20 ++++++------- src/util/vircrypto.c | 57 ++++++++++++++++++++++++++----------- src/util/vircrypto.h | 10 +++++++ 6 files changed, 100 insertions(+), 57 deletions(-) -- 2.16.1

3 9

[libvirt] [PATCH] travis: Uninstall packages before upgrade
by Andrea Bolognani 15 May '18

15 May '18

numpy (needed by cgal) started having the same issue with linking as python, which makes upgrade and thus the entire build fail on macOS. Instead of playing more tricks with linking/unlinking, just uninstall the problematic packages (and those dragging them in) before doing anything else. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Technically a build breaker, but since I'm changing the approach I'd rather wait for an explicit ACK before pushing. .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3f72d46f3..140072b801 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ matrix: - compiler: clang os: osx before_install: + - brew uninstall python mercurial postgis sfcgal cgal gdal - brew update - - brew unlink python - brew upgrade - - brew install rpcgen yajl + - brew install python rpcgen yajl script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us -- 2.17.0

3 3

[libvirt] [PATCH] tests: Fix qemucapsprobemock linking
by Martin Kletzander 14 May '18

14 May '18

Add libvirt.la into qemucapsprobemock_la_LIBADD because that mock uses bunch of libvirt internal functions. Without this patch the following error occurs: $ ./qemucapsprobe /usr/bin/qemu-system-x86_64 ... warning : virQEMUCapsLogProbeFailure:4204 : Failed to probe capabilities for /usr/bin/qemu-system-x86_64: internal error: Failed to probe QEMU binary with QMP: /usr/bin/qemu-system-x86_64: symbol lookup error: .../qemucapsprobemock.so: undefined symbol: virJSONValueObjectHasKey Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- TBH I didn't go into details why this is needed. It still seems fishy to me. Not only that I get that error above as a libvirt error, but if i add just libvirt_util.la in there, I get: .../qemucapsprobe: symbol lookup error: .../qemucapsprobemock.so: undefined symbol: libvirt_event_poll_update_handle_semaphore If anyone has a better idea how this should be fixed, please suggest that. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 05db6b1192a4..24ea41f5176c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -619,7 +619,7 @@ qemucapsprobe_LDADD = \ qemucapsprobemock_la_SOURCES = \ qemucapsprobemock.c qemucapsprobemock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) -qemucapsprobemock_la_LIBADD = $(MOCKLIBS_LIBS) +qemucapsprobemock_la_LIBADD = $(MOCKLIBS_LIBS) ../src/libvirt.la qemucommandutiltest_SOURCES = \ qemucommandutiltest.c \ -- 2.17.0

2 1

[libvirt] [dbus PATCH v2 0/3] Type fixes
by Katerina Koukiou 14 May '18

14 May '18

Katerina Koukiou (3): virtDBusNetworkGetDHCPLeases: fix lease type Replace uint -> int wherever libvirt uses int type virtDBusNetworkGetDHCPLeases: fix type for expirytime data/org.libvirt.Connect.xml | 18 +++++++++--------- data/org.libvirt.Domain.xml | 18 +++++++++--------- data/org.libvirt.Network.xml | 2 +- data/org.libvirt.Secret.xml | 2 +- data/org.libvirt.StoragePool.xml | 2 +- src/connect.c | 6 +++--- src/domain.c | 22 +++++++++++----------- src/events.c | 12 ++++++------ src/network.c | 4 ++-- src/secret.c | 2 +- src/storagepool.c | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) -- 2.15.0

2 6

[libvirt] [dbus PATCH v2 0/3] Domain Events
by Katerina Koukiou 14 May '18

14 May '18

Katerina Koukiou (3): events: Register VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 events: Register VIR_DOMAIN_EVENT_ID_GRAPHICS events: Register VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON data/org.libvirt.Domain.xml | 25 ++++++++++ src/events.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 2 + 3 files changed, 146 insertions(+) -- 2.15.0

2 6

[libvirt] [dbus PATCH] connect: Remove unused variable
by Andrea Bolognani 14 May '18

14 May '18

Clang catches the issue: ../../src/connect.c:532:26: error: unused variable 'domain' [-Werror,-Wunused-variable] g_autoptr(virDomain) domain = NULL; ^ Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/connect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/connect.c b/src/connect.c index 6719e21..14a60dc 100644 --- a/src/connect.c +++ b/src/connect.c @@ -529,7 +529,6 @@ virtDBusConnectDomainSaveImageGetXMLDesc(GVariant *inArgs, GError **error) { virtDBusConnect *connect = userData; - g_autoptr(virDomain) domain = NULL; const gchar *file; guint flags; g_autofree gchar *xml = NULL; -- 2.17.0

2 1

[libvirt] [PATCH 0/3] Finish replacements for virDomainObjCheckActive
by clem＠lse.epita.fr 14 May '18

14 May '18

From: Clementine Hayat <clem(a)lse.epita.fr> Follow-up of https://www.redhat.com/archives/libvir-list/2018-April/msg01591.html Here is the changes asked by Ján Tomko: * Refactor also checks when the error message is close to "domain is not running" * Add forgotten checks in qemu_migration.c * Revert one incorrect change in lxc_driver.c Clementine Hayat (3): qemu: start using virDomainObjCheckActive lxc: start using virDomainObjCheckActive bhyve: start using virDomainObjCheckActive src/bhyve/bhyve_driver.c | 15 +-- src/lxc/lxc_driver.c | 65 ++------- src/qemu/qemu_domain.c | 5 +- src/qemu/qemu_driver.c | 271 ++++++++------------------------------ src/qemu/qemu_migration.c | 10 +- 5 files changed, 74 insertions(+), 292 deletions(-) -- 2.17.0

2 4

[libvirt] [PATCH 0/2] Some include cleanups
by Ján Tomko 14 May '18

14 May '18

Ján Tomko (2): virutil.c: do not include ioctl.h virutil.c: do not include stdarg.h src/util/virutil.c | 2 -- 1 file changed, 2 deletions(-) -- 2.16.1

2 4

[libvirt] [PATCH] maint: typo fix in VIR_MIGRATE_PARAM_URI
by Eric Blake 12 May '18

12 May '18

s/filed/field/ Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule include/libvirt/libvirt-domain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 12fd34037e..d7cbd18796 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -837,7 +837,7 @@ typedef enum { * the destination host has multiple interfaces and a specific interface is * required to transmit migration data. * - * This filed may not be used when VIR_MIGRATE_TUNNELLED flag is set. + * This field may not be used when VIR_MIGRATE_TUNNELLED flag is set. */ # define VIR_MIGRATE_PARAM_URI "migrate_uri" -- 2.14.3

1 0

[libvirt] [PATCH v5 0/7] Enable memory-backend-file.discard-data
by Michal Privoznik 12 May '18

12 May '18

v5 of: https://www.redhat.com/archives/libvir-list/2018-April/msg02029.html diff to v4: - last patch in the original series is split into two, - more tests added - couple of small changes (e.g. s/int/virTristateBool/) Michal Privoznik (7): qemuMonitorJSONGetDeviceProps: Separate props processing qemu_monitor: Introduce qemuMonitorGetObjectProps qemu_capabilities: Introduce QEMU_CAPS_QOM_LIST_PROPERTIES qemu_capabilities: Introduce QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD conf: Move virDomainMemtune formatting into a separate function conf: Introduce memoryBacking/discard qemu: Implement memoryBacking/discard docs/formatdomain.html.in | 34 +- docs/schemas/cputypes.rng | 5 + docs/schemas/domaincommon.rng | 10 + src/conf/domain_conf.c | 150 +- src/conf/domain_conf.h | 3 + src/conf/numa_conf.c | 27 + src/conf/numa_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 22 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 27 +- src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 89 +- src/qemu/qemu_monitor_json.h | 4 + .../caps_2.12.0.aarch64.replies | 416 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 4 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 4454 ++++++++++---------- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 4 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 78 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 + .../caps_2.12.0.x86_64.replies | 804 ++-- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 4 +- tests/qemuxml2argvdata/hugepages-pages.args | 12 +- tests/qemuxml2argvdata/hugepages-pages.xml | 3 +- tests/qemuxml2argvdata/hugepages-pages3.args | 3 +- tests/qemuxml2argvdata/hugepages-pages3.xml | 4 +- tests/qemuxml2argvdata/hugepages-pages7.args | 3 +- tests/qemuxml2argvdata/hugepages-pages7.xml | 4 +- tests/qemuxml2argvtest.c | 9 +- tests/qemuxml2xmloutdata/hugepages-pages.xml | 3 +- tests/qemuxml2xmloutdata/hugepages-pages3.xml | 4 +- 32 files changed, 3337 insertions(+), 2869 deletions(-) -- 2.16.1

2 10

[libvirt] [PATCH v2 0/4] Reimplement logging wildcards to use full shell glob syntax
by Daniel P. Berrangé 12 May '18

12 May '18

This series provides a more generalized support for wildcards in logging and removes the ordering constraint. Changed in v2: - Improve various config file comments (Erik) - Always use fnmatch as performance hit vs strstr will be inconsequential in real world (Dan). Daniel P. Berrangé (4): Revert "util: virlog: Introduce wildcard to log filters" log: rename virLogFlags to virLogFilterFlags to match docs log: support logging using shell wildcard syntax log: update docs for daemons to improve user understanding src/locking/test_virtlockd.aug.in | 2 +- src/locking/virtlockd.conf | 65 +++++++++++++++++++++++++---------- src/logging/test_virtlogd.aug.in | 2 +- src/logging/virtlogd.conf | 68 +++++++++++++++++++++++++----------- src/remote/libvirtd.conf | 72 +++++++++++++++++++++++---------------- src/remote/test_libvirtd.aug.in | 2 +- src/util/virlog.c | 49 +++----------------------- src/util/virlog.h | 3 +- 8 files changed, 146 insertions(+), 117 deletions(-) -- 2.14.3

2 10

[libvirt] [dbus PATCH 0/2] Fixes required before first release
by Katerina Koukiou 12 May '18

12 May '18

Katerina Koukiou (2): domain: Replace State property with GetState method Replace uint -> int wherever libvirt uses int type data/org.libvirt.Connect.xml | 18 +++++------ data/org.libvirt.Domain.xml | 26 +++++++++------- data/org.libvirt.Network.xml | 2 +- data/org.libvirt.Secret.xml | 2 +- data/org.libvirt.StoragePool.xml | 2 +- src/connect.c | 6 ++-- src/domain.c | 67 ++++++++++++++++++++++------------------ src/events.c | 12 +++---- src/network.c | 4 +-- src/secret.c | 2 +- src/storagepool.c | 2 +- tests/test_domain.py | 9 +++--- 12 files changed, 80 insertions(+), 72 deletions(-) -- 2.15.0

3 6

[libvirt] [PATCH] virbuffer: Set child buffer indent properly
by Michal Privoznik 12 May '18

12 May '18

There's this macro virBufferSetChildIndent which sets offset of child buffer from given parent buffer. However, it is calling virBufferAdjustIndent() which only adds adjustment instead of calling virBufferSetIndent() which clears out any adjustment previously set. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virbuffer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index 4f5ed162fb..e95ee878a1 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -112,7 +112,7 @@ void virBufferSetIndent(virBufferPtr, int indent); * child buffer. */ # define virBufferSetChildIndent(childBuf_, parentBuf_) \ - virBufferAdjustIndent(childBuf_, virBufferGetIndent(parentBuf_, false) + 2) + virBufferSetIndent(childBuf_, virBufferGetIndent(parentBuf_, false) + 2) int virBufferGetIndent(const virBuffer *buf, bool dynamic); -- 2.16.1

2 1

[libvirt] [dbus PATCH 00/22] StoragePool remains and Domain Events
by Katerina Koukiou 11 May '18

11 May '18

Katerina Koukiou (22): Implement StoragePoolCreateXML method for Connect Interface Implement StoragePoolDefineXML method for Connect Interface events: Register VIR_STORAGE_POOL_EVENT_ID_REFRESH events: Register VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE events: Register VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE events: Register VIR_DOMAIN_EVENT_ID_BLOCK_JOB events: Register VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 events: Register VIR_DOMAIN_EVENT_ID_CONTROL_ERROR events: Register VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED events: Register VIR_DOMAIN_EVENT_ID_GRAPHICS events: Register VIR_DOMAIN_EVENT_ID_REBOOT events: Register VIR_DOMAIN_EVENT_ID_IO_ERROR events: Register VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON events: Register VIR_DOMAIN_EVENT_ID_JOB_COMPLETED events: Register VIR_DOMAIN_EVENT_ID_METADATA_CHANGE events: Register VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION events: Register VIR_DOMAIN_EVENT_ID_PMSUSPEND events: Register VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK events: Register VIR_DOMAIN_EVENT_ID_PMWAKEUP events: Register VIR_DOMAIN_EVENT_ID_RTC_CHANGE events: Register VIR_DOMAIN_EVENT_ID_TUNABLE events: Register VIR_DOMAIN_EVENT_ID_WATCHDOG data/org.libvirt.Connect.xml | 14 + data/org.libvirt.Domain.xml | 108 ++++++++ data/org.libvirt.StoragePool.xml | 4 + src/connect.c | 62 +++++ src/events.c | 549 +++++++++++++++++++++++++++++++++++++++ tests/test_connect.py | 48 ++++ tests/test_storage.py | 10 + 7 files changed, 795 insertions(+) -- 2.15.0

2 45

[libvirt] [PATCHv2 00/12] Switch from yajl to Jansson
by Ján Tomko 11 May '18

11 May '18

Per the discussion here: https://www.redhat.com/archives/libvir-list/2017-November/msg00225.html Switch from using yajl to Jansson. v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01781.html Patches 5-11 are meant to be squashed together before pushing, but are posted separately here in hope it will make reviewing them easier. Ján Tomko (12): virJSONValue: remove unused 'protect' property tests: replace references to yajl build: add --with-jansson build: undef WITH_JANSSON for SETUID_RPC_CLIENT Switch from yajl to Jansson FIXUP: Adjust test data for Jansson FIXUP: Remove functions using yajl FIXUP: make nss depend on Jansson instead of yajl FIXUP: compile and link with Jansson instead of yajl FIXUP: s/WITH_YAJL/WITH_JANSSON/ FIXUP: libvirt.spec: use jansson instead of yajl build: require Jansson if QEMU driver is enabled config-post.h | 1 + configure.ac | 3 + libvirt.spec.in | 4 +- m4/virt-driver-qemu.m4 | 8 +- m4/virt-jansson.m4 | 29 + m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 8 +- src/qemu/qemu_driver.c | 2 +- src/util/Makefile.inc.am | 4 +- src/util/virjson.c | 614 ++++++--------------- tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 4 +- .../xml2json/file-backing_basic-aio_threads.json | 9 +- .../file-backing_basic-cache-directsync.json | 9 +- .../xml2json/file-backing_basic-cache-none.json | 9 +- .../xml2json/file-backing_basic-cache-unsafe.json | 9 +- .../file-backing_basic-cache-writeback.json | 9 +- .../file-backing_basic-cache-writethrough.json | 9 +- .../xml2json/file-backing_basic-detect.json | 9 +- .../xml2json/file-backing_basic-noopts.json | 9 +- .../xml2json/file-backing_basic-unmap-detect.json | 9 +- .../xml2json/file-backing_basic-unmap-ignore.json | 9 +- .../xml2json/file-backing_basic-unmap.json | 9 +- .../file-qcow2-backing-chain-encryption.json | 3 +- .../xml2json/file-qcow2-backing-chain-noopts.json | 27 +- .../file-qcow2-backing-chain-unterminated.json | 3 +- .../network-qcow2-backing-chain-cache-unsafe.json | 3 +- ...etwork-qcow2-backing-chain-encryption_auth.json | 3 +- tests/qemucapabilitiestest.c | 4 +- tests/qemucaps2xmltest.c | 4 +- tests/qemucommandutiltest.c | 4 +- tests/qemuhotplugtest.c | 4 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 4 +- tests/qemumonitorjsontest.c | 4 +- tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 2 +- tests/virstoragetest.c | 4 +- 43 files changed, 292 insertions(+), 632 deletions(-) create mode 100644 m4/virt-jansson.m4 -- 2.16.1

2 26

[libvirt] [REPOST PATCHv3 0/6] Add support for VM Generation ID (vmgenid)
by John Ferlan 11 May '18

11 May '18

Repost of : https://www.redhat.com/archives/libvir-list/2018-May/msg00251.html to update patch 2 with the recent capabilities changes. Sync'd up to commit id 'c9da6cbe'. Cover from the v3 posting: v2: https://www.redhat.com/archives/libvir-list/2018-April/msg02234.html Changes since v2: * Essentially handle comments from code review of original series from comments received for patch 6: https://www.redhat.com/archives/libvir-list/2018-April/msg02240.html It's a somewhat simplified approach removing the ABI checks and the adjustment to the genid value as part of domain def copy. * (NEW) Patch 5 - add a 'genid' domain capability (similar to how Cole added support for vmcoreinfo). Since the apps need a way to determine whether this is enabled, this seems to be the best way. John Ferlan (6): conf: Add VM Generation ID parse/format support qemu: Add VM Generation ID device capability qemu: Alter VM Generation ID for specific startup/launch transitions qemu: Add VM Generation ID to qemu command line domcaps: Add 'genid' to domain capabilities docs: Add news article for VM Generation ID docs/formatdomain.html.in | 27 +++++++++++ docs/formatdomaincaps.html.in | 7 ++- docs/news.xml | 13 ++++++ docs/schemas/domaincaps.rng | 7 +++ docs/schemas/domaincommon.rng | 8 ++++ src/conf/domain_capabilities.c | 3 ++ src/conf/domain_capabilities.h | 1 + src/conf/domain_conf.c | 54 ++++++++++++++++++++++ src/conf/domain_conf.h | 5 ++ src/qemu/qemu_capabilities.c | 6 +++ src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 24 ++++++++++ src/qemu/qemu_driver.c | 17 +++++-- src/qemu/qemu_process.c | 46 +++++++++++++++++- src/qemu/qemu_process.h | 1 + tests/domaincapsschemadata/basic.xml | 1 + tests/domaincapsschemadata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsschemadata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsschemadata/full.xml | 1 + tests/domaincapsschemadata/libxl-xenfv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenfv.xml | 1 + tests/domaincapsschemadata/libxl-xenpv-usb.xml | 1 + tests/domaincapsschemadata/libxl-xenpv.xml | 1 + tests/domaincapsschemadata/qemu_1.7.0.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsschemadata/qemu_2.6.0.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 + .../domaincapsschemadata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsschemadata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.9.0-q35.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.9.0-tcg.x86_64.xml | 1 + tests/domaincapsschemadata/qemu_2.9.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../qemuxml2argvdata/genid-auto.x86_64-latest.args | 30 ++++++++++++ tests/qemuxml2argvdata/genid-auto.xml | 32 +++++++++++++ tests/qemuxml2argvdata/genid.x86_64-latest.args | 30 ++++++++++++ tests/qemuxml2argvdata/genid.xml | 32 +++++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmloutdata/genid-active.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-auto-active.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-auto-inactive.xml | 32 +++++++++++++ tests/qemuxml2xmloutdata/genid-inactive.xml | 32 +++++++++++++ tests/qemuxml2xmltest.c | 5 +- 53 files changed, 504 insertions(+), 7 deletions(-) create mode 100644 tests/qemuxml2argvdata/genid-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/genid-auto.xml create mode 100644 tests/qemuxml2argvdata/genid.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/genid.xml create mode 100644 tests/qemuxml2xmloutdata/genid-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/genid-inactive.xml -- 2.14.3

1 6

[libvirt] [PATCH] virsh: Don't skip the first entry when the typed command share same prefix
by Lin Ma 11 May '18

11 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/vsh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index f76076b164..1516e578d9 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3495,11 +3495,11 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd) if (!(matches = vshReadlineCompletion(arg, 0, 0))) goto cleanup; - /* According to rl_completion_matches documentation, the - * first entry in @matches array is some dummy substitution - * string for @arg. Skip it. */ - for (iter = &matches[1]; *iter; iter++) + for (iter = matches; *iter; iter++) { + if (iter == matches && matches[1]) + continue; printf("%s\n", *iter); + } ret = true; cleanup: -- 2.16.2

2 1

Re: [libvirt] ZFS backend does fail if used on non top level pools
by Brian Candler 11 May '18

11 May '18

> This one is the "unknown" for me. What happens if you create > Xzfs/images/vol1 (or your command below) without first creating Xzfs/images? Answer: it fails, unless you give the '-p' flag. -p Creates all the non-existing parent datasets. Datasets created in this manner are automatically mounted according to the mountpoint property inherited from their parent. Any property specified on the command line using the -o option is ignored. If the target filesystem already exists, the operation completes successfully. Example: given an existing zfs pool called "zfs": # zfs create zfs/foo/bar cannot create 'zfs/foo/bar': parent does not exist # zfs create -p zfs/foo/bar # zfs list zfs/foo NAME USED AVAIL REFER MOUNTPOINT zfs/foo 192K 23.5G 96K /zfs/foo # zfs list -r zfs/foo NAME USED AVAIL REFER MOUNTPOINT zfs/foo 192K 23.5G 96K /zfs/foo zfs/foo/bar 96K 23.5G 96K /zfs/foo/bar However, I don't see this as a problem for libvirt. The parent should already exist when you define the pool, and I expect libvirt will only create immediate children. > If one digs into the virStorageBackendZFSBuildPool they will see libvirt > pool create/build processing would "zpool create $name $path[0...n]" > where $name is the "source.name" (in your case Xzfs/images) and > $path[0...n] would be the various paths (in your case tmp/Xzfs) Just to be clear, creating a zpool ("zpool create") is different to creating a zfs dataset ("zfs create"). By analogy to LVM: a zpool is like a volume group, and a zfs dataset/zvol is like a logical volume. A zpool (or VG) is created from a collection of block devices - or something which looks like a block device, e.g. a partition or a loopback-mounted file. Those are $path[0...n] in the above, and would be called "physical volumes" in LVM. "zfs create" then creates a dataset (filesystem) or zvol (block device) which draws space out of the zpool. The analogous operation in LVM is "lvcreate", although it will only give you a block device - it's up to you to make a filesystem within it. In summary: zpool create ==> vgcreate (*) zfs create -V ==> lvcreate (*) LVM also requires you to label the block devices with "pvcreate" before you can add them to a volume group. zpool create doesn't require this. From my point of view, as a libvirt user: I *could* dedicate an entire zpool to libvirt, but I don't want to. It would mean libvirt has full ownership of that set of physical disks, and I may want to use the space for other things as well. What I want to do is to allow libvirt to use an existing zpool, with a parent dataset which it can allocate underneath, like this: zfs create zfs/libvirt virsh pool-define-as --name zfs --source-name zfs/libvirt --type zfs (instead of using pool-create/pool-build). This not only makes it clear which datasets belong to libvirt, but allows me to do things like storage accounting at the parent dataset level. And actually, this almost works. It's just the pool refresh which fails, because it tries to treat "zfs/images" as if it were a zpool. Stripping off everything up to the first slash for "zpool get" would fix this. Arguably this uncovers a couple of other related issues to do with error handling: - to the end user, "virsh pool-refresh" silently appears to work (unless you dig down deep into logs), even though the underlying "zpool get" returns with an error - by this stage, pool-refresh has already destroyed all existing libvirt volumes which were previously in the pool Regards, Brian.

1 0

[libvirt] [PATCH v3 0/2] rpc: fixing compilation error due to deprecated ssh_get_publickey().
by Julio Faracco 11 May '18

11 May '18

After 0.7.5 release, libssh deprecated ssh_get_publickey() method to introduce ssh_get_server_publickey(). This commit check if ssh_get_server_publickey() is available to use. If it is not, it creates an alias to ssh_get_publickey() during the configuration. See the error: make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src' CC rpc/libvirt_net_rpc_la-virnetlibsshsession.lo rpc/virnetlibsshsession.c:217:9: error: 'ssh_get_publickey' is deprecated [-Werror,-Wdeprecated-declarations] if (ssh_get_publickey(sess->session, &key) != SSH_OK) { ^ /usr/include/libssh/libssh.h:489:1: note: 'ssh_get_publickey' has been explicitly marked deprecated here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh_key *key); ^ /usr/include/libssh/libssh.h:99:40: note: expanded from macro 'SSH_DEPRECATED' ^ 1 error generated. Makefile:8604: recipe for target 'rpc/libvirt_net_rpc_la-virnetlibsshsession.lo' failed Julio Faracco (2): m4: checking if ssh_get_server_publickey() exists. rpc: replacing ssh_get_publickey() by ssh_get_server_publickey(). m4/virt-libssh.m4 | 13 +++++++++++++ src/rpc/virnetlibsshsession.c | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) -- 2.17.0

2 3

[libvirt] [dbus PATCH 0/5] remaining domain APIs for libvirt up to 3.0.0
by Pavel Hrdina 11 May '18

11 May '18

The only one left are APIs that require virStream. Pavel Hrdina (5): domain: Implement MigrateToURI3 method domain: Implement GetEmulatorPinInfo method domain: Implement GetSecurityLabelList method domain: Implement GetVcpuPinInfo method connect: Implement SaveImageGetXMLDesc method data/org.libvirt.Connect.xml | 7 ++ data/org.libvirt.Domain.xml | 24 +++++ src/connect.c | 28 ++++++ src/domain.c | 173 +++++++++++++++++++++++++++++++++++ tests/test_domain.py | 9 ++ 5 files changed, 241 insertions(+) -- 2.17.0

2 6

[libvirt] [PATCH v5 00/11] Basic implementation of persistent reservations
by Michal Privoznik 11 May '18

11 May '18

v5 of: https://www.redhat.com/archives/libvir-list/2018-April/msg00736.html diff to v4: - John's review worked in. Partially. Michal Privoznik (11): virstoragefile: Introduce virStoragePRDef qemuDomainDiskChangeSupported: Deny changing reservations qemu: Introduce pr-manager-helper capability qemu: Generate pr cmd line at startup qemu_ns: Allow /dev/mapper/control for PR qemu_cgroup: Allow /dev/mapper/control for PR qemu: Introduce pr_helper to qemu.conf qemu: Start PR daemon on domain startup qemu_hotplug: Hotplug of reservations qemu_hotplug: Hotunplug of reservations qemu: Detect pr-manager-helper capability docs/formatdomain.html.in | 23 +- docs/schemas/domaincommon.rng | 34 +-- docs/schemas/storagecommon.rng | 50 +++++ m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 38 ++++ src/libvirt_private.syms | 6 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 + src/qemu/qemu_alias.c | 18 ++ src/qemu/qemu_alias.h | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 33 ++- src/qemu/qemu_command.c | 134 ++++++++++++ src/qemu/qemu_command.h | 5 + src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 66 ++++++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_hotplug.c | 149 ++++++++++++- src/qemu/qemu_process.c | 232 +++++++++++++++++++++ src/qemu/qemu_process.h | 6 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virdevmapper.c | 8 +- src/util/virstoragefile.c | 164 +++++++++++++++ src/util/virstoragefile.h | 18 ++ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + .../disk-virtio-scsi-reservations.args | 38 ++++ .../disk-virtio-scsi-reservations.xml | 49 +++++ tests/qemuxml2argvtest.c | 4 + .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2xmltest.c | 2 + 36 files changed, 1075 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml -- 2.16.1

2 24

[libvirt] [PATCH v3 00/14] Add support for TPM emulator
by Stefan Berger 11 May '18

11 May '18

This series of patches adds support for the TPM emulator backend that is available in QEMU and based on swtpm + libtpms. It allows to attach a TPM 1.2 or 2 to a QEMU VM. sVirt labels are used for labeling the swtpm process, its Unix socket, and log file with the same label that the QEMU process gets. Besides that swtpm is added to the emulator cgroup to restrict its CPU usage. The device XML can be changed from a TPM 1.2 to a TPM 2 and back to a TPM 1.2. The device state is not removed during those changes but only when the domain is undefined. The swtpm needs persistent storage to store its state. For that I am using the uuid of the VM as part of the path since the name of the VM can be changed. Logfiles, PID files, and socket names are based on the name of the VM, though. Stefan Stefan Berger (14): util: implement virFileReadOffsetQuiet() util: Implement virStringFilterLines() conf: Add support for external swtpm TPM emulator to domain XML qemu: Extend QEMU capabilities with 'tpm-emulator' util: Implement virFileChownFiles() security: Add DAC and SELinux security for tpm-emulator util: Extend virtpm.c with tpm-emulator support qemu: Extend qemu_conf with tpm-emulator support qemu: Implement a layer for external devices like tpm-emulator qemu: Add support for external swtpm TPM emulator tests: Add test cases for external swtpm TPM emulator security: Label the external swtpm with SELinux labels tpm: Add support for choosing emulation of a TPM 2 qemu: Add swtpm to emulator cgroup docs/formatdomain.html.in | 45 ++ docs/schemas/domaincommon.rng | 17 + src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 70 ++- src/conf/domain_conf.h | 14 + src/libvirt_private.syms | 9 + src/qemu/Makefile.inc.am | 2 + src/qemu/libvirtd_qemu.aug | 5 + src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 54 ++ src/qemu/qemu_cgroup.h | 1 + src/qemu/qemu_command.c | 40 +- src/qemu/qemu_conf.c | 43 ++ src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 4 + src/qemu/qemu_driver.c | 7 + src/qemu/qemu_extdevice.c | 339 +++++++++++ src/qemu/qemu_extdevice.h | 43 ++ src/qemu/qemu_process.c | 17 + src/qemu/test_libvirtd_qemu.aug.in | 2 + src/security/security_dac.c | 6 + src/security/security_driver.h | 4 + src/security/security_manager.c | 17 + src/security/security_manager.h | 3 + src/security/security_selinux.c | 89 +++ src/security/security_stack.c | 19 + src/util/virfile.c | 63 +- src/util/virfile.h | 6 + src/util/virstring.c | 62 ++ src/util/virstring.h | 3 + src/util/virtpm.c | 638 ++++++++++++++++++++- src/util/virtpm.h | 33 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemuxml2argvdata/tpm-emulator-tpm2.args | 27 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 30 + tests/qemuxml2argvdata/tpm-emulator.args | 27 + tests/qemuxml2argvdata/tpm-emulator.xml | 30 + tests/qemuxml2argvtest.c | 17 + tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml | 34 ++ tests/qemuxml2xmloutdata/tpm-emulator.xml | 34 ++ tests/qemuxml2xmltest.c | 1 + 47 files changed, 1866 insertions(+), 16 deletions(-) create mode 100644 src/qemu/qemu_extdevice.c create mode 100644 src/qemu/qemu_extdevice.h create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2argvdata/tpm-emulator.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator.xml -- 2.5.5

2 41

[libvirt] [PATCH] tests: Update x86_64 replies, caps to QEMU 2.12
by John Ferlan 11 May '18

11 May '18

Using a QEMU 2.12 tagged tree build and full build, used: tests/qemucapsprobe /home/qemu/x64_64-softmmu/qemu-system-x86_64 > \ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Seems like a bit of change since 2.12-rc0, but for the most part it was parameter reorganization and cpudef differences. I'm never quite sure if it's using something from my host on those or something that is modeled. I did make a somewhat feeble attempt at doing something similar for other arches, but gave up because I never could figure out the magic incantation or rpm's to install in order to get libvirt to actually build on a "fresh" aarch64 system (it's where I started). I found even just cloning the libvirt.git repo resulted in a number "modified" tests/ virhostcpudata/linux-test*/node/node*/cpu* files that were modified and then attempting an autogen.sh would fail because README got deleted. If someone wants to do all 4 in one commit - I'm happy to drop this. Just figured I'd get the ball rolling before the end of the month. tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 14 +- .../caps_2.12.0.x86_64.replies | 328 +++++++++++++-------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 57 ++-- 3 files changed, 235 insertions(+), 164 deletions(-) diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml index d0e2866c49..9d752a0146 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml @@ -23,10 +23,11 @@ <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> - <model fallback='forbid'>Haswell-noTSX</model> + <model fallback='forbid'>Haswell-noTSX-IBRS</model> <vendor>Intel</vendor> <feature policy='require' name='vme'/> <feature policy='require' name='ss'/> + <feature policy='require' name='vmx'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> @@ -36,6 +37,7 @@ <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> <feature policy='require' name='invtsc'/> + <feature policy='require' name='ibpb'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> @@ -51,13 +53,13 @@ <model usable='yes'>core2duo</model> <model usable='no'>athlon</model> <model usable='yes'>Westmere</model> - <model usable='no'>Westmere-IBRS</model> + <model usable='yes'>Westmere-IBRS</model> <model usable='no'>Skylake-Server</model> <model usable='no'>Skylake-Server-IBRS</model> <model usable='no'>Skylake-Client</model> <model usable='no'>Skylake-Client-IBRS</model> <model usable='yes'>SandyBridge</model> - <model usable='no'>SandyBridge-IBRS</model> + <model usable='yes'>SandyBridge-IBRS</model> <model usable='yes'>Penryn</model> <model usable='no'>Opteron_G5</model> <model usable='no'>Opteron_G4</model> @@ -65,12 +67,12 @@ <model usable='yes'>Opteron_G2</model> <model usable='yes'>Opteron_G1</model> <model usable='yes'>Nehalem</model> - <model usable='no'>Nehalem-IBRS</model> + <model usable='yes'>Nehalem-IBRS</model> <model usable='yes'>IvyBridge</model> - <model usable='no'>IvyBridge-IBRS</model> + <model usable='yes'>IvyBridge-IBRS</model> <model usable='no'>Haswell</model> <model usable='yes'>Haswell-noTSX</model> - <model usable='no'>Haswell-noTSX-IBRS</model> + <model usable='yes'>Haswell-noTSX-IBRS</model> <model usable='no'>Haswell-IBRS</model> <model usable='no'>EPYC</model> <model usable='no'>EPYC-IBPB</model> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index c086e04afd..a5ffffc0b7 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -2,14 +2,13 @@ "QMP": { "version": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "v2.12.0" }, "capabilities": [ - "oob" ] } } @@ -23,11 +22,11 @@ { "return": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "v2.12.0" }, "id": "libvirt-2" } @@ -536,7 +535,7 @@ { "return": { - "fd": 19, + "fd": 17, "fdset-id": 0 }, "id": "libvirt-5" @@ -735,6 +734,10 @@ "name": "virtio-keyboard-pci", "parent": "virtio-input-hid-pci" }, + { + "name": "xen-sysbus", + "parent": "bus" + }, { "name": "i440FX", "parent": "pci-device" @@ -767,6 +770,10 @@ "name": "chardev-pty", "parent": "chardev" }, + { + "name": "xen-apic", + "parent": "apic-common" + }, { "name": "SUNW,fdtwo", "parent": "base-sysbus-fdc" @@ -1023,6 +1030,10 @@ "name": "pc-testdev", "parent": "isa-device" }, + { + "name": "xen-backend", + "parent": "xen-sysdev" + }, { "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" @@ -1063,6 +1074,10 @@ "name": "virtio-balloon-pci", "parent": "virtio-pci" }, + { + "name": "chardev-socket", + "parent": "chardev" + }, { "name": "iothread", "parent": "object" @@ -1072,13 +1087,9 @@ "parent": "isa-device" }, { - "name": "chardev-socket", + "name": "chardev-mux", "parent": "chardev" }, - { - "name": "486-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-2.7-machine", "parent": "generic-pc-machine" @@ -1088,8 +1099,8 @@ "parent": "generic-pc-machine" }, { - "name": "chardev-mux", - "parent": "chardev" + "name": "486-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "filter-redirector", @@ -1223,14 +1234,14 @@ "name": "chardev-msmouse", "parent": "chardev" }, - { - "name": "pc-q35-2.9-machine", - "parent": "generic-pc-machine" - }, { "name": "chardev-pipe", "parent": "chardev-fd" }, + { + "name": "pc-q35-2.9-machine", + "parent": "generic-pc-machine" + }, { "name": "pc-i440fx-1.7-machine", "parent": "generic-pc-machine" @@ -1419,6 +1430,10 @@ "name": "chardev-file", "parent": "chardev-fd" }, + { + "name": "xen-sysdev", + "parent": "sys-bus-device" + }, { "name": "intel-iommu", "parent": "x86-iommu" @@ -1483,6 +1498,10 @@ "name": "ccid-bus", "parent": "bus" }, + { + "name": "xenpv-machine", + "parent": "machine" + }, { "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" @@ -1815,6 +1834,10 @@ "name": "pc-i440fx-2.2-machine", "parent": "generic-pc-machine" }, + { + "name": "xen-pci-passthrough", + "parent": "pci-device" + }, { "name": "cryptodev-backend", "parent": "object" @@ -1947,10 +1970,18 @@ "name": "virtio-scsi-pci", "parent": "virtio-pci" }, + { + "name": "piix3-ide", + "parent": "pci-ide" + }, { "name": "ES1370", "parent": "pci-device" }, + { + "name": "xen-pvdevice", + "parent": "pci-device" + }, { "name": "virtio-pci-bus", "parent": "virtio-bus" @@ -1960,8 +1991,8 @@ "parent": "pcie-port" }, { - "name": "piix3-ide", - "parent": "pci-ide" + "name": "xenfv-machine", + "parent": "generic-pc-machine" }, { "name": "pci-testdev", @@ -2015,6 +2046,10 @@ "name": "pc-i440fx-2.6-machine", "parent": "generic-pc-machine" }, + { + "name": "xen-platform", + "parent": "pci-device" + }, { "name": "chardev-serial", "parent": "chardev-fd" @@ -2111,6 +2146,10 @@ "name": "isa-applesmc", "parent": "isa-device" }, + { + "name": "xen-accel", + "parent": "accel" + }, { "name": "secret", "parent": "object" @@ -3192,102 +3231,93 @@ { "return": [ { - "name": "serial", - "type": "str" - }, - { - "name": "port_index", + "name": "min_io_size", "type": "uint16" }, { - "name": "dpofua", + "name": "removable", "description": "on/off", "type": "bool" }, { - "name": "bootindex", - "type": "int32" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" + "name": "channel", + "type": "uint32" }, { - "name": "discard_granularity", - "type": "uint32" + "name": "serial", + "type": "str" }, { "name": "lun", "type": "uint32" }, { - "name": "max_unmap_size", - "type": "uint64" + "name": "dpofua", + "description": "on/off", + "type": "bool" }, { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", + "name": "ver", "type": "str" }, { - "name": "port_wwn", - "type": "uint64" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "opt_io_size", + "name": "scsi-id", "type": "uint32" }, { - "name": "min_io_size", + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", "type": "uint16" }, { - "name": "product", + "name": "drive", + "description": "Node name or ID of a block device to use as a backend", "type": "str" }, { - "name": "scsi-id", - "type": "uint32" + "name": "scsi_version", + "type": "int32" }, { - "name": "channel", + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" + }, + { + "name": "discard_granularity", "type": "uint32" }, { - "name": "vendor", - "type": "str" + "name": "port_wwn", + "type": "uint64" }, { - "name": "wwn", + "name": "max_unmap_size", "type": "uint64" }, { - "name": "werror", + "name": "rerror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "removable", - "description": "on/off", + "name": "max_io_size", + "type": "uint64" + }, + { + "name": "wwn", + "type": "uint64" + }, + { + "name": "share-rw", "type": "bool" }, { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "product", + "type": "str" }, { - "name": "ver", + "name": "vendor", "type": "str" }, { @@ -3296,8 +3326,21 @@ "type": "uint16" }, { - "name": "max_io_size", - "type": "uint64" + "name": "port_index", + "type": "uint16" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "opt_io_size", + "type": "uint32" } ], "id": "libvirt-19" @@ -4103,6 +4146,11 @@ "name": "vectors", "type": "uint32" }, + { + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, { "name": "x-pcie-extcap-init", "description": "on/off", @@ -4120,13 +4168,18 @@ "name": "x-ignore-backend-features", "type": "bool" }, + { + "name": "stats", + "description": "on/off", + "type": "bool" + }, { "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "iommu_platform", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, @@ -4136,7 +4189,7 @@ "type": "bool" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "virgl", "description": "on/off", "type": "bool" }, @@ -4174,19 +4227,29 @@ "name": "yres", "type": "uint32" }, + { + "name": "stats", + "description": "on/off", + "type": "bool" + }, { "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "max_outputs", + "name": "xres", "type": "uint32" }, { - "name": "xres", + "name": "max_outputs", "type": "uint32" }, + { + "name": "virgl", + "description": "on/off", + "type": "bool" + }, { "name": "max_hostmem", "type": "size" @@ -4657,6 +4720,11 @@ "name": "pc-i440fx-2.7", "cpu-max": 255 }, + { + "hotpluggable-cpus": true, + "name": "xenfv", + "cpu-max": 128 + }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.3", @@ -4698,6 +4766,11 @@ "cpu-max": 288, "alias": "q35" }, + { + "hotpluggable-cpus": false, + "name": "xenpv", + "cpu-max": 1 + }, { "hotpluggable-cpus": true, "name": "pc-q35-2.10", @@ -4947,7 +5020,6 @@ "name": "Westmere-IBRS", "typename": "Westmere-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -4997,7 +5069,6 @@ "avx512cd", "avx512bw", "avx512vl", - "spec-ctrl", "3dnowprefetch", "xsavec", "xgetbv1", @@ -5039,7 +5110,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch", "xsavec", "xgetbv1", @@ -5061,7 +5131,6 @@ "name": "SandyBridge-IBRS", "typename": "SandyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5139,7 +5208,6 @@ "name": "Nehalem-IBRS", "typename": "Nehalem-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5156,7 +5224,6 @@ "name": "IvyBridge-IBRS", "typename": "IvyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5183,7 +5250,6 @@ "name": "Haswell-noTSX-IBRS", "typename": "Haswell-noTSX-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5193,8 +5259,7 @@ "typename": "Haswell-IBRS-x86_64-cpu", "unavailable-features": [ "hle", - "rtm", - "spec-ctrl" + "rtm" ], "static": false, "migration-safe": true @@ -5237,7 +5302,6 @@ "misalignsse", "3dnowprefetch", "osvw", - "ibpb", "xsavec", "xgetbv1" ], @@ -5285,7 +5349,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch" ], "static": false, @@ -5300,7 +5363,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch" ], "static": false, @@ -5462,6 +5524,14 @@ }, { "parameters": [ + { + "name": "rendernode", + "type": "string" + }, + { + "name": "gl", + "type": "boolean" + }, { "name": "head", "type": "number" @@ -6163,6 +6233,10 @@ }, { "parameters": [ + { + "name": "x-oob", + "type": "boolean" + }, { "name": "pretty", "type": "boolean" @@ -14309,9 +14383,9 @@ "type": "int" }, { - "name": "static", + "name": "preallocation", "default": null, - "type": "bool" + "type": "356" } ], "meta-type": "object" @@ -18145,7 +18219,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 63, + "model": 60, "movbe": true, "nrip-save": false, "ssse3": true, @@ -18156,7 +18230,7 @@ "fma": true, "cx16": true, "de": true, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18170,13 +18244,13 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, "lwp": false, "xop": false, - "ibpb": false, + "ibpb": true, "avx": true, "ospke": false, "acpi": false, @@ -18191,7 +18265,7 @@ "vaes": false, "xsaves": false, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18215,22 +18289,22 @@ "fxsr-opt": false, "xstore": false, "rtm": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "lmce": true, "perfctr-nb": false, "rdrand": true, "rdseed": false, "avx512-4vnniw": false, "vme": true, - "vmx": false, + "vmx": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -18260,6 +18334,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -18372,7 +18447,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 63, + "model": 60, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -18385,7 +18460,7 @@ "cx16": true, "de": true, "enforce": false, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18404,7 +18479,7 @@ "pmu": false, "pmm": false, "apic": true, - "spec-ctrl": false, + "spec-ctrl": true, "min-xlevel2": 0, "tsc-adjust": true, "tsc_adjust": true, @@ -18413,7 +18488,7 @@ "kvmclock": true, "l3-cache": true, "lwp": false, - "ibpb": false, + "ibpb": true, "xop": false, "avx": true, "ospke": false, @@ -18431,7 +18506,7 @@ "xsaves": false, "tcg-cpuid": true, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18465,7 +18540,7 @@ "hv-synic": false, "xstore": false, "fxsr_opt": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "rtm": false, "lmce": true, "hv-time": false, @@ -18475,18 +18550,18 @@ "rdrand": true, "rdseed": false, "avx512-4vnniw": false, - "vmx": false, + "vmx": true, "vme": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -18590,7 +18665,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 63, + "model": 60, "movbe": true, "nrip-save": false, "ssse3": true, @@ -18601,7 +18676,7 @@ "fma": true, "cx16": true, "de": true, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18615,13 +18690,13 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, "lwp": false, "xop": false, - "ibpb": false, + "ibpb": true, "avx": true, "ospke": false, "acpi": false, @@ -18636,7 +18711,7 @@ "vaes": false, "xsaves": false, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18660,22 +18735,22 @@ "fxsr-opt": false, "xstore": false, "rtm": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "lmce": true, "perfctr-nb": false, "rdrand": true, "rdseed": false, "avx512-4vnniw": false, "vme": true, - "vmx": false, + "vmx": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -18705,6 +18780,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -18817,7 +18893,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 63, + "model": 60, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -18830,7 +18906,7 @@ "cx16": true, "de": true, "enforce": false, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18849,7 +18925,7 @@ "pmu": false, "pmm": false, "apic": true, - "spec-ctrl": false, + "spec-ctrl": true, "min-xlevel2": 0, "tsc-adjust": true, "tsc_adjust": true, @@ -18858,7 +18934,7 @@ "kvmclock": true, "l3-cache": true, "lwp": false, - "ibpb": false, + "ibpb": true, "xop": false, "avx": true, "ospke": false, @@ -18876,7 +18952,7 @@ "xsaves": false, "tcg-cpuid": true, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18910,7 +18986,7 @@ "hv-synic": false, "xstore": false, "fxsr_opt": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "rtm": false, "lmce": true, "hv-time": false, @@ -18920,18 +18996,18 @@ "rdrand": true, "rdseed": false, "avx512-4vnniw": false, - "vmx": false, + "vmx": true, "vme": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -19744,6 +19820,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -20189,6 +20266,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 150fbd21f3..de8445ba56 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -122,6 +122,7 @@ <flag name='gic-version'/> <flag name='incoming-defer'/> <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> @@ -132,6 +133,7 @@ <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> <flag name='chardev-logfile'/> <flag name='debug-threads'/> @@ -161,6 +163,7 @@ <flag name='drive-iotune-group'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> + <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> @@ -196,10 +199,10 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> - <version>2011090</version> + <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>390060</microcodeVersion> - <package>v2.12.0-rc0</package> + <microcodeVersion>391479</microcodeVersion> + <package>v2.12.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> @@ -216,6 +219,7 @@ <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> <property name='osxsave' type='boolean' value='false'/> + <property name='hv-frequencies' type='boolean' value='false'/> <property name='tsc-frequency' type='number' value='0'/> <property name='xd' type='boolean' value='true' migratable='yes'/> <property name='hv-vendor-id' type='string' value=''/> @@ -328,7 +332,7 @@ <property name='nodeid_msr' type='boolean' value='false'/> <property name='pdcm' type='boolean' value='false'/> <property name='movbe' type='boolean' value='true' migratable='yes'/> - <property name='model' type='number' value='63'/> + <property name='model' type='number' value='60'/> <property name='nrip_save' type='boolean' value='false'/> <property name='nrip-save' type='boolean' value='false'/> <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/> @@ -341,7 +345,7 @@ <property name='cx16' type='boolean' value='true' migratable='yes'/> <property name='de' type='boolean' value='true' migratable='yes'/> <property name='enforce' type='boolean' value='false'/> - <property name='stepping' type='number' value='2'/> + <property name='stepping' type='number' value='3'/> <property name='xsave' type='boolean' value='true' migratable='yes'/> <property name='clflush' type='boolean' value='true' migratable='yes'/> <property name='skinit' type='boolean' value='false'/> @@ -360,7 +364,7 @@ <property name='pmu' type='boolean' value='false'/> <property name='pmm' type='boolean' value='false'/> <property name='apic' type='boolean' value='true' migratable='yes'/> - <property name='spec-ctrl' type='boolean' value='false'/> + <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/> <property name='min-xlevel2' type='number' value='0'/> <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/> <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/> @@ -369,7 +373,7 @@ <property name='kvmclock' type='boolean' value='true' migratable='yes'/> <property name='l3-cache' type='boolean' value='true' migratable='yes'/> <property name='lwp' type='boolean' value='false'/> - <property name='ibpb' type='boolean' value='false'/> + <property name='ibpb' type='boolean' value='true' migratable='yes'/> <property name='xop' type='boolean' value='false'/> <property name='avx' type='boolean' value='true' migratable='yes'/> <property name='ospke' type='boolean' value='false'/> @@ -387,7 +391,7 @@ <property name='xsaves' type='boolean' value='false'/> <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/> <property name='lm' type='boolean' value='true' migratable='yes'/> - <property name='umip' type='boolean' value='false'/> + <property name='umip' type='boolean' value='true' migratable='yes'/> <property name='pse' type='boolean' value='true' migratable='yes'/> <property name='avx2' type='boolean' value='true' migratable='yes'/> <property name='sep' type='boolean' value='true' migratable='yes'/> @@ -421,7 +425,7 @@ <property name='hv-synic' type='boolean' value='false'/> <property name='xstore' type='boolean' value='false'/> <property name='fxsr_opt' type='boolean' value='false'/> - <property name='kvm-hint-dedicated' type='boolean' value='true' migratable='yes'/> + <property name='kvm-hint-dedicated' type='boolean' value='false'/> <property name='rtm' type='boolean' value='false'/> <property name='lmce' type='boolean' value='true' migratable='yes'/> <property name='hv-time' type='boolean' value='false'/> @@ -431,18 +435,18 @@ <property name='rdrand' type='boolean' value='true' migratable='yes'/> <property name='rdseed' type='boolean' value='false'/> <property name='avx512-4vnniw' type='boolean' value='false'/> - <property name='vmx' type='boolean' value='false'/> + <property name='vmx' type='boolean' value='true' migratable='yes'/> <property name='vme' type='boolean' value='true' migratable='yes'/> <property name='dtes64' type='boolean' value='false'/> <property name='mtrr' type='boolean' value='true' migratable='yes'/> <property name='rdtscp' type='boolean' value='true' migratable='yes'/> <property name='pse36' type='boolean' value='true' migratable='yes'/> - <property name='kvm-pv-tlb-flush' type='boolean' value='false'/> + <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/> <property name='tbm' type='boolean' value='false'/> <property name='wdt' type='boolean' value='false'/> <property name='pause_filter' type='boolean' value='false'/> <property name='sha-ni' type='boolean' value='false'/> - <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz'/> + <property name='model-id' type='string' value='Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz'/> <property name='abm' type='boolean' value='true' migratable='yes'/> <property name='avx512pf' type='boolean' value='false'/> <property name='xstore-en' type='boolean' value='false'/> @@ -462,6 +466,7 @@ <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> <property name='osxsave' type='boolean' value='false'/> + <property name='hv-frequencies' type='boolean' value='false'/> <property name='tsc-frequency' type='number' value='0'/> <property name='xd' type='boolean' value='true' migratable='yes'/> <property name='hv-vendor-id' type='string' value=''/> @@ -720,9 +725,7 @@ <blocker name='3dnow'/> </cpu> <cpu type='kvm' name='Westmere' usable='yes'/> - <cpu type='kvm' name='Westmere-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Westmere-IBRS' usable='yes'/> <cpu type='kvm' name='Skylake-Server' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> @@ -759,7 +762,6 @@ <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> @@ -789,7 +791,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> @@ -797,9 +798,7 @@ <blocker name='mpx'/> </cpu> <cpu type='kvm' name='SandyBridge' usable='yes'/> - <cpu type='kvm' name='SandyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='Penryn' usable='yes'/> <cpu type='kvm' name='Opteron_G5' usable='no'> <blocker name='sse4a'/> @@ -823,25 +822,18 @@ <cpu type='kvm' name='Opteron_G2' usable='yes'/> <cpu type='kvm' name='Opteron_G1' usable='yes'/> <cpu type='kvm' name='Nehalem' usable='yes'/> - <cpu type='kvm' name='Nehalem-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/> <cpu type='kvm' name='IvyBridge' usable='yes'/> - <cpu type='kvm' name='IvyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> </cpu> <cpu type='kvm' name='Haswell-noTSX' usable='yes'/> - <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell-IBRS' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> - <blocker name='spec-ctrl'/> </cpu> <cpu type='kvm' name='EPYC' usable='no'> <blocker name='rdseed'/> @@ -872,7 +864,6 @@ <blocker name='misalignsse'/> <blocker name='3dnowprefetch'/> <blocker name='osvw'/> - <blocker name='ibpb'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> </cpu> @@ -895,7 +886,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='Broadwell-IBRS' usable='no'> @@ -904,7 +894,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='486' usable='yes'/> @@ -1210,6 +1199,7 @@ <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> + <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/> <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> @@ -1218,6 +1208,7 @@ <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine name='xenpv' maxCpus='1'/> <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> -- 2.14.3

1 0

[libvirt] [jenkins-ci PATCH 0/3] Enable out-of-the-box parallel make
by Andrea Bolognani 11 May '18

11 May '18

Andrea Bolognani (3): jobs: Enable parallel make everywhere guests: Set MAKEFLAGS for out-of-the-box parallel make jobs: Drop explicit parallel make usage guests/templates/bashrc | 2 ++ jobs/autotools.yaml | 10 +++++----- jobs/defaults.yaml | 1 - jobs/perl-makemaker.yaml | 8 ++++---- projects/libvirt.yaml | 4 ++-- projects/osinfo-db.yaml | 4 ++-- 6 files changed, 15 insertions(+), 14 deletions(-) -- 2.17.0

1 3

[libvirt] [REPOST PATCH] util: Clean up consumers of virJSONValueArraySize
by John Ferlan 11 May '18

11 May '18

Rather than have virJSONValueArraySize return a -1 when the input is not an array and then splat an error message, let's check for an array before calling and then change the return to be a size_t instead of ssize_t. That means using the helper virJSONValueIsArray as well as using a more generic error message such as "Malformed <something> array". In some cases we can remove stack variables and when we cannot, those variables should be size_t not ssize_t. Alter a few references of if (!value) to be if (value == 0) instead as well. Some callers can already assume an array is being worked on based on the previous call, so there's less to do. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Original: https://www.redhat.com/archives/libvir-list/2018-April/msg02003.html Reposting as I found a recent upstream changes created some simple merge conflicts and it's never clear if applying what was there can be applied on top even with git am -3, so I figured I would just repost. As noted previously, based off a review of the Coverity work from Peter: https://www.redhat.com/archives/libvir-list/2018-April/msg01613.html src/locking/lock_daemon.c | 7 ++-- src/logging/log_handler.c | 7 ++-- src/network/bridge_driver.c | 7 ++-- src/qemu/qemu_agent.c | 35 ++++++++++-------- src/qemu/qemu_monitor_json.c | 85 ++++++++++++++++++++----------------------- src/rpc/virnetdaemon.c | 7 +--- src/rpc/virnetserver.c | 15 +++----- src/rpc/virnetserverservice.c | 7 ++-- src/util/virjson.c | 5 +-- src/util/virjson.h | 2 +- src/util/virlockspace.c | 16 ++++---- src/util/virstoragefile.c | 3 +- tests/testutilsqemuschema.c | 18 +++------ tools/nss/libvirt_nss.c | 3 +- 14 files changed, 97 insertions(+), 120 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 7afff42246..78c33bd29c 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -248,7 +248,6 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) virJSONValuePtr child; virJSONValuePtr lockspaces; size_t i; - ssize_t n; const char *serverNames[] = { "virtlockd" }; if (VIR_ALLOC(lockd) < 0) @@ -281,13 +280,13 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) goto error; } - if ((n = virJSONValueArraySize(lockspaces)) < 0) { + if (!virJSONValueIsArray(lockspaces)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed lockspaces data from JSON file")); + _("Malformed lockspaces array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(lockspaces); i++) { virLockSpacePtr lockspace; child = virJSONValueArrayGet(lockspaces, i); diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 40dfa8ecae..5364e06dff 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -292,7 +292,6 @@ virLogHandlerNewPostExecRestart(virJSONValuePtr object, { virLogHandlerPtr handler; virJSONValuePtr files; - ssize_t n; size_t i; if (!(handler = virLogHandlerNew(privileged, @@ -308,13 +307,13 @@ virLogHandlerNewPostExecRestart(virJSONValuePtr object, goto error; } - if ((n = virJSONValueArraySize(files)) < 0) { + if (!virJSONValueIsArray(files)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed files data from JSON file")); + _("Malformed files array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(files); i++) { virLogHandlerLogFilePtr file; virJSONValuePtr child = virJSONValueArrayGet(files, i); diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index ece7e41d35..4b33e12b30 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4124,7 +4124,7 @@ networkGetDHCPLeases(virNetworkPtr net, size_t i, j; size_t nleases = 0; int rv = -1; - ssize_t size = 0; + size_t size = 0; int custom_lease_file_len = 0; bool need_results = !!leases; long long currtime = 0; @@ -4179,11 +4179,12 @@ networkGetDHCPLeases(virNetworkPtr net, goto error; } - if ((size = virJSONValueArraySize(leases_array)) < 0) { + if (!virJSONValueIsArray(leases_array)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("couldn't fetch array of leases")); + _("Malformed lease_entries array")); goto error; } + size = virJSONValueArraySize(leases_array); } currtime = (long long)time(NULL); diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4df1bde458..eeede645ef 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1490,7 +1490,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; - ssize_t ndata; + size_t ndata; if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; @@ -1505,6 +1505,12 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, goto cleanup; } + if (!virJSONValueIsArray(data)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed guest-get-vcpus data array")); + goto cleanup; + } + ndata = virJSONValueArraySize(data); if (VIR_ALLOC_N(*info, ndata) < 0) @@ -1869,15 +1875,14 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, goto cleanup; } - if (virJSONValueGetType(data) != VIR_JSON_TYPE_ARRAY) { + if (!virJSONValueIsArray(data)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("guest-get-fsinfo return information was not " - "an array")); + _("Malformed guest-get-fsinfo data array")); goto cleanup; } ndata = virJSONValueArraySize(data); - if (!ndata) { + if (ndata == 0) { ret = 0; *info = NULL; goto cleanup; @@ -1928,14 +1933,14 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, goto cleanup; } - if (virJSONValueGetType(entry) != VIR_JSON_TYPE_ARRAY) { + if (!virJSONValueIsArray(entry)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("guest-get-fsinfo 'disk' data was not an array")); + _("Malformed guest-get-fsinfo 'disk' data array")); goto cleanup; } ndisk = virJSONValueArraySize(entry); - if (!ndisk) + if (ndisk == 0) continue; if (VIR_ALLOC_N(info_ret[i]->devAlias, ndisk) < 0) goto cleanup; @@ -2035,7 +2040,6 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, { int ret = -1; size_t i, j; - ssize_t size = -1; virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr ret_array = NULL; @@ -2065,17 +2069,16 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, goto cleanup; } - if ((size = virJSONValueArraySize(ret_array)) < 0) { + if (!virJSONValueIsArray(ret_array)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("qemu agent didn't return an array of interfaces")); goto cleanup; } - for (i = 0; i < size; i++) { + for (i = 0; i < virJSONValueArraySize(ret_array); i++) { virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i); virJSONValuePtr ip_addr_arr = NULL; const char *hwaddr, *ifname_s, *name = NULL; - ssize_t ip_addr_arr_size; virDomainInterfacePtr iface = NULL; /* Shouldn't happen but doesn't hurt to check neither */ @@ -2131,14 +2134,16 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!ip_addr_arr) continue; - if ((ip_addr_arr_size = virJSONValueArraySize(ip_addr_arr)) < 0) - /* Mmm, empty 'ip-address'? */ + if (!virJSONValueIsArray(ip_addr_arr)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed ip-addresses array")); goto error; + } /* If current iface already exists, continue with the count */ addrs_count = iface->naddrs; - for (j = 0; j < ip_addr_arr_size; j++) { + for (j = 0; j < virJSONValueArraySize(ip_addr_arr); j++) { const char *type, *addr; virJSONValuePtr ip_addr_obj = virJSONValueArrayGet(ip_addr_arr, j); virDomainIPAddressPtr ip_addr; diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 8176175894..e0ea553c41 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1627,9 +1627,9 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr data, struct qemuMonitorQueryCpusEntry *cpus = NULL; int ret = -1; size_t i; - ssize_t ncpus; + size_t ncpus; - if ((ncpus = virJSONValueArraySize(data)) <= 0) + if ((ncpus = virJSONValueArraySize(data)) == 0) return -2; if (VIR_ALLOC_N(cpus, ncpus) < 0) @@ -3595,7 +3595,7 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, int ret = -1; const char *tmp; virJSONValuePtr returnArray, entry, table, element; - ssize_t nTable; + size_t nTable; size_t i; virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); @@ -3656,12 +3656,13 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, goto cleanup; } if ((!(table = virJSONValueObjectGet(entry, "unicast-table"))) || - ((nTable = virJSONValueArraySize(table)) < 0)) { + (!virJSONValueIsArray(table))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing or invalid 'unicast-table' array " "in query-rx-filter response")); goto cleanup; } + nTable = virJSONValueArraySize(table); if (VIR_ALLOC_N(fil->unicast.table, nTable)) goto cleanup; for (i = 0; i < nTable; i++) { @@ -3697,12 +3698,13 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, goto cleanup; } if ((!(table = virJSONValueObjectGet(entry, "multicast-table"))) || - ((nTable = virJSONValueArraySize(table)) < 0)) { + (!virJSONValueIsArray(table))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing or invalid 'multicast-table' array " "in query-rx-filter response")); goto cleanup; } + nTable = virJSONValueArraySize(table); if (VIR_ALLOC_N(fil->multicast.table, nTable)) goto cleanup; for (i = 0; i < nTable; i++) { @@ -3731,12 +3733,13 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, goto cleanup; } if ((!(table = virJSONValueObjectGet(entry, "vlan-table"))) || - ((nTable = virJSONValueArraySize(table)) < 0)) { + (!virJSONValueIsArray(table))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing or invalid 'vlan-table' array " "in query-rx-filter response")); goto cleanup; } + nTable = virJSONValueArraySize(table); if (VIR_ALLOC_N(fil->vlan.table, nTable)) goto cleanup; for (i = 0; i < nTable; i++) { @@ -4575,7 +4578,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr data; - ssize_t nr_results; + size_t nr_results; size_t i; virHashTablePtr blockJobs = NULL; @@ -4591,12 +4594,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) goto cleanup; } - if ((nr_results = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("unable to determine array size")); - goto cleanup; - } - + nr_results = virJSONValueArraySize(data); if (!(blockJobs = virHashCreate(nr_results, virHashValueFree))) goto cleanup; @@ -5114,7 +5112,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorMachineInfoPtr *infolist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *machines = NULL; @@ -5206,7 +5204,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorCPUDefInfoPtr *cpulist = NULL; - int n = 0; + size_t n = 0; size_t i; *cpus = NULL; @@ -5257,7 +5255,7 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, if (virJSONValueObjectHasKey(child, "unavailable-features")) { virJSONValuePtr blockers; size_t j; - int len; + size_t len; blockers = virJSONValueObjectGetArray(child, "unavailable-features"); @@ -5494,7 +5492,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **commandlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *commands = NULL; @@ -5550,7 +5548,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **eventlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *events = NULL; @@ -5614,7 +5612,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, virJSONValuePtr data = NULL; virJSONValuePtr array = NULL; char **paramlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *params = NULL; @@ -5646,17 +5644,17 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, "return data")); goto cleanup; } - qemuMonitorSetOptions(mon, array); - } - if ((n = virJSONValueArraySize(array)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-command-line-options reply data was not " - "an array")); - goto cleanup; + if (!virJSONValueIsArray(array)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed query-cmmand-line-options array")); + goto cleanup; + } + + qemuMonitorSetOptions(mon, array); } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(array); i++) { virJSONValuePtr child = virJSONValueArrayGet(array, i); const char *tmp; @@ -5681,12 +5679,12 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, if (found) *found = true; - if ((n = virJSONValueArraySize(data)) < 0) { + if (!virJSONValueIsArray(data)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-command-line-options parameter data was not " - "an array")); + _("Malformed query-cmmand-line-options parameters array")); goto cleanup; } + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(paramlist, n + 1) < 0) @@ -5776,7 +5774,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **typelist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *types = NULL; @@ -5832,7 +5830,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorJSONListPathPtr *pathlist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *paths = NULL; @@ -6062,7 +6060,7 @@ int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **proplist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *props = NULL; @@ -6161,7 +6159,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps; char **list = NULL; size_t i; - ssize_t n; + size_t n; *capabilities = NULL; @@ -6272,7 +6270,7 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps; virGICCapability *list = NULL; size_t i; - ssize_t n; + size_t n; *capabilities = NULL; @@ -6495,7 +6493,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **list = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *array = NULL; @@ -6892,14 +6890,11 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data) virCPUDataPtr cpudata = NULL; virCPUx86CPUID cpuid; size_t i; - ssize_t n; - - n = virJSONValueArraySize(data); if (!(cpudata = virCPUDataNew(VIR_ARCH_X86_64))) goto error; - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(data); i++) { if (qemuMonitorJSONParseCPUx86FeatureWord(virJSONValueArrayGet(data, i), &cpuid) < 0 || virCPUx86DataAddCPUID(cpudata, &cpuid) < 0) @@ -6960,7 +6955,7 @@ qemuMonitorJSONCheckCPUx86(qemuMonitorPtr mon) virJSONValuePtr reply = NULL; virJSONValuePtr data; size_t i; - ssize_t n; + size_t n; int ret = -1; if (!(cmd = qemuMonitorJSONMakeCommand("qom-list", @@ -7098,7 +7093,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorIOThreadInfoPtr *infolist = NULL; - ssize_t n = 0; + size_t n = 0; size_t i; *iothreads = NULL; @@ -7180,7 +7175,6 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; qemuMonitorMemoryDeviceInfoPtr meminfo = NULL; - ssize_t n; size_t i; if (!(cmd = qemuMonitorJSONMakeCommand("query-memory-devices", NULL))) @@ -7198,9 +7192,8 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, goto cleanup; data = virJSONValueObjectGetArray(reply, "return"); - n = virJSONValueArraySize(data); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(data); i++) { virJSONValuePtr elem = virJSONValueArrayGet(data, i); const char *type; @@ -7666,7 +7659,7 @@ qemuMonitorJSONGetHotpluggableCPUs(qemuMonitorPtr mon, size_t *nentries) { struct qemuMonitorQueryHotpluggableCpusEntry *info = NULL; - ssize_t ninfo = 0; + size_t ninfo = 0; int ret = -1; size_t i; virJSONValuePtr data; diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index eb0b822545..31b687de12 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -322,12 +322,7 @@ virNetDaemonNewPostExecRestart(virJSONValuePtr object, goto error; } else if (virJSONValueIsArray(servers)) { size_t i; - ssize_t n = virJSONValueArraySize(servers); - if (n < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Server count %zd should be positive"), n); - goto error; - } + size_t n = virJSONValueArraySize(servers); if (n > nDefServerNames) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Server count %zd greater than default name count %zu"), diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f4105b1394..5aeb188900 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -411,7 +411,6 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, virJSONValuePtr clients; virJSONValuePtr services; size_t i; - ssize_t n; unsigned int min_workers; unsigned int max_workers; unsigned int priority_workers; @@ -492,14 +491,13 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, goto error; } - n = virJSONValueArraySize(services); - if (n < 0) { + if (!virJSONValueIsArray(services)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed services data in JSON document")); + _("Malformed services array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(services); i++) { virNetServerServicePtr service; virJSONValuePtr child = virJSONValueArrayGet(services, i); if (!child) { @@ -525,14 +523,13 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, goto error; } - n = virJSONValueArraySize(clients); - if (n < 0) { + if (!virJSONValueIsArray(clients)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed clients data in JSON document")); + _("Malformed clients array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(clients); i++) { virNetServerClientPtr client; virJSONValuePtr child = virJSONValueArrayGet(clients, i); if (!child) { diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index fb19d09dda..23fc23cab4 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -325,7 +325,7 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj virNetServerServicePtr svc; virJSONValuePtr socks; size_t i; - ssize_t n; + size_t n; unsigned int max; if (virNetServerServiceInitialize() < 0) @@ -358,12 +358,13 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj goto error; } - if ((n = virJSONValueArraySize(socks)) < 0) { + if (!virJSONValueIsArray(socks)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("socks field in JSON was not an array")); + _("Malformed socks array")); goto error; } + n = virJSONValueArraySize(socks); if (VIR_ALLOC_N(svc->socks, n) < 0) goto error; svc->nsocks = n; diff --git a/src/util/virjson.c b/src/util/virjson.c index dfe00d9280..bb4e3c257b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -971,12 +971,9 @@ virJSONValueIsArray(virJSONValuePtr array) } -ssize_t +size_t virJSONValueArraySize(const virJSONValue *array) { - if (array->type != VIR_JSON_TYPE_ARRAY) - return -1; - return array->data.array.nvalues; } diff --git a/src/util/virjson.h b/src/util/virjson.h index 0f098892b4..e4a82bdbc8 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -81,7 +81,7 @@ virJSONValuePtr virJSONValueObjectGetByType(virJSONValuePtr object, bool virJSONValueIsObject(virJSONValuePtr object); bool virJSONValueIsArray(virJSONValuePtr array); -ssize_t virJSONValueArraySize(const virJSONValue *array); +size_t virJSONValueArraySize(const virJSONValue *array); virJSONValuePtr virJSONValueArrayGet(virJSONValuePtr object, unsigned int element); virJSONValuePtr virJSONValueArraySteal(virJSONValuePtr object, unsigned int element); typedef int (*virJSONArrayIteratorFunc)(size_t pos, diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 41af0cdb6d..3364c843aa 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -293,7 +293,6 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) { virLockSpacePtr lockspace; virJSONValuePtr resources; - ssize_t n; size_t i; VIR_DEBUG("object=%p", object); @@ -324,19 +323,19 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) goto error; } - if ((n = virJSONValueArraySize(resources)) < 0) { + if (!virJSONValueIsArray(resources)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed resources value in JSON document")); + _("Malformed resources array")); goto error; } - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(resources); i++) { virJSONValuePtr child = virJSONValueArrayGet(resources, i); virLockSpaceResourcePtr res; const char *tmp; virJSONValuePtr owners; size_t j; - ssize_t m; + size_t m; if (VIR_ALLOC(res) < 0) goto error; @@ -396,18 +395,19 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) goto error; } - if ((m = virJSONValueArraySize(owners)) < 0) { + if (!virJSONValueIsArray(owners)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed owners value in JSON document")); + _("Malformed owners array")); virLockSpaceResourceFree(res); goto error; } - res->nOwners = m; + m = virJSONValueArraySize(owners); if (VIR_ALLOC_N(res->owners, res->nOwners) < 0) { virLockSpaceResourceFree(res); goto error; } + res->nOwners = m; for (j = 0; j < res->nOwners; j++) { unsigned long long int owner; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index eae1dc01dc..275ab9b54b 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2928,8 +2928,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src, return -1; nservers = virJSONValueArraySize(server); - - if (nservers < 1) { + if (nservers == 0) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("at least 1 server is necessary in " "JSON backing definition for gluster volume")); diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c index 21f5d119e8..46bbc4f1e5 100644 --- a/tests/testutilsqemuschema.c +++ b/tests/testutilsqemuschema.c @@ -101,11 +101,9 @@ testQEMUSchemaStealObjectMemberByName(const char *name, { virJSONValuePtr member; virJSONValuePtr ret = NULL; - size_t n; size_t i; - n = virJSONValueArraySize(members); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(members); i++) { member = virJSONValueArrayGet(members, i); if (STREQ_NULLABLE(name, virJSONValueObjectGetString(member, "name"))) { @@ -188,7 +186,6 @@ testQEMUSchemaValidateObjectMergeVariant(virJSONValuePtr root, virHashTablePtr schema, virBufferPtr debug) { - size_t n; size_t i; virJSONValuePtr variants = NULL; virJSONValuePtr variant; @@ -203,8 +200,7 @@ testQEMUSchemaValidateObjectMergeVariant(virJSONValuePtr root, return -2; } - n = virJSONValueArraySize(variants); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(variants); i++) { variant = virJSONValueArrayGet(variants, i); if (STREQ_NULLABLE(variantname, @@ -342,7 +338,6 @@ testQEMUSchemaValidateEnum(virJSONValuePtr obj, const char *objstr; virJSONValuePtr values = NULL; virJSONValuePtr value; - size_t n; size_t i; if (virJSONValueGetType(obj) != VIR_JSON_TYPE_STRING) { @@ -358,8 +353,7 @@ testQEMUSchemaValidateEnum(virJSONValuePtr obj, return -2; } - n = virJSONValueArraySize(values); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(values); i++) { value = virJSONValueArrayGet(values, i); if (STREQ_NULLABLE(objstr, virJSONValueGetString(value))) { @@ -383,7 +377,6 @@ testQEMUSchemaValidateArray(virJSONValuePtr objs, const char *elemtypename = virJSONValueObjectGetString(root, "element-type"); virJSONValuePtr elementschema; virJSONValuePtr obj; - size_t n; size_t i; if (virJSONValueGetType(objs) != VIR_JSON_TYPE_ARRAY) { @@ -401,8 +394,7 @@ testQEMUSchemaValidateArray(virJSONValuePtr objs, virBufferAddLit(debug, "[\n"); virBufferAdjustIndent(debug, 3); - n = virJSONValueArraySize(objs); - for (i = 0; i < n; i++) { + for (i = 0; i < virJSONValueArraySize(objs); i++) { obj = virJSONValueArrayGet(objs, i); if (testQEMUSchemaValidateRecurse(obj, elementschema, schema, debug) < 0) @@ -423,8 +415,8 @@ testQEMUSchemaValidateAlternate(virJSONValuePtr obj, { virJSONValuePtr members; virJSONValuePtr member; - size_t n; size_t i; + size_t n; const char *membertype; virJSONValuePtr memberschema; int indent; diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c index 62fe589bed..ec73ea575a 100644 --- a/tools/nss/libvirt_nss.c +++ b/tools/nss/libvirt_nss.c @@ -309,8 +309,7 @@ findLease(const char *name, } VIR_DIR_CLOSE(dir); - if ((nleases = virJSONValueArraySize(leases_array)) < 0) - goto cleanup; + nleases = virJSONValueArraySize(leases_array); DEBUG("Read %zd leases", nleases); #if !defined(LIBVIRT_NSS_GUEST) -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH] Revert "projects: Drop explicit --enable-gtk-doc"
by Andrea Bolognani 11 May '18

11 May '18

Turns out using --enable-gtk-doc *is* required, as otherwise the *-rpm jobs for projects using gtk-doc fail with *** gtk-doc must be installed and enabled in order to make dist Interestingly, libosinfo doesn't seem to be affected by this issue despite it, too, using gtk-doc. Fixing libvirt-sandbox and libvirt-glib so they don't need this either is left as an exercise for the reader. This reverts commit 14f444fec9ca7aa670ce7a8db62ba44cad2df6fd. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the "would be a build-breaker if I didn't" rule. projects/libvirt-glib.yaml | 1 + projects/libvirt-sandbox.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 5a1cb37..286d25b 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -6,6 +6,7 @@ jobs: - autotools-build-job: parent_jobs: 'libvirt-master-build' + autogen_args: --enable-gtk-doc - autotools-syntax-check-job: parent_jobs: 'libvirt-glib-master-build' - autotools-check-job: diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index 9117f50..bb8bda6 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -10,6 +10,7 @@ jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' + autogen_args: --enable-gtk-doc - autotools-syntax-check-job: parent_jobs: 'libvirt-sandbox-master-build' - autotools-check-job: -- 2.17.0

1 0

[libvirt] [PATCH] qemu: Remove parameter 'driver' from qemuBlockJobUpdate
by Roland Schulz 11 May '18

11 May '18

The pointer to the qemu driver is already included in domain object's private data, so does not need to be passed as yet another parameter when the domain object is already passed. Also removes parameter 'driver' from functions which had it just because of qemuBlockJobUpdate. Signed-off-by: Roland Schulz <schullzroll(a)gmail.com> --- Follow up on BiteSizeTask https://wiki.libvirt.org/page/BiteSizedTasks#Clean_up_virQEMUDriverPtr_para… src/qemu/qemu_blockjob.c | 13 +++++-------- src/qemu/qemu_blockjob.h | 6 ++---- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_migration.c | 29 +++++++++++++---------------- 4 files changed, 23 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 617e4ee56..e0dfb88c1 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -44,7 +44,6 @@ VIR_LOG_INIT("qemu.qemu_blockjob"); /** * qemuBlockJobUpdate: - * @driver: qemu driver * @vm: domain * @disk: domain disk * @error: error (output parameter) @@ -55,20 +54,20 @@ VIR_LOG_INIT("qemu.qemu_blockjob"); * Returns the block job event processed or -1 if there was no pending event. */ int -qemuBlockJobUpdate(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockJobUpdate(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk, char **error) { qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + qemuDomainObjPrivatePtr priv = vm->privateData; int status = diskPriv->blockJobStatus; if (error) *error = NULL; if (status != -1) { - qemuBlockJobEventProcess(driver, vm, disk, asyncJob, + qemuBlockJobEventProcess(priv->driver, vm, disk, asyncJob, diskPriv->blockJobType, diskPriv->blockJobStatus); diskPriv->blockJobStatus = -1; @@ -244,7 +243,6 @@ qemuBlockJobSyncBegin(virDomainDiskDefPtr disk) /** * qemuBlockJobSyncEnd: - * @driver: qemu driver * @vm: domain * @disk: domain disk * @@ -252,12 +250,11 @@ qemuBlockJobSyncBegin(virDomainDiskDefPtr disk) * for the disk is processed. */ void -qemuBlockJobSyncEnd(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuBlockJobSyncEnd(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk) { VIR_DEBUG("disk=%s", disk->dst); - qemuBlockJobUpdate(driver, vm, asyncJob, disk, NULL); + qemuBlockJobUpdate(vm, asyncJob, disk, NULL); QEMU_DOMAIN_DISK_PRIVATE(disk)->blockJobSync = false; } diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index e71d691c9..cee3ee21c 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -26,8 +26,7 @@ # include "qemu_conf.h" # include "qemu_domain.h" -int qemuBlockJobUpdate(virQEMUDriverPtr driver, - virDomainObjPtr vm, +int qemuBlockJobUpdate(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk, char **error); @@ -39,8 +38,7 @@ void qemuBlockJobEventProcess(virQEMUDriverPtr driver, int status); void qemuBlockJobSyncBegin(virDomainDiskDefPtr disk); -void qemuBlockJobSyncEnd(virQEMUDriverPtr driver, - virDomainObjPtr vm, +void qemuBlockJobSyncEnd(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c129321a5..b03eb3042 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16934,19 +16934,19 @@ qemuDomainBlockJobAbort(virDomainPtr dom, * block jobs from confusing us. */ if (!async) { qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); - qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk, NULL); + qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL); while (diskPriv->blockjob) { if (virDomainObjWait(vm) < 0) { ret = -1; goto endjob; } - qemuBlockJobUpdate(driver, vm, QEMU_ASYNC_JOB_NONE, disk, NULL); + qemuBlockJobUpdate(vm, QEMU_ASYNC_JOB_NONE, disk, NULL); } } endjob: if (disk) - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk); qemuDomainObjEndJob(driver, vm); cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7602a304c..f01bb64f6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -464,7 +464,6 @@ qemuMigrationDstStopNBDServer(virQEMUDriverPtr driver, /** * qemuMigrationSrcDriveMirrorReady: - * @driver: qemu driver * @vm: domain * * Check the status of all drive-mirrors started by @@ -476,8 +475,7 @@ qemuMigrationDstStopNBDServer(virQEMUDriverPtr driver, * -1 on error. */ static int -qemuMigrationSrcDriveMirrorReady(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuMigrationSrcDriveMirrorReady(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { size_t i; @@ -492,7 +490,7 @@ qemuMigrationSrcDriveMirrorReady(virQEMUDriverPtr driver, if (!diskPriv->migrating) continue; - status = qemuBlockJobUpdate(driver, vm, asyncJob, disk, &error); + status = qemuBlockJobUpdate(vm, asyncJob, disk, &error); if (status == VIR_DOMAIN_BLOCK_JOB_FAILED) { if (error) { virReportError(VIR_ERR_OPERATION_FAILED, @@ -532,8 +530,7 @@ qemuMigrationSrcDriveMirrorReady(virQEMUDriverPtr driver, * -2 all mirrors are gone but some of them failed. */ static int -qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver, - virDomainObjPtr vm, +qemuMigrationDriveMirrorCancelled(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, bool check) { @@ -552,7 +549,7 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver, if (!diskPriv->migrating) continue; - status = qemuBlockJobUpdate(driver, vm, asyncJob, disk, &error); + status = qemuBlockJobUpdate(vm, asyncJob, disk, &error); switch (status) { case VIR_DOMAIN_BLOCK_JOB_FAILED: if (check) { @@ -569,7 +566,7 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver, ATTRIBUTE_FALLTHROUGH; case VIR_DOMAIN_BLOCK_JOB_CANCELED: case VIR_DOMAIN_BLOCK_JOB_COMPLETED: - qemuBlockJobSyncEnd(driver, vm, asyncJob, disk); + qemuBlockJobSyncEnd(vm, asyncJob, disk); diskPriv->migrating = false; break; @@ -633,7 +630,7 @@ qemuMigrationSrcCancelOneDriveMirror(virQEMUDriverPtr driver, int status; int rv; - status = qemuBlockJobUpdate(driver, vm, asyncJob, disk, &error); + status = qemuBlockJobUpdate(vm, asyncJob, disk, &error); switch (status) { case VIR_DOMAIN_BLOCK_JOB_FAILED: case VIR_DOMAIN_BLOCK_JOB_CANCELED: @@ -716,12 +713,12 @@ qemuMigrationSrcCancelDriveMirror(virQEMUDriverPtr driver, err = virSaveLastError(); failed = true; } - qemuBlockJobSyncEnd(driver, vm, asyncJob, disk); + qemuBlockJobSyncEnd(vm, asyncJob, disk); diskPriv->migrating = false; } } - while ((rv = qemuMigrationDriveMirrorCancelled(driver, vm, asyncJob, + while ((rv = qemuMigrationDriveMirrorCancelled(vm, asyncJob, check)) != 1) { if (check && !failed && dconn && virConnectIsAlive(dconn) <= 0) { @@ -848,7 +845,7 @@ qemuMigrationSrcDriveMirror(virQEMUDriverPtr driver, VIR_FREE(nbd_dest); if (qemuDomainObjExitMonitor(driver, vm) < 0 || mon_ret < 0) { - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_MIGRATION_OUT, disk); goto cleanup; } diskPriv->migrating = true; @@ -859,7 +856,7 @@ qemuMigrationSrcDriveMirror(virQEMUDriverPtr driver, } } - while ((rv = qemuMigrationSrcDriveMirrorReady(driver, vm, + while ((rv = qemuMigrationSrcDriveMirrorReady(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) != 1) { if (rv < 0) goto cleanup; @@ -1366,7 +1363,7 @@ qemuMigrationAnyCompleted(virQEMUDriverPtr driver, /* This flag should only be set when run on src host */ if (flags & QEMU_MIGRATION_COMPLETED_CHECK_STORAGE && - qemuMigrationSrcDriveMirrorReady(driver, vm, asyncJob) < 0) + qemuMigrationSrcDriveMirrorReady(vm, asyncJob) < 0) goto error; if (flags & QEMU_MIGRATION_COMPLETED_ABORT_ON_ERROR && @@ -5273,7 +5270,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, VIR_DEBUG("Drive mirror on disk %s is still running", disk->dst); } else { VIR_DEBUG("Drive mirror on disk %s is gone", disk->dst); - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk); diskPriv->migrating = false; } } @@ -5295,7 +5292,7 @@ qemuMigrationSrcCancel(virQEMUDriverPtr driver, qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); if (diskPriv->migrating) { - qemuBlockJobSyncEnd(driver, vm, QEMU_ASYNC_JOB_NONE, disk); + qemuBlockJobSyncEnd(vm, QEMU_ASYNC_JOB_NONE, disk); diskPriv->migrating = false; } } -- 2.14.3

2 1

[libvirt] [go-xml PATCH] test: Clone libvirt.git via https:// instead of git://
by Andrea Bolognani 11 May '18

11 May '18

The git:// protocol can cause issues when the client is behind a corporate firewall; https:// works in pretty much any scenario, and these days it's basically as efficient. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- xml_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml_test.go b/xml_test.go index dcec589..2a2e16f 100644 --- a/xml_test.go +++ b/xml_test.go @@ -388,7 +388,7 @@ func syncGit(t *testing.T) { _, err := os.Stat("testdata/libvirt/tests") if err != nil { if os.IsNotExist(err) { - msg, err := exec.Command("git", "clone", "--depth", "1", "git://libvirt.org/libvirt.git", "testdata/libvirt").CombinedOutput() + msg, err := exec.Command("git", "clone", "--depth", "1", "https://libvirt.org/git/libvirt.git", "testdata/libvirt").CombinedOutput() if err != nil { t.Fatal(fmt.Errorf("Unable to clone libvirt.git: %s: %s", err, msg)) } -- 2.17.0

2 1

[libvirt] [jenkins-ci PATCH] projects: Drop explicit --enable-gtk-doc
by Andrea Bolognani 10 May '18

10 May '18

We rely on autodetection for all other features, no reason to treat gtk-doc any differently; the gtk-doc package will have been installed on the worker in any case. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt-glib.yaml | 1 - projects/libvirt-sandbox.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 286d25b..5a1cb37 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -6,7 +6,6 @@ jobs: - autotools-build-job: parent_jobs: 'libvirt-master-build' - autogen_args: --enable-gtk-doc - autotools-syntax-check-job: parent_jobs: 'libvirt-glib-master-build' - autotools-check-job: diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index bb8bda6..9117f50 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -10,7 +10,6 @@ jobs: - autotools-build-job: parent_jobs: 'libvirt-glib-master-build' - autogen_args: --enable-gtk-doc - autotools-syntax-check-job: parent_jobs: 'libvirt-sandbox-master-build' - autotools-check-job: -- 2.17.0

2 1

[libvirt] [jenkins-ci PATCH] projects: Reduce scope for local_env
by Andrea Bolognani 10 May '18

10 May '18

The TEST_ARGS environment variable is only used when running the test suite, which means that local_env can be moved to the *-check-job instead of being at the top level. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt-go-xml.yaml | 4 ++-- projects/libvirt-go.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 1f26751..8d9c16d 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -3,10 +3,10 @@ name: libvirt-go-xml machines: '{all_machines}' title: Libvirt Go XML - local_env: | - export TEST_ARGS="-tags xmlroundtrip" jobs: - go-build-job: parent_jobs: 'libvirt-master-build' - go-check-job: parent_jobs: 'libvirt-go-xml-master-build' + local_env: | + export TEST_ARGS="-tags xmlroundtrip" diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml index f40f523..f2eb87e 100644 --- a/projects/libvirt-go.yaml +++ b/projects/libvirt-go.yaml @@ -3,10 +3,10 @@ name: libvirt-go machines: '{all_machines}' title: Libvirt Go - local_env: | - export TEST_ARGS="-tags api" jobs: - go-build-job: parent_jobs: 'libvirt-master-build' - go-check-job: parent_jobs: 'libvirt-go-master-build' + local_env: | + export TEST_ARGS="-tags api" -- 2.17.0

2 1

[libvirt] [dbus PATCH 0/4] Implement domain APIs with file descriptors
by Pavel Hrdina 10 May '18

10 May '18

Pavel Hrdina (4): gdbus: fix memory and FD leak in virtDBusGDBusHandleMethod domain: Implement CreateWithFiles method domain: Implement OpenGraphicsFD method connect: Implement DomainCreateXMLWithFiles method data/org.libvirt.Connect.xml | 8 +++++ data/org.libvirt.Domain.xml | 13 ++++++++ src/connect.c | 40 ++++++++++++++++++++++ src/domain.c | 64 ++++++++++++++++++++++++++++++++++++ src/gdbus.c | 3 +- 5 files changed, 127 insertions(+), 1 deletion(-) -- 2.17.0

2 5

[libvirt] [dbus PATCH] docs: Introduce man file for libvirt-dbus daemon
by Pavel Hrdina 10 May '18

10 May '18

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- .gitignore | 2 ++ Makefile.am | 2 +- configure.ac | 1 + docs/Makefile.am | 13 +++++++++ docs/libvirt-dbus.pod | 66 +++++++++++++++++++++++++++++++++++++++++++ libvirt-dbus.spec.in | 1 + 6 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 docs/Makefile.am create mode 100644 docs/libvirt-dbus.pod diff --git a/.gitignore b/.gitignore index c6d9754..0bf09cf 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,8 @@ vgcore.* /data/system/libvirt-dbus.rules /data/system/org.libvirt.conf +/docs/*.1 + /src/.deps/ /src/libvirt-dbus /src/org.libvirt.service diff --git a/Makefile.am b/Makefile.am index 16f57b2..bb5ff5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -SUBDIRS = data src tests +SUBDIRS = data docs src tests ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index cc8947c..707a03e 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,7 @@ AC_CONFIG_FILES([run], [chmod +x,-w run]) AC_OUTPUT(Makefile data/Makefile + docs/Makefile src/Makefile tests/Makefile libvirt-dbus.spec) diff --git a/docs/Makefile.am b/docs/Makefile.am new file mode 100644 index 0000000..c41ffae --- /dev/null +++ b/docs/Makefile.am @@ -0,0 +1,13 @@ +POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" + +PODFILES = libvirt-dbus.pod + +%.8: %.pod + $(AM_V_GEN)$(POD2MAN) -s 8 $< $@ \ + && if grep 'POD ERROR' $@; then rm $@; exit 1; fi + +man8_MANS = libvirt-dbus.8 + +EXTRA_DIST = $(PODFILES) + +CLEANFILES = $(man8_MANS) diff --git a/docs/libvirt-dbus.pod b/docs/libvirt-dbus.pod new file mode 100644 index 0000000..49de044 --- /dev/null +++ b/docs/libvirt-dbus.pod @@ -0,0 +1,66 @@ +=head1 NAME + +libvirt-dbus - D-Bus daemon exporting libvirt API + +=head1 SYNOPSIS + +B<libvirt-dbus> [I<OPTION>]... + +=head1 DESCRIPTION + +libvirt-dbus wraps libvirt API to provide a high-level object-oriented +API better suited for dbus-based applications. + +Normally libvirt-dbus is started by D-Bus daemon on demand. + +=head1 OPTIONS + +=over + +=item B<-h --help> + +Display command line help usage then exit. + +=item B<--system> + +Connect to the system bus. + +=item B<--session> + +Connect to the session bus. + +=item B<-t --threads> I<NUM> + +Configure maximal number of worker threads. + +=back + +=head1 BUGS + +Please report all bugs you discover. This should be done via either: + +=over + +=item a) the mailing list + +L<https://libvirt.org/contact.html> + +=item b) the bug tracker + +L<https://libvirt.org/bugs.html> + +=back + +Alternatively, you may report bugs to your software distribution / vendor. + +=head1 AUTHORS + +Please refer to the AUTHORS file distributed with libvirt-dbus. + +=head1 LICENSE + +libvirt-dbus is Free Software and licenced under LGPLv2+. + +=head1 SEE ALSO + +L<https://libvirt.org/dbus.html>, L<https://libvirt.org/> diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index 1543197..45cc617 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -55,5 +55,6 @@ exit 0 %{_datadir}/dbus-1/system-services/org.libvirt.service %{_datadir}/dbus-1/system.d/org.libvirt.conf %{_datadir}/dbus-1/interfaces/org.libvirt.*.xml +%{_mandir}/man8/libvirt-dbus.8* %changelog -- 2.17.0

1 0

[libvirt] [dbus PATCH 00/13] Secret APIs
by Katerina Koukiou 10 May '18

10 May '18

Katerina Koukiou (13): Introduce Secret Interface Implement ListSecrets method for Connect Interface Register Secret Lifecycle Events Implement UUID property for Secret Interface Implement UsageID property for Secret Interface Implement UsageType property for Secret Interface Implement GetXMLDesc method for Secret Interface Implement SecretLookupByUUID method for Connect Interface Implement SecretLookupByUsage method for Connect Interface Implement Undefine method for Secret Interface Implement GetValue method for Secret Interface Implement SetValue method for Secret Interface Implement SecretDefineXML method for Connect Interface data/Makefile.am | 1 + data/org.libvirt.Connect.xml | 33 ++++++ data/org.libvirt.Secret.xml | 44 +++++++ src/Makefile.am | 1 + src/connect.c | 145 +++++++++++++++++++++++ src/connect.h | 2 + src/events.c | 42 +++++++ src/secret.c | 270 +++++++++++++++++++++++++++++++++++++++++++ src/secret.h | 9 ++ src/util.c | 33 ++++++ src/util.h | 16 +++ 11 files changed, 596 insertions(+) create mode 100644 data/org.libvirt.Secret.xml create mode 100644 src/secret.c create mode 100644 src/secret.h -- 2.15.0

2 15

[libvirt] [PATCH] qemu: add sdl opengl support
by Maciej Wolny 10 May '18

10 May '18

Add SDL graphics gl attribute, modify the domain XML schema, add a test, modify the documentation to include the new option. Signed-off-by: Maciej Wolny <maciej.wolny(a)codethink.co.uk> --- docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 41 ++++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 19 ++++++++++ .../qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 28 +++++++++++++++ tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml | 38 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ 9 files changed, 143 insertions(+) create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 3569b9212..a2ef93c09 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3031,6 +3031,14 @@ <ref name="virYesNo"/> </attribute> </optional> + <optional> + <element name="gl"> + <attribute name="enable"> + <ref name="virYesNo"/> + </attribute> + <empty/> + </element> + </optional> </group> <group> <attribute name="type"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b0257068d..7d65ca9df 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13448,6 +13448,7 @@ static int virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def, xmlNodePtr node) { + xmlNodePtr cur; char *fullscreen = virXMLPropString(node, "fullscreen"); int ret = -1; @@ -13468,6 +13469,34 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsDefPtr def, def->data.sdl.xauth = virXMLPropString(node, "xauth"); def->data.sdl.display = virXMLPropString(node, "display"); + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE) { + if (virXMLNodeNameEqual(cur, "gl")) { + char *enable = virXMLPropString(cur, "enable"); + int enableVal; + + if (!enable) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("sdl gl element missing enable")); + goto cleanup; + } + + enableVal = virTristateBoolTypeFromString(enable); + if (enableVal < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown enable value '%s'"), enable); + VIR_FREE(enable); + goto cleanup; + } + VIR_FREE(enable); + + def->data.sdl.gl = enableVal; + } + } + cur = cur->next; + } + ret = 0; cleanup: VIR_FREE(fullscreen); @@ -25652,6 +25681,18 @@ virDomainGraphicsDefFormat(virBufferPtr buf, if (def->data.sdl.fullscreen) virBufferAddLit(buf, " fullscreen='yes'"); + if (!children && def->data.sdl.gl) { + virBufferAddLit(buf, ">\n"); + virBufferAdjustIndent(buf, 2); + children = true; + } + + if (def->data.sdl.gl) { + virBufferAsprintf(buf, "<gl enable='%s'", + virTristateBoolTypeToString(def->data.sdl.gl)); + virBufferAddLit(buf, "/>\n"); + } + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3c7eccb8c..90071d9c0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1601,6 +1601,7 @@ struct _virDomainGraphicsDef { char *display; char *xauth; bool fullscreen; + virTristateBool gl; } sdl; struct { int port; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index aa8d350f5..02680502e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -474,6 +474,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "query-cpus-fast", "disk-write-cache", "nbd-tls", + "sdl-gl", ); @@ -2451,6 +2452,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "vnc", "vnc", QEMU_CAPS_VNC_MULTI_SERVERS }, { "chardev", "reconnect", QEMU_CAPS_CHARDEV_RECONNECT }, { "sandbox", "elevateprivileges", QEMU_CAPS_SECCOMP_BLACKLIST }, + { "sdl", "gl", QEMU_CAPS_SDL_GL }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2afe7ef58..e36611e2a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -458,6 +458,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */ QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cache param */ QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */ + QEMU_CAPS_SDL_GL, /* -sdl gl */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 418729b98..29214e806 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7988,6 +7988,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) { + virBuffer opt = VIR_BUFFER_INITIALIZER; switch (graphics->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: if (graphics->data.sdl.xauth) @@ -8009,6 +8010,24 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, * default, since the default changes :-( */ virCommandAddArg(cmd, "-sdl"); + if (graphics->data.sdl.gl == VIR_TRISTATE_BOOL_YES) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL_GL)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support SDL OpenGL")); + return -1; + + } + + virBufferAsprintf(&opt, "gl=%s", + virTristateSwitchTypeToString(graphics->data.sdl.gl)); + } + + { + const char *optContent = virBufferCurrentContent(&opt); + if (optContent && STRNEQ(optContent, "")) + virCommandAddArgBuffer(cmd, &opt); + } + break; case VIR_DOMAIN_GRAPHICS_TYPE_VNC: diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args new file mode 100644 index 000000000..4172320ed --- /dev/null +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -0,0 +1,28 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ +-m 1024 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,\ +id=drive-ide0-0-0,cache=none \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-sdl gl=on \ +-device virtio-gpu-pci,id=video0,virgl=on,bus=pci.0,addr=0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml new file mode 100644 index 000000000..9dea73fbe --- /dev/null +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2' cache='none'/> + <source file='/var/lib/libvirt/images/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='sdl'> + <gl enable='yes'/> + </graphics> + <video> + <model type='virtio' heads='1'> + <acceleration accel3d='yes'/> + </model> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5b3bd4a99..0b06699f0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1924,6 +1924,11 @@ mymain(void) QEMU_CAPS_SPICE_GL, QEMU_CAPS_SPICE_RENDERNODE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + DO_TEST("video-virtio-gpu-sdl-gl", + QEMU_CAPS_DEVICE_VIRTIO_GPU, + QEMU_CAPS_VIRTIO_GPU_VIRGL, + QEMU_CAPS_SDL_GL, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY); DO_TEST("video-virtio-gpu-secondary", QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); -- 2.11.0

3 10

[libvirt] [PATCH] xenconfig: Remove references to my name and email
by David Kiarie 10 May '18

10 May '18

Replace references to my name and email with a pseudonym Signed-off-by: David Kiarie <davidkiarie4(a)gmail.com> --- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xl.h | 2 +- tests/xlconfigtest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 35d52f8a..0343a73c 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -17,7 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)gmail.com> * Author: Jim Fehlig <jfehlig(a)suse.com> */ diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h index 68f332ac..4ce13f05 100644 --- a/src/xenconfig/xen_xl.h +++ b/src/xenconfig/xen_xl.h @@ -17,7 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani<davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)gmail.com> */ #ifndef __VIR_XEN_XL_H__ diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 39f51e2d..1bbc0b72 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)gmail.com> * */ -- 2.17.0

8 34

Re: [libvirt] Question about verifying same uid:gid in src and dstfor live migration
by Fei Li 10 May '18

10 May '18

Hi Daniel, On 05/09/2018 03:55 PM, Daniel P. Berrangé wrote: > On Wed, May 09, 2018 at 01:45:53PM +0800, Fei Li wrote: >> Hi, >> >> When I do live migration using virsh command line based on NFS shared >> storage between two systems >> having the same security mechanism and having the same kvm/qemu/libvirt >> version, I encounter the >> following error: >> >> debug : qemuMonitorJSONIOProcessLine:193 : Line [{"timestamp": {"seconds": 1524893525, "microseconds": 522686}, >> "event": "BLOCK_IO_ERROR", "data": {"device": "drive-virtio-disk0", "nospace": false, "node-name": "#block120", >> "reason": "Permission denied", "operation": "write", "action": "report"}}] >> ... >> error: internal error: qemu unexpectedly closed the monitor: >> qemu-system-x86_64: load of migration failed: Input/output error >> ... >> >> According to the "Permission denied" && "write" information, I find the >> below 2 ways can fix this error: >> - Change the mode of guest's .qcow2 file from 644 to 646 > Absolutely no - any process or user that can access the mount can > then compromise your disk images Right, this should not be a fix. :) > >> - Keep qemu's uid the same one between src host and dst host (They are not >> same before I change them) > You *must* have the same uid+gid between source and dest hosts > >> After confirming that keeping qemu's uid identical between src host and dst >> host can fix such issue, >> my question is whether a fix in libvirt should be pursued or just document >> the requirement for same >> uid:gid across host systems in a migration cluster is ok? > In Fedora and RHEL at least the system is setup so that these users get > a fixed uid:gid upon installation to avoid this kind of problem. Thanks for the "fixed uid:gid" advice, this helps a lot. Have a nice day, thanks again Fei > > Regards, > Daniel

1 0

[libvirt] [qemu PATCH] docs/interop: add "firmware.json"
by Laszlo Ersek 10 May '18

10 May '18

Add a schema that describes the different uses and properties of virtual machine firmware. Each firmware executable installed on a host system should come with at least one JSON file that conforms to this schema. Each file informs the management applications about - the firmware's properties and one possible use case / feature set, - configuration bits that are required to run the firmware binary. In addition, define rules for management apps for picking the highest priority firmware JSON file when multiple such files match the search criteria. Cc: "Daniel P. Berrange" <berrange(a)redhat.com> Cc: David Gibson <dgibson(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Kashyap Chamarthy <kchamart(a)redhat.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: Thomas Huth <thuth(a)redhat.com> Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- Notes: PATCH: - previous version (RFCv3) was posted at: <http://mid.mail-archive.com/20180420231246.23130-4-lersek@redhat.com> - move "firmware.json" under docs/interop/; drop earlier development artifacts - no changes to the schema (received no comments on RFCv3) RFCv3: - Previous version (RFCv2) was posted at: <http://mid.mail-archive.com/20180417224054.26363-1-lersek@redhat.com> - Trim the CC list a little. - Wrap to a 72-char margin, for an easier reading. [Markus] - Run spell-checker. [Markus] - Rename @FirmwareType to @FirmwareOSInterface, to better express the concept. Update the enum constants accordingly (incl. documentation); in particular replace @slof with @openfirmware. Rename the @type field in @Firmware to @interface-type. [David, Gerd, Paolo, Thomas] - Better yet, rename @interface-type to @interface-types (plural), and turn it into a list of @FirmwareOSInterface entries, to express an ordered compat list with multiple firmware<->OS interface types. [Dan, Eric, Gerd, Paolo] - Drop @FirmwareArchitecture, and switch the type of @FirmwareTarget.@architecture to @SysEmuTarget (now defined in "common.json"). [Dan, Gerd, Markus] - Switch elements of @FirmwareTarget.@machines from aliases ("pc", "q35", "virt") to concrete machine types, with glob patterns understood. [Dan, Gerd] - Rename @secure-boot-enrolled-keys to @enrolled-keys, and drop the dependency on @secure-boot in its documentation. [Gerd] - Describe the firmware JSON directories and the search rules to management apps, under the @Firmware element. Relatedly, remove the language on any concrete certificates under @enrolled-keys, as these can be customized through the overrides. Also refresh the commit message. [Dan, Gerd] - Rename @pathname fields to @filename. [Markus] - Don't replace "@executable.@filename" with "@executable.filename" (that is, keep the second @ sign), because removing the 2nd @ sign messes up the documentation ("filename" stops being type-set in monospace in the HTML, for example). [Markus] - Rename @nvram_template to @nvram-template. [Thomas] - Keep @x-check-firmware for a while longer. [Dan, Gerd, Markus, Paolo] RFCv2: - previous version (RFCv1) was posted at <http://mid.mail-archive.com/20180407000117.25640-1-lersek@redhat.com> - v2 is basically a rewrite from scratch, starting out with Dan's definitions from <http://mid.mail-archive.com/20180410102033.GL5155@redhat.com> and <http://mid.mail-archive.com/20180410110357.GP5155@redhat.com>, hopefully addressing others' feedback as well RFCv1: - Folks on the CC list, please try to see if the suggested schema is flexible enough to describe the virtual firmware(s) that you are familiar with. Thanks! docs/interop/firmware.json | 554 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 554 insertions(+) create mode 100644 docs/interop/firmware.json diff --git a/docs/interop/firmware.json b/docs/interop/firmware.json new file mode 100644 index 000000000000..2add6fd8afe7 --- /dev/null +++ b/docs/interop/firmware.json @@ -0,0 +1,554 @@ +# -*- Mode: Python -*- +# +# Copyright (C) 2018 Red Hat, Inc. +# +# Authors: +# Daniel P. Berrange <berrange(a)redhat.com> +# Laszlo Ersek <lersek(a)redhat.com> +# +# This work is licensed under the terms of the GNU GPL, version 2 or +# later. See the COPYING file in the top-level directory. + +## +# = Firmware +## + +{ 'include' : 'common.json' } +{ 'include' : 'block-core.json' } + +## +# @FirmwareOSInterface: +# +# Lists the firmware-OS interface types provided by various firmware +# that is commonly used with QEMU virtual machines. +# +# @bios: Traditional x86 BIOS interface. For example, firmware built +# from the SeaBIOS project usually provides this interface. +# +# @openfirmware: The interface is defined by the (historical) IEEE +# 1275-1994 standard. Examples for firmware projects that +# provide this interface are: OpenBIOS, OpenHackWare, +# SLOF. +# +# @uboot: Firmware interface defined by the U-Boot project. +# +# @uefi: Firmware interface defined by the UEFI specification. For +# example, firmware built from the edk2 (EFI Development Kit II) +# project usually provides this interface. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareOSInterface', + 'data' : [ 'bios', 'openfirmware', 'uboot', 'uefi' ] } + +## +# @FirmwareDevice: +# +# Defines the device types that firmware can be mapped into. +# +# @flash: The firmware executable and its accompanying NVRAM file are to +# be mapped into a pflash chip each. +# +# @kernel: The firmware is to be loaded like a Linux kernel. This is +# similar to @memory but may imply additional processing that +# is specific to the target architecture and machine type. +# +# @memory: The firmware is to be mapped into memory. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareDevice', + 'data' : [ 'flash', 'kernel', 'memory' ] } + +## +# @FirmwareTarget: +# +# Defines the machine types that firmware may execute on. +# +# @architecture: Determines the emulation target (the QEMU system +# emulator) that can execute the firmware. +# +# @machines: Lists the machine types (known by the emulator that is +# specified through @architecture) that can execute the +# firmware. Elements of @machines are supposed to be concrete +# machine types, not aliases. Glob patterns are understood, +# which is especially useful for versioned machine types. +# (For example, the glob pattern "pc-i440fx-*" matches +# "pc-i440fx-2.12".) On the QEMU command line, "-machine +# type=..." specifies the requested machine type (but that +# option does not accept glob patterns). +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareTarget', + 'data' : { 'architecture' : 'SysEmuTarget', + 'machines' : [ 'str' ] } } + +## +# @FirmwareFeature: +# +# Defines the features that firmware may support, and the platform +# requirements that firmware may present. +# +# @acpi-s3: The firmware supports S3 sleep (suspend to RAM), as defined +# in the ACPI specification. On the "pc-i440fx-*" machine +# types of the @i386 and @x86_64 emulation targets, S3 can be +# enabled with "-global PIIX4_PM.disable_s3=0" and disabled +# with "-global PIIX4_PM.disable_s3=1". On the "pc-q35-*" +# machine types of the @i386 and @x86_64 emulation targets, S3 +# can be enabled with "-global ICH9-LPC.disable_s3=0" and +# disabled with "-global ICH9-LPC.disable_s3=1". +# +# @acpi-s4: The firmware supports S4 hibernation (suspend to disk), as +# defined in the ACPI specification. On the "pc-i440fx-*" +# machine types of the @i386 and @x86_64 emulation targets, S4 +# can be enabled with "-global PIIX4_PM.disable_s4=0" and +# disabled with "-global PIIX4_PM.disable_s4=1". On the +# "pc-q35-*" machine types of the @i386 and @x86_64 emulation +# targets, S4 can be enabled with "-global +# ICH9-LPC.disable_s4=0" and disabled with "-global +# ICH9-LPC.disable_s4=1". +# +# @amd-sev: The firmware supports running under AMD Secure Encrypted +# Virtualization, as specified in the AMD64 Architecture +# Programmer's Manual. QEMU command line options related to +# this feature are documented in +# "docs/amd-memory-encryption.txt". +# +# @enrolled-keys: The variable store (NVRAM) template associated with +# the firmware binary has the UEFI Secure Boot +# operational mode turned on, with certificates +# enrolled. +# +# @requires-smm: The firmware requires the platform to emulate SMM +# (System Management Mode), as defined in the AMD64 +# Architecture Programmer's Manual, and in the Intel(R)64 +# and IA-32 Architectures Software Developer's Manual. On +# the "pc-q35-*" machine types of the @i386 and @x86_64 +# emulation targets, SMM emulation can be enabled with +# "-machine smm=on". (On the "pc-q35-*" machine types of +# the @i386 emulation target, @requires-smm presents +# further CPU requirements; one combination known to work +# is "-cpu coreduo,-nx".) If the firmware is marked as +# both @secure-boot and @requires-smm, then write +# accesses to the pflash chip (NVRAM) that holds the UEFI +# variable store must be restricted to code that executes +# in SMM, using the additional option "-global +# driver=cfi.pflash01,property=secure,value=on". +# Furthermore, a large guest-physical address space +# (comprising guest RAM, memory hotplug range, and 64-bit +# PCI MMIO aperture), and/or a high VCPU count, may +# present high SMRAM requirements from the firmware. On +# the "pc-q35-*" machine types of the @i386 and @x86_64 +# emulation targets, the SMRAM size may be increased +# above the default 16MB with the "-global +# mch.extended-tseg-mbytes=uint16" option. As a rule of +# thumb, the default 16MB size suffices for 1TB of +# guest-phys address space and a few tens of VCPUs; for +# every further TB of guest-phys address space, add 8MB +# of SMRAM. 48MB should suffice for 4TB of guest-phys +# address space and 2-3 hundred VCPUs. +# +# @secure-boot: The firmware implements the software interfaces for UEFI +# Secure Boot, as defined in the UEFI specification. Note +# that without @requires-smm, guest code running with +# kernel privileges can undermine the security of Secure +# Boot. +# +# @verbose-dynamic: When firmware log capture is enabled, the firmware +# logs a large amount of debug messages, which may +# impact boot performance. With log capture disabled, +# there is no boot performance impact. On the +# "pc-i440fx-*" and "pc-q35-*" machine types of the +# @i386 and @x86_64 emulation targets, firmware log +# capture can be enabled with the QEMU command line +# options "-chardev file,id=fwdebug,path=LOGFILEPATH +# -device isa-debugcon,iobase=0x402,chardev=fwdebug". +# @verbose-dynamic is mutually exclusive with +# @verbose-static. +# +# @verbose-static: The firmware unconditionally produces a large amount +# of debug messages, which may impact boot performance. +# This feature may typically be carried by certain UEFI +# firmware for the "virt-*" machine types of the @arm +# and @aarch64 emulation targets, where the debug +# messages are written to the first (always present) +# PL011 UART. @verbose-static is mutually exclusive +# with @verbose-dynamic. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareFeature', + 'data' : [ 'acpi-s3', 'acpi-s4', 'amd-sev', 'enrolled-keys', + 'requires-smm', 'secure-boot', 'verbose-dynamic', + 'verbose-static' ] } + +## +# @FirmwareFlashFile: +# +# Defines common properties that are necessary for loading a firmware +# file into a pflash chip. The corresponding QEMU command line option is +# "-drive file=@filename,format=@format". Note however that the +# option-argument shown here is incomplete; it is completed under +# @FirmwareMappingFlash. +# +# @filename: Specifies the filename on the host filesystem where the +# firmware file can be found. +# +# @format: Specifies the block format of the file pointed-to by +# @filename, such as @raw or @qcow2. +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareFlashFile', + 'data' : { 'filename' : 'str', + 'format' : 'BlockdevDriver' } } + +## +# @FirmwareMappingFlash: +# +# Describes loading and mapping properties for the firmware executable +# and its accompanying NVRAM file, when @FirmwareDevice is @flash. +# +# @executable: Identifies the firmware executable. The firmware +# executable may be shared by multiple virtual machine +# definitions. The corresponding QEMU command line option +# is "-drive +# if=pflash,unit=0,readonly=on,file=@executable.@filename,format=@executable.@format". +# +# @nvram-template: Identifies the NVRAM template compatible with +# @executable. Management software instantiates an +# individual copy -- a specific NVRAM file -- from +# @nvram-template.@filename for each new virtual +# machine definition created. @nvram-template.@filename +# itself is never mapped into virtual machines, only +# individual copies of it are. An NVRAM file is +# typically used for persistently storing the +# non-volatile UEFI variables of a virtual machine +# definition. The corresponding QEMU command line +# option is "-drive +# if=pflash,unit=1,readonly=off,file=FILENAME_OF_PRIVATE_NVRAM_FILE,format=@nvram-template.@format". +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareMappingFlash', + 'data' : { 'executable' : 'FirmwareFlashFile', + 'nvram-template' : 'FirmwareFlashFile' } } + +## +# @FirmwareMappingKernel: +# +# Describes loading and mapping properties for the firmware executable, +# when @FirmwareDevice is @kernel. +# +# @filename: Identifies the firmware executable. The firmware executable +# may be shared by multiple virtual machine definitions. The +# corresponding QEMU command line option is "-kernel +# @filename". +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareMappingKernel', + 'data' : { 'filename' : 'str' } } + +## +# @FirmwareMappingMemory: +# +# Describes loading and mapping properties for the firmware executable, +# when @FirmwareDevice is @memory. +# +# @filename: Identifies the firmware executable. The firmware executable +# may be shared by multiple virtual machine definitions. The +# corresponding QEMU command line option is "-bios +# @filename". +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareMappingMemory', + 'data' : { 'filename' : 'str' } } + +## +# @FirmwareMapping: +# +# Provides a discriminated structure for firmware to describe its +# loading / mapping properties. +# +# @device: Selects the device type that the firmware must be mapped +# into. +# +# Since: 2.13 +## +{ 'union' : 'FirmwareMapping', + 'base' : { 'device' : 'FirmwareDevice' }, + 'discriminator' : 'device', + 'data' : { 'flash' : 'FirmwareMappingFlash', + 'kernel' : 'FirmwareMappingKernel', + 'memory' : 'FirmwareMappingMemory' } } + +## +# @Firmware: +# +# Describes a firmware (or a firmware use case) to management software. +# +# It is possible for multiple @Firmware elements to match the search +# criteria of management software. Applications thus need rules to pick +# one of the many matches, and users need the ability to override distro +# defaults. +# +# It is recommended to create firmware JSON files (each containing a +# single @Firmware root element) with a double-digit prefix, for example +# "50-ovmf.json", "50-seabios-256k.json", etc, so they can be sorted in +# predictable order. The firmware JSON files should be searched for in +# three directories: +# +# - /usr/share/qemu/firmware -- populated by distro-provided firmware +# packages (XDG_DATA_DIRS covers +# /usr/share by default), +# +# - /etc/qemu/firmware -- exclusively for sysadmins' local additions, +# +# - $XDG_CONFIG_HOME/qemu/firmware -- exclusively for per-user local +# additions (XDG_CONFIG_HOME +# defaults to $HOME/.config). +# +# Top-down, the list of directories goes from general to specific. +# +# Management software should build a list of files from all three +# locations, then sort the list by filename (i.e., last pathname +# component). Management software should choose the first JSON file on +# the sorted list that matches the search criteria. If a more specific +# directory has a file with same name as a less specific directory, then +# the file in the more specific directory takes effect. If the more +# specific file is zero length, it hides the less specific one. +# +# For example, if a distro ships +# +# - /usr/share/qemu/firmware/50-ovmf.json +# +# - /usr/share/qemu/firmware/50-seabios-256k.json +# +# then the sysadmin can prevent the default OVMF being used at all with +# +# $ touch /etc/qemu/firmware/50-ovmf.json +# +# The sysadmin can replace/alter the distro default OVMF with +# +# $ vim /etc/qemu/firmware/50-ovmf.json +# +# or they can provide a parallel OVMF with higher priority +# +# $ vim /etc/qemu/firmware/10-ovmf.json +# +# or they can provide a parallel OVMF with lower priority +# +# $ vim /etc/qemu/firmware/99-ovmf.json +# +# @description: Provides a human-readable description of the firmware. +# Management software may or may not display @description. +# +# @interface-types: Lists the types of interfaces that the firmware can +# expose to the guest OS. This is a non-empty, ordered +# list; entries near the beginning of @interface-types +# are considered more native to the firmware, and/or +# to have a higher quality implementation in the +# firmware, than entries near the end of +# @interface-types. +# +# @mapping: Describes the loading / mapping properties of the firmware. +# +# @targets: Collects the target architectures (QEMU system emulators) +# and their machine types that may execute the firmware. +# +# @features: Lists the features that the firmware supports, and the +# platform requirements it presents. +# +# @tags: A list of auxiliary strings associated with the firmware for +# which @description is not appropriate, due to the latter's +# possible exposure to the end-user. @tags serves development and +# debugging purposes only, and management software shall +# explicitly ignore it. +# +# Since: 2.13 +# +# Examples: +# +# { +# "description": "SeaBIOS", +# "interface-types": [ +# "bios" +# ], +# "mapping": { +# "device": "memory", +# "filename": "/usr/share/seabios/bios-256k.bin" +# }, +# "targets": [ +# { +# "architecture": "i386", +# "machines": [ +# "pc-i440fx-*", +# "pc-q35-*" +# ] +# }, +# { +# "architecture": "x86_64", +# "machines": [ +# "pc-i440fx-*", +# "pc-q35-*" +# ] +# } +# ], +# "features": [ +# "acpi-s3", +# "acpi-s4" +# ], +# "tags": [ +# "CONFIG_BOOTSPLASH=n", +# "CONFIG_ROM_SIZE=256", +# "CONFIG_USE_SMM=n" +# ] +# } +# +# { +# "description": "OVMF with SB+SMM, empty varstore", +# "interface-types": [ +# "uefi" +# ], +# "mapping": { +# "device": "flash", +# "executable": { +# "filename": "/usr/share/OVMF/OVMF_CODE.secboot.fd", +# "format": "raw" +# }, +# "nvram-template": { +# "filename": "/usr/share/OVMF/OVMF_VARS.fd", +# "format": "raw" +# } +# }, +# "targets": [ +# { +# "architecture": "x86_64", +# "machines": [ +# "pc-q35-*" +# ] +# } +# ], +# "features": [ +# "acpi-s3", +# "amd-sev", +# "requires-smm", +# "secure-boot", +# "verbose-dynamic" +# ], +# "tags": [ +# "-a IA32", +# "-a X64", +# "-p OvmfPkg/OvmfPkgIa32X64.dsc", +# "-t GCC48", +# "-b DEBUG", +# "-D SMM_REQUIRE", +# "-D SECURE_BOOT_ENABLE", +# "-D FD_SIZE_4MB" +# ] +# } +# +# { +# "description": "OVMF with SB+SMM, SB enabled, MS certs enrolled", +# "interface-types": [ +# "uefi" +# ], +# "mapping": { +# "device": "flash", +# "executable": { +# "filename": "/usr/share/OVMF/OVMF_CODE.secboot.fd", +# "format": "raw" +# }, +# "nvram-template": { +# "filename": "/usr/share/OVMF/OVMF_VARS.secboot.fd", +# "format": "raw" +# } +# }, +# "targets": [ +# { +# "architecture": "x86_64", +# "machines": [ +# "pc-q35-*" +# ] +# } +# ], +# "features": [ +# "acpi-s3", +# "amd-sev", +# "enrolled-keys", +# "requires-smm", +# "secure-boot", +# "verbose-dynamic" +# ], +# "tags": [ +# "-a IA32", +# "-a X64", +# "-p OvmfPkg/OvmfPkgIa32X64.dsc", +# "-t GCC48", +# "-b DEBUG", +# "-D SMM_REQUIRE", +# "-D SECURE_BOOT_ENABLE", +# "-D FD_SIZE_4MB" +# ] +# } +# +# { +# "description": "UEFI firmware for ARM64 virtual machines", +# "interface-types": [ +# "uefi" +# ], +# "mapping": { +# "device": "flash", +# "executable": { +# "filename": "/usr/share/AAVMF/AAVMF_CODE.fd", +# "format": "raw" +# }, +# "nvram-template": { +# "filename": "/usr/share/AAVMF/AAVMF_VARS.fd", +# "format": "raw" +# } +# }, +# "targets": [ +# { +# "architecture": "aarch64", +# "machines": [ +# "virt-*" +# ] +# } +# ], +# "features": [ +# +# ], +# "tags": [ +# "-a AARCH64", +# "-p ArmVirtPkg/ArmVirtQemu.dsc", +# "-t GCC48", +# "-b DEBUG", +# "-D DEBUG_PRINT_ERROR_LEVEL=0x80000000" +# ] +# } +## +{ 'struct' : 'Firmware', + 'data' : { 'description' : 'str', + 'interface-types' : [ 'FirmwareOSInterface' ], + 'mapping' : 'FirmwareMapping', + 'targets' : [ 'FirmwareTarget' ], + 'features' : [ 'FirmwareFeature' ], + 'tags' : [ 'str' ] } } + +## +# @x-check-firmware: +# +# Accept a @Firmware object and do nothing, successfully. This command +# can be used in the QMP shell to validate @Firmware JSON against the +# schema. +# +# @fw: ignored +# +# Since: 2.13 +## +{ 'command' : 'x-check-firmware', + 'data' : { 'fw' : 'Firmware' } } -- 2.14.1.3.gb7cf6e02401b

1 1

[libvirt] [PATCH python] Implement virDomainCreateWithParams API
by Marc Hartmayer 10 May '18

10 May '18

This patch adds the Python binding for virDomainCreateWithParams API. The Python side can be generated automatically, the C side not. Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> --- generator.py | 1 + libvirt-override-api.xml | 19 ++++++++++++++++ libvirt-override.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) diff --git a/generator.py b/generator.py index 74150b72388f..9d12218a0aef 100755 --- a/generator.py +++ b/generator.py @@ -488,6 +488,7 @@ skip_impl = ( 'virDomainGetPerfEvents', 'virDomainSetPerfEvents', 'virDomainGetGuestVcpus', + 'virDomainCreateWithParams', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index b63a40378437..34af14df0a62 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -717,5 +717,24 @@ <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> <return type='int' info="dictionary of vcpu data returned by the guest agent"/> </function> + <function name='virDomainCreateWithParams' file='python'> + <info>Launch a defined domain. If the call succeeds the domain moves +from the defined to the running domains pools. + +@params provides a dictionary. This dictionary will be used to +configure the domain to be temporary started from the device +specified by the value of the key 'bootdevice'. With the values +of the keys 'kernel', 'initrd', and 'cmdline' it's possible to +temporarily override the corresponding values. The dictionary +and all dictionary items are optional. + +For more control over @flags, see createWithFlags(). + +Returns 0 in case of success, -1 in case of error</info> + <arg name='domain' type='virDomainPtr' info='a domain object'/> + <arg name='params' type='char *' info='dictionary with parameters'/> + <arg name='flags' type='unsigned int' info='an OR'ed set of virDomainCreateFlags'/> + <return type='int' info='0 on success, -1 on error'/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index b4c1529f621d..2a4e91d640df 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -9708,6 +9708,60 @@ libvirt_virStreamRecvFlags(PyObject *self ATTRIBUTE_UNUSED, #endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ +#if LIBVIR_CHECK_VERSION(4, 4, 0) +static virPyTypedParamsHint virPyDomainCreateWithParams[] = { + { VIR_DOMAIN_CREATE_PARM_KERNEL, VIR_TYPED_PARAM_STRING }, + { VIR_DOMAIN_CREATE_PARM_CMDLINE, VIR_TYPED_PARAM_STRING }, + { VIR_DOMAIN_CREATE_PARM_INITRD, VIR_TYPED_PARAM_STRING }, + { VIR_DOMAIN_CREATE_PARM_DEVICE_IDENTIFIER, VIR_TYPED_PARAM_STRING }, +}; + + +static PyObject * +libvirt_virDomainCreateWithParams(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *pyobj_domain; + PyObject *pyobj_dict; + virDomainPtr domain; + int nparams; + virTypedParameterPtr params; + unsigned int flags; + int c_retval; + + if (!PyArg_ParseTuple(args, (char *)"OOI:virDomainCreateWithParams", + &pyobj_domain, &pyobj_dict, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (PyDict_Check(pyobj_dict)) { + if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, + virPyDomainCreateWithParams, + VIR_N_ELEMENTS(virPyDomainCreateWithParams)) < 0) { + return NULL; + } + } else if (pyobj_dict == Py_None) { + /* Since 'None' is a Singleton, testing for object identity is + * sufficient */ + params = NULL; + nparams = 0; + } else { + PyErr_SetString(PyExc_ValueError, + "Only dictionaries or None arguments" + " are allowed for the parameter 'params'"); + return NULL; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainCreateWithParams(domain, params, nparams, flags); + LIBVIRT_END_ALLOW_THREADS; + + virTypedParamsFree(params, nparams); + return libvirt_intWrap(c_retval); +} +#endif /* LIBVIR_CHECK_VERSION(4, 4, 0) */ + + /************************************************************************ * * * The registration stuff * @@ -9941,6 +9995,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virStreamSendHole", libvirt_virStreamSendHole, METH_VARARGS, NULL}, {(char *) "virStreamRecvFlags", libvirt_virStreamRecvFlags, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ +#if LIBVIR_CHECK_VERSION(4, 4, 0) + {(char *) "virDomainCreateWithParams", libvirt_virDomainCreateWithParams, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(4, 4, 0) */ {NULL, NULL, 0, NULL} }; -- 2.13.4

1 0

[libvirt] [PATCH v2] rpc: fixing compilation error due to deprecated ssh_get_publickey().
by Julio Faracco 10 May '18

10 May '18

After 0.7.5 release, libssh deprecated ssh_get_publickey() method to introduce ssh_get_server_publickey(). This commit check the current version of libssh and use the proper method during the compilation. See the error: make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src' CC rpc/libvirt_net_rpc_la-virnetlibsshsession.lo rpc/virnetlibsshsession.c:217:9: error: 'ssh_get_publickey' is deprecated [-Werror,-Wdeprecated-declarations] if (ssh_get_publickey(sess->session, &key) != SSH_OK) { ^ /usr/include/libssh/libssh.h:489:1: note: 'ssh_get_publickey' has been explicitly marked deprecated here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh_key *key); ^ /usr/include/libssh/libssh.h:99:40: note: expanded from macro 'SSH_DEPRECATED' ^ 1 error generated. Makefile:8604: recipe for target 'rpc/libvirt_net_rpc_la-virnetlibsshsession.lo' failed Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/rpc/virnetlibsshsession.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 309e8a9340..9dc7976828 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -214,7 +214,11 @@ virLibsshServerKeyAsString(virNetLibsshSessionPtr sess) size_t keyhashlen; char *str; - if (ssh_get_publickey(sess->session, &key) != SSH_OK) { +#if LIBSSH_VERSION_INT <= 0x0705 /* 0.7.5 */ +# define ssh_get_server_publickey ssh_get_publickey +#endif + + if (ssh_get_server_publickey(sess->session, &key) != SSH_OK) { virReportError(VIR_ERR_LIBSSH, "%s", _("failed to get the key of the current " "session")); -- 2.17.0

2 1

[libvirt] [PATCH 0/3] spec: drop deprecated el5 bits
by Cole Robinson 09 May '18

09 May '18

2 patches from a Fedora contributor, 1 from me, dropping spec bits that aren't required on el6 and later builds Cole Robinson (1): spec: Remove Group: tags Igor Gnatenko (2): spec: Remove BuildRoot definition spec: Remove %clean section libvirt.spec.in | 45 --------------------------------------------- 1 file changed, 45 deletions(-) -- 2.17.0

3 6

[libvirt] [RFC 0/3] LXC with block device and enabled userns
by Radostin Stoyanov 09 May '18

09 May '18

Problem background ------------------ The LXC driver has support for the filesystem types "file" and "block" that allow a disk image to be mounted in the guest (container). [1] However, when user-namespace is enabled (uid/gid mapping is used) the mount of the root filesystem block device fails. [2] According to "man 7 user_namespaces": Mounting block-based filesystems can be done only by a process that holds CAP_SYS_ADMIN in the initial user namespace. Suggested approach ------------------ Mount the root file system block device before the clone() call, then set filesystem type to VIR_DOMAIN_FS_TYPE_MOUNT and filesystem source to the folder where it was mounted. Issues encountered -------------------- This patch series implements the basic idea of the mentioned approach. In result, a container with configured idmap and NBD filesystem is able to start. However, on guest shutdown this kernel error [3] occurs. Similar messages [4] occur on shutdown when NBD filesystem is used with LXC container without idmap. Perhaps, one reason could be that on guest shutdown the LXC driver kills qemu-nbd process without sending disconnect for the specified device. References ---------- [1] https://libvirt.org/formatdomain.html#elementsFilesystems [2] https://bugzilla.redhat.com/show_bug.cgi?id=1328946 [3] https://pastebin.com/raw/jMBk5mtG [4] https://pastebin.com/raw/wTKbuRP9 Radostin Stoyanov (3): lxc: Make lxcContainerMountFSBlock non static lxc: Move up virLXCControllerAppendNBDPids lxc: Mount NBD devices before clone src/lxc/lxc_container.c | 58 +------------------ src/lxc/lxc_container.h | 4 ++ src/lxc/lxc_controller.c | 145 +++++++++++++++++++++++++++-------------------- 3 files changed, 87 insertions(+), 120 deletions(-) -- 2.14.3

3 7

[libvirt] [dbus PATCH 00/19] StoragePool APIs till libvirt 3.0
by Katerina Koukiou 09 May '18

09 May '18

Katerina Koukiou (19): Introduce StoragePool Interface Implement ListStoragePools method for Connect Interface Register StoragePool Lifecycle Events Implement Destroy method for StoragePool Interface Implement Build method for StoragePool Interface Implement Create method for StoragePool Interface Implement Delete method for StoragePool Interface Implement getter for Autostart property for StoragePool Interface Implement GetInfo method for StoragePool Interface Implement Name property for StoragePool Interface Implement UUID property for StoragePool Interface Implement GetXMLDesc method for StoragePool Interface Implement Active property for StoragePool Interface Implement Persistent property for StoragePool Interface Implement StoragePoolLookupByName method for Connect Interface Implement StoragePoolLookupByUUID method for Connect Interface Implement Refresh method for StoragePool Interface Implement setter for Autostart property for StoragePool Interface Implement Undefine method for StoragePool Interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 24 +++ data/org.libvirt.StoragePool.xml | 69 +++++++ src/Makefile.am | 3 +- src/connect.c | 120 +++++++++++ src/connect.h | 2 + src/events.c | 43 ++++ src/storagepool.c | 422 +++++++++++++++++++++++++++++++++++++++ src/storagepool.h | 9 + src/util.c | 33 +++ src/util.h | 15 ++ tests/libvirttest.py | 29 +++ tests/test_connect.py | 28 +++ tests/test_storage.py | 112 +++++++++++ 14 files changed, 910 insertions(+), 2 deletions(-) create mode 100644 data/org.libvirt.StoragePool.xml create mode 100644 src/storagepool.c create mode 100644 src/storagepool.h create mode 100755 tests/test_storage.py -- 2.15.0

2 23

[libvirt] [jenkins-ci PATCH] Build libosinfo and osinfo-db-tools on mingw platform
by Daniel P. Berrangé 09 May '18

09 May '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 ++ guests/vars/mappings.yml | 6 ++++++ guests/vars/projects/libosinfo+mingw.yml | 8 ++++++++ guests/vars/projects/osinfo-db-tools+mingw.yml | 10 ++++++++++ projects/libosinfo.yaml | 12 ++++++++++++ projects/osinfo-db-tools.yaml | 12 ++++++++++++ 6 files changed, 50 insertions(+) create mode 100644 guests/vars/projects/libosinfo+mingw.yml create mode 100644 guests/vars/projects/osinfo-db-tools+mingw.yml diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 43555d0..82d46e8 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -4,6 +4,7 @@ PYTHONPATH: $VIRT_PREFIX/lib64/python3.6/site-packages projects: - libosinfo + - libosinfo+mingw - libvirt - libvirt+mingw - libvirt-cim @@ -18,6 +19,7 @@ projects: - libvirt-tck - osinfo-db - osinfo-db-tools + - osinfo-db-tools+mingw - virt-manager - virt-viewer - virt-viewer+mingw diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index f1777fe..3e33bf1 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -368,6 +368,9 @@ mappings: mingw32-gtk-vnc2: FedoraRawhide: mingw32-gtk-vnc2 + mingw32-libarchive: + FedoraRawhide: mingw32-libarchive + mingw32-libgovirt: FedoraRawhide: mingw32-libgovirt @@ -437,6 +440,9 @@ mappings: mingw64-gtk-vnc2: FedoraRawhide: mingw64-gtk-vnc2 + mingw64-libarchive: + FedoraRawhide: mingw64-libarchive + mingw64-libgovirt: FedoraRawhide: mingw64-libgovirt diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/projects/libosinfo+mingw.yml new file mode 100644 index 0000000..e3fc3cb --- /dev/null +++ b/guests/vars/projects/libosinfo+mingw.yml @@ -0,0 +1,8 @@ +--- +packages: + - mingw32-glib2 + - mingw32-libxml2 + - mingw32-libxslt + - mingw64-glib2 + - mingw64-libxml2 + - mingw64-libxslt diff --git a/guests/vars/projects/osinfo-db-tools+mingw.yml b/guests/vars/projects/osinfo-db-tools+mingw.yml new file mode 100644 index 0000000..578e185 --- /dev/null +++ b/guests/vars/projects/osinfo-db-tools+mingw.yml @@ -0,0 +1,10 @@ +--- +packages: + - mingw32-glib2 + - mingw32-libxml2 + - mingw32-libxslt + - mingw32-libarchive + - mingw64-glib2 + - mingw64-libxml2 + - mingw64-libxslt + - mingw64-libarchive diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index 0d25447..8e3d105 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -13,3 +13,15 @@ - autotools-rpm-job: parent_jobs: 'libosinfo-master-check' machines: '{rpm_machines}' + - autotools-build-job: + parent_jobs: 'osinfo-db-tools-master-build-mingw32' + variant: -mingw32 + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' + machines: '{mingw_machines}' + - autotools-build-job: + parent_jobs: 'osinfo-db-tools-master-build-mingw64' + variant: -mingw64 + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' + machines: '{mingw_machines}' diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index 6b451ef..cab85af 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -13,3 +13,15 @@ - autotools-rpm-job: parent_jobs: 'osinfo-db-tools-master-check' machines: '{rpm_machines}' + - autotools-build-job: + parent_jobs: + variant: -mingw32 + local_env: '{mingw32_local_env}' + autogen_args: '{mingw32_autogen_args}' + machines: '{mingw_machines}' + - autotools-build-job: + parent_jobs: + variant: -mingw64 + local_env: '{mingw64_local_env}' + autogen_args: '{mingw64_autogen_args}' + machines: '{mingw_machines}' -- 2.17.0

2 3

[libvirt] [PATCH] qemu: domain: Replace qemuDomainFilePathIsHostCDROM with virFileIsCDROM
by Peter Krempa 09 May '18

09 May '18

Use the new helper when checking that the VM needs to be tainted as a host-cdrom passthrough. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_domain.c | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b13e6d8ca4..ec865e68c8 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6483,35 +6483,6 @@ qemuDomainDefFormatLive(virQEMUDriverPtr driver, } -/* qemuDomainFilePathIsHostCDROM - * @path: Supplied path. - * - * Determine if the path is a host CD-ROM path. Typically this is - * either /dev/cdrom[n] or /dev/srN, so those are easy checks, but - * it's also possible that @path resolves to /dev/srN, so check for - * those conditions on @path in order to emit the tainted message. - * - * Returns true if the path is a CDROM, false otherwise or on error. - */ -static bool -qemuDomainFilePathIsHostCDROM(const char *path) -{ - bool ret = false; - char *linkpath = NULL; - - if (virFileResolveLink(path, &linkpath) < 0) - goto cleanup; - - if (STRPREFIX(path, "/dev/cdrom") || STRPREFIX(path, "/dev/sr") || - STRPREFIX(linkpath, "/dev/sr")) - ret = true; - - cleanup: - VIR_FREE(linkpath); - return ret; -} - - void qemuDomainObjTaint(virQEMUDriverPtr driver, virDomainObjPtr obj, virDomainTaintFlags taint, @@ -6630,7 +6601,7 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver, if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK && - disk->src->path && qemuDomainFilePathIsHostCDROM(disk->src->path)) + disk->src->path && virFileIsCDROM(disk->src->path)) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH, logCtxt); -- 2.16.2

2 2

[libvirt] Question about verifying same uid:gid in src and dst for live migration
by Fei Li 09 May '18

09 May '18

Hi, When I do live migration using virsh command line based on NFS shared storage between two systems having the same security mechanism and having the same kvm/qemu/libvirt version, I encounter the following error: debug : qemuMonitorJSONIOProcessLine:193 : Line [{"timestamp": {"seconds": 1524893525, "microseconds": 522686}, "event": "BLOCK_IO_ERROR", "data": {"device": "drive-virtio-disk0", "nospace": false, "node-name": "#block120", "reason": "Permission denied", "operation": "write", "action": "report"}}] ... error: internal error: qemu unexpectedly closed the monitor: qemu-system-x86_64: load of migration failed: Input/output error ... According to the "Permission denied" && "write" information, I find the below 2 ways can fix this error: - Change the mode of guest's .qcow2 file from 644 to 646 - Keep qemu's uid the same one between src host and dst host (They are not same before I change them) My environment and test cases: src:~ # id qemu uid=473(qemu) gid=476(qemu) groups=488(kvm),476(qemu) dst:~ # id qemu uid=467(qemu) gid=470(qemu) groups=488(kvm),470(qemu) In /etc/libvirt/qemu.conf, my confifuration is the following default: # The user for QEMU processes run by the system instance. It can be # specified as a user name or as a user id. The qemu driver will try to # parse this value first as a name and then, if the name doesn't exist, # as a user id. # # Since a sequence of digits is a valid user name, a leading plus sign # can be used to ensure that a user id will not be interpreted as a user # name. # # Some examples of valid values are: # # user = "qemu" # A user named "qemu" # user = "+0" # Super user (uid=0) # user = "100" # A user named "100" or a user with uid=100 # #user = "root" # The group for QEMU processes run by the system instance. It can be # specified in a similar way to user. #group = "root" # Whether libvirt should dynamically change file ownership # to match the configured user/group above. Defaults to 1. # Set to 0 to disable file ownership changes. #dynamic_ownership = 1 On the src, do live migration "virsh -d 0 migrate --live vm-name qemu+ssh://dst-ip/system": - after a vm is defined, user:group=root:root - after a vm is started, user:group=qemu:qemu - after migration begins, user:group=467:470 (that is dst's uid:gid) - after migration succeeds, user:group=467:470 (that is dst's uid:gid) - after a vm is destroyed, user:group=root:root (back to the src's) - after migration fails, user:group=467:470; the vm is still running in src but the file inside the guest becomes read-only even its mode is 644 Other notes: - I tried libvirt v3.3.0 && v4.0.0 to do the same test, both can see such error. After confirming that keeping qemu's uid identical between src host and dst host can fix such issue, my question is whether a fix in libvirt should be pursued or just document the requirement for same uid:gid across host systems in a migration cluster is ok? BTW, if a fix is needed, maybe the pre-migration checks in libvirt could determine different uid and/or gid and fail sooner with a better/explicit error like "Should keep the qemu uid in src and dst be the same for migration, or elsemigration will fail"? Does anyone have noticed this and could give some suggestions? Thanks a lot! Have a nice day, thanks again Fei

3 2

[libvirt] [jenkins-ci PATCH] projects: Run libvirt's 'make check' on all machines
by Andrea Bolognani 09 May '18

09 May '18

Up until now, we had to skip it on FreeBSD due to some portability issues in the test suite, but as of libvirt commit 0b86e23d2569 they've all been fixed. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/libvirt.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 9b9b0b4..6f5464b 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -18,13 +18,6 @@ - libvirt-fedora-rawhide - autotools-check-job: parent_jobs: 'libvirt-master-syntax-check' - machines: - - libvirt-centos-7 - - libvirt-debian-8 - - libvirt-debian-9 - - libvirt-fedora-27 - - libvirt-fedora-28 - - libvirt-fedora-rawhide local_env: | export VIR_TEST_EXPENSIVE=1 export VIR_TEST_DEBUG=2 -- 2.14.3

2 3

[libvirt] [PATCHv2] Deprecate QEMU_CAPS_NESTING
by Ján Tomko 09 May '18

09 May '18

Unused since commit <a7424fa>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- v2: also delete the hasHwVirt variable as well as the whole 'svm' checking src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index abd6eff14a..b9628b8266 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -105,7 +105,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 40 */ X_QEMU_CAPS_FSDEV, /* -fstype filesystem passthrough */ - QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ + X_QEMU_CAPS_NESTING, /* -enable-nesting (SVM/VMX) */ X_QEMU_CAPS_NAME_PROCESS, /* Is -name process= available */ X_QEMU_CAPS_DRIVE_READONLY, /* -drive readonly=on|off */ X_QEMU_CAPS_SMBIOS_TYPE, /* Is -smbios type= available */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 50b0ffcf94..22c560c67c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6652,7 +6652,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, { virArch hostarch = virArchFromHost(); char *cpu = NULL, *cpu_flags = NULL; - bool hasHwVirt = false; int ret = -1; virBuffer cpu_buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -6662,26 +6661,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, (def->cpu->mode != VIR_CPU_MODE_CUSTOM || def->cpu->model)) { if (qemuBuildCpuModelArgStr(driver, def, &cpu_buf, qemuCaps) < 0) goto cleanup; - - /* Only 'svm' requires --enable-nesting. The nested 'vmx' patches now - * simply hook off the CPU features. */ - if (ARCH_IS_X86(def->os.arch) && - def->virtType == VIR_DOMAIN_VIRT_KVM) { - virCPUDefPtr cpuDef = NULL; - - if (def->cpu->mode == VIR_CPU_MODE_CUSTOM) - cpuDef = def->cpu; - else if (def->cpu->mode == VIR_CPU_MODE_HOST_PASSTHROUGH) - cpuDef = virQEMUCapsGetHostModel(qemuCaps, def->virtType, - VIR_QEMU_CAPS_HOST_CPU_REPORTED); - - if (cpuDef) { - int svm = virCPUCheckFeature(def->os.arch, cpuDef, "svm"); - if (svm < 0) - goto cleanup; - hasHwVirt = svm > 0; - } - } } else { /* * Need to force a 32-bit guest CPU type if @@ -6870,9 +6849,6 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, if (cpu) { virCommandAddArg(cmd, "-cpu"); virCommandAddArgFormat(cmd, "%s%s", cpu, cpu_flags ? cpu_flags : ""); - - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NESTING) && hasHwVirt) - virCommandAddArg(cmd, "-enable-nesting"); } ret = 0; -- 2.16.1

2 1

[libvirt] [PATCH] rpc: fixing compilation error due to deprecated ssh_get_publickey().
by Julio Faracco 09 May '18

09 May '18

After 0.7.5 release, libssh deprecated ssh_get_publickey() method to introduce ssh_get_server_publickey(). This commit check the current version of libssh and use the proper method during the compilation. See the error: make[3]: Entering directory '/home/julio/Desktop/virt/libvirt/src' CC rpc/libvirt_net_rpc_la-virnetlibsshsession.lo rpc/virnetlibsshsession.c:217:9: error: 'ssh_get_publickey' is deprecated [-Werror,-Wdeprecated-declarations] if (ssh_get_publickey(sess->session, &key) != SSH_OK) { ^ /usr/include/libssh/libssh.h:489:1: note: 'ssh_get_publickey' has been explicitly marked deprecated here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh_key *key); ^ /usr/include/libssh/libssh.h:99:40: note: expanded from macro 'SSH_DEPRECATED' ^ 1 error generated. Makefile:8604: recipe for target 'rpc/libvirt_net_rpc_la-virnetlibsshsession.lo' failed Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/rpc/virnetlibsshsession.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 309e8a9340..96c5bc0882 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -214,7 +214,11 @@ virLibsshServerKeyAsString(virNetLibsshSessionPtr sess) size_t keyhashlen; char *str; +#if LIBSSH_VERSION_INT > 0x0705 /* 0.7.5 */ + if (ssh_get_server_publickey(sess->session, &key) != SSH_OK) { +#else if (ssh_get_publickey(sess->session, &key) != SSH_OK) { +#endif virReportError(VIR_ERR_LIBSSH, "%s", _("failed to get the key of the current " "session")); -- 2.17.0

5 7

[libvirt] [PATCH] xenconfig: remove my name and email from files
by David Kiarie 08 May '18

08 May '18

Remove my name and email from these files Signed-off-by: David Kiarie <davidkiarie4(a)gmail.com> --- src/xenconfig/xen_xl.c | 1 - src/xenconfig/xen_xl.h | 1 - tests/xlconfigtest.c | 1 - 3 files changed, 3 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 35d52f8a..f0d9177c 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -17,7 +17,6 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> * Author: Jim Fehlig <jfehlig(a)suse.com> */ diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h index 68f332ac..588d8d11 100644 --- a/src/xenconfig/xen_xl.h +++ b/src/xenconfig/xen_xl.h @@ -17,7 +17,6 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani<davidkiarie4(a)gmail.com> */ #ifndef __VIR_XEN_XL_H__ diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 39f51e2d..36f7699f 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> * */ -- 2.17.0

2 3

[libvirt] [PATCH 0/8] vfio-ccw passthrough support
by Shalini Chellathurai Saroja 08 May '18

08 May '18

Let us support the basic channel I/O passthrough infrastructure based on vfio, which have been introduced in QEMU 2.10. The current focus is to support dasd-eckd (cu_type/dev_type = 0x3990/0x3390) as the target device. Shalini Chellathurai Saroja (8): qemu: introduce capability for virtual-css-bridge qemu: introduce vfio-ccw capability util: virhostdev: add virHostdevIsMdevDevice() qemu: vfio-ccw device address generation qemu: command line generation for vfio-ccw device tests: tests for vfio-ccw passthrough docs: documentation for vfio-ccw passthrough news: documentation of new feature docs/drvnodedev.html.in | 21 ++++- docs/formatdomain.html.in | 20 +++- docs/news.xml | 9 ++ docs/schemas/domaincommon.rng | 5 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 23 +++++ src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_command.c | 37 ++++++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 32 +++++-- src/qemu/qemu_hostdev.c | 3 +- src/qemu/qemu_hotplug.c | 4 +- src/util/virhostdev.c | 26 ++++-- src/util/virhostdev.h | 3 + src/util/virmdev.c | 3 +- src/util/virmdev.h | 1 + .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 31 +++++-- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 + .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 24 +++-- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 28 ++++-- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 +- tests/qemuhotplugtest.c | 2 +- ...tdev-subsys-mdev-vfio-ccw-duplicate-address.xml | 29 ++++++ ...ostdev-subsys-mdev-vfio-ccw-invalid-address.xml | 23 +++++ .../hostdev-subsys-mdev-vfio-ccw.args | 23 +++++ .../hostdev-subsys-mdev-vfio-ccw.xml | 22 +++++ tests/qemuxml2argvtest.c | 102 ++++++++++++--------- .../hostdev-subsys-mdev-vfio-ccw.xml | 28 ++++++ tests/qemuxml2xmltest.c | 31 ++++--- 36 files changed, 491 insertions(+), 149 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.xml create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args create mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml -- 2.13.4

5 18

[libvirt] unix_sock_dir for virtlogd
by Mathieu Tarral 08 May '18

08 May '18

Hi ! I'm trying to run libvirtd from git, and the daemon is starting now, but when i try to start a VM (using virt-manager) it complains that virtlogd socket is unreachable. The problem is that it tries to reach it at the following location: virNetSocketNewConnectUNIX:713 : Failed to connect socket to '/home/tarrma/usr/var/run/libvirt/virtlogd-sock': Connection refused however, i specified in my $HOME/usr/etc/libvirt/libvirtd.conf unix_sock_dir = "/var/run/libvirt" Then why virt-manager is not using the socket from /var/run/libvirt/virtlogd.sock ?? Any ideas, where i misconfigured my installation ? Thanks a lot. -- Mathieu Tarral

2 3

[libvirt] [tck PATCH v2 0/3] Remove Test::AutoBuild leftovers
by Andrea Bolognani 08 May '18

08 May '18

Changes from [v1]: * rename the script instead of dropping it; * perform some further clean ups. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00218.html Andrea Bolognani (3): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to Test::AutoBuild spec: Drop %{extra_release} perl-Sys-Virt-TCK.spec.PL | 3 +-- autobuild.sh => prepare-release.sh | 15 ++------------- 2 files changed, 3 insertions(+), 15 deletions(-) rename autobuild.sh => prepare-release.sh (64%) -- 2.17.0

2 4

[libvirt] [PATCH] util: file: Fix usage of STRPREFIX in virFileIsCDROM
by Peter Krempa 08 May '18

08 May '18

STRPREFIX takes only two arguments, but the code it was adapted from used function with 3 arguments. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule.t src/util/virfile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index ea2a3ea731..523241f64f 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -1982,8 +1982,8 @@ virFileIsCDROM(const char *path) int virFileIsCDROM(const char *path) { - if (STRPREFIX(path, "/dev/cd", NULL) || - STRPREFIX(path, "/dev/acd", NULL)) + if (STRPREFIX(path, "/dev/cd") || + STRPREFIX(path, "/dev/acd")) return 1; return 0; -- 2.16.2

1 0

[libvirt] [tck PATCH] maint: Drop autobuild.sh
by Andrea Bolognani 08 May '18

08 May '18

The Test-AutoBuild project, that this script is supposed to be used with, hasn't seen any activity in ~7 years; these days, libvirt-tck CI builds are happening on the Jenkins-based CentOS CI environment under the libvirt umbrella[1], and in that context the script is not used at all. [1] https://ci.centos.org/view/libvirt/ Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- autobuild.sh | 59 ----------------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh deleted file mode 100755 index 005993d..0000000 --- a/autobuild.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# -# This script is used to Test::AutoBuild (http://www.autobuild.org) -# to perform automated builds of the Sys-Virt module -# -# Copyright (C) 2009 Red Hat, Inc. -# Copyright (C) 2009 Daniel P. Berrange -# -# 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 -# - -NAME=Sys-Virt-TCK - -set -e - -rm -rf MANIFEST blib _build Build - -test -z "$AUTOBUILD_INSTALL_ROOT" && AUTOBUILD_INSTALL_ROOT=$HOME/builder - -perl Build.PL install_base=$AUTOBUILD_INSTALL_ROOT - -./Build -./Build manifest - - -if [ -z "$USE_COVER" ]; then - perl -MDevel::Cover -e '' 1>/dev/null 2>&1 && USE_COVER=1 || USE_COVER=0 -fi - -if [ -z "$SKIP_TESTS" -o "$SKIP_TESTS" = "0" ]; then - if [ "$USE_COVER" = "1" ]; then - ./Build test - else - ./Build test - fi -fi - -./Build install - -rm -f $NAME-*.tar.gz -./Build dist - -if [ -f /usr/bin/rpmbuild ]; then - if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" - else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" - fi - rpmbuild -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz -fi - -exit 0 -- 2.14.3

3 3

[libvirt] [dbus PATCH] "foo* [bar]" should be "foo *[bar]"
by Katerina Koukiou 08 May '18

08 May '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- We forgot to include this in the last code style fixes. src/connect.c | 6 +++--- src/domain.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/connect.c b/src/connect.c index fd335e3..1c87bf2 100644 --- a/src/connect.c +++ b/src/connect.c @@ -227,7 +227,7 @@ virtDBusConnectBaselineCPU(GVariant *inArgs, ncpus = g_variant_iter_n_children(iter); if (ncpus > 0) { - xmlCPUs = g_new0(const gchar*, ncpus); + xmlCPUs = g_new0(const gchar *, ncpus); tmp = xmlCPUs; while (g_variant_iter_next(iter, "&s", tmp)) tmp++; @@ -517,7 +517,7 @@ virtDBusConnectGetAllDomainStats(GVariant *inArgs, g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sa{sv})")); for (gint i = 0; i < nstats; i++) { - const gchar* name; + const gchar *name; GVariant *grecords; g_variant_builder_open(&builder, G_VARIANT_TYPE("(sa{sv})")); @@ -582,7 +582,7 @@ virtDBusConnectGetDomainCapabilities(GVariant *inArgs, const gchar *machine; const gchar *virttype; guint flags; - g_autofree gchar* domCapabilities = NULL; + g_autofree gchar *domCapabilities = NULL; g_variant_get(inArgs, "(&s&s&s&su)", &emulatorbin, &arch, &machine, &virttype, &flags); diff --git a/src/domain.c b/src/domain.c index 2ba58e0..3127f6c 100644 --- a/src/domain.c +++ b/src/domain.c @@ -118,7 +118,7 @@ virtDBusDomainGVariantToMountpoints(GVariantIter *iter, *nmountpoints = g_variant_iter_n_children(iter); if (*nmountpoints > 0) { - *mountpoints = g_new0(const gchar*, *nmountpoints); + *mountpoints = g_new0(const gchar *, *nmountpoints); tmp = *mountpoints; while (g_variant_iter_next(iter, "&s", tmp)) tmp++; -- 2.15.0

2 1

[libvirt] [PATCH 09/12] virsh: Enable multiple --event flags to 'event' command
by Lin Ma 07 May '18

07 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain.c | 76 +++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 89aefbf86a..b35c9adaaa 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13347,10 +13347,6 @@ static const vshCmdInfo info_event[] = { static const vshCmdOptDef opts_event[] = { VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("filter by domain name, id or uuid"), 0), - {.name = "event", - .type = VSH_OT_STRING, - .help = N_("which event type to wait for") - }, {.name = "all", .type = VSH_OT_BOOL, .help = N_("wait for all events instead of just one type") @@ -13371,6 +13367,10 @@ static const vshCmdOptDef opts_event[] = { .type = VSH_OT_BOOL, .help = N_("show timestamp for each printed event") }, + {.name = "event", + .type = VSH_OT_ARGV, + .help = N_("which event type to wait for") + }, {.name = NULL} }; @@ -13382,12 +13382,14 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) int timeout = 0; virshDomEventData *data = NULL; size_t i; - const char *eventName = NULL; + int *eventIdxList = NULL; + size_t nevents = 0; int event = -1; bool all = vshCommandOptBool(cmd, "all"); bool loop = vshCommandOptBool(cmd, "loop"); bool timestamp = vshCommandOptBool(cmd, "timestamp"); int count = 0; + const vshCmdOpt *opt = NULL; virshControlPtr priv = ctl->privData; if (vshCommandOptBool(cmd, "list")) { @@ -13396,15 +13398,25 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) return true; } - if (vshCommandOptStringReq(ctl, cmd, "event", &eventName) < 0) - return false; - if (eventName) { - for (event = 0; event < VIR_DOMAIN_EVENT_ID_LAST; event++) - if (STREQ(eventName, vshEventCallbacks[event].name)) - break; - if (event == VIR_DOMAIN_EVENT_ID_LAST) { - vshError(ctl, _("unknown event type %s"), eventName); - return false; + if (vshCommandOptBool(cmd, "event")) { + if (VIR_ALLOC_N(eventIdxList, 1) < 0) + goto cleanup; + nevents = 1; + while ((opt = vshCommandOptArgv(ctl, cmd, opt))) { + if (opt->data) { + for (event = 0; event < VIR_DOMAIN_EVENT_ID_LAST; event++) + if (STREQ(opt->data, vshEventCallbacks[event].name)) + break; + if (event == VIR_DOMAIN_EVENT_ID_LAST) { + vshError(ctl, _("unknown event type %s"), opt->data); + return false; + } + if (VIR_INSERT_ELEMENT(eventIdxList, + nevents - 1, + nevents, + event) < 0) + goto cleanup; + } } } else if (!all) { vshError(ctl, "%s", @@ -13412,26 +13424,15 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) return false; } - if (all) { - if (VIR_ALLOC_N(data, VIR_DOMAIN_EVENT_ID_LAST) < 0) - goto cleanup; - for (i = 0; i < VIR_DOMAIN_EVENT_ID_LAST; i++) { - data[i].ctl = ctl; - data[i].loop = loop; - data[i].count = &count; - data[i].timestamp = timestamp; - data[i].cb = &vshEventCallbacks[i]; - data[i].id = -1; - } - } else { - if (VIR_ALLOC_N(data, 1) < 0) - goto cleanup; - data[0].ctl = ctl; - data[0].loop = vshCommandOptBool(cmd, "loop"); - data[0].count = &count; - data[0].timestamp = timestamp; - data[0].cb = &vshEventCallbacks[event]; - data[0].id = -1; + if (VIR_ALLOC_N(data, all ? VIR_DOMAIN_EVENT_ID_LAST : nevents - 1) < 0) + goto cleanup; + for (i = 0; i < (all ? VIR_DOMAIN_EVENT_ID_LAST : nevents - 1); i++) { + data[i].ctl = ctl; + data[i].loop = loop; + data[i].count = &count; + data[i].timestamp = timestamp; + data[i].cb = &vshEventCallbacks[all ? i : eventIdxList[i]]; + data[i].id = -1; } if (vshCommandOptTimeoutToMs(ctl, cmd, &timeout) < 0) goto cleanup; @@ -13441,9 +13442,9 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) if (vshEventStart(ctl, timeout) < 0) goto cleanup; - for (i = 0; i < (all ? VIR_DOMAIN_EVENT_ID_LAST : 1); i++) { + for (i = 0; i < (all ? VIR_DOMAIN_EVENT_ID_LAST : nevents - 1); i++) { if ((data[i].id = virConnectDomainEventRegisterAny(priv->conn, dom, - all ? i : event, + all ? i : eventIdxList[i], data[i].cb->cb, &data[i], NULL)) < 0) { @@ -13476,13 +13477,14 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) cleanup: vshEventCleanup(ctl); if (data) { - for (i = 0; i < (all ? VIR_DOMAIN_EVENT_ID_LAST : 1); i++) { + for (i = 0; i < (all ? VIR_DOMAIN_EVENT_ID_LAST : nevents - 1); i++) { if (data[i].id >= 0 && virConnectDomainEventDeregisterAny(priv->conn, data[i].id) < 0) ret = false; } VIR_FREE(data); } + VIR_FREE(eventIdxList); virshDomainFree(dom); return ret; } -- 2.15.1

2 2

Re: [libvirt] [PATCH 0/1] Bug: Sandbox: libvirt breakdowns qemu guest
by Christian Borntraeger 07 May '18

07 May '18

On 05/07/2018 05:32 AM, Yi Min Zhao wrote: > 1. Problem Description > ====================== > If QEMU is built without seccomp support, 'elevatorprivileges' remains compiled. > This option of sandbox is treated as an indication for seccomp blacklist support > in libvirt. This behavior is introduced by the libvirt commits 31ca6a5 and > 3527f9d. It would make libvirt build wrong QEMU cmdline, and then the guest > startup would fail. Adding libvirt list. This would still fail with older QEMUs, so the question is if we should also OR instead change something in libvirt. > > 2. Libvirt Log > ============== > qemu-system-s390x: -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ > resourcecontrol=deny: seccomp support is disabled > > 3. Fixup > ======== > Wrap the options except 'enable' for qemu_sandbox_opts by CONFIG_SECCOMP. > > Yi Min Zhao (1): > sandbox: avoid to compile options if CONFIG_SECCOMP undefined > > vl.c | 2 ++ > 1 file changed, 2 insertions(+) >

3 3

[libvirt] [dbus PATCH 0/9] random fixes
by Pavel Hrdina 07 May '18

07 May '18

*** BLURB HERE *** Pavel Hrdina (9): Process input arguments before getting libvirt object Use ++ operator instead of += in for loop connect: Fix List* methods to return empty array for empty list connect: Pass error into virtDBusConnectOpen function domain: There is no need to check ret again domain: Return error if libvirt API fails domain: Introduce virtDBusDomainGVariantToMountpoints helper domain: Introduce virtDBusDomainGVariantToCpumap helper util: Use spaces around operators src/connect.c | 28 ++++++--------- src/domain.c | 110 ++++++++++++++++++++++++++++------------------------------ src/main.c | 2 +- src/network.c | 2 +- src/util.c | 6 ++-- 5 files changed, 70 insertions(+), 78 deletions(-) -- 2.14.3

3 11

[libvirt] [PATCH 0/7] Couple of tiny fixes for virsh and translation.
by Lin Ma 07 May '18

07 May '18

Lin Ma (7): virsh: Error out while domain not found for 'qemu-monitor-event' command virsh: Error out while domain not found for 'event' command po: fix typo: remove a redundant Chinese character virsh: Simplify control flow for 'desc' command virsh: Simplify control flow for 'qemu-agent-command' command qemu: stats: Display the net type and net source in bulk stats qemu: stats: Display net count,type and source even if domain is inactive po/zh_CN.mini.po | 2 +- src/libvirt-domain.c | 2 ++ src/qemu/qemu_driver.c | 11 ++++++++--- tools/virsh-domain.c | 33 ++++++++++++++++----------------- tools/virsh.pod | 2 ++ 5 files changed, 29 insertions(+), 21 deletions(-) -- 2.15.1

3 15

[libvirt] [PATCH] xenconfig: Remove references to my name and email
by David Kiarie 05 May '18

05 May '18

Replace references to my name and email with a pseudonym Signed-off-by: David Kiarie <davidkiarie4(a)gmail.com> --- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xl.h | 2 +- tests/xlconfigtest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c index 35d52f8a..b383560d 100644 --- a/src/xenconfig/xen_xl.c +++ b/src/xenconfig/xen_xl.c @@ -17,7 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)mail.com> * Author: Jim Fehlig <jfehlig(a)suse.com> */ diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h index 68f332ac..4ce13f05 100644 --- a/src/xenconfig/xen_xl.h +++ b/src/xenconfig/xen_xl.h @@ -17,7 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. * - * Author: Kiarie Kahurani<davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)gmail.com> */ #ifndef __VIR_XEN_XL_H__ diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index 39f51e2d..1bbc0b72 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> + * Author: Oneko <kawaiii.nekomata(a)gmail.com> * */ -- 2.17.0

1 0

[libvirt] ZFS backend does fail if used on non top level pools
by Christian Ehrhardt 05 May '18

05 May '18

Hi, by discussing on bug [1] we found an issue in the ZFS storage backend. When one defines a zfs pool through XML (virsh pool-create --build) a top level ZFS pool will be created and works fine. The virsh pool-define-as counterpart to this is: $ fallocate -l 100M /tmp/Mzfs $ sudo zpool create Mzfs /tmp/Mzfs $ virsh pool-define-as --name zfs --source-name Mzfs --type zfs $ virsh pool-start zfs $ virsh vol-create-as --pool zfs --name vol1 --capacity 10M $ virsh vol-list --pool zfs vol1 /dev/zvol/Mzfs/vol1 $ virsh pool-refresh zfs Pool zfs refreshed $ virsh vol-list --pool zfs vol1 /dev/zvol/Mzfs/vol1 Ok, all fine so far. But if one wants to use a zfs-FS as sub-pool things work a while but fail as soon as pool info is refreshed. $ fallocate -l 100M /tmp/Xzfs $ sudo zpool create Xzfs /tmp/Xzfs $ sudo zfs create Xzfs/images $ virsh pool-define-as --name Xzfs --source-name Xzfs/images --type zfs I ended with the pool not being started (expected after pool-define-as), but then $ virsh pool-start Xzfs $ virsh vol-create-as --pool Xzfs --name vol1 --capacity 10M $ virsh vol-list --pool Xzfs vol1 /dev/zvol/Xzfs/images/vol1 $ virsh pool-refresh zfs Pool zfs refreshed $ virsh vol-list --pool Xzfs # no output anymore We happened to find this in the libvirt log: error : virCommandWait:2601 : internal error: Child process (/sbin/zpool get -Hp health,size,free,allocated Xzfs/images) unexpected exit status 1: cannot open 'Xzfs/images': invalid character '/' in pool name So it seems the data refresh would need to become aware of filesytems and strip this to the basename before doing the call. This comes from src/storage/storage_backend_zfs.c cmd = virCommandNewArgList(ZPOOL, "get", "-Hp", "health,size,free,allocated", def->source.name, NULL); # fails zfs list -Hp -t volume -r -o name,volsize,refreservation Xzfs/images # would work zfs list -Hp -t volume -r -o name,volsize,refreservation Xzfs But there might be more to it than what I see, either more changes needed to fully work with subpools or intentionally not working with them. For the latter we should still consider improving the error handling, like refusing right away with a reasonable message on "virsh pool-define-as". I wondered if one with more experience in that area of libvirt would be willing to pick this up or has an opinion why it would not need to be changed that I might be missing? [1]: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1767997 -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd

3 2

[libvirt] [PATCH 0/5] Another batch of old capability cleanups
by Ján Tomko 05 May '18

05 May '18

Ján Tomko (5): qemu: remove qemuBuildObsoleteAccelArg qemuBuildMachineCommandLine: use a switch for virDomainVirtType Deprecate QEMU_CAPS_NO_KVM_PIT Depreacte QEMU_CAPS_TDF Deprecate QEMU_CAPS_NESTING src/qemu/qemu_capabilities.c | 6 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 101 +++++++-------------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvdata/clock-hpet-off.args | 1 - tests/qemuxml2argvdata/hugepages-numa.args | 1 - tests/qemuxml2argvdata/no-kvm-pit-device.args | 28 ------ tests/qemuxml2argvdata/no-kvm-pit-device.xml | 29 ------ tests/qemuxml2argvdata/q35-virt-manager-basic.args | 1 - tests/qemuxml2argvtest.c | 3 +- tests/qemuxml2xmltest.c | 1 - 22 files changed, 40 insertions(+), 149 deletions(-) delete mode 100644 tests/qemuxml2argvdata/no-kvm-pit-device.args delete mode 100644 tests/qemuxml2argvdata/no-kvm-pit-device.xml -- 2.16.1

2 8

[libvirt] [PATCH] lxc: convert to typesafe virConf accessors in lxc_native.c
by Prafull 05 May '18

05 May '18

From: Prafullkumar Tale <talep158(a)gmail.com> Signed-off-by: Prafullkumar Tale <talep158(a)gmail.com> --- src/lxc/lxc_native.c | 141 +++++++++++++++++++++++++-------------------------- 1 file changed, 70 insertions(+), 71 deletions(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 55ea774..35077e1 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -199,19 +199,15 @@ lxcSetRootfs(virDomainDefPtr def, virConfPtr properties) { int type = VIR_DOMAIN_FS_TYPE_MOUNT; - virConfValuePtr value; + char *value = NULL; - if (!(value = virConfGetValue(properties, "lxc.rootfs")) || - !value->str) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Missing lxc.rootfs configuration")); + if (virConfGetValueString(properties, "lxc.rootfs", &value) <= 0) return -1; - } - if (STRPREFIX(value->str, "/dev/")) + if (STRPREFIX(value, "/dev/")) type = VIR_DOMAIN_FS_TYPE_BLOCK; - if (lxcAddFSDef(def, type, value->str, "/", false, 0) < 0) + if (lxcAddFSDef(def, type, value, "/", false, 0) < 0) return -1; return 0; @@ -684,17 +680,17 @@ lxcConvertNetworkSettings(virDomainDefPtr def, virConfPtr properties) static int lxcCreateConsoles(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; int nbttys = 0; virDomainChrDefPtr console; size_t i; - if (!(value = virConfGetValue(properties, "lxc.tty")) || !value->str) + if (virConfGetValueString(properties, "lxc.tty", &value) <= 0) return 0; - if (virStrToLong_i(value->str, NULL, 10, &nbttys) < 0) { + if (virStrToLong_i(value, NULL, 10, &nbttys) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse int: '%s'"), - value->str); + value); return -1; } @@ -761,89 +757,91 @@ lxcIdmapWalkCallback(const char *name, virConfValuePtr value, void *data) static int lxcSetMemTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; unsigned long long size = 0; - if ((value = virConfGetValue(properties, - "lxc.cgroup.memory.limit_in_bytes")) && - value->str && STRNEQ(value->str, "-1")) { - if (lxcConvertSize(value->str, &size) < 0) - return -1; + if (virConfGetValueString(properties, + "lxc.cgroup.memory.limit_in_bytes", + &value) > 0) { + if (lxcConvertSize(value, &size) < 0) + goto error; size = size / 1024; virDomainDefSetMemoryTotal(def, size); def->mem.hard_limit = virMemoryLimitTruncate(size); } - if ((value = virConfGetValue(properties, - "lxc.cgroup.memory.soft_limit_in_bytes")) && - value->str && STRNEQ(value->str, "-1")) { - if (lxcConvertSize(value->str, &size) < 0) - return -1; - + if (virConfGetValueString(properties, + "lxc.cgroup.memory.soft_limit_in_bytes", + &value) > 0) { + if (lxcConvertSize(value, &size) < 0) + goto error; def->mem.soft_limit = virMemoryLimitTruncate(size / 1024); } - if ((value = virConfGetValue(properties, - "lxc.cgroup.memory.memsw.limit_in_bytes")) && - value->str && STRNEQ(value->str, "-1")) { - if (lxcConvertSize(value->str, &size) < 0) - return -1; - + if (virConfGetValueString(properties, + "lxc.cgroup.memory.memsw.limit_in_bytes", + &value) > 0) { + if (lxcConvertSize(value, &size) < 0) + goto error; def->mem.swap_hard_limit = virMemoryLimitTruncate(size / 1024); } return 0; + + error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse integer: '%s'"), value); + return -1; + } static int lxcSetCpuTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; - if ((value = virConfGetValue(properties, "lxc.cgroup.cpu.shares")) && - value->str) { - if (virStrToLong_ull(value->str, NULL, 10, &def->cputune.shares) < 0) + if (virConfGetValueString(properties, "lxc.cgroup.cpu.shares", + &value) > 0) { + if (virStrToLong_ull(value, NULL, 10, &def->cputune.shares) < 0) goto error; def->cputune.sharesSpecified = true; } - if ((value = virConfGetValue(properties, - "lxc.cgroup.cpu.cfs_quota_us")) && - value->str && virStrToLong_ll(value->str, NULL, 10, - &def->cputune.quota) < 0) - goto error; + if (virConfGetValueString(properties, "lxc.cgroup.cpu.cfs_quota_us", + &value) > 0) { + if (virStrToLong_ll(value, NULL, 10, &def->cputune.quota) < 0) + goto error; + } - if ((value = virConfGetValue(properties, - "lxc.cgroup.cpu.cfs_period_us")) && - value->str && virStrToLong_ull(value->str, NULL, 10, - &def->cputune.period) < 0) - goto error; + if (virConfGetValueString(properties, "lxc.cgroup.cpu.cfs_period_us", + &value) > 0) { + if (virStrToLong_ull(value, NULL, 10, &def->cputune.period) < 0) + goto error; + } return 0; error: virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse integer: '%s'"), value->str); + _("failed to parse integer: '%s'"), value); return -1; } static int lxcSetCpusetTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; virBitmapPtr nodeset = NULL; - if ((value = virConfGetValue(properties, "lxc.cgroup.cpuset.cpus")) && - value->str) { - if (virBitmapParse(value->str, &def->cpumask, - VIR_DOMAIN_CPUMASK_LEN) < 0) + if (virConfGetValueString(properties, "lxc.cgroup.cpuset.cpus", + &value) > 0) { + if (virBitmapParse(value, &def->cpumask, VIR_DOMAIN_CPUMASK_LEN) < 0) return -1; - def->placement_mode = VIR_DOMAIN_CPU_PLACEMENT_MODE_STATIC; } - if ((value = virConfGetValue(properties, "lxc.cgroup.cpuset.mems")) && - value->str) { - if (virBitmapParse(value->str, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) + if (virConfGetValueString(properties, "lxc.cgroup.cpuset.mems", + &value) > 0) { + if (virBitmapParse(value, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) return -1; if (virDomainNumatuneSet(def->numa, def->placement_mode == @@ -952,14 +950,15 @@ lxcBlkioDeviceWalkCallback(const char *name, virConfValuePtr value, void *data) static int lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; - if ((value = virConfGetValue(properties, "lxc.cgroup.blkio.weight")) && - value->str && virStrToLong_ui(value->str, NULL, 10, - &def->blkio.weight) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("failed to parse integer: '%s'"), value->str); - return -1; + if (virConfGetValueString(properties, "lxc.cgroup.blkio.weight", + &value) > 0) { + if (virStrToLong_ui(value, NULL, 10, &def->blkio.weight) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to parse integer: '%s'"), value); + return -1; + } } if (virConfWalk(properties, lxcBlkioDeviceWalkCallback, def) < 0) @@ -971,13 +970,13 @@ lxcSetBlkioTune(virDomainDefPtr def, virConfPtr properties) static void lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties) { - virConfValuePtr value; + char *value = NULL; char **toDrop = NULL; const char *capString; size_t i; - if ((value = virConfGetValue(properties, "lxc.cap.drop")) && value->str) - toDrop = virStringSplit(value->str, " ", 0); + if (virConfGetValueString(properties, "lxc.cap.drop", &value) > 0) + toDrop = virStringSplit(value, " ", 0); for (i = 0; i < VIR_DOMAIN_CAPS_FEATURE_LAST; i++) { capString = virDomainCapsFeatureTypeToString(i); @@ -998,7 +997,7 @@ lxcParseConfigString(const char *config, { virDomainDefPtr vmdef = NULL; virConfPtr properties = NULL; - virConfValuePtr value; + char *value = NULL; if (!(properties = virConfReadString(config, VIR_CONF_FLAG_LXC_FORMAT))) return NULL; @@ -1031,11 +1030,11 @@ lxcParseConfigString(const char *config, vmdef->nfss = 0; vmdef->os.type = VIR_DOMAIN_OSTYPE_EXE; - if ((value = virConfGetValue(properties, "lxc.arch")) && value->str) { - virArch arch = virArchFromString(value->str); - if (arch == VIR_ARCH_NONE && STREQ(value->str, "x86")) + if (virConfGetValueString(properties, "lxc.arch", &value) > 0) { + virArch arch = virArchFromString(value); + if (arch == VIR_ARCH_NONE && STREQ(value, "x86")) arch = VIR_ARCH_I686; - else if (arch == VIR_ARCH_NONE && STREQ(value->str, "amd64")) + else if (arch == VIR_ARCH_NONE && STREQ(value, "amd64")) arch = VIR_ARCH_X86_64; vmdef->os.arch = arch; } @@ -1043,8 +1042,8 @@ lxcParseConfigString(const char *config, if (VIR_STRDUP(vmdef->os.init, "/sbin/init") < 0) goto error; - if (!(value = virConfGetValue(properties, "lxc.utsname")) || - !value->str || (VIR_STRDUP(vmdef->name, value->str) < 0)) + if (virConfGetValueString(properties, "lxc.utsname", &value) <= 0 || + VIR_STRDUP(vmdef->name, value) < 0) goto error; if (!vmdef->name && (VIR_STRDUP(vmdef->name, "unnamed") < 0)) goto error; -- 2.7.4

2 1

[libvirt] [dbus PATCH] Add detail argument to DomainEvent signal
by Katerina Koukiou 05 May '18

05 May '18

Adjust all DomainEvent tests to do detail type checking. Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- This commit is rebased on top of unmerged patches for removing enum<->string translation. data/org.libvirt.Connect.xml | 1 + src/events.c | 4 ++-- tests/libvirttest.py | 55 ++++++++++++++++++++++++++++++++++++++++++++ tests/test_connect.py | 6 +++-- tests/test_domain.py | 15 ++++++++---- 5 files changed, 72 insertions(+), 9 deletions(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 8272da6..0f1456f 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -171,6 +171,7 @@ value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventC…"/> <arg name="domain" type="o"/> <arg name="event" type="u"/> + <arg name="detail" type="u"/> </signal> <signal name="NetworkEvent"> <annotation name="org.gtk.GDBus.DocString" diff --git a/src/events.c b/src/events.c index b432535..ea55180 100644 --- a/src/events.c +++ b/src/events.c @@ -8,7 +8,7 @@ static gint virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, virDomainPtr domain, gint event, - gint detail G_GNUC_UNUSED, + gint detail, gpointer opaque) { virtDBusConnect *connect = opaque; @@ -21,7 +21,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, "DomainEvent", - g_variant_new("(ou)", path, event), + g_variant_new("(ouu)", path, event, detail), NULL); return 0; diff --git a/tests/libvirttest.py b/tests/libvirttest.py index 06ac0e4..eee67a0 100644 --- a/tests/libvirttest.py +++ b/tests/libvirttest.py @@ -100,6 +100,61 @@ class DomainEvent(IntEnum): CRASHED = 8 +class DomainEventDefinedDetailType(IntEnum): + ADDED = 0 + UPDATED = 1 + RENAMED = 2 + FROM_SNAPSHOT = 3 + LAST = 4 + + +class DomainEventResumedDetailType(IntEnum): + UNPAUSED = 0 + MIGRATED = 1 + FROM_SNAPSHOT = 2 + POSTCOPY = 3 + LAST = 4 + + +class DomainEventStartedDetailType(IntEnum): + BOOTED = 0 + MIGRATED = 1 + RESTORED = 2 + FROM_SNAPSHOT = 3 + WAKEUP = 4 + LAST = 5 + + +class DomainEventStoppedDetailType(IntEnum): + SHUTDOWN = 0 + DESTROYED = 1 + CRASHED = 2 + MIGRATED = 3 + SAVED = 4 + FAILED = 5 + FROM_SNAPSHOT = 6 + LAST = 7 + + +class DomainEventSuspendedDetailType(IntEnum): + PAUSED = 0 + MIGRATED = 1 + IOERROR = 2 + WATCHDOG = 3 + RESTORED = 4 + FROM_SNAPSHOT = 5 + API_ERROR = 6 + POSTCOPY = 7 + POSTCOPY_FAILED = 8 + LAST = 9 + + +class DomainEventUndefinedDetailType(IntEnum): + REMOVED = 0 + RENAMED = 1 + LAST = 2 + + class DomainState(IntEnum): NOSTATE = 0 RUNNING = 1 diff --git a/tests/test_connect.py b/tests/test_connect.py index 7748822..a2bd17f 100755 --- a/tests/test_connect.py +++ b/tests/test_connect.py @@ -31,9 +31,10 @@ class TestConnect(libvirttest.BaseTestClass): ''' def test_connect_domain_create_xml(self): - def domain_started(path, event): + def domain_started(path, event, detail): if event != libvirttest.DomainEvent.STARTED: return + assert detail == libvirttest.DomainEventStartedDetailType.BOOTED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -45,9 +46,10 @@ class TestConnect(libvirttest.BaseTestClass): self.main_loop() def test_comnect_domain_define_xml(self): - def domain_defined(path, event): + def domain_defined(path, event, detail): if event != libvirttest.DomainEvent.DEFINED: return + assert detail == libvirttest.DomainEventDefinedDetailType.ADDED assert isinstance(path, dbus.ObjectPath) self.loop.quit() diff --git a/tests/test_domain.py b/tests/test_domain.py index c7e09cd..dfa19ed 100755 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -47,9 +47,10 @@ class TestDomain(libvirttest.BaseTestClass): assert autostart_current == dbus.Boolean(autostart_expected) def test_domain_managed_save(self): - def domain_stopped(path, event): + def domain_stopped(path, event, detail): if event != libvirttest.DomainEvent.STOPPED: return + assert detail == libvirttest.DomainEventStoppedDetailType.SAVED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -74,9 +75,10 @@ class TestDomain(libvirttest.BaseTestClass): assert description_expected == domain.GetMetadata(metadata_description, "", 0) def test_resume(self): - def domain_resumed(path, event): + def domain_resumed(path, event, detail): if event != libvirttest.DomainEvent.RESUMED: return + assert detail == libvirttest.DomainEventResumedDetailType.UNPAUSED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -92,9 +94,10 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() def test_shutdown(self): - def domain_stopped(path, event): + def domain_stopped(path, event, detail): if event != libvirttest.DomainEvent.STOPPED: return + assert detail == libvirttest.DomainEventStoppedDetailType.SHUTDOWN assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -109,9 +112,10 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() def test_suspend(self): - def domain_suspended(path, event): + def domain_suspended(path, event, detail): if event != libvirttest.DomainEvent.SUSPENDED: return + assert detail == libvirttest.DomainEventSuspendedDetailType.PAUSED assert isinstance(path, dbus.ObjectPath) self.loop.quit() @@ -126,9 +130,10 @@ class TestDomain(libvirttest.BaseTestClass): self.main_loop() def test_undefine(self): - def domain_undefined(path, event): + def domain_undefined(path, event, detail): if event != libvirttest.DomainEvent.UNDEFINED: return + assert detail == libvirttest.DomainEventUndefinedDetailType.REMOVED assert isinstance(path, dbus.ObjectPath) self.loop.quit() -- 2.15.0

2 1

[libvirt] [dbus PATCH v2 0/9] Remove all enum->string and string->enum code
by Katerina Koukiou 05 May '18

05 May '18

Changes from v1: * Added the three last patches Katerina Koukiou (9): Abandon usage of all *TypeToString functions in domain.c Abandon usage of all *TypeToString functions in connect.c Abandon usage of all *TypeToString functions in network.c Change DomainEvent argument from string to unsigned int Change NetworkEvent argument from string to unsigned int Remove virtDBusUtilEnum{From,From}String functions Remove reason to string translation in virtDBusEventsDomainTrayChange Remove state to string translation in virtDBusDomainGetState Remove reason to string translation in virtDBusEventsDomainDiskChange data/org.libvirt.Connect.xml | 6 +- data/org.libvirt.Domain.xml | 20 ++--- data/org.libvirt.Network.xml | 6 +- src/connect.c | 18 +--- src/domain.c | 203 ++++--------------------------------------- src/events.c | 72 ++------------- src/network.c | 66 +------------- src/util.c | 27 ------ src/util.h | 28 ------ tests/libvirttest.py | 32 +++++++ tests/test_connect.py | 24 +++-- tests/test_domain.py | 46 ++++++---- tests/test_network.py | 20 +++-- 13 files changed, 131 insertions(+), 437 deletions(-) -- 2.15.0

2 18

[libvirt] [perl PATCH] spec: Drop %{extra_release}
by Andrea Bolognani 04 May '18

04 May '18

It was mainly meant to be used for automatic builds through Test::AutoBuild, so it can be removed now. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- perl-Sys-Virt.spec.PL | 2 +- prepare-release.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/perl-Sys-Virt.spec.PL b/perl-Sys-Virt.spec.PL index dbb749d..ffa6c86 100644 --- a/perl-Sys-Virt.spec.PL +++ b/perl-Sys-Virt.spec.PL @@ -24,7 +24,7 @@ __DATA__ Name: perl-Sys-Virt Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 1%{?dist} Summary: Represent and manage a libvirt hypervisor connection License: GPLv2+ or Artistic Group: Development/Libraries diff --git a/prepare-release.sh b/prepare-release.sh index 9de67fe..fea03f4 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -52,7 +52,5 @@ rm -f $NAME-*.tar.gz make dist if [ -f /usr/bin/rpmbuild ]; then - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" - rpmbuild --nodeps -ta --define "extra_release $EXTRA_RELEASE" --clean $NAME-*.tar.gz + rpmbuild --nodeps -ta --clean $NAME-*.tar.gz fi -- 2.17.0

2 1

[libvirt] [perl PATCH v2 0/3] maint: Rename autobuild.sh to prepare-release.sh
by Andrea Bolognani 04 May '18

04 May '18

Changes from [v1]: * rename the script instead of dropping it; * perform some further clean ups. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00221.html Andrea Bolognani (3): maint: Rename autobuild.sh to prepare-release.sh prepare-release: Drop references to Test::AutoBuild prepare-release: Drop references to Debian packages autobuild.sh => prepare-release.sh | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) rename autobuild.sh => prepare-release.sh (67%) -- 2.17.0

2 10

[libvirt] [PATCH 0/2] adding virHas/GetLastErrorCode/Domain to paritally replace virGetLastError
by ramyelkest 04 May '18

04 May '18

Many places in the code call virGetLastError() just to check the raised error code, or domain. However virGetLastError() can return NULL, so the code has to check for that as well. So Instead we create functions virGetLastErrorCode and virGetLastErrorDomain (in addition to the existing virGetLastErrorMessage) that always return a valid error code/domain/message, to simplify callers. Also created virHasLastErrorCode for completion This is my first commit, for: https://wiki.libvirt.org/page/BiteSizedTasks#Add_and_use_virGetLastErrorCod… Notes: * There are a few instances of virGetLastErrorCode() left where we use multiple fields from the error, which makes sense to keep it. * I didn't manage to use virGetLastErrorDomain() (due to the above) so I'm inclined to remove it. * virHasLastError is more or less only a semantic improvement over virGetLastError, so I'm happy to revert it if needed Signed-off-by: Ramy Elkest <ramyelkest(a)gmail.com> ramyelkest (2): util: adding virHasLastError and virGetLastErrorCode/Domain all: replacing virGetLastError with virHas/GetLastErrorCode/Domain include/libvirt/virterror.h | 3 ++ src/libvirt_public.syms | 7 +++++ src/locking/lock_driver_lockd.c | 3 +- src/lxc/lxc_controller.c | 4 +-- src/qemu/qemu_agent.c | 3 +- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 12 ++++---- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 4 +-- src/qemu/qemu_monitor.c | 5 ++-- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 3 +- src/rpc/virnetclient.c | 2 +- src/util/virerror.c | 63 +++++++++++++++++++++++++++++++++++++++++ src/util/virfilecache.c | 3 +- src/util/virxml.c | 4 +-- tests/commandtest.c | 2 +- tests/testutils.c | 6 ++-- tests/virhostcputest.c | 2 +- tests/virstoragetest.c | 8 +++--- tools/virsh-domain-monitor.c | 7 ++--- tools/virsh-domain.c | 4 +-- tools/virsh-util.c | 3 +- tools/vsh.c | 2 +- 26 files changed, 110 insertions(+), 51 deletions(-) -- 2.7.4

2 4

[libvirt] [jenkins-ci PATCH] guests: Update vault
by Pavel Hrdina 04 May '18

04 May '18

Renaming node in Jenkins changes the secret as well so we cannot reuse the same secret as for the old node. This updates the libvirt-fedora-28 secret to correct one. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. guests/vars/vault.yml | 90 +++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/guests/vars/vault.yml b/guests/vars/vault.yml index 403bd9b..5bf89dc 100644 --- a/guests/vars/vault.yml +++ b/guests/vars/vault.yml @@ -1,46 +1,46 @@ $ANSIBLE_VAULT;1.1;AES256 -37663961316238333332643164623861363938613135376161343231383739663836313130363538 -3136326161376136376332636534643437626530316439650a636134636561333962376564626635 -31306539613534653133383161313834633133316361303539646234356335386639303332323063 -3937626336326131650a373737396639373063316131633634393961393634663961613532353134 -32623065373438336561643538666536666665323536643730386364653162323939616131313634 -38653936663937613765663465353166656363356336636362353432636537633836623930653437 -30353239303435613536636333386436336638636462626537623766343237376331643334633433 -37353531616466386234376639306261303561373035383338383366646537373231386362313562 -66663965366438383833653631386236356163653835303664666539326362383362343838653333 -39623535616361653838626164306666626634373237626638373131303439356164646361613838 -64333165393935636162613638626461313661623963626664366361366364643136313236306636 -61633665393630356133306338343563636332386539626366383133326662633638306330323437 -34613034326465346338633538363231386430363932656430346634663437333734363234346533 -35303962333032626435343030653338656133323932386264346562323133326164623961623466 -62643763333563336362666439653038653335373531303930313239393166623539386239323337 -39393337313563656131646130633330313230366462306636363535386663666131613662363566 -63643030633262336263316134636136616430636536363464386436616530336264396264393762 -36646531636238343763376438666163376166613231306363633536623166356437386333383665 -37353962383238346132633230373666366638386162663263663134303936633034643737386362 -36393537373864323632376632376134303866393966336536376139393334613163356234623863 -36353837616535313266326538376663316366616561613833393037316264396532306430623338 -33636339623861313536323835326464636265386536646263643765306432626462363533373434 -32343961613563613734633736396139623463653230303337333862393836393533363637626662 -35376236613436323736643533613436646136373436363862383933323231663237343838313262 -34343337343031326139366636346632303738366439346433633738313464366438366235356462 -65376165396532623566663335396332333635346661613431343237366166376462393732373532 -62616631643564653865386133663666313366313336323432316236336165386234323165366461 -35343238336235386364363732343862393039326234653539643861383832393465343536353739 -33633134333836393965343935316564653866363130343234633566643463343331306135386334 -39316166616463383964613432373437623964343164383638666531303064313063663330366566 -33643930396232626266396634366564633163333837373062636131623463613061656138363534 -39383830626136636563663233376237626565643661656430336462626436386235643239646365 -34303938323237626362613765326138376130666466373033626338363161383432623465353131 -39373230336330666337393161306437313035373164366330333533636662313266336333626261 -37353638623362643138356434323864346265613835306665383564323139333539336231323534 -38323664396438663664343436333133656336663633396234303034633163643534346139663632 -34633364373066303363306366653566353338326566616138643761343166343536333239653966 -39626639383762653439643631663161303333323330313063336532303531393830646532343261 -65363434373538653337306233333238653465313266643838333862616337323063626432393939 -34663838363931353561396164623138366538376230333738373962356337366533643866343863 -37633366323334323936303962653462353831386262336233336339633366336164623766653862 -32653262373433343136386363386231373938636661373363393331663365636333633164353563 -38643966373261356131666432313934313038363034306162373262353666303936666564303935 -62383432633763623864323263616632396166363165336331363434316430626334616537376132 -63666665336362373265363462343666356434323365633632626632666130356431 +66646139336431653964363035353762363664313738393832356132333835616363373032656335 +3439633266356532316564643762623935643736613839390a616631363336393962633464326264 +31373235323236303134356165386638663865353331353362386538386233363438623035343462 +3864656136376430360a646235373734636666373934616463363234316262376534633865616632 +32643566633531323162366134333562363463336237646130393965646335316561393565663664 +36343164373564336233363963393031363937336137303433396265323261663632373534613365 +31613838363562366564646333646638303837626638323065326237623665646264633233633537 +39373432363962396463323532353434623631383763346234343462333565383333366439393835 +30356437393232363432313334616462346164393437303330343562356461626464633935376239 +39626464316662333736643962623961343662396236306239333335373033366535623730353538 +66346164333839626563366666373432363331343030663537663536623965303333393534316538 +66623737363431303632363237323562306134376336393564366138626435343539613239623539 +39653331623466333535356166653036356564373138623461643862346161383062623738626266 +32613337323038646134336333613266386332353431656263353463656162393732343730393736 +34373033653933656565613063316463373535333836353234333536643639323037373333376338 +65666632623161326538333263626264373535633462306361633835323439663536326433616263 +66373532633865653834323565333536313731643837393834666464626565373938336537363633 +33323335633261643638643038623631633362633366393564316632383030656262383931656262 +65306265316264373732623466393935666633353730346632336262663766333833393961353565 +36383336313062363930633335346430306138656538633637623266383461323735643635613531 +38613265353736303336616638303333343739313033383363303638346266663830613534666464 +33383538303562643232626333303065313364386336366165316263363135396637623739316261 +32376332373539616334646130366262343837323832623965376566343366336563386639326333 +36653365383162623333373766393166656463393331663035616636386238396365663535383334 +39663634386133613138333730366331653262383761633462633239666132343239643735303732 +37343239383038343332656565313465666261646436333536363532376361636461336133336465 +65663561336430336664636262356362636635623961386462313437373863366134343164643762 +64653236616435326432363137646362646433316535393135353333336331313832623461623536 +35653739613834323564313163383563383633343336316533356535623838313663623464353238 +66333862623762316363636439613430363038633062663439383032393934313266316131323836 +30396163303038323564663639656161353336356435633635306538313032626566306366666135 +36383234353161313534343962336536313763306337393239626330396363396235643239306436 +31386631383666363365313434366538616130636164363536343364653861666662343065346663 +31356430653831653962333333396436626630333831343537366636336462373865643164326637 +65623237373561616164333238336463666239306564626538383666303562623632303630303335 +36386665346135623334646336663831666136323231376131383263343631643962643962336466 +38376264376662383263373562313263613866316138653862643833666134316338343863363631 +32663961366635353461303633366364333836636639386537396565333737353164616165323238 +66656666323265323361613162353835313763656637633464363131343361366435313565326664 +63663064336231633865663665666564366264366638356265396236326436623133653836376665 +30383436353663663637363337313232373430356261316465326261656161356436373265653939 +63356538663134386438666638386563393961373265363532653733373263623932613737613234 +61643536663036633132623161343935376633313364616436626561396262303765393662346632 +62353432646234383764366235623062636536666537323831316133636537306334616266363164 +64613735653731626231313931633839326663343262316362383763653832356163 -- 2.14.3

1 0

[libvirt] [PATCH] Qemu driver: Support network-backed pflash disks.
by Prerna Saxena 04 May '18

04 May '18

This implements support for firmware loader & NVRAM disks over network-backed disks. As discussed in https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html, the patch embeds the <source> spec for disks in <loader> and <nvram> elements as well. Currently, the source type is annotated by introducing a new attribute "backing" for both 'loader' and 'nvram' elements. Hence, a sample XML with new annotation looks like this: <loader readonly='yes' type='pflash' backing='file'> <source file='/usr/share/OVMF/OVMF_CODE.fd'/> </loader> <nvram backing='network'> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> <host name='example.com' port='6000'/> </source> The patche automatically re-formats any older-stype declaration into this new style. Templates can be used to create a new NVRAM only if the nvram backing = 'file'.

3 4

[libvirt] [dbus PATCH v2 0/2] improve annotation of properties
by Pavel Hrdina 04 May '18

04 May '18

Pavel Hrdina (2): Change the default annotation for emitting changed properties to false Annotate properties that will never change during the object lifecycle data/org.libvirt.Connect.xml | 3 +++ data/org.libvirt.Domain.xml | 2 ++ data/org.libvirt.Network.xml | 3 +++ 3 files changed, 8 insertions(+) -- 2.14.3

2 3

[libvirt] [dbus PATCH 0/4] various fixes
by Pavel Hrdina 04 May '18

04 May '18

Pavel Hrdina (4): configure: Bump required libvirt version Revert "Implement BridgeName property for Network interface." Annotate properties for which we will not emit changed signal Annotate properties that will never change during the object lifecycle configure.ac | 2 +- data/org.libvirt.Connect.xml | 5 +++++ data/org.libvirt.Domain.xml | 10 ++++++++++ data/org.libvirt.Network.xml | 9 +++++---- src/network.c | 23 ----------------------- tests/test_network.py | 1 - 6 files changed, 21 insertions(+), 29 deletions(-) -- 2.14.3

2 9

[libvirt] [dbus PATCH] Implement SetGuestVcpus method for Domain Interface
by Katerina Koukiou 04 May '18

04 May '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- data/org.libvirt.Domain.xml | 7 +++++ src/domain.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index db43b1c..eae6d97 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -463,6 +463,13 @@ <arg name="params" type="a{sv}" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> + <method name="SetGuestVcpus"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetGuestVcpus"/> + <arg name="vcpumap" type="ab" direction="in"/> + <arg name="state" type="i" direction="in"/> + <arg name="flags" type="u" direction="in"/> + </method> <method name="SetInterfaceParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetInterfaceP…"/> diff --git a/src/domain.c b/src/domain.c index e305fa3..bbc4ead 100644 --- a/src/domain.c +++ b/src/domain.c @@ -72,6 +72,39 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMetadata, "title", "element") +static gchar * +virtDBusDomainConvertBoolArrayToGuestVcpumap(GVariantIter *iter) +{ + g_autoptr(GVariantIter) tmpIter = NULL; + gboolean set; + gint intervalCnt = 0; + guint intervalStart = 0; + gboolean setPrev = 0; + g_autofree GString *ret = NULL; + + ret = g_string_new(""); + for (guint i = 0; ; i++) { + gboolean next = g_variant_iter_loop(iter, "b", &set); + + if (set && !setPrev) + intervalStart = i; + else if ((!set && setPrev) || next) { + if (intervalCnt > 0) + g_string_append_printf(ret, ","); + if (intervalStart != i - 1) + g_string_append_printf(ret, "%d-%d", intervalStart, i - 1); + else + g_string_append_printf(ret, "%d", intervalStart); + intervalCnt++; + } + setPrev = set; + if (!next) + break; + } + + return ret->str; +} + struct _virtDBusDomainFSInfoList { virDomainFSInfoPtr *info; gint count; @@ -2490,6 +2523,34 @@ virtDBusDomainSetBlockIOTune(GVariant *inArgs, } } +static void +virtDBusDomainSetGuestVcpus(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect = userData; + g_autoptr(virDomain) domain = NULL; + g_autoptr(GVariantIter) iter = NULL; + gint state; + guint flags; + g_autofree gchar *ret = NULL; + + g_variant_get(inArgs, "(abiu)", &iter, &state, &flags); + + domain = virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + ret = virtDBusDomainConvertBoolArrayToGuestVcpumap(iter); + + if (virDomainSetGuestVcpus(domain, ret, state, flags) < 0) + virtDBusUtilSetLastVirtError(error); +} + static void virtDBusDomainSetInterfaceParameters(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2988,6 +3049,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "SendProcessSignal", virtDBusDomainSendProcessSignal }, { "SetBlkioParameters", virtDBusDomainSetBlkioParameters }, { "SetBlockIOTune", virtDBusDomainSetBlockIOTune }, + { "SetGuestVcpus", virtDBusDomainSetGuestVcpus }, { "SetInterfaceParameters", virtDBusDomainSetInterfaceParameters }, { "SetVcpus", virtDBusDomainSetVcpus }, { "SetMemory", virtDBusDomainSetMemory }, -- 2.15.0

2 1

[libvirt] [PATCH 03/12] virsh: Create macros for VSH_OT_STRING "domain" option
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 3 +++ tools/virsh-domain.c | 3 +++ tools/virsh-snapshot.c | 3 +++ tools/virsh.h | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8e071779b4..8ad651626b 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -43,6 +43,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + VIR_ENUM_DECL(virshDomainIOError) VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6601f94a12..8a63761fab 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -68,6 +68,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e4908eea70..3d86ac84d1 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -45,6 +45,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) + /* Helper for snapshot-create and snapshot-create-as */ static bool virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, diff --git a/tools/virsh.h b/tools/virsh.h index f2213ebb57..9dcf104cc4 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -107,6 +107,14 @@ .help = _helpstr \ } +# define VIRSH_COMMON_OPT_DOMAIN_OT_STRING(_helpstr, cflags) \ + {.name = "domain", \ + .type = VSH_OT_STRING, \ + .help = _helpstr, \ + .completer = virshDomainNameCompleter, \ + .completer_flags = cflags, \ + } + typedef struct _virshControl virshControl; typedef virshControl *virshControlPtr; -- 2.15.1

2 1

[libvirt] [PATCH 06/12] virsh: Create macros for VSH_OT_ARGV "domain" option
by Lin Ma 04 May '18

04 May '18

Signed-off-by: Lin Ma <lma(a)suse.com> --- tools/virsh-domain-monitor.c | 3 +++ tools/virsh-domain.c | 3 +++ tools/virsh-snapshot.c | 3 +++ tools/virsh.h | 9 +++++++++ 4 files changed, 18 insertions(+) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 8ad651626b..e4a21534cb 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -46,6 +46,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + VIR_ENUM_DECL(virshDomainIOError) VIR_ENUM_IMPL(virshDomainIOError, VIR_DOMAIN_DISK_ERROR_LAST, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 689f9d686b..89aefbf86a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -71,6 +71,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 3d86ac84d1..0c86b6c950 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -48,6 +48,9 @@ #define VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(cflags) \ VIRSH_COMMON_OPT_DOMAIN_OT_STRING(N_("domain name, id or uuid"), cflags) +#define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV_FULL(cflags) \ + VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(N_("domain name, id or uuid"), cflags) + /* Helper for snapshot-create and snapshot-create-as */ static bool virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, diff --git a/tools/virsh.h b/tools/virsh.h index 9dcf104cc4..a33d108b2d 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -115,6 +115,15 @@ .completer_flags = cflags, \ } +# define VIRSH_COMMON_OPT_DOMAIN_OT_ARGV(_helpstr, cflags) \ + {.name = "domain", \ + .type = VSH_OT_ARGV, \ + .flags = VSH_OFLAG_NONE, \ + .help = _helpstr, \ + .completer = virshDomainNameCompleter, \ + .completer_flags = cflags, \ + } + typedef struct _virshControl virshControl; typedef virshControl *virshControlPtr; -- 2.15.1

2 1