- Devel - libvirt List Archives

[libvirt] [PATCH 00/22] qemu: Clean up typed parameter handling in bulk stats
by Peter Krempa 24 Sep '19

24 Sep '19

While investigating whether block bulk stats work properly with blockdev I got irritated by macros hiding gotos. Refactor the stats tracking by introducing few new typed parameter handlers. Peter Krempa (22): util: typedparam: Split out public APIs into a separate file util: typedparam: Purge public bits from virTypedParamsGetStringList util: typedparam: Move and unexport virTypedParameterAssignFromStr util: typedparam: Remove pointless cleanup label from virTypedParameterAssignFromStr docs: apibuild: Purge irrelevant typed parameter APIs from ignore util: typedparam: Separate code to assign value to typed parameter util: typedparam: Optionally copy strings passed to virTypedParameterAssignValue util: typedparam: Simplify handling of lists of typed parameters qemu: Remove stale comment for qemuDomainBlockStats qemu: monitor: Refactor cleanup in qemuMonitorJSONBlockStatsCollectData qemu: monitor: Refactor cleanup in qemuMonitorJSONGetOneBlockStatsInfo qemu: monitor: Refactor cleanup in qemuMonitorJSONGetAllBlockStatsInfo qemu: monitor: Change fields in qemuBlockStats to 'unsigned' qemu: driver: Remove pointless macro QEMU_BLOCK_STAT_TOTAL qemu: driver: Don't return anything from qemuDomainBlockStatsGatherTotals qemu: driver: Remove QEMU_ADD_BLOCK_PARAM_LL macro qemu: Use virTypedParamList in the bulk stats gathering functions qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsOneBlockFallback qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsOneBlock qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsBlockExportBackendStorage qemu: driver: Stop using QEMU_ADD_BLOCK_PARAM_ULL in qemuDomainGetStatsBlockExportFrontend qemu: driver: Remove unused cleanup labels in stats gathering functions docs/Makefile.am | 2 +- docs/apibuild.py | 7 +- src/libvirt_private.syms | 10 +- src/qemu/qemu_driver.c | 635 ++++++----------- src/qemu/qemu_monitor.h | 16 +- src/qemu/qemu_monitor_json.c | 57 +- src/util/Makefile.inc.am | 1 + src/util/virtypedparam-public.c | 886 ++++++++++++++++++++++++ src/util/virtypedparam.c | 1129 +++++++------------------------ src/util/virtypedparam.h | 67 +- 10 files changed, 1440 insertions(+), 1370 deletions(-) create mode 100644 src/util/virtypedparam-public.c -- 2.21.0

2 44

[libvirt] [libvirt-tck PATCH] conf: Drop UML from the suite
by Erik Skultety 24 Sep '19

24 Sep '19

Libvirt dropped UML in v5.0.0 so there's no reason for us not to follow along. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- conf/default.cfg | 26 -------------------------- lib/Sys/Virt/TCK.pm | 2 -- 2 files changed, 28 deletions(-) diff --git a/conf/default.cfg b/conf/default.cfg index d9fd0cb..39d9b04 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -95,32 +95,6 @@ kernels = ( kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/… initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/… } - # User mode linux i686 needs custom kernel + root filesystem - { - arch = i686 - ostype = uml - kernel = { - source = http://user-mode-linux.sourceforge.net/linux-2.6.24-rc7.bz2 - uncompress = bzip2 - } - disk = { - source = http://fs.devloop.org.uk/filesystems/Fedora13/Fedora13-x86-root_fs.bz2 - uncompress = bzip2 - } - } - # User mode linux x86_64 needs custom kernel + root filesystem - { - arch = x86_64 - ostype = uml - kernel = { - source = http://user-mode-linux.sourceforge.net/linux-2.6.24-x86_64.bz2 - uncompress = bzip2 - } - disk = { - source = http://fs.devloop.org.uk/filesystems/Fedora13/Fedora13-AMD64-root_fs.bz2 - uncompress = bzip2 - } - } # LXC containers need a virtual container filesystem somewhere # { # arch = x86_64 diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index 3ea06cc..a641d01 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -681,8 +681,6 @@ sub get_disk_dev { my $dev; if ($ostype eq "xen") { $dev = "xvda"; - } elsif ($ostype eq "uml") { - $dev = "ubda"; } elsif ($ostype eq "hvm") { if ($domain eq "kvm" || $domain eq "qemu" || -- 2.20.1

