[libvirt PATCH] fix build by NULL string handling
by Mishal Shah
Fix libvirt build by taking care of NULL string handling
---
src/openvz/openvz_driver.c | 6 +++++-
tests/sockettest.c | 8 ++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index 1a189dbbe7..46f117cd00 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -2084,7 +2084,7 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn,
virDomainDefPtr def = NULL;
virDomainObjPtr vm = NULL;
char *my_hostname = NULL;
- const char *hostname = NULL;
+ char *hostname = NULL;
virURIPtr uri = NULL;
int ret = -1;
@@ -2149,6 +2149,10 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn,
}
}
+ if (hostname == NULL) {
+ goto error;
+ }
+
*uri_out = g_strdup_printf("ssh://%s", hostname);
ret = 0;
diff --git a/tests/sockettest.c b/tests/sockettest.c
index 29a565de40..f0a0815b88 100644
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -188,8 +188,12 @@ static int testMaskNetwork(const char *addrstr,
return -1;
if (STRNEQ(networkstr, gotnet)) {
- VIR_FREE(gotnet);
- fprintf(stderr, "Expected %s, got %s\n", networkstr, gotnet);
+ if (gotnet == NULL) {
+ fprintf(stderr, "Expected %s, got empty string\n", networkstr);
+ } else {
+ fprintf(stderr, "Expected %s, got %s\n", networkstr, gotnet);
+ VIR_FREE(gotnet);
+ }
return -1;
}
VIR_FREE(gotnet);
--
2.17.1
4 years, 12 months
[libvirt PATCH] github: enable lockdown of issues and merge requests
by Daniel P. Berrangé
Libvirt uses GitHub as an automated read-only mirror. The goals were to
have a disaster recovery backup for libvirt.org, a way to make it easy
for people to clone their own private copy of libvirt Git, and finally
as a way to interact with apps like Travis.
The project description was set to a message telling people that we
don't respond to pull requests. This was quite a negative message to
potential contributors, and also did not give them any guidance about
the right way to submit to libvirt. Many also missed the description and
submitted issues or pull requests regardless.
It is possible to disable the issue tracker in GitHub, but there is no
way to disable merge requests. Disabling the issue tracker would also
leave the problem of users not being given any positive information
about where they should be reporting instead.
There is a fairly new 3rd party application built for GitHub that
provides a bot which auto-responds to both issues and merge requests,
closing and locking them, with a arbitrary comment:
https://github.com/apps/repo-lockdown
This commit adds a suitable configuration file for libvirt, which
tries to give a positive response to user's issue/pullreq and guide
them to the desired contribution path on GitLab.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
FYI, I have configured the test.git repo to demonstrate the operation.
See the comments / actions performed here:
https://github.com/libvirt/test/pull/3
https://github.com/libvirt/test/issues/2
This lockdown.yml file will need to be created in each libvirt git
repo, with just the URL changed. If this patch is approved, then I
propose to directly push the equivalent config file to every other
git repo, without spamming libvir-list for review of each.
Ideally we should be creating a CONTRIBUTING.md file in each repo
too, as both GitHub and GitLab direct users to look at this file
for information about how to contribute. This is how we could
guide people to use GitLab in the first place, avoiding them
filing issues/pulls on the wrong site and triggering this bot.
.github/lockdown.yml | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 .github/lockdown.yml
diff --git a/.github/lockdown.yml b/.github/lockdown.yml
new file mode 100644
index 0000000000..09cbdf1b4a
--- /dev/null
+++ b/.github/lockdown.yml
@@ -0,0 +1,36 @@
+# Configuration for Repo Lockdown - https://github.com/dessant/repo-lockdown
+
+# Close issues and pull requests
+close: true
+
+# Lock issues and pull requests
+lock: true
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+issues:
+ comment: |
+ Thank you for your interest in the libvirt project.
+
+ Since this repository is a read-only mirror of the project's master repostory hosted on GitLab, issues opened here are not processed.
+
+ We kindly request that new issues are reported to
+
+ https://gitlab.com/libvirt/libvirt/-/issues/new
+
+ Thank you for your time and understanding.
+
+pulls:
+ comment: |
+ Thank you for your interest in the libvirt project.
+
+ Since this repository is a read-only mirror of the project's master repostory hosted on GitLab, merge requests opened here are not processed.
+
+ We kindly request that contributors fork the project at
+
+ https://gitlab.com/libvirt/libvirt/
+
+ push changes to the fork, and then open a new merge request at
+
+ https://gitlab.com/libvirt/libvirt/-/merge_requests/new
+
+ Thank you for your time and understanding.
--
2.24.1
4 years, 12 months
[PATCH] cpu.c: Use g_autoptr and g_autofree in virCPUDataParse
by Seeteena Thoufeek
Signed-off-by: Seeteena Thoufeek <s1seetee(a)linux.vnet.ibm.com>
---
src/cpu/cpu.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index 631c755..e556ffe 100644
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -772,40 +772,36 @@ virCPUDataPtr
virCPUDataParse(const char *xmlStr)
{
struct cpuArchDriver *driver;
- xmlDocPtr xml = NULL;
- xmlXPathContextPtr ctxt = NULL;
+ g_autoptr(xmlDoc) xml = NULL;
+ g_autoptr(xmlXPathContext) ctxt = NULL;
virCPUDataPtr data = NULL;
- char *arch = NULL;
+ g_autofree char *arch = NULL;
VIR_DEBUG("xmlStr=%s", xmlStr);
if (!(xml = virXMLParseStringCtxt(xmlStr, _("CPU data"), &ctxt))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("cannot parse CPU data"));
- goto cleanup;
+ return data;
}
if (!(arch = virXPathString("string(/cpudata/@arch)", ctxt))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing CPU data architecture"));
- goto cleanup;
+ return data;
}
if (!(driver = cpuGetSubDriverByName(arch)))
- goto cleanup;
+ return data;
if (!driver->dataParse) {
virReportError(VIR_ERR_NO_SUPPORT,
_("cannot parse %s CPU data"), arch);
- goto cleanup;
+ return data;
}
data = driver->dataParse(ctxt);
- cleanup:
- xmlXPathFreeContext(ctxt);
- xmlFreeDoc(xml);
- VIR_FREE(arch);
return data;
}
--
1.8.3.1
5 years
[PATCH 0/4] support for virtio packed virtqueues
by Bjoern Walk
QEMU recently (86044b24e) introduced packed virtqueues for virtio that
supposedly have better cache utilization and performance compared to the
default split queues. So here's a patch set that expose the virtio
parameter as a optional libvirt XML attribute to virtio-backed devices,
e.g.:
<interface type='user'>
<mac address='00:11:22:33:44:55'/>
<model type='virtio'/>
<driver packed='on'/>
</interface>
The default value if the attribute is omitted is still 'off' and regular
split virtqueues are used.
Bjoern Walk (4):
qemu: capabilities: add 'packed' capability
conf: domain: support for virtio packed option
qemu: command: support for virtio packed option
docs: documentation for virtio packed option
docs/formatdomain.html.in | 8 +++++
docs/schemas/domaincommon.rng | 5 +++
src/conf/domain_conf.c | 28 ++++++++++++++++
src/conf/domain_conf.h | 1 +
src/qemu/qemu_capabilities.c | 6 ++++
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 10 ++++++
.../caps_4.2.0.aarch64.xml | 1 +
.../caps_4.2.0.x86_64.xml | 1 +
.../caps_5.0.0.aarch64.xml | 1 +
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 +
.../caps_5.0.0.x86_64.xml | 1 +
tests/qemuxml2argvdata/virtio-options.args | 32 ++++++++++---------
tests/qemuxml2argvdata/virtio-options.xml | 26 +++++++--------
tests/qemuxml2argvtest.c | 3 +-
tests/qemuxml2xmltest.c | 3 +-
16 files changed, 98 insertions(+), 30 deletions(-)
--
2.24.1
5 years
[PATCH 00/15] move validations out of qemu_domain.c
by Daniel Henrique Barboza
This is a suggestion made by Peter in [1], in the review
discussion of a series in which I started moving qemuCaps
validation from qemu_command.c to qemu_domain.c [2]. I'll
quote here what he said back then:
"My only suggestion is that after this we should move all
validation into a separate file. qemu_domain was a code dumping
place for a long time and since we now have a lot of common code
moving it out would be benficial for cleaning up an making it
more obvious."
This is my first go at it with a new file called 'qemu_validate.c'.
The code changes are trivial - just moving stuff from qemu_domain
to qemu_validate - but the amount of changes can sure make for
really tedious reviews. Patches were split according to my own
criteria of how annoying would it be to review each one. The
maintainer is, as always, welcome to squash them up as necessary.
There are still validations to be moved inside qemu_domain.c
after this series. I chose to do this first round to validate
the idea instead of rocking a 40-something patch series all of a
sudden. Once this is figured out we can proceed with the moving.
After all this is settled I intend to continue the work I started
in [2], but using qemu_validate.c instead of qemu_domain.c as
destination.
[1] https://www.redhat.com/archives/libvir-list/2019-December/msg00608.html
[2] https://www.redhat.com/archives/libvir-list/2019-December/msg00570.html
Daniel Henrique Barboza (15):
qemu: introducing qemu_validate.c/h
qemu: move static functions of qemuDomainDefValidate()
qemu: move qemuDomainValidateDef() to qemu_validate.c
qemu: move qemuDomainDeviceDefValidateAddress() to qemu_validation.c
qemu: move qemuDomainDeviceDefValidateAddress() to qemu_validate.c
qemu: move qemuDomainChrDefValidate() to qemu_validate.c
qemu: move qemuDomainDeviceDefValidateHostdev() to qemu_validate.c
qemu: move qemuDomainDeviceDefValidateVideo() to qemu_validate.c
qemu: move qemuDomainDeviceDefValidateDisk() to qemu_validate.c
qemu: move qemuValidateDomainDeviceDefController() to qemu_validate.c
qemu: move qemuDomainDeviceDefValidateGraphics() to qemu_validate.c
qemu: move qemuDomainDeviceDefValidateFS() to qemu_validate.c
qemu: move qemuDomainDeviceDefValidateSound() to qemu_validate.c
qemu: move remaining qemuDomainDeviceDefValidate() helpers
qemu: move qemuValidateDomainDeviceDef() to qemu_validate.c
po/POTFILES.in | 1 +
src/qemu/Makefile.inc.am | 2 +
src/qemu/qemu_domain.c | 3895 ++------------------------------------
src/qemu/qemu_validate.c | 3592 +++++++++++++++++++++++++++++++++++
src/qemu/qemu_validate.h | 34 +
tests/qemublocktest.c | 3 +-
6 files changed, 3801 insertions(+), 3726 deletions(-)
create mode 100644 src/qemu/qemu_validate.c
create mode 100644 src/qemu/qemu_validate.h
--
2.25.1
5 years
[PATCH] rng: Support encryption and slices element in snapshot XML
by Han Han
Signed-off-by: Han Han <hhan(a)redhat.com>
---
docs/schemas/domainsnapshot.rng | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/docs/schemas/domainsnapshot.rng b/docs/schemas/domainsnapshot.rng
index 8e39feb2..c881da74 100644
--- a/docs/schemas/domainsnapshot.rng
+++ b/docs/schemas/domainsnapshot.rng
@@ -160,6 +160,12 @@
<zeroOrMore>
<ref name='devSeclabel'/>
</zeroOrMore>
+ <optional>
+ <ref name='diskSourceCommon'/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
<empty/>
</element>
</optional>
@@ -179,6 +185,12 @@
<zeroOrMore>
<ref name='devSeclabel'/>
</zeroOrMore>
+ <optional>
+ <ref name='diskSourceCommon'/>
+ </optional>
+ <optional>
+ <ref name="encryption"/>
+ </optional>
<empty/>
</element>
</optional>
--
2.25.0
5 years
[PATCH] qemu_checkpoint.c: Use g_autofree in qemuCheckpointPrepare()
by Seeteena Thoufeek
This is the only instance of g_autofree change applicable for
qemu_checkpoint.c
Signed-off-by: Seeteena Thoufeek <s1seetee(a)linux.vnet.ibm.com>
---
src/qemu/qemu_checkpoint.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index 3a510c9..ccd10cb 100644
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -405,9 +405,8 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
virDomainObjPtr vm,
virDomainCheckpointDefPtr def)
{
- int ret = -1;
size_t i;
- char *xml = NULL;
+ g_autofree char *xml = NULL;
qemuDomainObjPrivatePtr priv = vm->privateData;
/* Easiest way to clone inactive portion of vm->def is via
@@ -419,10 +418,10 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
priv->qemuCaps,
VIR_DOMAIN_DEF_PARSE_INACTIVE |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
- goto cleanup;
+ return -1;
if (virDomainCheckpointAlignDisks(def) < 0)
- goto cleanup;
+ return -1;
for (i = 0; i < def->ndisks; i++) {
virDomainCheckpointDiskDefPtr disk = &def->disks[i];
@@ -434,7 +433,7 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("bitmap for disk '%s' must match checkpoint name '%s'"),
disk->name, def->parent.name);
- goto cleanup;
+ return -1;
}
if (vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) {
@@ -444,15 +443,11 @@ qemuCheckpointPrepare(virQEMUDriverPtr driver,
disk->name,
virStorageFileFormatTypeToString(
vm->def->disks[i]->src->format));
- goto cleanup;
+ return -1;
}
}
- ret = 0;
-
- cleanup:
- VIR_FREE(xml);
- return ret;
+ return 0;
}
static int
--
1.8.3.1
5 years
[libvirt-jenkins-ci PATCH] lcitool: Fix $PYTHON value in environment
by Andrea Bolognani
Starting with commit
commit d76f41ece09b9aaf492553fe466c30a22c78e509
Author: Andrea Bolognani <abologna(a)redhat.com>
Date: Fri Mar 27 17:21:26 2020 +0100
lcitool: Include paths in the inventory
Figuring them out at runtime is neat, but in practice they don't
change frequently enough for it to be necessary; more importantly,
including them in the inventory means we can use them in the
Dockerfile generator in addition to the Ansible playbooks.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
we have hardcoded the path of the Python interpreter to be used for
builds in the inventory; an unforeseen consequence of this change is
that Python builds on CentOS 7 have started failing. The reason for
that is simple, but not immediately obvious.
While on most target platforms we have a single Python interpreter
installed, on CentOS 7 we still need two: Python 3 works fine when
it comes to building projects, but it's missing a bunch of modules
that Ansible needs to run, so we're stuck with Python 2 for Ansible
use. This has worked fine for us so far.
As part of the change above, however, due to a naming clash we have
ended up in a situation where the bootstrap task, which installs a
Python suitable for Ansible, overrides the Python intended for builds
as set in the inventory. Of course this would result in breakages
only on CentOS 7, where the two Pythons differ.
Fix this by removing the runtime detection from the bootstrap task
and storing the relevant information in the inventory.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
guests/host_vars/libvirt-centos-7/main.yml | 1 +
guests/host_vars/libvirt-centos-8/main.yml | 1 +
guests/host_vars/libvirt-debian-10/main.yml | 1 +
guests/host_vars/libvirt-debian-9/main.yml | 1 +
guests/host_vars/libvirt-debian-sid/main.yml | 1 +
guests/host_vars/libvirt-fedora-30/main.yml | 1 +
guests/host_vars/libvirt-fedora-31/main.yml | 1 +
guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 +
guests/host_vars/libvirt-freebsd-11/main.yml | 1 +
guests/host_vars/libvirt-freebsd-12/main.yml | 1 +
guests/host_vars/libvirt-freebsd-current/main.yml | 1 +
guests/host_vars/libvirt-opensuse-151/main.yml | 1 +
guests/host_vars/libvirt-ubuntu-1604/main.yml | 1 +
guests/host_vars/libvirt-ubuntu-1804/main.yml | 1 +
guests/playbooks/update/tasks/bootstrap.yml | 11 +----------
15 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index f1fef44..104b702 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -30,4 +30,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python2
ansible_python_interpreter: /usr/bin/python2
diff --git a/guests/host_vars/libvirt-centos-8/main.yml b/guests/host_vars/libvirt-centos-8/main.yml
index 48edb78..441802c 100644
--- a/guests/host_vars/libvirt-centos-8/main.yml
+++ b/guests/host_vars/libvirt-centos-8/main.yml
@@ -30,4 +30,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-debian-10/main.yml b/guests/host_vars/libvirt-debian-10/main.yml
index 37036e6..e3aca55 100644
--- a/guests/host_vars/libvirt-debian-10/main.yml
+++ b/guests/host_vars/libvirt-debian-10/main.yml
@@ -32,4 +32,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-debian-9/main.yml b/guests/host_vars/libvirt-debian-9/main.yml
index b46efd1..0599aa4 100644
--- a/guests/host_vars/libvirt-debian-9/main.yml
+++ b/guests/host_vars/libvirt-debian-9/main.yml
@@ -32,4 +32,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-debian-sid/main.yml b/guests/host_vars/libvirt-debian-sid/main.yml
index 36045cd..565b0be 100644
--- a/guests/host_vars/libvirt-debian-sid/main.yml
+++ b/guests/host_vars/libvirt-debian-sid/main.yml
@@ -32,4 +32,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-fedora-30/main.yml b/guests/host_vars/libvirt-fedora-30/main.yml
index 71b8e7b..d31a84a 100644
--- a/guests/host_vars/libvirt-fedora-30/main.yml
+++ b/guests/host_vars/libvirt-fedora-30/main.yml
@@ -45,4 +45,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-fedora-31/main.yml b/guests/host_vars/libvirt-fedora-31/main.yml
index c692715..389cfac 100644
--- a/guests/host_vars/libvirt-fedora-31/main.yml
+++ b/guests/host_vars/libvirt-fedora-31/main.yml
@@ -33,4 +33,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml
index bea4ad1..374cb4c 100644
--- a/guests/host_vars/libvirt-fedora-rawhide/main.yml
+++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml
@@ -33,4 +33,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml
index 7fbab39..c289221 100644
--- a/guests/host_vars/libvirt-freebsd-11/main.yml
+++ b/guests/host_vars/libvirt-freebsd-11/main.yml
@@ -31,4 +31,5 @@ python: /usr/local/bin/python3
su: /usr/bin/su
sudoers: /usr/local/etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/local/bin/python3
diff --git a/guests/host_vars/libvirt-freebsd-12/main.yml b/guests/host_vars/libvirt-freebsd-12/main.yml
index abedd95..3bc3cc6 100644
--- a/guests/host_vars/libvirt-freebsd-12/main.yml
+++ b/guests/host_vars/libvirt-freebsd-12/main.yml
@@ -31,4 +31,5 @@ python: /usr/local/bin/python3
su: /usr/bin/su
sudoers: /usr/local/etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/local/bin/python3
diff --git a/guests/host_vars/libvirt-freebsd-current/main.yml b/guests/host_vars/libvirt-freebsd-current/main.yml
index 9b0ba1f..02297e0 100644
--- a/guests/host_vars/libvirt-freebsd-current/main.yml
+++ b/guests/host_vars/libvirt-freebsd-current/main.yml
@@ -31,4 +31,5 @@ python: /usr/local/bin/python3
su: /usr/bin/su
sudoers: /usr/local/etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/local/bin/python3
diff --git a/guests/host_vars/libvirt-opensuse-151/main.yml b/guests/host_vars/libvirt-opensuse-151/main.yml
index 3e674cc..656de36 100644
--- a/guests/host_vars/libvirt-opensuse-151/main.yml
+++ b/guests/host_vars/libvirt-opensuse-151/main.yml
@@ -31,4 +31,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-ubuntu-1604/main.yml b/guests/host_vars/libvirt-ubuntu-1604/main.yml
index 1eb2345..476d7ed 100644
--- a/guests/host_vars/libvirt-ubuntu-1604/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-1604/main.yml
@@ -31,4 +31,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/host_vars/libvirt-ubuntu-1804/main.yml b/guests/host_vars/libvirt-ubuntu-1804/main.yml
index c9515b6..5a1ffcf 100644
--- a/guests/host_vars/libvirt-ubuntu-1804/main.yml
+++ b/guests/host_vars/libvirt-ubuntu-1804/main.yml
@@ -32,4 +32,5 @@ python: /usr/bin/python3
su: /bin/su
sudoers: /etc/sudoers
+ansible_python_package: python3
ansible_python_interpreter: /usr/bin/python3
diff --git a/guests/playbooks/update/tasks/bootstrap.yml b/guests/playbooks/update/tasks/bootstrap.yml
index 2e1dc42..410fe66 100644
--- a/guests/playbooks/update/tasks/bootstrap.yml
+++ b/guests/playbooks/update/tasks/bootstrap.yml
@@ -4,14 +4,5 @@
when:
- package_format == 'pkg'
-- set_fact:
- python: python3
-
-- set_fact:
- python: python2
- when:
- - os_name == 'CentOS'
- - os_version == '7'
-
- name: Bootstrap Ansible
- raw: '{{ package_manager }} install -y {{ python }}'
+ raw: '{{ package_manager }} install -y {{ ansible_python_package }}'
--
2.25.1
5 years
[libvirt PATCH v2 0/6] daemons: Improve timeout handling, plus some cleanups
by Andrea Bolognani
Changes from [v1]:
* move timeout setting from the service files to the sysconf files
instead of the other way around;
* remove obsolete KRB5_KTNAME override completely, including from
OpenRC init scripts;
* don't enable timeout for virtlogd, as it's not safe, and
virtlockd, as it's probably safe but I messed this one up before
so honestly why risk it.
[v1] https://www.redhat.com/archives/libvir-list/2020-April/msg00030.html
Andrea Bolognani (6):
daemons: Support --timeout 0
systemd: Tweak existing sysconf files
systemd: Add sysconf files for all daemons
systemd: Move timeout from service files to sysconf files
qemu: Allow audio driver override in virtqemud
remote: Drop KRB5_KTNAME override
libvirt.spec.in | 11 +++++++++++
src/interface/Makefile.inc.am | 2 ++
src/interface/virtinterfaced.service.in | 3 ++-
src/interface/virtinterfaced.sysconf | 3 +++
src/libxl/Makefile.inc.am | 2 ++
src/libxl/virtxend.service.in | 3 ++-
src/libxl/virtxend.sysconf | 3 +++
src/locking/lock_daemon.c | 6 +++---
src/locking/virtlockd.sysconf | 6 +++---
src/logging/log_daemon.c | 6 +++---
src/logging/virtlogd.sysconf | 6 +++---
src/lxc/Makefile.inc.am | 2 ++
src/lxc/virtlxcd.service.in | 3 ++-
src/lxc/virtlxcd.sysconf | 3 +++
src/network/Makefile.inc.am | 2 ++
src/network/virtnetworkd.service.in | 3 ++-
src/network/virtnetworkd.sysconf | 3 +++
src/node_device/Makefile.inc.am | 2 ++
src/node_device/virtnodedevd.service.in | 3 ++-
src/node_device/virtnodedevd.sysconf | 3 +++
src/nwfilter/Makefile.inc.am | 2 ++
src/nwfilter/virtnwfilterd.service.in | 3 ++-
src/nwfilter/virtnwfilterd.sysconf | 3 +++
src/qemu/Makefile.inc.am | 2 ++
src/qemu/virtqemud.service.in | 3 ++-
src/qemu/virtqemud.sysconf | 12 ++++++++++++
src/remote/Makefile.inc.am | 5 ++++-
src/remote/libvirtd.init.in | 1 -
src/remote/libvirtd.sasl | 4 +---
src/remote/libvirtd.sysconf | 3 ---
src/remote/remote_daemon.c | 6 +++---
src/remote/virtproxyd.init.in | 1 -
src/remote/virtproxyd.service.in | 3 ++-
src/remote/virtproxyd.sysconf | 3 +++
src/secret/Makefile.inc.am | 2 ++
src/secret/virtsecretd.service.in | 3 ++-
src/secret/virtsecretd.sysconf | 3 +++
src/storage/Makefile.inc.am | 2 ++
src/storage/virtstoraged.service.in | 3 ++-
src/storage/virtstoraged.sysconf | 3 +++
src/vbox/Makefile.inc.am | 2 ++
src/vbox/virtvboxd.service.in | 3 ++-
src/vbox/virtvboxd.sysconf | 3 +++
src/vz/Makefile.inc.am | 2 ++
src/vz/virtvzd.service.in | 3 ++-
src/vz/virtvzd.sysconf | 3 +++
tools/libvirt-guests.sysconf | 2 ++
47 files changed, 124 insertions(+), 36 deletions(-)
create mode 100644 src/interface/virtinterfaced.sysconf
create mode 100644 src/libxl/virtxend.sysconf
create mode 100644 src/lxc/virtlxcd.sysconf
create mode 100644 src/network/virtnetworkd.sysconf
create mode 100644 src/node_device/virtnodedevd.sysconf
create mode 100644 src/nwfilter/virtnwfilterd.sysconf
create mode 100644 src/qemu/virtqemud.sysconf
create mode 100644 src/remote/virtproxyd.sysconf
create mode 100644 src/secret/virtsecretd.sysconf
create mode 100644 src/storage/virtstoraged.sysconf
create mode 100644 src/vbox/virtvboxd.sysconf
create mode 100644 src/vz/virtvzd.sysconf
--
2.25.1
5 years
[PATCH] maint: Post-release version bump to 6.3.0
by Peter Krempa
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
configure.ac | 2 +-
docs/news.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
Pushed.
diff --git a/configure.ac b/configure.ac
index e565437062..10573497fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public
dnl License along with this library. If not, see
dnl <http://www.gnu.org/licenses/>.
-AC_INIT([libvirt], [6.2.0], [libvir-list(a)redhat.com], [], [https://libvirt.org])
+AC_INIT([libvirt], [6.3.0], [libvir-list(a)redhat.com], [], [https://libvirt.org])
if test $srcdir = "."
then
diff --git a/docs/news.xml b/docs/news.xml
index 30de995a7c..0d3f3386ec 100644
--- a/docs/news.xml
+++ b/docs/news.xml
@@ -42,6 +42,14 @@
-->
<libvirt>
+ <release version="v6.3.0" date="unreleased">
+ <section title="New features">
+ </section>
+ <section title="Improvements">
+ </section>
+ <section title="Bug fixes">
+ </section>
+ </release>
<release version="v6.2.0" date="2020-04-02">
<section title="New features">
<change>
--
2.25.1
5 years
