- Devel - libvirt List Archives

[libvirt] [PATCH] tests: Make check-file-access.pl accept files through argv
by Michal Privoznik 04 Dec '19

04 Dec '19

The script needs two files to open: $(builddir)/test_file_access.txt, and $(srcdir)/file_access_whitelist.txt. However, the script is opening the files from the $CWD which won't work for a VPATH build. Make the script accept paths to the files through @ARGV and tune the Makefile.am to pass them. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/Makefile.am | 4 +++- tests/check-file-access.pl | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index cbe8e86224..4c2856bf97 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -454,7 +454,9 @@ EXTRA_DIST += $(test_scripts) if WITH_LINUX check-access: file-access-clean VIR_TEST_FILE_ACCESS=1 $(MAKE) $(AM_MAKEFLAGS) check - $(PERL) check-file-access.pl | sort -u + $(PERL) $(abs_srcdir)/check-file-access.pl \ + $(abs_builddir)/test_file_access.txt \ + $(abs_srcdir)/file_access_whitelist.txt | sort -u file-access-clean: > test_file_access.txt diff --git a/tests/check-file-access.pl b/tests/check-file-access.pl index ea0b7a18a2..2926126b14 100755 --- a/tests/check-file-access.pl +++ b/tests/check-file-access.pl @@ -24,8 +24,12 @@ use strict; use warnings; -my $access_file = "test_file_access.txt"; -my $whitelist_file = "file_access_whitelist.txt"; +sub usage { + die "$0 access_file file_access_whitelist\n"; +} + +my $access_file = shift or usage(); +my $whitelist_file = shift or usage(); my @known_actions = ("open", "fopen", "access", "stat", "lstat", "connect"); -- 2.23.0

2 1

[libvirt] [PATCH v5 00/23] scripts: convert most perl scripts to python
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

This series is an effort to reduce the number of different languages we use by eliminating most use of perl in favour of python. This aligns with fact that the likely future build system we'll use (meson) is written in python, and that python is much more commonly used/understood by developers these days than perl. With this applied we use perl in a handful of places only: - src/rpc/gendispatch.pl - this is a horrendously large script and very hard to understand/follow. A straight syntax conversion to Python would still leave a hgue and hard to understand/follow script. It really needs a clean room rewrite from scratch, with better structure. - src/rpc/genprotocol.pl - fairly easy to convert, but might be obsolete depending on approach for rewriting gendispatch.pl, so ignored for now - tests/oomtrace.pl - will be purge by the patches that drop OOM handling anyway - tools/wireshark/util/genxdrstub.pl - a very large script, which I haven't got the courage to tackle yet. - cfg.mk/maint.mk - many syntax rules involve regexes which are fed to perl. Decision on what to do with syntax-check rules punted to another time. - build-aux/gitlog-to-changelog - build-aux/useless-if-before-free - Both pulled in from gnulib. Could be rewritten quite easily if desired, but given that we aren't maintainers of them right now, they're ignored as they don't really impact our developers. Note that the check-spacing.py script is significantly slower in Python than in Perl. After researching this it appears there is nothing that can be done. The Perl regex engine is simply much better optimized than the Python one. As previously discussed we need to loook at uncrustify or clang-format or some other tool to validate whitespace formatting. This is ongoing. We can either accept the slow down in the short term or keep the Perl version in the short term. In v5: - Rebased to cope with changes to require VPATH build - Merged the already-ACKd scripts In v4: - Moved all scripts into the scripts/ directory instead of having them scattered around source tree - Use re.search instead of re.match - Don't bother re-compiling regexes In v3: - All scripts comply with all flake8 style rules with exception of E129 visually indented line with same indent as next logical line In v2: - Pulled in patch to hacking file - Converted many more scripts - Forced UTF-8 character set to avoid ascii codec on py3 < 3.7 Daniel P. Berrangé (23): build-aux: rewrite duplicate header checker in Python build-aux: rewrite whitespace checker in Python build-aux: rewrite mock inline checker in Python build-aux: rewrite header ifdef checker in Python src: rewrite ACL permissions checker in Python src: rewrite symfile sorting checker in Python src: rewrite symfile library checker in Python src: rewrite systemtap probe generator in Python src: rewrite systemtap function generator in Python src: rewrite driver name checker in Python src: rewrite driver impl checker in Python src: rewrite ACL rule checker in Python src: rewrite polkit ACL generator in Python src: rewrite remote protocol checker in Python tests: rewrite test argv line wrapper in Python tests: rewrite qemu capability grouper in Python tests: rewrite file access checker in Python docs: rewrite hvsupport.html page generator in python docs: rewrite polkit docs generator in Python docs: move apibuild.py to the scripts/ directory docs: move reformat-news.py to the scripts/ directory docs: move esx_vi_generator.py to the scripts/ directory docs: move hyperv_wmi_generator.py to the scripts/ directory Makefile.am | 33 +- build-aux/check-spacing.pl | 198 ------- build-aux/header-ifdef.pl | 182 ------- build-aux/mock-noinline.pl | 75 --- build-aux/prohibit-duplicate-header.pl | 26 - build-aux/syntax-check.mk | 32 +- docs/Makefile.am | 16 +- docs/genaclperms.pl | 125 ----- docs/hvsupport.pl | 459 ---------------- {docs => scripts}/apibuild.py | 0 scripts/check-aclperms.py | 75 +++ scripts/check-aclrules.py | 263 +++++++++ scripts/check-driverimpls.py | 102 ++++ scripts/check-drivername.py | 114 ++++ scripts/check-file-access.py | 123 +++++ scripts/check-remote-protocol.py | 136 +++++ scripts/check-spacing.py | 229 ++++++++ scripts/check-symfile.py | 80 +++ scripts/check-symsorting.py | 117 ++++ scripts/dtrace2systemtap.py | 143 +++++ {src/esx => scripts}/esx_vi_generator.py | 0 scripts/genaclperms.py | 123 +++++ scripts/genpolkit.py | 122 +++++ scripts/gensystemtap.py | 184 +++++++ scripts/group-qemu-caps.py | 123 +++++ scripts/header-ifdef.py | 231 ++++++++ scripts/hvsupport.py | 504 ++++++++++++++++++ .../hyperv_wmi_generator.py | 0 scripts/mock-noinline.py | 85 +++ scripts/prohibit-duplicate-header.py | 56 ++ {docs => scripts}/reformat-news.py | 0 scripts/test-wrap-argv.py | 170 ++++++ src/Makefile.am | 146 ++--- src/access/Makefile.inc.am | 6 +- src/access/genpolkit.pl | 119 ----- src/admin/Makefile.inc.am | 6 +- src/check-aclperms.pl | 73 --- src/check-aclrules.pl | 252 --------- src/check-driverimpls.pl | 80 --- src/check-drivername.pl | 83 --- src/check-symfile.pl | 70 --- src/check-symsorting.pl | 106 ---- src/dtrace2systemtap.pl | 130 ----- src/esx/Makefile.inc.am | 6 +- src/hyperv/Makefile.inc.am | 5 +- src/rpc/Makefile.inc.am | 1 - src/rpc/gensystemtap.pl | 193 ------- tests/Makefile.am | 3 +- tests/check-file-access.pl | 126 ----- tests/file_access_whitelist.txt | 2 +- tests/group-qemu-caps.pl | 124 ----- tests/test-wrap-argv.pl | 174 ------ tests/testutils.c | 16 +- 53 files changed, 3092 insertions(+), 2755 deletions(-) delete mode 100755 build-aux/check-spacing.pl delete mode 100644 build-aux/header-ifdef.pl delete mode 100644 build-aux/mock-noinline.pl delete mode 100644 build-aux/prohibit-duplicate-header.pl delete mode 100755 docs/genaclperms.pl delete mode 100755 docs/hvsupport.pl rename {docs => scripts}/apibuild.py (100%) create mode 100755 scripts/check-aclperms.py create mode 100755 scripts/check-aclrules.py create mode 100755 scripts/check-driverimpls.py create mode 100644 scripts/check-drivername.py create mode 100755 scripts/check-file-access.py create mode 100644 scripts/check-remote-protocol.py create mode 100755 scripts/check-spacing.py create mode 100755 scripts/check-symfile.py create mode 100755 scripts/check-symsorting.py create mode 100755 scripts/dtrace2systemtap.py rename {src/esx => scripts}/esx_vi_generator.py (100%) create mode 100755 scripts/genaclperms.py create mode 100755 scripts/genpolkit.py create mode 100755 scripts/gensystemtap.py create mode 100755 scripts/group-qemu-caps.py create mode 100644 scripts/header-ifdef.py create mode 100755 scripts/hvsupport.py rename {src/hyperv => scripts}/hyperv_wmi_generator.py (100%) create mode 100644 scripts/mock-noinline.py create mode 100644 scripts/prohibit-duplicate-header.py rename {docs => scripts}/reformat-news.py (100%) create mode 100755 scripts/test-wrap-argv.py delete mode 100755 src/access/genpolkit.pl delete mode 100755 src/check-aclperms.pl delete mode 100755 src/check-aclrules.pl delete mode 100755 src/check-driverimpls.pl delete mode 100755 src/check-drivername.pl delete mode 100755 src/check-symfile.pl delete mode 100755 src/check-symsorting.pl delete mode 100755 src/dtrace2systemtap.pl delete mode 100755 src/rpc/gensystemtap.pl delete mode 100755 tests/check-file-access.pl delete mode 100755 tests/group-qemu-caps.pl delete mode 100755 tests/test-wrap-argv.pl -- 2.21.0