2 1

[libvirt] [libvirt-tck PATCH] domain: Relax the checks matching disk sizes
by Erik Skultety 24 Sep '19

24 Sep '19

There may be some preallocation going on depending on what host filesystem is in place which may mess up the numbers we expect mainly in allocation, so let's stick with exact matching of the capacity and relaxing the checks on allocation and physical size as commit 30beeb2e did. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- scripts/domain/121-block-info.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-info.t index bfff48c..d9d644e 100644 --- a/scripts/domain/121-block-info.t +++ b/scripts/domain/121-block-info.t @@ -98,8 +98,8 @@ ok_domain(sub { $dom = $conn->create_domain($xml) }, "Create domain"); $xml = $dom->get_xml_description(); is($dom->get_block_info($dst2,0)->{capacity}, 1024*1024*50, "Get disk capacity info"); -is($dom->get_block_info($dst2,0)->{allocation}, 1024*1024, "Get disk allocation info"); -is($dom->get_block_info($dst2,0)->{physical}, 1024*1024*50, "Get disk physical info"); +ok($dom->get_block_info($dst2,0)->{allocation} >= 1024*1024, "Get disk allocation info"); +ok($dom->get_block_info($dst2,0)->{physical} >= 1024*1024*50, "Get disk physical info"); is($dom->get_block_info($dst,0)->{capacity}, 1024*1024*50, "Get disk capacity info"); -- 2.20.1

2 1

[libvirt] [libvirt-tck PATCH] conf: Upgrade the used version of fedora to 30
by Erik Skultety 24 Sep '19

24 Sep '19

Fedora 28 is already EOL and the URLs don't work anymore either because EOL resources eventually move to http://archives.fedoraproject.org/pub/archive/fedora/ from https://dl.fedoraproject.org/pub/fedora/linux/releases/. --- Notes: I'm wondering whether we shouldn't drop the secondary i686 sections as well since i686 will die starting with fedora 31. On a similar note with UML, upstream libvirt dropped it a while ago. conf/default.cfg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/default.cfg b/conf/default.cfg index b97688e..d9fd0cb 100644 --- a/conf/default.cfg +++ b/conf/default.cfg @@ -49,7 +49,7 @@ images = ( hvm xen ) - osname = fedora-28 + osname = fedora-30 } ) @@ -75,25 +75,25 @@ images = ( # empty sparse root FS will be created # kernels = ( - # Fedora 28 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here + # Fedora 30 i686 PAE has pv_ops, so one kernel can do both Xen and KVM guests here { arch = i686 ostype = ( hvm xen ) - kernel = http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i38… - initrd = http://dl.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i38… + kernel = http://dl.fedoraproject.org/pub/fedora-secondary/releases/30/Everything/i38… + initrd = http://dl.fedoraproject.org/pub/fedora-secondary/releases/30/Everything/i38… } - # Fedora 28 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here + # Fedora 30 x86_64 has pv_ops, so one kernel can do both Xen and KVM guests here { arch = x86_64 ostype = ( hvm xen ) - kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/… - initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/… + kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/… + initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/… } # User mode linux i686 needs custom kernel + root filesystem { -- 2.20.1

3 3

[libvirt] [libvirt-tck PATCH] TCK.pm: Define libvirt VMs with an RNG device
by Erik Skultety 24 Sep '19

24 Sep '19

