[libvirt] [jenkins-ci PATCH 0/2] Stop building Go projects on CentOS 7
by Andrea Bolognani
Found while creating a new CentOS 7 guest from scratch using
lcitool. See the commit messages for more details.
Andrea Bolognani (2):
Stop building Go projects on CentOS 7
guests: Don't prepare CentOS 7 for Go projects
guests/host_vars/libvirt-centos-7/main.yml | 2 --
guests/playbooks/build/projects/libvirt-go-xml.yml | 13 ++++++++++++-
guests/playbooks/build/projects/libvirt-go.yml | 13 ++++++++++++-
projects/libvirt-go-xml.yaml | 9 ++++++++-
projects/libvirt-go.yaml | 9 ++++++++-
5 files changed, 40 insertions(+), 6 deletions(-)
--
2.19.2
5 years, 9 months
[libvirt] [PATCH] lxc: allow empty path in URI for historical compatibility
by Daniel P. Berrangé
The use of 'lxc://' was mistakenly broken in:
commit 4c8574c85c554e68de0d8bf9b85727954a5bea91
Author: Daniel P. Berrangé <berrange(a)redhat.com>
Date: Wed Mar 28 12:49:29 2018 +0100
driver: ensure NULL URI isn't passed to drivers with whitelisted URIs
Allow it again for historical compatibility.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/lxc/lxc_driver.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index de045c80bb..df15a0da50 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -140,7 +140,8 @@ static virDrvOpenStatus lxcConnectOpen(virConnectPtr conn,
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
/* If path isn't '/' then they typoed, tell them correct path */
- if (STRNEQ(conn->uri->path, "/") &&
+ if (STRNEQ(conn->uri->path, "") &&
+ STRNEQ(conn->uri->path, "/") &&
STRNEQ(conn->uri->path, "/system")) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unexpected LXC URI path '%s', try lxc:///system"),
--
2.19.2
5 years, 9 months
[libvirt] [RFC PATCH] maint: let MIN/MAX evaluate only once, on modern compilers
by Eric Blake
We might as well take advantage of gcc's extensions for a safer
MIN()/MAX() macro.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
RFC because we could also try to fall back to older gcc's typeof(a)_a=(a)
when the newer __auto_type _a=(a) is not present, and because I don't
know how to properly probe for __auto_type and/or typeof support in
clang (I know that clang added __auto_type in 2015, per
https://reviews.llvm.org/D12686); I also don't know if we have officially
stated that we require gcc/clang (because of attribute((cleanup)), which
really cannot be emulated without extensions), or if we still try to
allow compilation with other compilers; if we have, I don't know if we
have declared a minimum compiler version that we demand (qemu has recently
demanded gcc 4.8 or clang 3.4 [branded 5.1 on Apple]).
src/util/virutil.h | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/util/virutil.h b/src/util/virutil.h
index 908d8920ec..364e354bcb 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -28,10 +28,26 @@
# include <sys/types.h>
# ifndef MIN
-# define MIN(a, b) ((a) < (b) ? (a) : (b))
+# if __GNUC_PREREQ(4, 9)
+# define MIN(a, b) ({ \
+ __auto_type _a = (a); \
+ __auto_type _b = (b); \
+ _a < _b ? _a : _b; \
+ })
+# else
+# define MIN(a, b) ((a) < (b) ? (a) : (b))
+# endif
# endif
# ifndef MAX
-# define MAX(a, b) ((a) > (b) ? (a) : (b))
+# if __GNUC_PREREQ(4, 9)
+# define MAX(a, b) ({ \
+ __auto_type _a = (a); \
+ __auto_type _b = (b); \
+ _a > _b ? _a : _b; \
+ })
+# else
+# define MAX(a, b) ((a) > (b) ? (a) : (b))
+# endif
# endif
--
2.20.1
5 years, 9 months
[libvirt] [PATCH] maint: cfg.mk typo fix
by Eric Blake
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
Pushing as trivial.
cfg.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cfg.mk b/cfg.mk
index 90ec8dfc60..e00213b7dd 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1066,7 +1066,7 @@ sc_prohibit_backslash_alignment:
# Some syntax rules pertaining to the usage of cleanup macros
# implementing GNU C's cleanup attribute
-# Rule to ensure that varibales declared using a cleanup macro are
+# Rule to ensure that variables declared using a cleanup macro are
# always initialized.
sc_require_attribute_cleanup_initialization:
@prohibit='VIR_AUTO((FREE|PTR)\(.+\)|CLOSE) *[^=]+;' \
--
2.20.1
5 years, 9 months
[libvirt] [PATCH RFC] qemu: caps: invalidate kvm capable qemu binaries on every restart
by Nikolay Shirokovskiy
If qemu binary exposes kvm then caps depends heavily on host state.
We are already check explicitly some host features - kernel version,
microcode version, nested flag state. This won't nesserily help if somebody
change CPU on host. Let's instead invalidate such caps on every daemon
restart. This makes kernel version and microcode version check
excessive but nested flag is still need to be checked.
Cache invalidating on restart is archived by keeping list of
binaries that whose caps cache was validated at least once.
If binary in not yet validated and supports kvm then we need to
invalidate it's caps cache.
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
---
If the patch will be accepted then I'll send a patch which removes mentioned
excessive checks also.
src/qemu/qemu_capabilities.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 51bf97b..649aba2 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3264,6 +3264,7 @@ struct _virQEMUCapsCachePriv {
virArch hostArch;
unsigned int microcodeVersion;
char *kernelVersion;
+ virHashTablePtr validated;
/* cache whether /dev/kvm is usable as runUid:runGuid */
virTristateBool kvmUsable;
@@ -3280,6 +3281,7 @@ virQEMUCapsCachePrivFree(void *privData)
VIR_FREE(priv->libDir);
VIR_FREE(priv->kernelVersion);
+ virHashFree(priv->validated);
VIR_FREE(priv);
}
@@ -3952,10 +3954,19 @@ virQEMUCapsIsValid(void *data,
bool kvmUsable;
struct stat sb;
bool kvmSupportsNesting;
+ bool validated = true;
if (!qemuCaps->binary)
return true;
+ if (!virHashLookup(priv->validated, qemuCaps->binary)) {
+ validated = false;
+
+ /* If we fail to remember this binary is validated it is not problem,
+ * it will be validated again next time once again */
+ virHashAddEntry(priv->validated, qemuCaps->binary, (void*)1);
+ }
+
if (qemuCaps->libvirtCtime != virGetSelfLastChanged() ||
qemuCaps->libvirtVersion != LIBVIR_VERSION_NUMBER) {
VIR_DEBUG("Outdated capabilities for '%s': libvirt changed "
@@ -4011,6 +4022,12 @@ virQEMUCapsIsValid(void *data,
}
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {
+ if (!validated) {
+ VIR_DEBUG("Capabilities for QEMU that supports KVM need to be "
+ "updated after daemon restart");
+ return false;
+ }
+
if (priv->microcodeVersion != qemuCaps->microcodeVersion) {
VIR_DEBUG("Outdated capabilities for '%s': microcode version "
"changed (%u vs %u)",
@@ -4809,6 +4826,9 @@ virQEMUCapsCacheNew(const char *libDir,
if (VIR_STRDUP(priv->libDir, libDir) < 0)
goto error;
+ if (!(priv->validated = virHashCreate(1, NULL)))
+ goto error;
+
priv->hostArch = virArchFromHost();
priv->runUid = runUid;
--
1.8.3.1
5 years, 9 months
[libvirt] [PATCH] docs: schemas: Decouple the virtio options from each other
by Erik Skultety
Currently, all of the VirtioOptions are under a single <optional>
element, however, neither our parser/formatter or QEMU driver requires
the presence of all the options if only a single one from the set has
been specified, so fix it and silence the schema validator.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
docs/schemas/domaincommon.rng | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 6518aff73a..aa50eac424 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -5498,6 +5498,8 @@
<attribute name="iommu">
<ref name="virOnOff"/>
</attribute>
+ </optional>
+ <optional>
<attribute name="ats">
<ref name="virOnOff"/>
</attribute>
--
2.20.1
5 years, 9 months
[libvirt] [PATCH] maint: update gnulib
by Eric Blake
In particular, this incorporates Roman's patches to allow
'make syntax-check' to work on BSD with its exec argv
limitations that previously failed when trying to grep the
large number of files present in libvirt.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
Really just two changes since the new year copyright update,
but posting for review to make sure this works on BSD boxes.
* .gnulib 4652c7b...7216e3e (2):
> maint.mk: Replace grep with $(GREP)
> maint.mk: Split long argument lists
.gnulib | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gnulib b/.gnulib
index 4652c7bafa..7216e3e8d9 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 4652c7bafa60332145f1e05a7de5f48e1bc56226
+Subproject commit 7216e3e8d9f914d216fb10abf7dbeafa6570eb87
--
2.20.1
5 years, 9 months
[libvirt] [PATCH] Remove even more Author(s): lines from source files
by Michal Privoznik
In 600462834f4ec1955a9a4 we've tried to remove Author(s): lines
from comments at the beginning of our source files. Well, in some
files while we removed the "Author" line we did not remove the
actual list of authors.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
examples/dommigrate/dommigrate.c | 2 --
src/conf/interface_conf.c | 1 -
src/conf/interface_conf.h | 1 -
src/libvirt.c | 2 --
src/test/test_driver.c | 2 --
src/test/test_driver.h | 2 --
src/util/virbuffer.c | 2 --
src/util/virbuffer.h | 2 --
src/util/virconf.c | 2 --
src/util/virconf.h | 2 --
src/util/virthreadpool.h | 2 --
src/util/virxml.c | 2 --
src/util/virxml.h | 2 --
tests/testutils.c | 2 --
tests/testutils.h | 2 --
tools/virsh-completer.h | 3 ---
tools/virsh-domain-monitor.c | 5 -----
tools/virsh-domain-monitor.h | 5 -----
tools/virsh-domain.c | 5 -----
tools/virsh-domain.h | 5 -----
tools/virsh-edit.c | 2 --
tools/virsh-host.c | 5 -----
tools/virsh-host.h | 5 -----
tools/virsh-interface.c | 5 -----
tools/virsh-interface.h | 5 -----
tools/virsh-network.c | 5 -----
tools/virsh-network.h | 5 -----
tools/virsh-nodedev.c | 5 -----
tools/virsh-nodedev.h | 5 -----
tools/virsh-nwfilter.c | 5 -----
tools/virsh-nwfilter.h | 5 -----
tools/virsh-pool.c | 5 -----
tools/virsh-pool.h | 5 -----
tools/virsh-secret.c | 5 -----
tools/virsh-secret.h | 5 -----
tools/virsh-snapshot.c | 5 -----
tools/virsh-snapshot.h | 5 -----
tools/virsh-volume.c | 5 -----
tools/virsh-volume.h | 5 -----
tools/virsh.c | 4 ----
tools/virsh.h | 4 ----
tools/virt-admin-completer.c | 3 ---
tools/virt-admin-completer.h | 3 ---
tools/virt-admin.h | 2 --
tools/virt-login-shell.c | 2 --
tools/vsh.c | 4 ----
tools/vsh.h | 4 ----
47 files changed, 169 deletions(-)
diff --git a/examples/dommigrate/dommigrate.c b/examples/dommigrate/dommigrate.c
index 3fd078d55d..1b6072d138 100644
--- a/examples/dommigrate/dommigrate.c
+++ b/examples/dommigrate/dommigrate.c
@@ -18,8 +18,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)cloudwatt.com>
*/
#include <stdio.h>
diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index c4d2e1b9ab..c5360c8900 100644
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -16,7 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- * Laine Stump <laine(a)redhat.com>
*/
#include <config.h>
diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index 24d0acd323..fb7bf932f1 100644
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -16,7 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- * Laine Stump <laine(a)redhat.com>
*/
#ifndef LIBVIRT_INTERFACE_CONF_H
diff --git a/src/libvirt.c b/src/libvirt.c
index 7c379495ad..cc1c3c6ea1 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -17,8 +17,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
*/
#include <config.h>
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index b76f0b718e..1d81772a46 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -17,8 +17,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Berrange <berrange(a)redhat.com>
*/
#include <config.h>
diff --git a/src/test/test_driver.h b/src/test/test_driver.h
index 7201a40a52..ff7803da7f 100644
--- a/src/test/test_driver.h
+++ b/src/test/test_driver.h
@@ -17,8 +17,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Berrange <berrange(a)redhat.com>
*/
#ifndef LIBVIRT_TEST_DRIVER_H
diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index 8a2108f2f2..95c0dd1b96 100644
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
*/
#include <config.h>
diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h
index 4b8111de8e..c3703710b7 100644
--- a/src/util/virbuffer.h
+++ b/src/util/virbuffer.h
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
*/
#ifndef LIBVIRT_VIRBUFFER_H
diff --git a/src/util/virconf.c b/src/util/virconf.c
index 88a869517e..4497972b1c 100644
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
*/
#include <config.h>
diff --git a/src/util/virconf.h b/src/util/virconf.h
index 411b8d669b..961a5338d4 100644
--- a/src/util/virconf.h
+++ b/src/util/virconf.h
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
*/
#ifndef LIBVIRT_VIRCONF_H
diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h
index e3ff36998d..461682b01a 100644
--- a/src/util/virthreadpool.h
+++ b/src/util/virthreadpool.h
@@ -17,8 +17,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- * Hu Tao <hutao(a)cn.fujitsu.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
*/
#ifndef LIBVIRT_VIRTHREADPOOL_H
diff --git a/src/util/virxml.c b/src/util/virxml.c
index 3ed44e9036..8eb201fddf 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
*/
#include <config.h>
diff --git a/src/util/virxml.h b/src/util/virxml.h
index 8d4ab0a427..23a4da1b7e 100644
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
*/
#ifndef LIBVIRT_VIRXML_H
diff --git a/tests/testutils.c b/tests/testutils.c
index 4fe95bda8b..d2219ad21e 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Karel Zak <kzak(a)redhat.com>
*/
#include <config.h>
diff --git a/tests/testutils.h b/tests/testutils.h
index 11d99a74b8..658f9053ad 100644
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Karel Zak <kzak(a)redhat.com>
*/
#ifndef LIBVIRT_TESTUTILS_H
diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h
index 4069d976b8..4563fd76ac 100644
--- a/tools/virsh-completer.h
+++ b/tools/virsh-completer.h
@@ -16,9 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Michal Privoznik <mprivozn(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_COMPLETER_H
diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 06e7fec7be..c692cc5128 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-domain-monitor.h b/tools/virsh-domain-monitor.h
index d641df4c13..d24e0bbd40 100644
--- a/tools/virsh-domain-monitor.h
+++ b/tools/virsh-domain-monitor.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_DOMAIN_MONITOR_H
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 24f78520de..e63fc028b9 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h
index 71d7902fee..119d4422a1 100644
--- a/tools/virsh-domain.h
+++ b/tools/virsh-domain.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_DOMAIN_H
diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c
index d97794fed3..5091ac74b7 100644
--- a/tools/virsh-edit.c
+++ b/tools/virsh-edit.c
@@ -39,8 +39,6 @@
* - everything else is taken as success
* For example:
* #define EDIT_DEFINE (dom_edited = virDomainDefineXML(ctl->conn, doc_edited))
- *
- * Michal Privoznik <mprivozn(a)redhat.com>
*/
#ifndef EDIT_GET_XML
diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index b7f86bdd91..be3c2cf1cb 100644
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-host.h b/tools/virsh-host.h
index cdec9ae920..395e39cd57 100644
--- a/tools/virsh-host.h
+++ b/tools/virsh-host.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_HOST_H
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 1eb1a27ac7..7e84ee3c52 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#define VIRSH_COMMON_OPT_INTERFACE(cflags) \
diff --git a/tools/virsh-interface.h b/tools/virsh-interface.h
index 03e6ec28a5..e110e3a8e2 100644
--- a/tools/virsh-interface.h
+++ b/tools/virsh-interface.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_INTERFACE_H
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 440b23d8a8..a30b4f4389 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-network.h b/tools/virsh-network.h
index 2aeb894484..0fff4b7748 100644
--- a/tools/virsh-network.h
+++ b/tools/virsh-network.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_NETWORK_H
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index e6f963ea66..9da3ad2e19 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-nodedev.h b/tools/virsh-nodedev.h
index 8be21d1b17..e58eedf6ea 100644
--- a/tools/virsh-nodedev.h
+++ b/tools/virsh-nodedev.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_NODEDEV_H
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index b680ea082c..952fb2f391 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-nwfilter.h b/tools/virsh-nwfilter.h
index 14292424fa..2ac9bdff7f 100644
--- a/tools/virsh-nwfilter.h
+++ b/tools/virsh-nwfilter.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_NWFILTER_H
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 75ec572af2..70ca39bd3d 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-pool.h b/tools/virsh-pool.h
index c6edfa5541..458e843d3c 100644
--- a/tools/virsh-pool.h
+++ b/tools/virsh-pool.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_POOL_H
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index 87239ff60b..30bdec2657 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-secret.h b/tools/virsh-secret.h
index 03b7a6a16c..71271f7c80 100644
--- a/tools/virsh-secret.h
+++ b/tools/virsh-secret.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_SECRET_H
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 73861957ba..e3d4cda0fc 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-snapshot.h b/tools/virsh-snapshot.h
index e999a9bb7b..c9e706ded6 100644
--- a/tools/virsh-snapshot.h
+++ b/tools/virsh-snapshot.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_SNAPSHOT_H
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 6cd989446e..7294d6f045 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virsh-volume.h b/tools/virsh-volume.h
index ce4ee8a490..66cf9cfa54 100644
--- a/tools/virsh-volume.h
+++ b/tools/virsh-volume.h
@@ -16,11 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRSH_VOLUME_H
diff --git a/tools/virsh.c b/tools/virsh.c
index 8428e539f6..b41304a888 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -16,10 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
*/
#include <config.h>
diff --git a/tools/virsh.h b/tools/virsh.h
index dcf98c773b..254ce3289e 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -16,10 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
*/
#ifndef LIBVIRT_VIRSH_H
diff --git a/tools/virt-admin-completer.c b/tools/virt-admin-completer.c
index 2cd471f32c..e0e36f9756 100644
--- a/tools/virt-admin-completer.c
+++ b/tools/virt-admin-completer.c
@@ -16,9 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Michal Privoznik <mprivozn(a)redhat.com>
- *
*/
#include <config.h>
diff --git a/tools/virt-admin-completer.h b/tools/virt-admin-completer.h
index 5358276daf..a0b09f1ec9 100644
--- a/tools/virt-admin-completer.h
+++ b/tools/virt-admin-completer.h
@@ -16,9 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Michal Privoznik <mprivozn(a)redhat.com>
- *
*/
#ifndef LIBVIRT_VIRT_ADMIN_COMPLETER_H
diff --git a/tools/virt-admin.h b/tools/virt-admin.h
index de5a65ebdc..a58bb7bef2 100644
--- a/tools/virt-admin.h
+++ b/tools/virt-admin.h
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Erik Skultety <eskultet(a)redhat.com>
*/
#ifndef LIBVIRT_VIRT_ADMIN_H
diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c
index d0b1e1e368..ee5c04f9c2 100644
--- a/tools/virt-login-shell.c
+++ b/tools/virt-login-shell.c
@@ -16,8 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Walsh <dwalsh(a)redhat.com>
*/
#include <config.h>
diff --git a/tools/vsh.c b/tools/vsh.c
index de887a9e76..610de4495b 100644
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -16,10 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
*/
#include <config.h>
diff --git a/tools/vsh.h b/tools/vsh.h
index d5f15622f8..68fbe0a1f2 100644
--- a/tools/vsh.h
+++ b/tools/vsh.h
@@ -16,10 +16,6 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see
* <http://www.gnu.org/licenses/>.
- *
- * Daniel Veillard <veillard(a)redhat.com>
- * Karel Zak <kzak(a)redhat.com>
- * Daniel P. Berrange <berrange(a)redhat.com>
*/
#ifndef LIBVIRT_VSH_H
--
2.19.2
5 years, 9 months
[libvirt] [PATCH 0/3] Allow adding mountOpts to the storage pool mount command
by John Ferlan
Modify the generation of the command line to allow usage of a
new XML pool source directory "mount_opts" in order to allow (for
instance) starting an NFS pool with specific mount options.
John Ferlan (3):
storage: Add mount options attribute for pool source dir element
storage: Add mountOpts to the storage pool mount command line
virsh: Add source-mount-opts for pool commands
docs/formatstorage.html.in | 8 ++++++++
docs/schemas/storagepool.rng | 5 +++++
src/conf/storage_conf.c | 12 +++++++++--
src/conf/storage_conf.h | 3 +++
src/storage/storage_util.c | 4 ++++
.../pool-netfs-mountopts.argv | 1 +
tests/storagepoolxml2argvtest.c | 1 +
.../pool-netfs-mountopts.xml | 20 +++++++++++++++++++
.../pool-netfs-mountopts.xml | 20 +++++++++++++++++++
tests/storagepoolxml2xmltest.c | 1 +
tools/virsh-pool.c | 15 +++++++++++---
tools/virsh.pod | 5 +++++
12 files changed, 90 insertions(+), 5 deletions(-)
create mode 100644 tests/storagepoolxml2argvdata/pool-netfs-mountopts.argv
create mode 100644 tests/storagepoolxml2xmlin/pool-netfs-mountopts.xml
create mode 100644 tests/storagepoolxml2xmlout/pool-netfs-mountopts.xml
--
2.17.2
5 years, 9 months