4 65

[libvirt] [PATCH v3 0/3] Update valid range of scsi unit
by Han Han 04 Dec '19

04 Dec '19

Fix spelling typo. Separate virtio serial port and ccid slot from driveUnit. v2: https://www.redhat.com/archives/libvir-list/2019-December/msg00004.html Han Han (3): conf: fix logic error for scsi units rng: Separate virtio serial port and ccid slot from driveUnit rng: Extend the range of driveUnit docs/schemas/domaincommon.rng | 16 +++++++++++++--- src/conf/domain_conf.c | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) -- 2.24.0.rc1

2 4

[libvirt] [PATCH v2 00/15] docs: some refactoring and new docs about RPM deployment
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

This refactors existing docs related to the remote driver/daemon and URIs. It then also adds a kbase page about RPM package options. This introduces the use of RST for docs as a replacement for HTML. The intent is that all new docs should use RST from this point. The POD man pages will also be converted to RST. I'll post this as a different series. Note this series only touches the main HTML content, not the styling / templating using XSL. Tackling that is a separate job I've not attempted. My guess is that we'd use either Sphinx or Pelican to do the templating. Existing HTML docs are candidates for conversion to RST, however, people should *NOT* attempt todo this manually. In this series I've converted docs/kbase/ files, using the pandoc tool. This does a pretty good job in general but does need some manual cleanups. First I post-processed its output to change the heading highlighting to follow the documented style $ cat convert.pl my @in = <>; my @out; for (my $i ; $i <= $#in; $i++) { my $line = $in[$i]; if ($line =~ /^=+$/) { my @newout = splice @out, 0, $i - 1; push @newout, $line; push @newout, $out[$i-1]; push @newout, $out[$i]; push @newout, $line; push @newout, "\n"; push @newout, ".. contents::\n"; @out = @newout; } elsif ($line =~ /^(-|~|^|')+$/) { $line =~ s/-/=/g; $line =~ s/~/-/g; $line =~ s/\^/~/g; $line =~ s/'/^/g; push @out, $line; } else { push @out, $line; } } print @out; So I'm converting with pandoc -f html -t rst < foo.html.in | perl convert.pl > foo.rst $EDITOR foot.rst git rm -f foot.html.in git add foo.rst After pandoc & the headings convert, there's usually manual fixes needed to deal with a few oddities pandoc gets wrong, or looks ugly. This is still way simpler than converting the doc to rst manually. Changed in v2: - Added a style guide for RST docs - Probe for rst2html's different names - Added make rules for building rst - Fixed permalinks in generated docs - Misc CSS fixes - Auto-converted all of kbase/ directory Daniel P. Berrangé (15): docs: split TLS certificate setup into its own file docs: move docs about remote driver URIs into URI docs docs: introduce rst2html as a mandatory tool for building docs docs: adapt filling of <head> section for rst2html output docs: generate permalinks correctly for rst2html output docs: relax CSS context match for pretty tables docs: add styling for <tt> element docs: add a minimal style guide for writing RST docs docs: convert kbase/domainstatecapture.html.in to RST docs: convert kbase/launch_security_sev.html.in to RST docs: convert kbase/secureusage.html.in to RST docs: convert kbase/locking.html.in to RST docs: convert kbase/locking-lockd.html.in to RST docs: convert kbase/locking-sanlock.html.in to RST docs: add a kbase page about RPM packaging options docs/Makefile.am | 33 +- docs/aclpolkit.html.in | 20 +- docs/docs.html.in | 6 + docs/genaclperms.pl | 2 +- docs/generic.css | 4 +- docs/kbase.html.in | 4 + docs/kbase/domainstatecapture.html.in | 303 ----------- docs/kbase/domainstatecapture.rst | 255 +++++++++ docs/kbase/launch_security_sev.html.in | 533 ------------------- docs/kbase/launch_security_sev.rst | 529 +++++++++++++++++++ docs/kbase/locking-lockd.html.in | 160 ------ docs/kbase/locking-lockd.rst | 121 +++++ docs/kbase/locking-sanlock.html.in | 247 --------- docs/kbase/locking-sanlock.rst | 193 +++++++ docs/kbase/locking.html.in | 48 -- docs/kbase/locking.rst | 33 ++ docs/kbase/rpm-deployment.rst | 410 +++++++++++++++ docs/kbase/secureusage.html.in | 171 ------- docs/kbase/secureusage.rst | 131 +++++ docs/libvirt.css | 76 +-- docs/migration.html.in | 2 +- docs/newapi.xsl | 4 +- docs/page.xsl | 9 +- docs/remote.html.in | 684 +------------------------ docs/styleguide.rst | 66 +++ docs/tlscerts.html.in | 413 +++++++++++++++ docs/uri.html.in | 263 ++++++++-- libvirt.spec.in | 2 + m4/virt-external-programs.m4 | 5 + mingw-libvirt.spec.in | 1 + 30 files changed, 2478 insertions(+), 2250 deletions(-) delete mode 100644 docs/kbase/domainstatecapture.html.in create mode 100644 docs/kbase/domainstatecapture.rst delete mode 100644 docs/kbase/launch_security_sev.html.in create mode 100644 docs/kbase/launch_security_sev.rst delete mode 100644 docs/kbase/locking-lockd.html.in create mode 100644 docs/kbase/locking-lockd.rst delete mode 100644 docs/kbase/locking-sanlock.html.in create mode 100644 docs/kbase/locking-sanlock.rst delete mode 100644 docs/kbase/locking.html.in create mode 100644 docs/kbase/locking.rst create mode 100644 docs/kbase/rpm-deployment.rst delete mode 100644 docs/kbase/secureusage.html.in create mode 100644 docs/kbase/secureusage.rst create mode 100644 docs/styleguide.rst create mode 100644 docs/tlscerts.html.in -- 2.23.0

2 17

[libvirt] [PATCH] tests: stop static linking to libvirt code in tests
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

If we static link to libvirt_util.la then we can't override functions in this file by simply implementing them in the test code. Any tests should dynamic link to the main libvirt.la and ensure symbols are exported. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/libvirt_private.syms | 2 ++ tests/Makefile.am | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8fe0bf9365..0864de030b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -915,6 +915,8 @@ virDomainSnapshotDefFormat; virDomainSnapshotDefIsExternal; virDomainSnapshotDefNew; virDomainSnapshotDefParseString; +virDomainSnapshotDiskDefFree; +virDomainSnapshotDiskDefParseXML; virDomainSnapshotFormatConvertXMLFlags; virDomainSnapshotIsExternal; virDomainSnapshotLocationTypeFromString; diff --git a/tests/Makefile.am b/tests/Makefile.am index e009de830c..af8fd69842 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -662,8 +662,7 @@ qemublocktest_SOURCES = \ $(NULL) qemublocktest_LDADD = \ libqemumonitortestutils.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ + ../src/libvirt.la \ $(qemu_LDADDS) \ $(NULL) @@ -939,8 +938,7 @@ storagevolxml2argvtest_SOURCES = \ storagevolxml2argvtest_LDADD = \ $(LIBXML_LIBS) \ ../src/libvirt_driver_storage_impl.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ + ../src/libvirt.la \ $(LDADDS) storagepoolxml2argvtest_SOURCES = \ @@ -949,8 +947,7 @@ storagepoolxml2argvtest_SOURCES = \ storagepoolxml2argvtest_LDADD = \ $(LIBXML_LIBS) \ ../src/libvirt_driver_storage_impl.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ + ../src/libvirt.la \ $(LDADDS) storagepoolxml2xmltest_SOURCES = \ @@ -1150,8 +1147,6 @@ virstoragetest_SOURCES = \ virstoragetest.c testutils.h testutils.c virstoragetest_LDADD = $(LDADDS) \ ../src/libvirt.la \ - ../src/libvirt_conf.la \ - ../src/libvirt_util.la \ ../src/libvirt_driver_storage_impl.la \ ../gnulib/lib/libgnu.la \ $(NULL) -- 2.23.0

2 1

[libvirt] [PATCH] scripts: fix list indexing when printing mis-ordered symbols
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

The python array slice syntax expects the first and last indexes, not the first length and element count. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- scripts/check-symsorting.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/check-symsorting.py b/scripts/check-symsorting.py index 8e698c0657..006c42f1b3 100755 --- a/scripts/check-symsorting.py +++ b/scripts/check-symsorting.py @@ -59,8 +59,8 @@ def check_sorting(group, symfile, line, groupfile, lastgroup): issorted = False if not issorted: - actual = group[first:(last - first + 1)] - expect = sortedgroup[first:(last - first + 1)] + actual = group[first:last] + expect = sortedgroup[first:last] print("Symbol block at %s:%s: symbols not sorted" % (symfile, line), file=sys.stderr) for g in actual: -- 2.23.0

2 1

[libvirt] [python PATCH] Drop support for python 2
by Daniel P. Berrangé 04 Dec '19

04 Dec '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/consolecallback.py | 2 +- examples/dhcpleases.py | 2 +- examples/dominfo.py | 2 +- examples/domipaddrs.py | 2 +- examples/domrestore.py | 2 +- examples/domsave.py | 2 +- examples/domstart.py | 2 +- examples/esxlist.py | 2 +- examples/event-test.py | 2 +- examples/guest-vcpus/guest-vcpu-daemon.py | 2 +- examples/guest-vcpus/guest-vcpu.py | 2 +- examples/nodestats.py | 2 +- examples/sparsestream.py | 2 +- examples/topology.py | 2 +- generator.py | 2 +- libvirt-lxc-override.c | 51 ++------- libvirt-override.c | 51 ++------- libvirt-python.spec.in | 96 +--------------- libvirt-qemu-override.c | 51 ++------- libvirt-utils.c | 17 +-- libvirt-utils.h | 6 +- sanitytest.py | 2 +- setup.py | 9 +- typewrappers.c | 133 +++------------------- typewrappers.h | 5 - 25 files changed, 71 insertions(+), 380 deletions(-) diff --git a/examples/consolecallback.py b/examples/consolecallback.py index c539a92..1347384 100644 --- a/examples/consolecallback.py +++ b/examples/consolecallback.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # consolecallback - provide a persistent console that survives guest reboots import sys, os, logging, libvirt, tty, termios, atexit diff --git a/examples/dhcpleases.py b/examples/dhcpleases.py index da51f52..f394541 100755 --- a/examples/dhcpleases.py +++ b/examples/dhcpleases.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # netdhcpleases - print leases info for given virtual network import libvirt diff --git a/examples/dominfo.py b/examples/dominfo.py index d3049cd..0a39f4c 100755 --- a/examples/dominfo.py +++ b/examples/dominfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # dominfo - print some information about a domain import libvirt diff --git a/examples/domipaddrs.py b/examples/domipaddrs.py index d6d5cac..bda308c 100755 --- a/examples/domipaddrs.py +++ b/examples/domipaddrs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domipaddrs - print domain interfaces along with their MAC and IP addresses import libvirt diff --git a/examples/domrestore.py b/examples/domrestore.py index 06fdfbc..96f4955 100755 --- a/examples/domrestore.py +++ b/examples/domrestore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domstart - make sure a given domU is running, if not start it import libvirt diff --git a/examples/domsave.py b/examples/domsave.py index 727217c..4940cce 100755 --- a/examples/domsave.py +++ b/examples/domsave.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domstart - make sure a given domU is running, if not start it import libvirt diff --git a/examples/domstart.py b/examples/domstart.py index ce1b60c..7ff6cb9 100755 --- a/examples/domstart.py +++ b/examples/domstart.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # domstart - make sure a given domU is running, if not start it import libvirt diff --git a/examples/esxlist.py b/examples/esxlist.py index 0d47b00..d86e064 100755 --- a/examples/esxlist.py +++ b/examples/esxlist.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # esxlist - list active domains of an ESX host and print some info. # also demonstrates how to use the libvirt.openAuth() method diff --git a/examples/event-test.py b/examples/event-test.py index 4458e22..fddef64 100755 --- a/examples/event-test.py +++ b/examples/event-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # # diff --git a/examples/guest-vcpus/guest-vcpu-daemon.py b/examples/guest-vcpus/guest-vcpu-daemon.py index c7c08a8..30fcb9c 100755 --- a/examples/guest-vcpus/guest-vcpu-daemon.py +++ b/examples/guest-vcpus/guest-vcpu-daemon.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import libvirt import threading diff --git a/examples/guest-vcpus/guest-vcpu.py b/examples/guest-vcpus/guest-vcpu.py index 8faba87..479ec40 100755 --- a/examples/guest-vcpus/guest-vcpu.py +++ b/examples/guest-vcpus/guest-vcpu.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import libvirt import sys diff --git a/examples/nodestats.py b/examples/nodestats.py index c01dead..ae2a442 100755 --- a/examples/nodestats.py +++ b/examples/nodestats.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Print some host NUMA node statistics # # Authors: diff --git a/examples/sparsestream.py b/examples/sparsestream.py index e960c40..d7c09b7 100755 --- a/examples/sparsestream.py +++ b/examples/sparsestream.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Example of sparse streams usage # # Authors: diff --git a/examples/topology.py b/examples/topology.py index 191669c..197c87a 100755 --- a/examples/topology.py +++ b/examples/topology.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Parse topology information from the capabilities XML and use # them to calculate host topology # diff --git a/generator.py b/generator.py index 3352521..cba9d47 100755 --- a/generator.py +++ b/generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # generate python wrappers from the XML API description # diff --git a/libvirt-lxc-override.c b/libvirt-lxc-override.c index d7af154..138ba5b 100644 --- a/libvirt-lxc-override.c +++ b/libvirt-lxc-override.c @@ -4,13 +4,13 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2012-2013 Red Hat, Inc. + * Copyright (C) 2012-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, + via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H @@ -21,18 +21,10 @@ #include "libvirt-utils.h" #include "build/libvirt-lxc.h" -#if PY_MAJOR_VERSION > 2 -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ extern PyObject *PyInit_libvirtmod_lxc(void); -# else -extern PyObject *PyInit_cygvirtmod_lxc(void); -# endif #else -# ifndef __CYGWIN__ -extern void initlibvirtmod_lxc(void); -# else -extern void initcygvirtmod_lxc(void); -# endif +extern PyObject *PyInit_cygvirtmod_lxc(void); #endif #if 0 @@ -107,14 +99,13 @@ static PyMethodDef libvirtLxcMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ "libvirtmod_lxc", -# else +#else "cygvirtmod_lxc", -# endif +#endif NULL, -1, libvirtLxcMethods, @@ -125,11 +116,11 @@ static struct PyModuleDef moduledef = { }; PyObject * -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ PyInit_libvirtmod_lxc -# else +#else PyInit_cygvirtmod_lxc -# endif +#endif (void) { PyObject *module; @@ -141,25 +132,3 @@ PyInit_cygvirtmod_lxc return module; } -#else /* ! PY_MAJOR_VERSION > 2 */ -void -# ifndef __CYGWIN__ -initlibvirtmod_lxc -# else -initcygvirtmod_lxc -# endif -(void) -{ - if (virInitialize() < 0) - return; - - /* initialize the python extension module */ - Py_InitModule((char *) -# ifndef __CYGWIN__ - "libvirtmod_lxc", -# else - "cygvirtmod_lxc", -# endif - libvirtLxcMethods); -} -#endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-override.c b/libvirt-override.c index 2e24d27..4e4c00a 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -4,13 +4,13 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2005, 2007-2015 Red Hat, Inc. + * Copyright (C) 2005-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, + via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H @@ -25,18 +25,10 @@ #include "build/libvirt.h" #include "libvirt-utils.h" -#if PY_MAJOR_VERSION > 2 -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ extern PyObject *PyInit_libvirtmod(void); -# else -extern PyObject *PyInit_cygvirtmod(void); -# endif #else -# ifndef __CYGWIN__ -extern void initlibvirtmod(void); -# else -extern void initcygvirtmod(void); -# endif +extern PyObject *PyInit_cygvirtmod(void); #endif #if 0 @@ -10553,14 +10545,13 @@ static PyMethodDef libvirtMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ "libvirtmod", -# else +#else "cygvirtmod", -# endif +#endif NULL, -1, libvirtMethods, @@ -10571,11 +10562,11 @@ static struct PyModuleDef moduledef = { }; PyObject * -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ PyInit_libvirtmod -# else +#else PyInit_cygvirtmod -# endif +#endif (void) { PyObject *module; @@ -10587,25 +10578,3 @@ PyInit_cygvirtmod return module; } -#else /* ! PY_MAJOR_VERSION > 2 */ -void -# ifndef __CYGWIN__ -initlibvirtmod -# else -initcygvirtmod -# endif -(void) -{ - if (virInitialize() < 0) - return; - - /* initialize the python extension module */ - Py_InitModule((char *) -# ifndef __CYGWIN__ - "libvirtmod", -# else - "cygvirtmod", -# endif - libvirtMethods); -} -#endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 8506840..1e92f3c 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -12,26 +12,7 @@ %define supported_platform 0 %endif -%define _with_python2 1 -%if 0%{?fedora} > 30 || 0%{?rhel} > 7 -%define _with_python2 0 -%endif - -%define _with_python3 0 -%if 0%{?fedora} || 0%{?rhel} > 7 -%define _with_python3 1 -%endif - -# Whether py2 packages are assumed to have python2- name prefix -%define py2_versioned_deps 0 -%if 0%{?fedora} || 0%{?rhel} > 7 -%define py2_versioned_deps 1 -%endif - -%{!?with_python2: %define with_python2 %{_with_python2}} -%{!?with_python3: %define with_python3 %{_with_python3}} - -Summary: The libvirt virtualization API python2 binding +Summary: The libvirt virtualization API python3 binding Name: libvirt-python Version: @PY_VERSION@ Release: 1%{?dist} @@ -39,31 +20,13 @@ Source0: http://libvirt.org/sources/python/%{name}-%{version}.tar.gz Url: http://libvirt.org License: LGPLv2+ BuildRequires: libvirt-devel == %{version} -%if %{with_python2} -%if %{py2_versioned_deps} -BuildRequires: python2-devel -BuildRequires: python2-nose -BuildRequires: python2-lxml -%else -BuildRequires: python-devel -BuildRequires: python-nose -BuildRequires: python-lxml -%endif -%endif -%if %{with_python3} BuildRequires: python3-devel BuildRequires: python3-nose BuildRequires: python3-lxml -%endif BuildRequires: gcc # Don't want provides for python shared objects -%if %{with_python2} -%{?filter_provides_in: %filter_provides_in %{python2_sitearch}/.*\.so} -%endif -%if %{with_python3} %{?filter_provides_in: %filter_provides_in %{python3_sitearch}/.*\.so} -%endif %{?filter_setup} %description @@ -72,23 +35,6 @@ written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%if %{with_python2} -%package -n python2-libvirt -Summary: The libvirt virtualization API python2 binding -Url: http://libvirt.org -License: LGPLv2+ -%{?python_provide:%python_provide python2-libvirt} -Provides: libvirt-python = %{version}-%{release} -Obsoletes: libvirt-python <= 3.6.0-1%{?dist} - -%description -n python2-libvirt -The python2-libvirt package contains a module that permits applications -written in the Python programming language to use the interface -supplied by the libvirt library to use the virtualization capabilities -of recent versions of Linux (and other OSes). -%endif - -%if %{with_python3} %package -n python3-libvirt Summary: The libvirt virtualization API python3 binding Url: http://libvirt.org @@ -99,16 +45,15 @@ Obsoletes: libvirt-python3 <= 3.6.0-1%{?dist} %description -n python3-libvirt The python3-libvirt package contains a module that permits applications -written in the Python programming language to use the interface +written in the Python 3.x programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). -%endif %prep %setup -q # Unset execute bit for example scripts; it can introduce spurious -# RPM dependencies, like /usr/bin/python which can pull in python2 +# RPM dependencies, like /usr/bin/python3 # for the -python3 package find examples -type f -exec chmod 0644 \{\} \; @@ -118,56 +63,22 @@ echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}" exit 1 %endif -%if %{with_python2} -%if 0%{?fedora} || 0%{?rhel} >= 8 -%py2_build -%else -CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build -%endif -%endif -%if %{with_python3} %if 0%{?fedora} || 0%{?rhel} >= 8 %py3_build %else CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %endif -%endif %install -%if %{with_python2} -%if 0%{?fedora} || 0%{?rhel} >= 8 -%py2_install -%else -%{__python2} setup.py install --skip-build --root=%{buildroot} -%endif -%endif -%if %{with_python3} %if 0%{?fedora} || 0%{?rhel} >= 8 %py3_install %else %{__python3} setup.py install --skip-build --root=%{buildroot} %endif -%endif %check -%if %{with_python2} -%{__python2} setup.py test -%endif -%if %{with_python3} %{__python3} setup.py test -%endif -%if %{with_python2} -%files -n python2-libvirt -%doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ -%{python2_sitearch}/libvirt.py* -%{python2_sitearch}/libvirt_qemu.py* -%{python2_sitearch}/libvirt_lxc.py* -%{python2_sitearch}/libvirtmod* -%{python2_sitearch}/*egg-info -%endif - -%if %{with_python3} %files -n python3-libvirt %doc ChangeLog AUTHORS NEWS README COPYING COPYING.LESSER examples/ %{python3_sitearch}/libvirt.py* @@ -180,6 +91,5 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build %{python3_sitearch}/__pycache__/libvirtaio.cpython-*.py* %{python3_sitearch}/libvirtmod* %{python3_sitearch}/*egg-info -%endif %changelog diff --git a/libvirt-qemu-override.c b/libvirt-qemu-override.c index f166f6e..6ae95b4 100644 --- a/libvirt-qemu-override.c +++ b/libvirt-qemu-override.c @@ -4,13 +4,13 @@ * entry points where an automatically generated stub is * unpractical * - * Copyright (C) 2011-2014 Red Hat, Inc. + * Copyright (C) 2011-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, + via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H @@ -21,18 +21,10 @@ #include "libvirt-utils.h" #include "build/libvirt-qemu.h" -#if PY_MAJOR_VERSION > 2 -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ extern PyObject *PyInit_libvirtmod_qemu(void); -# else -extern PyObject *PyInit_cygvirtmod_qemu(void); -# endif #else -# ifndef __CYGWIN__ -extern void initlibvirtmod_qemu(void); -# else -extern void initcygvirtmod_qemu(void); -# endif +extern PyObject *PyInit_cygvirtmod_qemu(void); #endif #if 0 @@ -351,14 +343,13 @@ static PyMethodDef libvirtQemuMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION > 2 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ "libvirtmod_qemu", -# else +#else "cygvirtmod_qemu", -# endif +#endif NULL, -1, libvirtQemuMethods, @@ -369,11 +360,11 @@ static struct PyModuleDef moduledef = { }; PyObject * -# ifndef __CYGWIN__ +#ifndef __CYGWIN__ PyInit_libvirtmod_qemu -# else +#else PyInit_cygvirtmod_qemu -# endif +#endif (void) { PyObject *module; @@ -385,25 +376,3 @@ PyInit_cygvirtmod_qemu return module; } -#else /* ! PY_MAJOR_VERSION > 2 */ -void -# ifndef __CYGWIN__ -initlibvirtmod_qemu -# else -initcygvirtmod_qemu -# endif -(void) -{ - if (virInitialize() < 0) - return; - - /* initialize the python extension module */ - Py_InitModule((char *) -# ifndef __CYGWIN__ - "libvirtmod_qemu", -# else - "cygvirtmod_qemu", -# endif - libvirtQemuMethods); -} -#endif /* ! PY_MAJOR_VERSION > 2 */ diff --git a/libvirt-utils.c b/libvirt-utils.c index 78b94ca..d8ff11d 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -1,7 +1,7 @@ /* * libvirt-utils.c: misc helper APIs for python binding * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013-2019 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -274,11 +274,7 @@ setPyVirTypedParameter(PyObject *info, int nparams) { PyObject *key, *value; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int pos = 0; -#else Py_ssize_t pos = 0; -#endif virTypedParameterPtr temp = NULL, ret = NULL; Py_ssize_t size; ssize_t i; @@ -416,13 +412,6 @@ virPyDictToTypedParamOne(virTypedParameterPtr *params, type = VIR_TYPED_PARAM_LLONG; else type = VIR_TYPED_PARAM_ULLONG; -#if PY_MAJOR_VERSION < 3 - } else if (PyInt_Check(value)) { - if (PyInt_AS_LONG(value) < 0) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; -#endif } else if (PyFloat_Check(value)) { type = VIR_TYPED_PARAM_DOUBLE; } @@ -520,11 +509,7 @@ virPyDictToTypedParams(PyObject *dict, { PyObject *key; PyObject *value; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int pos = 0; -#else Py_ssize_t pos = 0; -#endif virTypedParameterPtr params = NULL; int n = 0; int max = 0; diff --git a/libvirt-utils.h b/libvirt-utils.h index cc3d278..82f0af8 100644 --- a/libvirt-utils.h +++ b/libvirt-utils.h @@ -139,11 +139,7 @@ int virReallocN(void *ptrptr, size_t size, size_t count) void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); -# if PY_MAJOR_VERSION > 2 -# define libvirt_PyString_Check PyUnicode_Check -# else -# define libvirt_PyString_Check PyString_Check -# endif +# define libvirt_PyString_Check PyUnicode_Check #define VIR_N_ELEMENTS(array) (sizeof(array) / sizeof(*(array))) diff --git a/sanitytest.py b/sanitytest.py index 0b415fd..1bedd55 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import lxml diff --git a/setup.py b/setup.py index 117f6ff..ea25dc0 100755 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from distutils.core import setup, Extension, Command from distutils.command.build import build @@ -17,6 +17,10 @@ import re import shutil import time +if sys.version_info[0] != 3: + print("libvirt-python requires Python 3.x to build") + sys.exit(1) + MIN_LIBVIRT = "0.9.11" MIN_LIBVIRT_LXC = "1.0.2" @@ -341,7 +345,7 @@ setup(name = 'libvirt-python', description = 'The libvirt virtualization API python binding', long_description = '''The libvirt-python package provides a module that permits applications -written in the Python programming language to call the interface +written in the Python 3.x programming language to call the interface supplied by the libvirt library, to manage the virtualization capabilities of recent versions of Linux (and other OSes).''', license = 'LGPLv2+', @@ -362,7 +366,6 @@ of recent versions of Linux (and other OSes).''', "Intended Audience :: Developers", "License :: OSI Approved :: GNU Lesser General Public License v2 or later (LGPLv2+)", "Programming Language :: Python", - "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", ] ) diff --git a/typewrappers.c b/typewrappers.c index 2507859..3b1df87 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -2,141 +2,88 @@ * types.c: converter functions between the internal representation * and the Python objects * - * Copyright (C) 2005, 2007, 2012 Red Hat, Inc. + * Copyright (C) 2005-2019 Red Hat, Inc. * * Daniel Veillard <veillard(a)redhat.com> */ /* Horrible kludge to work around even more horrible name-space pollution - * via Python.h. That file includes /usr/include/python2.5/pyconfig*.h, - * which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ + * via Python.h. That file includes /usr/include/python3.x/pyconfig*.h, + * which has over 180 autoconf-style HAVE_* definitions. Shame on them. */ #undef HAVE_PTHREAD_H #include "typewrappers.h" #include "libvirt-utils.h" -#ifndef Py_CAPSULE_H -typedef void(*PyCapsule_Destructor)(void *, void *); -#endif - static PyObject * libvirt_buildPyObject(void *cobj, const char *name, PyCapsule_Destructor destr) { - PyObject *ret; - -#ifdef Py_CAPSULE_H - ret = PyCapsule_New(cobj, name, destr); -#else - ret = PyCObject_FromVoidPtrAndDesc(cobj, (void *) name, destr); -#endif /* _TEST_CAPSULE */ - - return ret; + return PyCapsule_New(cobj, name, destr); } PyObject * libvirt_intWrap(int val) { - PyObject *ret; -#if PY_MAJOR_VERSION > 2 - ret = PyLong_FromLong((long) val); -#else - ret = PyInt_FromLong((long) val); -#endif - return ret; + return PyLong_FromLong((long) val); } PyObject * libvirt_uintWrap(uint val) { - PyObject *ret; -#if PY_MAJOR_VERSION > 2 - ret = PyLong_FromLong((long) val); -#else - ret = PyInt_FromLong((long) val); -#endif - return ret; + return PyLong_FromLong((long) val); } PyObject * libvirt_longWrap(long val) { - PyObject *ret; - ret = PyLong_FromLong(val); - return ret; + return PyLong_FromLong(val); } PyObject * libvirt_ulongWrap(unsigned long val) { - PyObject *ret; - ret = PyLong_FromLong(val); - return ret; + return PyLong_FromLong(val); } PyObject * libvirt_longlongWrap(long long val) { - PyObject *ret; - ret = PyLong_FromLongLong(val); - return ret; + return PyLong_FromLongLong(val); } PyObject * libvirt_ulonglongWrap(unsigned long long val) { - PyObject *ret; - ret = PyLong_FromUnsignedLongLong(val); - return ret; + return PyLong_FromUnsignedLongLong(val); } PyObject * libvirt_charPtrSizeWrap(char *str, Py_ssize_t size) { - PyObject *ret; - if (str == NULL) { return VIR_PY_NONE; } -#if PY_MAJOR_VERSION > 2 - ret = PyBytes_FromStringAndSize(str, size); -#else - ret = PyString_FromStringAndSize(str, size); -#endif - return ret; + return PyBytes_FromStringAndSize(str, size); } PyObject * libvirt_charPtrWrap(char *str) { - PyObject *ret; - if (str == NULL) { return VIR_PY_NONE; } -#if PY_MAJOR_VERSION > 2 - ret = PyUnicode_FromString(str); -#else - ret = PyString_FromString(str); -#endif - return ret; + return PyUnicode_FromString(str); } PyObject * libvirt_constcharPtrWrap(const char *str) { - PyObject *ret; - if (str == NULL) { return VIR_PY_NONE; } -#if PY_MAJOR_VERSION > 2 - ret = PyUnicode_FromString(str); -#else - ret = PyString_FromString(str); -#endif - return ret; + return PyUnicode_FromString(str); } PyObject * @@ -163,11 +110,7 @@ libvirt_intUnwrap(PyObject *obj, * to C long type directly. If it is of PyLong_Type, PyInt_AsLong * will call PyLong_AsLong() to deal with it automatically. */ -#if PY_MAJOR_VERSION > 2 long_val = PyLong_AsLong(obj); -#else - long_val = PyInt_AsLong(obj); -#endif if ((long_val == -1) && PyErr_Occurred()) return -1; @@ -196,11 +139,7 @@ libvirt_uintUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION > 2 long_val = PyLong_AsLong(obj); -#else - long_val = PyInt_AsLong(obj); -#endif if ((long_val == -1) && PyErr_Occurred()) return -1; @@ -269,14 +208,7 @@ libvirt_longlongUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION == 2 - /* If obj is of PyInt_Type, PyLong_AsLongLong - * will call PyInt_AsLong() to handle it automatically. - */ - if (PyInt_Check(obj) || PyLong_Check(obj)) -#else if (PyLong_Check(obj)) -#endif llong_val = PyLong_AsLongLong(obj); else PyErr_SetString(PyExc_TypeError, "an integer is required"); @@ -299,21 +231,7 @@ libvirt_ulonglongUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION == 2 - /* The PyLong_AsUnsignedLongLong doesn't check the type of - * obj, only accept argument of PyLong_Type, so we check it instead. - */ - if (PyInt_Check(obj)) { - long long llong_val = PyInt_AsLong(obj); - if (llong_val < 0) - PyErr_SetString(PyExc_OverflowError, - "negative Python int cannot be converted to C unsigned long long"); - else - ullong_val = llong_val; - } else if (PyLong_Check(obj)) { -#else if (PyLong_Check(obj)) { -#endif ullong_val = PyLong_AsUnsignedLongLong(obj); } else { PyErr_SetString(PyExc_TypeError, "an integer is required"); @@ -367,9 +285,7 @@ int libvirt_charPtrUnwrap(PyObject *obj, char **str) { -#if PY_MAJOR_VERSION > 2 PyObject *bytes; -#endif const char *ret; *str = NULL; if (!obj) { @@ -377,21 +293,15 @@ libvirt_charPtrUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION > 2 if (!(bytes = PyUnicode_AsUTF8String(obj))) return -1; ret = PyBytes_AsString(bytes); -#else - ret = PyString_AsString(obj); -#endif if (ret) { *str = strdup(ret); if (!*str) PyErr_NoMemory(); } -#if PY_MAJOR_VERSION > 2 Py_DECREF(bytes); -#endif return ret && *str ? 0 : -1; } @@ -400,10 +310,6 @@ libvirt_charPtrSizeUnwrap(PyObject *obj, char **str, Py_ssize_t *size) { - int ret; -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION <= 4 - int isize; -#endif *str = NULL; *size = 0; if (!obj) { @@ -411,18 +317,7 @@ libvirt_charPtrSizeUnwrap(PyObject *obj, return -1; } -#if PY_MAJOR_VERSION > 2 - ret = PyBytes_AsStringAndSize(obj, str, size); -#else -# if PY_MINOR_VERSION <= 4 - ret = PyString_AsStringAndSize(obj, str, &isize); - *size = isize; -# else - ret = PyString_AsStringAndSize(obj, str, size); -# endif -#endif - - return ret; + return PyBytes_AsStringAndSize(obj, str, size); } PyObject * diff --git a/typewrappers.h b/typewrappers.h index 486017a..fc923bf 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -22,11 +22,6 @@ # define ATTRIBUTE_UNUSED #endif -/* Work around really old python. */ -#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5 -typedef ssize_t Py_ssize_t; -#endif - #if !LIBVIR_CHECK_VERSION(4, 5, 0) typedef struct _virNWFilterBinding *virNWFilterBindingPtr; #endif -- 2.21.0

2 1

[libvirt] [PATCH] tests: stop linking virt tests to secondary drivers
by Daniel P. Berrangé 03 Dec '19

03 Dec '19

The hard dependancy between the virt drivers and the network or storage drivers was removed quite a while back now, so the tests no longer need to link to these drivers. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/Makefile.am | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index e009de830c..ac4c0e1a3a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -500,11 +500,10 @@ sockettest_SOURCES = \ sockettest_LDADD = $(LDADDS) if WITH_LIBXL -libxl_LDADDS = ../src/libvirt_driver_libxl_impl.la -if WITH_NETWORK -libxl_LDADDS += ../src/libvirt_driver_network_impl.la -endif WITH_NETWORK -libxl_LDADDS += $(LDADDS) +libxl_LDADDS = \ + ../src/libvirt_driver_libxl_impl.la \ + $(LDADDS) \ + $(NULL) libxltestdriver_la_SOURCES = libxltestdriver_la_LDFLAGS = $(DRIVERLIB_LDFLAGS) @@ -547,12 +546,6 @@ if WITH_QEMU libqemumonitortestutils_la_SOURCES = $(QEMUMONITORTESTUTILS_SOURCES) qemu_LDADDS = ../src/libvirt_driver_qemu_impl.la -if WITH_NETWORK -qemu_LDADDS += ../src/libvirt_driver_network_impl.la -endif WITH_NETWORK -if WITH_STORAGE -qemu_LDADDS += ../src/libvirt_driver_storage_impl.la -endif WITH_STORAGE if WITH_DTRACE_PROBES qemu_LDADDS += ../src/libvirt_qemu_probes.lo endif WITH_DTRACE_PROBES @@ -733,11 +726,10 @@ endif ! WITH_QEMU if WITH_LXC -lxc_LDADDS = ../src/libvirt_driver_lxc_impl.la -if WITH_NETWORK -lxc_LDADDS += ../src/libvirt_driver_network_impl.la -endif WITH_NETWORK -lxc_LDADDS += $(LDADDS) +lxc_LDADDS = \ + ../src/libvirt_driver_lxc_impl.la \ + $(LDADDS) \ + $(NULL) lxcxml2xmltest_SOURCES = \ lxcxml2xmltest.c testutilslxc.c testutilslxc.h \ @@ -818,11 +810,10 @@ libbhyveargv2xmlmock_la_SOURCES = \ libbhyveargv2xmlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) libbhyveargv2xmlmock_la_LIBADD = $(MOCKLIBS_LIBS) -bhyve_LDADDS = ../src/libvirt_driver_bhyve_impl.la -if WITH_STORAGE -bhyve_LDADDS += ../src/libvirt_driver_storage_impl.la -endif WITH_STORAGE -bhyve_LDADDS += $(LDADDS) +bhyve_LDADDS = \ + ../src/libvirt_driver_bhyve_impl.la \ + $(LDADDS) \ + $(NULL) bhyvexml2argvtest_SOURCES = \ bhyvexml2argvtest.c \ testutils.c testutils.h -- 2.21.0