The nwfilter 220-no-ip-spoofing.t test relies on an SSH connection to the test VM. However, because the domain definition passed to libvirt lacks an RNG device, the SSH server isn't started inside the guest (even though that is the default on virt-builder images) and therefore: "ssh: connect to host 192.168.122.227 port 22: Connection refused" is returned which in turn makes a bunch of sub tests fail because the very basic premise - a working SSH connection - is false. This patch makes sure a virtio RNG is contained in the XML definition, thus causing the SSH server to be started successfully, thus allowing all the subtests to pass. --- lib/Sys/Virt/TCK.pm | 4 ++++ lib/Sys/Virt/TCK/DomainBuilder.pm | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index 389d5cc..3ea06cc 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -807,6 +807,8 @@ sub generic_machine_domain { $b->disk(src => $config{root}, dst => $config{dev}, type => "file"); + $b->rng(backend_model => "random", + backend => "/dev/urandom"); if ($config{firstboot}) { print "# Running the first boot\n"; @@ -865,6 +867,8 @@ sub generic_machine_domain { dst => $config{dev}, type => "file", shareable => $shareddisk); + $b->rng(backend_model => "random", + backend => "/dev/urandom"); return $b; } } diff --git a/lib/Sys/Virt/TCK/DomainBuilder.pm b/lib/Sys/Virt/TCK/DomainBuilder.pm index 45336b5..be8708f 100644 --- a/lib/Sys/Virt/TCK/DomainBuilder.pm +++ b/lib/Sys/Virt/TCK/DomainBuilder.pm @@ -49,6 +49,7 @@ sub new { graphics => [], hostdevs => [], seclabel => {}, + rng => {}, }; bless $self, $class; @@ -328,6 +329,19 @@ sub seclabel { return $self; } +sub rng { + my $self = shift; + my %params = @_; + + die "backend model parameter is required" unless $params{backend_model}; + die "backend parameter is required" unless $params{backend}; + + $self->{rng} = \%params; + $self->{rng}->{model} = "virtio" unless defined $self->{rng}->{model}; + + return $self; +} + sub as_xml { my $self = shift; @@ -504,6 +518,13 @@ sub as_xml { $w->endTag("graphics"); } $w->emptyTag("console", type => "pty"); + + $w->startTag("rng", + model => $self->{rng}->{model}); + $w->dataElement("backend", $self->{rng}->{backend}, + model => $self->{rng}->{backend_model}); + $w->endTag("rng"); + $w->endTag("devices"); if ($self->{seclabel}->{model}) { $w->startTag("seclabel", -- 2.20.1

3 8

[libvirt] [PATCH 0/4] Sanitize restrictions imposed by VIR_DOMAIN_START_AUTODESTROY
by Peter Krempa 24 Sep '19

24 Sep '19

Migration to a different host is the only reasonable restriction that should apply. Fix the wording in the docs and remove the restrictions of saving the VM, taking a snapshot and taking a checkpoint. Peter Krempa (4): lib: Lessen restrictions on VIR_DOMAIN_START_AUTODESTROY qemu: migration: Forbid only remote migration if autodestroy is active for VM qemu: snapshot: Don't forbid snapshot if autodestroy is registered qemu: checkpoint: Don't forbid checkpoint when VM is marked for autodestroy src/libvirt-domain.c | 9 ++++++--- src/qemu/qemu_driver.c | 12 ------------ src/qemu/qemu_migration.c | 3 ++- 3 files changed, 8 insertions(+), 16 deletions(-) -- 2.21.0

2 8

[libvirt] [jenkins-ci PATCH 0/4] Switch libosinfo builds to Meson
by Fabiano Fidêncio 24 Sep '19

24 Sep '19

Subject says it all, basically. It's important to note that we will add the whole machinery to install meson via pip and build the projects in platforms where the minimum required version of meson is not present, I really would like to go ahead with this patch as soon as I can have the libosinfo MR acked. Fabiano Fidêncio (4): libosinfo: Add meson dependency Only build libosinfo on systems with meson >= 0.49.0 Update libosinfo's archive_format Switch libosinfo builds to Meson guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-9/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/host_vars/libvirt-ubuntu-18/main.yml | 1 - .../build/projects/libosinfo+mingw32.yml | 6 ++--- .../build/projects/libosinfo+mingw64.yml | 6 ++--- guests/playbooks/build/projects/libosinfo.yml | 26 ++++++++++++++----- guests/vars/projects/libosinfo+mingw32.yml | 1 + guests/vars/projects/libosinfo+mingw64.yml | 1 + guests/vars/projects/libosinfo.yml | 1 + jenkins/projects/libosinfo+mingw32.yaml | 6 ++--- jenkins/projects/libosinfo+mingw64.yaml | 6 ++--- jenkins/projects/libosinfo.yaml | 26 +++++++++++++------ 13 files changed, 52 insertions(+), 31 deletions(-) -- 2.23.0

