[libvirt] [PATCH] configure: Fix check for --with-login-shell on Windows
by Andrea Bolognani
The check is supposed to stop users from trying to compile
virt-login-shell on Windows by erroring out during the
configure phase; however, there are two flaws in it:
* the value of "x$with_win" is compared to "yes" instead
of "xyes" (note the "x" in the first string)
* "test" is not being used, so the script will actually
try to run a command called "x$with_win" instead of
performing string comparison
This patch fixes both issues.
---
m4/virt-login-shell.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/virt-login-shell.m4 b/m4/virt-login-shell.m4
index c77ffb5..d5e2e00 100644
--- a/m4/virt-login-shell.m4
+++ b/m4/virt-login-shell.m4
@@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [
if test "x$with_login_shell" != "xno"; then
if test "x$with_win" = "xyes"; then
- if "x$with_login_shell" = "yes"; then
+ if test "x$with_login_shell" = "xyes"; then
AC_MSG_ERROR([virt-login-shell is not supported on Windows])
else
with_login_shell=no;
--
2.5.5
9 years
[libvirt] [PATCH] po: Really fix po/POTFILES.in ordering
by Erik Skultety
Commit e72667bd tried to fix the incorrect file ordering in po/POTFILES.in
except it didn't, since the sort was run using locale en_US instead of
using locale C which is the default in libvirt. So this patch hopefully fixes
it for good.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
po/POTFILES.in | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dfc2ac2..ca23526 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
daemon/admin.c
daemon/admin_dispatch.h
-daemon/libvirtd.c
daemon/libvirtd-config.c
+daemon/libvirtd.c
daemon/qemu_dispatch.h
daemon/remote.c
daemon/remote_dispatch.h
@@ -26,8 +26,8 @@ src/conf/interface_conf.c
src/conf/netdev_bandwidth_conf.c
src/conf/netdev_vlan_conf.c
src/conf/netdev_vport_profile_conf.c
-src/conf/networkcommon_conf.c
src/conf/network_conf.c
+src/conf/networkcommon_conf.c
src/conf/node_device_conf.c
src/conf/numa_conf.c
src/conf/nwfilter_conf.c
@@ -62,9 +62,8 @@ src/interface/interface_backend_netcf.c
src/interface/interface_backend_udev.c
src/internal.h
src/libvirt-admin.c
-src/libvirt.c
-src/libvirt-domain.c
src/libvirt-domain-snapshot.c
+src/libvirt-domain.c
src/libvirt-host.c
src/libvirt-lxc.c
src/libvirt-network.c
@@ -73,6 +72,7 @@ src/libvirt-qemu.c
src/libvirt-secret.c
src/libvirt-storage.c
src/libvirt-stream.c
+src/libvirt.c
src/libxl/libxl_conf.c
src/libxl/libxl_domain.c
src/libxl/libxl_driver.c
@@ -121,8 +121,8 @@ src/qemu/qemu_capabilities.c
src/qemu/qemu_cgroup.c
src/qemu/qemu_command.c
src/qemu/qemu_conf.c
-src/qemu/qemu_domain_address.c
src/qemu/qemu_domain.c
+src/qemu/qemu_domain_address.c
src/qemu/qemu_driver.c
src/qemu/qemu_hostdev.c
src/qemu/qemu_hotplug.c
@@ -205,9 +205,9 @@ src/util/virkeyfile.c
src/util/virlease.c
src/util/virlockspace.c
src/util/virlog.c
+src/util/virnetdev.c
src/util/virnetdevbandwidth.c
src/util/virnetdevbridge.c
-src/util/virnetdev.c
src/util/virnetdevmacvlan.c
src/util/virnetdevmidonet.c
src/util/virnetdevopenvswitch.c
@@ -242,14 +242,14 @@ src/util/viruri.c
src/util/virusb.c
src/util/virutil.c
src/util/virxml.c
+src/vbox/vbox_MSCOMGlue.c
+src/vbox/vbox_XPCOMCGlue.c
src/vbox/vbox_common.c
src/vbox/vbox_driver.c
-src/vbox/vbox_MSCOMGlue.c
src/vbox/vbox_network.c
src/vbox/vbox_snapshot_conf.c
src/vbox/vbox_storage.c
src/vbox/vbox_tmpl.c
-src/vbox/vbox_XPCOMCGlue.c
src/vmware/vmware_conf.c
src/vmware/vmware_driver.c
src/vmx/vmx.c
@@ -257,25 +257,24 @@ src/vz/vz_driver.c
src/vz/vz_sdk.c
src/vz/vz_utils.c
src/vz/vz_utils.h
-src/xenapi/xenapi_driver.c
-src/xenapi/xenapi_utils.c
src/xen/block_stats.c
-src/xenconfig/xen_common.c
-src/xenconfig/xen_sxpr.c
-src/xenconfig/xen_xl.c
-src/xenconfig/xen_xm.c
-src/xen/xend_internal.c
src/xen/xen_driver.c
src/xen/xen_hypervisor.c
src/xen/xen_inotify.c
+src/xen/xend_internal.c
src/xen/xm_internal.c
src/xen/xs_internal.c
+src/xenapi/xenapi_driver.c
+src/xenapi/xenapi_utils.c
+src/xenconfig/xen_common.c
+src/xenconfig/xen_sxpr.c
+src/xenconfig/xen_xl.c
+src/xenconfig/xen_xm.c
tests/virpolkittest.c
tools/libvirt-guests.sh.in
-tools/virsh.c
tools/virsh-console.c
-tools/virsh-domain.c
tools/virsh-domain-monitor.c
+tools/virsh-domain.c
tools/virsh-edit.c
tools/virsh-host.c
tools/virsh-interface.c
@@ -286,11 +285,12 @@ tools/virsh-pool.c
tools/virsh-secret.c
tools/virsh-snapshot.c
tools/virsh-volume.c
+tools/virsh.c
tools/virt-admin.c
-tools/virt-host-validate.c
tools/virt-host-validate-common.c
tools/virt-host-validate-lxc.c
tools/virt-host-validate-qemu.c
+tools/virt-host-validate.c
tools/virt-login-shell.c
tools/vsh.c
tools/vsh.h
--
2.4.11
9 years
[libvirt] [PATCH] po: fix POTFILES.in file ordering
by Erik Skultety
When it comes to a situation that a new translatable file needs to be added
into the list of files, an automatically generated patch is proposed during
syntax-check. However, the diff was made against a sorted list of files and
the same sorted list of files + the new file that actually needs to be added
into the list. Since we do not keep POTFILES sorted, the proposed patch thus
can't be applied...most of the time - depending on the context.
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
po/POTFILES.in | 68 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 21d4cc6..dfc2ac2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
-daemon/admin_dispatch.h
daemon/admin.c
-daemon/libvirtd-config.c
+daemon/admin_dispatch.h
daemon/libvirtd.c
+daemon/libvirtd-config.c
daemon/qemu_dispatch.h
daemon/remote.c
daemon/remote_dispatch.h
@@ -26,8 +26,8 @@ src/conf/interface_conf.c
src/conf/netdev_bandwidth_conf.c
src/conf/netdev_vlan_conf.c
src/conf/netdev_vport_profile_conf.c
-src/conf/network_conf.c
src/conf/networkcommon_conf.c
+src/conf/network_conf.c
src/conf/node_device_conf.c
src/conf/numa_conf.c
src/conf/nwfilter_conf.c
@@ -61,18 +61,22 @@ src/hyperv/hyperv_wmi.c
src/interface/interface_backend_netcf.c
src/interface/interface_backend_udev.c
src/internal.h
-src/libvirt.c
src/libvirt-admin.c
+src/libvirt.c
src/libvirt-domain.c
src/libvirt-domain-snapshot.c
src/libvirt-host.c
src/libvirt-lxc.c
src/libvirt-network.c
src/libvirt-nwfilter.c
+src/libvirt-qemu.c
src/libvirt-secret.c
src/libvirt-storage.c
src/libvirt-stream.c
-src/libvirt-qemu.c
+src/libxl/libxl_conf.c
+src/libxl/libxl_domain.c
+src/libxl/libxl_driver.c
+src/libxl/libxl_migration.c
src/locking/lock_daemon.c
src/locking/lock_daemon_config.c
src/locking/lock_daemon_dispatch.c
@@ -86,19 +90,15 @@ src/logging/log_daemon_dispatch.c
src/logging/log_handler.c
src/logging/log_manager.c
src/lxc/lxc_cgroup.c
-src/lxc/lxc_fuse.c
-src/lxc/lxc_hostdev.c
-src/lxc/lxc_native.c
-src/lxc/lxc_container.c
src/lxc/lxc_conf.c
+src/lxc/lxc_container.c
src/lxc/lxc_controller.c
src/lxc/lxc_domain.c
src/lxc/lxc_driver.c
+src/lxc/lxc_fuse.c
+src/lxc/lxc_hostdev.c
+src/lxc/lxc_native.c
src/lxc/lxc_process.c
-src/libxl/libxl_domain.c
-src/libxl/libxl_driver.c
-src/libxl/libxl_conf.c
-src/libxl/libxl_migration.c
src/network/bridge_driver.c
src/network/bridge_driver_linux.c
src/network/leaseshelper.c
@@ -114,10 +114,6 @@ src/nwfilter/nwfilter_learnipaddr.c
src/openvz/openvz_conf.c
src/openvz/openvz_driver.c
src/openvz/openvz_util.c
-src/vz/vz_driver.c
-src/vz/vz_sdk.c
-src/vz/vz_utils.c
-src/vz/vz_utils.h
src/phyp/phyp_driver.c
src/qemu/qemu_agent.c
src/qemu/qemu_alias.c
@@ -125,8 +121,8 @@ src/qemu/qemu_capabilities.c
src/qemu/qemu_cgroup.c
src/qemu/qemu_command.c
src/qemu/qemu_conf.c
-src/qemu/qemu_domain.c
src/qemu/qemu_domain_address.c
+src/qemu/qemu_domain.c
src/qemu/qemu_driver.c
src/qemu/qemu_hostdev.c
src/qemu/qemu_hotplug.c
@@ -146,12 +142,12 @@ src/rpc/virnetclientstream.c
src/rpc/virnetdaemon.c
src/rpc/virnetmessage.c
src/rpc/virnetsaslcontext.c
-src/rpc/virnetsocket.c
src/rpc/virnetserver.c
src/rpc/virnetserverclient.c
src/rpc/virnetservermdns.c
src/rpc/virnetserverprogram.c
src/rpc/virnetserverservice.c
+src/rpc/virnetsocket.c
src/rpc/virnetsshsession.c
src/rpc/virnettlscontext.c
src/secret/secret_driver.c
@@ -209,9 +205,9 @@ src/util/virkeyfile.c
src/util/virlease.c
src/util/virlockspace.c
src/util/virlog.c
-src/util/virnetdev.c
src/util/virnetdevbandwidth.c
src/util/virnetdevbridge.c
+src/util/virnetdev.c
src/util/virnetdevmacvlan.c
src/util/virnetdevmidonet.c
src/util/virnetdevopenvswitch.c
@@ -230,8 +226,8 @@ src/util/virportallocator.c
src/util/virprocess.c
src/util/virrandom.c
src/util/virrotatingfile.c
-src/util/virsexpr.c
src/util/virscsi.c
+src/util/virsexpr.c
src/util/virsocketaddr.c
src/util/virstats.c
src/util/virstorageencryption.c
@@ -246,36 +242,40 @@ src/util/viruri.c
src/util/virusb.c
src/util/virutil.c
src/util/virxml.c
-src/vbox/vbox_MSCOMGlue.c
-src/vbox/vbox_XPCOMCGlue.c
-src/vbox/vbox_driver.c
src/vbox/vbox_common.c
+src/vbox/vbox_driver.c
+src/vbox/vbox_MSCOMGlue.c
src/vbox/vbox_network.c
-src/vbox/vbox_storage.c
src/vbox/vbox_snapshot_conf.c
+src/vbox/vbox_storage.c
src/vbox/vbox_tmpl.c
+src/vbox/vbox_XPCOMCGlue.c
src/vmware/vmware_conf.c
src/vmware/vmware_driver.c
src/vmx/vmx.c
-src/xen/block_stats.c
-src/xen/xen_driver.c
-src/xen/xen_hypervisor.c
-src/xen/xen_inotify.c
-src/xen/xend_internal.c
-src/xen/xm_internal.c
-src/xen/xs_internal.c
+src/vz/vz_driver.c
+src/vz/vz_sdk.c
+src/vz/vz_utils.c
+src/vz/vz_utils.h
src/xenapi/xenapi_driver.c
src/xenapi/xenapi_utils.c
+src/xen/block_stats.c
src/xenconfig/xen_common.c
src/xenconfig/xen_sxpr.c
src/xenconfig/xen_xl.c
src/xenconfig/xen_xm.c
+src/xen/xend_internal.c
+src/xen/xen_driver.c
+src/xen/xen_hypervisor.c
+src/xen/xen_inotify.c
+src/xen/xm_internal.c
+src/xen/xs_internal.c
tests/virpolkittest.c
tools/libvirt-guests.sh.in
tools/virsh.c
tools/virsh-console.c
-tools/virsh-domain-monitor.c
tools/virsh-domain.c
+tools/virsh-domain-monitor.c
tools/virsh-edit.c
tools/virsh-host.c
tools/virsh-interface.c
@@ -287,10 +287,10 @@ tools/virsh-secret.c
tools/virsh-snapshot.c
tools/virsh-volume.c
tools/virt-admin.c
+tools/virt-host-validate.c
tools/virt-host-validate-common.c
tools/virt-host-validate-lxc.c
tools/virt-host-validate-qemu.c
-tools/virt-host-validate.c
tools/virt-login-shell.c
tools/vsh.c
tools/vsh.h
--
2.4.11
9 years
[libvirt] [PATCH] qemu: fix build without gnutls installed
by Roman Bogorodskiy
Move including of gnutls/gnutls.h in qemu/qemu_domain.c under the
"ifdef WITH_GNUTLS" check because otherwise it fails like this:
CC qemu/libvirt_driver_qemu_impl_la-qemu_domain.lo
qemu/qemu_domain.c:50:10: fatal error: 'gnutls/gnutls.h' file not found
in case if gnutls is not installed on the system.
---
src/qemu/qemu_domain.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 30dee4d..223154d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -47,9 +47,11 @@
#include "virprocess.h"
#include "virrandom.h"
#include "base64.h"
-#include <gnutls/gnutls.h>
-#if HAVE_GNUTLS_CRYPTO_H
-# include <gnutls/crypto.h>
+#ifdef WITH_GNUTLS
+# include <gnutls/gnutls.h>
+# if HAVE_GNUTLS_CRYPTO_H
+# include <gnutls/crypto.h>
+# endif
#endif
#include "logging/log_manager.h"
#include "locking/domain_lock.h"
--
2.7.4
9 years
[libvirt] [PATCH] build: work around gcc 6.0 warnings
by Eric Blake
gcc 6.0 added an annoying warning:
fdstream.c: In function 'virFDStreamWrite':
fdstream.c:390:29: error: logical 'or' of equal expressions [-Werror=logical-op]
if (errno == EAGAIN || errno == EWOULDBLOCK) {
^~
fdstream.c: In function 'virFDStreamRead':
fdstream.c:440:29: error: logical 'or' of equal expressions [-Werror=logical-op]
if (errno == EAGAIN || errno == EWOULDBLOCK) {
^~
This makes it impossible to build out-of-the-box on rawhide,
and we aren't guaranteed that the gcc bug will be fixed in a
timely manner:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
So work around it by further complicating the logic to thwart the
compiler.
Signed-off-by: Eric Blake <eblake(a)redhat.com>
---
This is a build-breaker fix for rawhide; but I'll wait for a day
for any reasons why I should not push it during freeze.
src/fdstream.c | 8 +++++---
src/rpc/virnetsshsession.c | 10 +++++++---
src/security/security_selinux.c | 5 +++--
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/fdstream.c b/src/fdstream.c
index a85cf9d..1c34321 100644
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -1,7 +1,7 @@
/*
* fdstream.c: generic streams impl for file descriptors
*
- * Copyright (C) 2009-2012, 2014, 2016 Red Hat, Inc.
+ * Copyright (C) 2009-2012, 2014, 2016 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
@@ -387,7 +387,8 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
retry:
ret = write(fdst->fd, bytes, nbytes);
if (ret < 0) {
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ if (errno == EAGAIN ||
+ (EAGAIN != EWOULDBLOCK && errno == EWOULDBLOCK)) {
ret = -2;
} else if (errno == EINTR) {
goto retry;
@@ -437,7 +438,8 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes)
retry:
ret = read(fdst->fd, bytes, nbytes);
if (ret < 0) {
- if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ if (errno == EAGAIN ||
+ (EAGAIN != EWOULDBLOCK && errno == EWOULDBLOCK)) {
ret = -2;
} else if (errno == EINTR) {
goto retry;
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 406a831..d7d1c1a 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -1,7 +1,7 @@
/*
* virnetsshsession.c: ssh network transport provider based on libssh2
*
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2013, 2016 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
@@ -546,7 +546,9 @@ virNetSSHAuthenticateAgent(virNetSSHSessionPtr sess,
return 0; /* key accepted */
if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED &&
- ret != LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED &&
+ (LIBSSH2_ERROR_AUTHENTICATION_FAILED !=
+ LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED &&
+ ret != LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED) &&
ret != LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) {
libssh2_session_last_error(sess->session, &errmsg, NULL, 0);
virReportError(VIR_ERR_AUTH_FAILED,
@@ -674,7 +676,9 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess,
priv->filename, errmsg);
if (ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED ||
- ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED)
+ (LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED !=
+ LIBSSH2_ERROR_AUTHENTICATION_FAILED &&
+ ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED))
return 1;
else
return -1;
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 26d95d1..25f0bdf 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2014 Red Hat, Inc.
+ * Copyright (C) 2008-2014, 2016 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
@@ -911,7 +911,8 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon,
* hopefully sets one of the necessary SELinux virt_use_{nfs,usb,pci}
* boolean tunables to allow it ...
*/
- if (setfilecon_errno != EOPNOTSUPP && setfilecon_errno != ENOTSUP &&
+ if (setfilecon_errno != EOPNOTSUPP &&
+ (EOPNOTSUPP != ENOTSUP && setfilecon_errno != ENOTSUP) &&
setfilecon_errno != EROFS) {
virReportSystemError(setfilecon_errno,
_("unable to set security context '%s' on '%s'"),
--
2.5.0
9 years
[libvirt] [PATCH] nss: properly include syms files to dist
by Roman Bogorodskiy
Explicitly add Linux and BSD syms files for nss to EXTRA_DIST
instead of using the LIBVIRT_NSS_SYMBOL_FILE variable, because its value
will point to either Linux or BSD syms file, but we need to ship both.
---
tools/Makefile.am | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6005b8b..9cd62ae 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -473,8 +473,9 @@ lib_LTLIBRARIES = \
endif WITH_NSS
-EXTRA_DIST += $(LIBVIRT_NSS_SYMBOL_FILE) \
- $(LIBVIRT_NSS_SOURCES)
+EXTRA_DIST += $(LIBVIRT_NSS_SOURCES) \
+ $(srcdir)/nss/libvirt_nss.syms \
+ $(srcdir)/nss/libvirt_nss_bsd.syms
clean-local:
-rm -rf wireshark/src/libvirt
--
2.7.4
9 years
[libvirt] [PATCH] nss: fix typo in configure help string
by Roman Bogorodskiy
Servie -> Service
Pushed as trivial.
---
m4/virt-nss.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/virt-nss.m4 b/m4/virt-nss.m4
index 3d6e8f4..bf5c416 100644
--- a/m4/virt-nss.m4
+++ b/m4/virt-nss.m4
@@ -20,7 +20,7 @@ dnl
AC_DEFUN([LIBVIRT_CHECK_NSS],[
AC_ARG_WITH([nss-plugin],
[AS_HELP_STRING([--with-nss-plugin],
- [enable Name Servie Switch plugin for resolving guest IP addresses])],
+ [enable Name Service Switch plugin for resolving guest IP addresses])],
[], [with_nss_plugin=check])
bsd_nss=no
--
2.7.4
9 years
[libvirt] [PATCH v2] Add macro for handling exponential backoff loops.
by Richard W.M. Jones
Since v1:
- Rename the macro VIR_TIME_WHILE_WITH_BACKOFF.
- Split out the variable initialization into a separate function
that the user must call explicitly.
- The macro is now an atomic C statement.
An interesting observation about the qemu monitor socket: In some
cases it appears almost instantaneously. In other runs it appears
after 32-64ms. This latter case is what I expect because qemu startup
takes ~50ms on my laptop.
There seems to be no reason that I can discern for the difference
between the runs. I've not observed the socket appearing anywhere in
the middle, only at these two distinct time delays.
Rich.
9 years