2 1

[libvirt] [PATCH] spec: mingw: add deps for genprotocol.pl usage
by Cole Robinson 03 Dec '19

03 Dec '19

As of 0985a9597bb03 we no longer distribute generated files. mingw needs to call genprotocol.pl itself, which means it needs rpcgen and cpp installed. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- mingw-libvirt.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index c29f3eeed2..fd9b729591 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -89,6 +89,10 @@ BuildRequires: mingw64-libssh2 BuildRequires: mingw32-curl BuildRequires: mingw64-curl %endif +BuildRequires: cpp +%if 0%{?fedora} || 0%{?rhel} > 7 +BuildRequires: rpcgen +%endif BuildArch: noarch -- 2.23.0

2 1

[libvirt] [PATCH v2] driver: Include source as a flag to virDomainGetHostname
by Julio Faracco 03 Dec '19

03 Dec '19

There is a lots of possibilities to retrieve hostname information from domain. Libvirt could use lease information from dnsmasq to get current hostname too. QEMU supports QEMU-agent but it can use lease source. See 'domifaddr' as an example. This commit still adds lease options for QEMU. It will get the first hostname available from domain networks. This case, every driver has a default section inside switch to keep compatibility. So, if someone call 'domhostname' without specifying source, it will get the default option. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- include/libvirt/libvirt-domain.h | 5 +++ src/lxc/lxc_driver.c | 71 ++++++++++++++++++++++++++++++++ src/openvz/openvz_driver.c | 30 ++++++++++---- src/qemu/qemu_driver.c | 69 ++++++++++++++++++++++++++----- tools/virsh-domain.c | 25 ++++++++++- 5 files changed, 178 insertions(+), 22 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index a2f007568c..b37f33d5d0 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4790,6 +4790,11 @@ typedef struct _virTypedParameter virMemoryParameter; */ typedef virMemoryParameter *virMemoryParameterPtr; +typedef enum { + VIR_DOMAIN_HOSTNAME_SRC_LEASE = (1 << 0), /* Parse DHCP lease file */ + VIR_DOMAIN_HOSTNAME_SRC_AGENT = (1 << 1), /* Query qemu guest agent */ +} virDomainHostnameSource; + typedef enum { VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE = 0, /* Parse DHCP lease file */ VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT = 1, /* Query qemu guest agent */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 826bf074e3..3221b06261 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5321,6 +5321,76 @@ lxcDomainGetCPUStats(virDomainPtr dom, return ret; } +static char * +lxcDomainGetHostname(virDomainPtr dom, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virNetwork) network = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + int n_leases; + size_t i, j; + char *hostname = NULL; + + virCheckFlags(VIR_DOMAIN_HOSTNAME_SRC_LEASE | + VIR_DOMAIN_HOSTNAME_SRC_AGENT, NULL); + + if (!(vm = lxcDomObjFromDomain(dom))) + return NULL; + + if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + switch (flags) { + default: + case VIR_DOMAIN_HOSTNAME_SRC_LEASE: + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + virObjectUnref(network); + network = virNetworkLookupByName(dom->conn, + vm->def->nets[i]->data.network.name); + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("There is no available hostname %d"), + flags); + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + if (lease->hostname) { + hostname = g_strdup(lease->hostname); + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + + goto cleanup; + } + } + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + } + break; + case VIR_DOMAIN_HOSTNAME_SRC_AGENT: + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unknown hostname data source %d"), + flags); + break; + } + + cleanup: + virDomainObjEndAPI(&vm); + return hostname; +} static int lxcNodeGetFreePages(virConnectPtr conn, @@ -5467,6 +5537,7 @@ static virHypervisorDriver lxcHypervisorDriver = { .domainSetMetadata = lxcDomainSetMetadata, /* 1.1.3 */ .domainGetMetadata = lxcDomainGetMetadata, /* 1.1.3 */ .domainGetCPUStats = lxcDomainGetCPUStats, /* 1.2.2 */ + .domainGetHostname = lxcDomainGetHostname, /* 5.9.0 */ .nodeGetMemoryParameters = lxcNodeGetMemoryParameters, /* 0.10.2 */ .nodeSetMemoryParameters = lxcNodeSetMemoryParameters, /* 0.10.2 */ .domainSendProcessSignal = lxcDomainSendProcessSignal, /* 1.0.1 */ diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index e07b3b302d..c9f8255f19 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -301,19 +301,31 @@ openvzDomainGetHostname(virDomainPtr dom, unsigned int flags) struct openvz_driver *driver = dom->conn->privateData; virDomainObjPtr vm; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_HOSTNAME_SRC_LEASE | + VIR_DOMAIN_HOSTNAME_SRC_AGENT, NULL); + if (!(vm = openvzDomObjFromDomain(driver, dom->uuid))) return NULL; - hostname = openvzVEGetStringParam(dom, "hostname"); - if (hostname == NULL) - goto cleanup; + switch (flags) { + default: + hostname = openvzVEGetStringParam(dom, "hostname"); + if (hostname == NULL) + goto cleanup; - /* vzlist prints an unset hostname as '-' */ - if (STREQ(hostname, "-")) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Hostname of '%s' is unset"), vm->def->name); - VIR_FREE(hostname); + /* vzlist prints an unset hostname as '-' */ + if (STREQ(hostname, "-")) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Hostname of '%s' is unset"), vm->def->name); + VIR_FREE(hostname); + } + break; + case VIR_DOMAIN_HOSTNAME_SRC_AGENT: + case VIR_DOMAIN_HOSTNAME_SRC_LEASE: + virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, + _("Unknown hostname data source %d"), + flags); + break; } cleanup: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b5300241a8..928f75cafe 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20090,9 +20090,15 @@ qemuDomainGetHostname(virDomainPtr dom, virQEMUDriverPtr driver = dom->conn->privateData; virDomainObjPtr vm = NULL; qemuAgentPtr agent; + char macaddr[VIR_MAC_STRING_BUFLEN]; + g_autoptr(virNetwork) network = NULL; + virNetworkDHCPLeasePtr *leases = NULL; + int n_leases; + size_t i, j; char *hostname = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_DOMAIN_HOSTNAME_SRC_LEASE | + VIR_DOMAIN_HOSTNAME_SRC_AGENT, NULL); if (!(vm = qemuDomainObjFromDomain(dom))) return NULL; @@ -20100,21 +20106,62 @@ qemuDomainGetHostname(virDomainPtr dom, if (virDomainGetHostnameEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) - goto cleanup; - if (virDomainObjCheckActive(vm) < 0) goto endjob; - if (!qemuDomainAgentAvailable(vm, true)) - goto endjob; + switch (flags) { + default: + case VIR_DOMAIN_HOSTNAME_SRC_AGENT: + if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_QUERY) < 0) + goto cleanup; - agent = qemuDomainObjEnterAgent(vm); - ignore_value(qemuAgentGetHostname(agent, &hostname)); - qemuDomainObjExitAgent(vm, agent); + if (!qemuDomainAgentAvailable(vm, true)) + goto endjob; - endjob: - qemuDomainObjEndAgentJob(vm); + agent = qemuDomainObjEnterAgent(vm); + ignore_value(qemuAgentGetHostname(agent, &hostname)); + qemuDomainObjExitAgent(vm, agent); + + endjob: + qemuDomainObjEndAgentJob(vm); + break; + case VIR_DOMAIN_HOSTNAME_SRC_LEASE: + for (i = 0; i < vm->def->nnets; i++) { + if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) + continue; + + virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); + virObjectUnref(network); + network = virNetworkLookupByName(dom->conn, + vm->def->nets[i]->data.network.name); + + if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, + &leases, 0)) < 0) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("There is no available hostname %d"), + flags); + + for (j = 0; j < n_leases; j++) { + virNetworkDHCPLeasePtr lease = leases[j]; + if (lease->hostname) { + hostname = g_strdup(lease->hostname); + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + + goto cleanup; + } + } + + for (j = 0; j < n_leases; j++) + virNetworkDHCPLeaseFree(leases[j]); + + VIR_FREE(leases); + } + break; + } cleanup: virDomainObjEndAPI(&vm); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6be9780836..01de6b633a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11669,6 +11669,10 @@ static const vshCmdInfo info_domhostname[] = { static const vshCmdOptDef opts_domhostname[] = { VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), + {.name = "source", + .type = VSH_OT_STRING, + .flags = VSH_OFLAG_NONE, + .help = N_("address source: 'lease' or 'agent'")}, {.name = NULL} }; @@ -11678,21 +11682,38 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) char *hostname; virDomainPtr dom; bool ret = false; + const char *sourcestr = NULL; + int flags = 0; /* Use default value. Drivers can have its own default. */ if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; - hostname = virDomainGetHostname(dom, 0); + if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0) + goto error; + + if (sourcestr) { + if (STREQ(sourcestr, "lease")) { + flags |= VIR_DOMAIN_HOSTNAME_SRC_LEASE; + } else if (STREQ(sourcestr, "agent")) { + flags |= VIR_DOMAIN_HOSTNAME_SRC_AGENT; + } else { + vshError(ctl, _("Unknown data source '%s'"), sourcestr); + goto error; + } + } + + hostname = virDomainGetHostname(dom, flags); if (hostname == NULL) { vshError(ctl, "%s", _("failed to get hostname")); goto error; } vshPrint(ctl, "%s\n", hostname); + + VIR_FREE(hostname); ret = true; error: - VIR_FREE(hostname); virshDomainFree(dom); return ret; } -- 2.20.1

2 1