2 6

[libvirt] [PATCH 00/10] remove repetition of URI path validation
by Daniel Henrique Barboza 23 Sep '19

23 Sep '19

This is a code repetition that I crossed a few times, then I noticed that Cole Robinson suggested a solution for it in the wiki. Here it is. Daniel Henrique Barboza (10): src/driver.c: add virConnectValidateURIPath() interface_backend_netcf.c: use virConnectValidateURIPath() interface_backend_udev.c: use virConnectValidateURIPath() bridge_driver.c: virConnectValidateURIPath() node_device_driver.c: use virConnectValidateURIPath() secret_driver.c: use virConnectValidateURIPath() storage_driver.c: use virConnectValidateURIPath() qemu_driver.c: use virConnectValidateURIPath() vbox_common.c: use virConnectValidateURIPath() vbox_driver.c: use virConnectValidateURIPath() src/driver.c | 25 +++++++++++++++++++++++++ src/driver.h | 4 ++++ src/interface/interface_backend_netcf.c | 17 ++--------------- src/interface/interface_backend_udev.c | 17 ++--------------- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 19 ++++--------------- src/node_device/node_device_driver.c | 17 ++--------------- src/qemu/qemu_driver.c | 20 ++++---------------- src/secret/secret_driver.c | 17 ++--------------- src/storage/storage_driver.c | 17 ++--------------- src/vbox/vbox_common.c | 16 ++-------------- src/vbox/vbox_driver.c | 16 ++-------------- 12 files changed, 52 insertions(+), 134 deletions(-) -- 2.21.0

2 12

[libvirt] [PATCH] build: ensure Makefile.inc.am is checked for long lines
by Daniel P. Berrangé 23 Sep '19

23 Sep '19

The filename match rule was accidentally excluding the Makefile.inc.am files from the long lines check. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- cfg.mk | 2 +- src/interface/Makefile.inc.am | 6 ++++-- src/libxl/Makefile.inc.am | 5 ++++- src/network/Makefile.inc.am | 6 ++++-- src/node_device/Makefile.inc.am | 6 ++++-- src/nwfilter/Makefile.inc.am | 6 ++++-- src/secret/Makefile.inc.am | 6 ++++-- src/storage/Makefile.inc.am | 27 ++++++++++++++++++--------- 8 files changed, 43 insertions(+), 21 deletions(-) diff --git a/cfg.mk b/cfg.mk index a7c883830f..3731a2830b 100644 --- a/cfg.mk +++ b/cfg.mk @@ -737,7 +737,7 @@ sc_prohibit_long_lines: halt='Wrap long lines in expected output files' \ $(_sc_search_regexp) @prohibit='.{80}' \ - in_vc_files='Makefile\.am' \ + in_vc_files='Makefile(\.inc)?\.am' \ halt='Wrap long lines in Makefiles' \ $(_sc_search_regexp) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index a88df0bd11..baa85b4ba9 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -75,10 +75,12 @@ VIRTINTERFACED_UNIT_VARS = \ -e 's|[@]sockprefix[@]|virtinterfaced|g' \ $(NULL) -virtinterfaced.service: interface/virtinterfaced.service.in $(top_builddir)/config.status +virtinterfaced.service: interface/virtinterfaced.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@ -virtinterface%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status +virtinterface%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@ interface/virtinterfaced.conf: remote/libvirtd.conf.in diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am index a2151162e6..18a06a47d1 100644 --- a/src/libxl/Makefile.inc.am +++ b/src/libxl/Makefile.inc.am @@ -80,9 +80,12 @@ SYSTEMD_UNIT_FILES_IN += \ libxl/virtxend.service.in \ $(NULL) +LIBXL_UNIT_COND="ConditionPathExists=/proc/xen/capabilities" +LIBXL_UNIT_CONFLICT="Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)" + VIRTXEND_UNIT_VARS = \ $(COMMON_UNIT_VARS) \ - -e 's|[@]deps[@]|Conflicts=$(LIBVIRTD_SOCKET_UNIT_FILES)\nConditionPathExists=/proc/xen/capabilities|g' \ + -e 's|[@]deps[@]|$(LIBXL_UNIT_CONFLICT)\n$(LIBXL_UNIT_COND)|g' \ -e 's|[@]name[@]|Libvirt libxl|g' \ -e 's|[@]service[@]|virtxend|g' \ -e 's|[@]sockprefix[@]|virtxend|g' \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 9f20dad7b3..17467a65ad 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -82,10 +82,12 @@ VIRTNETWORKD_UNIT_VARS = \ -e 's|[@]sockprefix[@]|virtnetworkd|g' \ $(NULL) -virtnetworkd.service: network/virtnetworkd.service.in $(top_builddir)/config.status +virtnetworkd.service: network/virtnetworkd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@ -virtnetwork%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status +virtnetwork%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@ network/virtnetworkd.conf: remote/libvirtd.conf.in diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am index 5a6525d843..eac7f92e88 100644 --- a/src/node_device/Makefile.inc.am +++ b/src/node_device/Makefile.inc.am @@ -98,10 +98,12 @@ VIRTNODEDEVD_UNIT_VARS = \ -e 's|[@]sockprefix[@]|virtnodedevd|g' \ $(NULL) -virtnodedevd.service: node_device/virtnodedevd.service.in $(top_builddir)/config.status +virtnodedevd.service: node_device/virtnodedevd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@ -virtnodedev%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status +virtnodedev%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@ node_device/virtnodedevd.conf: remote/libvirtd.conf.in diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 7693634e29..6acb45705c 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -83,10 +83,12 @@ VIRTNWFILTERD_UNIT_VARS = \ -e 's|[@]sockprefix[@]|virtnwfilterd|g' \ $(NULL) -virtnwfilterd.service: nwfilter/virtnwfilterd.service.in $(top_builddir)/config.status +virtnwfilterd.service: nwfilter/virtnwfilterd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@ -virtnwfilter%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status +virtnwfilter%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@ nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 37f816406e..76bc67418c 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -71,10 +71,12 @@ VIRTSECRETD_UNIT_VARS = \ -e 's|[@]sockprefix[@]|virtsecretd|g' \ $(NULL) -virtsecretd.service: secret/virtsecretd.service.in $(top_builddir)/config.status +virtsecretd.service: secret/virtsecretd.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@ -virtsecret%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status +virtsecret%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@ secret/virtsecretd.conf: remote/libvirtd.conf.in diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index fd0d57d2b6..4dccb14ac1 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -175,10 +175,12 @@ VIRTSTORAGED_UNIT_VARS = \ -e 's|[@]sockprefix[@]|virtstoraged|g' \ $(NULL) -virtstoraged.service: storage/virtstoraged.service.in $(top_builddir)/config.status +virtstoraged.service: storage/virtstoraged.service.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@ -virtstorage%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status +virtstorage%.socket: remote/libvirt%.socket.in \ + $(top_builddir)/config.status $(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@ storage/virtstoraged.conf: remote/libvirtd.conf.in @@ -264,7 +266,8 @@ libvirt_storage_backend_iscsi_la_LIBADD = \ endif WITH_STORAGE_ISCSI if WITH_STORAGE_ISCSI_DIRECT -libvirt_storage_backend_iscsi_direct_la_SOURCES = $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) +libvirt_storage_backend_iscsi_direct_la_SOURCES = \ + $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES) libvirt_storage_backend_iscsi_direct_la_CFLAGS = \ -I$(srcdir)/conf \ -I$(srcdir)/secret \ @@ -346,13 +349,15 @@ libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD) endif WITH_STORAGE_RBD if WITH_STORAGE_SHEEPDOG -libvirt_storage_backend_sheepdog_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +libvirt_storage_backend_sheepdog_la_SOURCES = \ + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) libvirt_storage_backend_sheepdog_la_CFLAGS = \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) -libvirt_storage_backend_sheepdog_priv_la_SOURCES = $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +libvirt_storage_backend_sheepdog_priv_la_SOURCES = \ + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) libvirt_storage_backend_sheepdog_priv_la_CFLAGS = \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ @@ -368,7 +373,8 @@ libvirt_storage_backend_sheepdog_la_LIBADD = \ endif WITH_STORAGE_SHEEPDOG if WITH_STORAGE_GLUSTER -libvirt_storage_backend_gluster_la_SOURCES = $(STORAGE_DRIVER_GLUSTER_SOURCES) +libvirt_storage_backend_gluster_la_SOURCES = \ + $(STORAGE_DRIVER_GLUSTER_SOURCES) libvirt_storage_backend_gluster_la_LIBADD = \ libvirt.la \ $(GLUSTERFS_LIBS) \ @@ -384,7 +390,8 @@ storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD) -libvirt_storage_file_gluster_la_SOURCES = $(STORAGE_FILE_GLUSTER_SOURCES) +libvirt_storage_file_gluster_la_SOURCES = \ + $(STORAGE_FILE_GLUSTER_SOURCES) libvirt_storage_file_gluster_la_LIBADD = \ libvirt.la \ $(GLUSTERFS_LIBS) \ @@ -401,7 +408,8 @@ libvirt_storage_file_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD) endif WITH_STORAGE_GLUSTER if WITH_STORAGE_ZFS -libvirt_storage_backend_zfs_la_SOURCES = $(STORAGE_DRIVER_ZFS_SOURCES) +libvirt_storage_backend_zfs_la_SOURCES = \ + $(STORAGE_DRIVER_ZFS_SOURCES) libvirt_storage_backend_zfs_la_CFLAGS = \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ @@ -416,7 +424,8 @@ libvirt_storage_backend_zfs_la_LIBADD = \ endif WITH_STORAGE_ZFS if WITH_STORAGE_VSTORAGE -libvirt_storage_backend_vstorage_la_SOURCES = $(STORAGE_DRIVER_VSTORAGE_SOURCES) +libvirt_storage_backend_vstorage_la_SOURCES = \ + $(STORAGE_DRIVER_VSTORAGE_SOURCES) libvirt_storage_backend_vstorage_la_CFLAGS = \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ -- 2.21.0

2 1

[libvirt] [jenkins-ci PATCH] Switch libvirt-dbus builds to Meson
by Fabiano Fidêncio 23 Sep '19

23 Sep '19

libvirt-dbus has switched its build system to meson and requires 0.49.0 or newer. It means, let's *not* build libvirt-dbus on: - Debian 9 (or older); - Ubuntu 18 (or older); - CentOS 7 Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com> --- .../playbooks/build/projects/libvirt-dbus.yml | 37 +++---------------- guests/vars/projects/libvirt-dbus.yml | 1 + jenkins/projects/libvirt-dbus.yaml | 30 +++------------ 3 files changed, 12 insertions(+), 56 deletions(-) diff --git a/guests/playbooks/build/projects/libvirt-dbus.yml b/guests/playbooks/build/projects/libvirt-dbus.yml index a6ff025..a031ba7 100644 --- a/guests/playbooks/build/projects/libvirt-dbus.yml +++ b/guests/playbooks/build/projects/libvirt-dbus.yml @@ -1,9 +1,9 @@ --- - set_fact: name: libvirt-dbus + # libvirt-dbus depends on meson 0.49.0 which is not available on + # CentOS 7, Debian 9, Ubuntu 18; machines: - - libvirt-centos-7 - - libvirt-debian-9 - libvirt-debian-10 - libvirt-debian-sid - libvirt-fedora-29 @@ -12,42 +12,15 @@ - libvirt-freebsd-11 - libvirt-freebsd-12 - libvirt-freebsd-current - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 archive_format: xz git_url: '{{ git_urls["libvirt-dbus"][git_remote] }}' - include: '{{ playbook_base }}/jobs/prepare.yml' -- include: '{{ playbook_base }}/jobs/autotools-build-job.yml' -- include: '{{ playbook_base }}/jobs/autotools-syntax-check-job.yml' +- include: '{{ playbook_base }}/jobs/meson-build-job.yml' +- include: '{{ playbook_base }}/jobs/meson-check-job.yml' +- include: '{{ playbook_base }}/jobs/meson-rpm-job.yml' vars: - # CentOS 7 doesn't include Python 3, while the versions of flake8 - # and pyflakes currently available on FreeBSD (3.5.0 and 2.0.0 - # respectively) are not compatible machines: - - libvirt-debian-9 - - libvirt-debian-10 - - libvirt-debian-sid - libvirt-fedora-29 - libvirt-fedora-30 - libvirt-fedora-rawhide - - libvirt-ubuntu-16 - - libvirt-ubuntu-18 -- include: '{{ playbook_base }}/jobs/autotools-check-job.yml' - vars: - # CentOS 7 doesn't include Python 3 and the version in Ubuntu - # 16.04 is too old - machines: - - libvirt-debian-9 - - libvirt-debian-10 - - libvirt-debian-sid - - libvirt-fedora-29 - - libvirt-fedora-30 - - libvirt-fedora-rawhide - - libvirt-freebsd-11 - - libvirt-freebsd-12 - - libvirt-freebsd-current - - libvirt-ubuntu-18 -- include: '{{ playbook_base }}/jobs/autotools-rpm-job.yml' - vars: - machines: '{{ rpm_machines }}' diff --git a/guests/vars/projects/libvirt-dbus.yml b/guests/vars/projects/libvirt-dbus.yml index ce902cb..406ad86 100644 --- a/guests/vars/projects/libvirt-dbus.yml +++ b/guests/vars/projects/libvirt-dbus.yml @@ -3,6 +3,7 @@ packages: - dbus-daemon - flake8 - glib2 + - meson - python3 - python3-dbus - python3-gi diff --git a/jenkins/projects/libvirt-dbus.yaml b/jenkins/projects/libvirt-dbus.yaml index 2b72fb4..82eb892 100644 --- a/jenkins/projects/libvirt-dbus.yaml +++ b/jenkins/projects/libvirt-dbus.yaml @@ -1,9 +1,9 @@ --- - project: name: libvirt-dbus + # libvirt-dbus requires meson 0.49.0, which is not available on + # CentOS 7 and Debian 9; machines: - - libvirt-centos-7 - - libvirt-debian-9 - libvirt-debian-10 - libvirt-fedora-29 - libvirt-fedora-30 @@ -14,31 +14,13 @@ archive_format: xz git_url: '{git_urls[libvirt-dbus][default]}' jobs: - - autotools-build-job: + - meson-build-job: parent_jobs: 'libvirt-glib-build' - - autotools-syntax-check-job: + - meson-check-job: parent_jobs: 'libvirt-dbus-build' - # CentOS 7 doesn't include Python 3, while the versions of flake8 - # and pyflakes currently available on FreeBSD (3.5.0 and 2.0.0 - # respectively) are not compatible - machines: - - libvirt-debian-9 - - libvirt-debian-10 - - libvirt-fedora-29 - - libvirt-fedora-30 - - libvirt-fedora-rawhide - - autotools-check-job: - parent_jobs: 'libvirt-dbus-syntax-check' - # CentOS 7 doesn't include Python 3 and the version in Ubuntu - # 16.04 is too old + - meson-rpm-job: + parent_jobs: 'libvirt-dbus-check' machines: - - libvirt-debian-9 - - libvirt-debian-10 - libvirt-fedora-29 - libvirt-fedora-30 - libvirt-fedora-rawhide - - libvirt-freebsd-11 - - libvirt-freebsd-12 - - autotools-rpm-job: - parent_jobs: 'libvirt-dbus-check' - machines: '{rpm_machines}' -- 2.23.0

4 9