- Devel - libvirt List Archives

[libvirt] backport politics to redhat/centos
by Vasiliy Tolstov 13 Apr '16

13 Apr '16

Hi! I'm need to use CentOS for some project and i want to not modify all my stuff (i'm use plain ethernet devices with bird routing daemon). CentOS have libvirt 1.2.17, does redhat in near feature want to backport my ethernet changes to main branches or not? Sorry for my questions. -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

3 4

[libvirt] [PATCH 00/18] cleanup of graphics code
by Pavel Hrdina 13 Apr '16

13 Apr '16

Pavel Hrdina (18): tests: remove unwanted VIR_FREE of spice and vnc default listen docs: rewrite graphics XML documentation domain_conf: introduce virDomainGraphicsListensParseXML domain_conf: cleanup virDomainGraphicsListensParseXML domain_conf: split graphics xml parser into multiple functions domain_conf: cleanup error paths for graphics parser domain_conf: introduce virDomainGraphicsListenAddAddress domain_conf: introduce virDomainGraphicsListenAddNetwork domain_conf: remove unused virDomainGraphicsListenSetType domain_conf: cleanup virDomainGraphicsGetListen use virDomainGraphicsGetListen instead of the other getters domain_conf: cleanup virDomainGraphicsListenDefParseXML domain_conf: remove unused virDomainGraphicsListenGet* domain_conf: call ...ListensParseXML only for appropriate graphics qemu_process: generate vnc unix socket in qemuProcessPrepareDomain qemu_process: move listen code out of qemuProcessSetupGraphics domain_conf: introduce virDomainGraphicsListenClear qemu_domain: remove all listens if vncAutoUnixSocket is enabled docs/formatdomain.html.in | 351 +++--- src/conf/domain_conf.c | 1163 ++++++++++---------- src/conf/domain_conf.h | 24 +- src/libvirt_private.syms | 10 +- src/libxl/libxl_conf.c | 15 +- src/qemu/qemu_command.c | 120 +- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 10 + src/qemu/qemu_migration.c | 9 +- src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 69 +- src/vbox/vbox_common.c | 14 +- src/vmx/vmx.c | 9 +- src/vz/vz_sdk.c | 11 +- src/xenconfig/xen_common.c | 28 +- src/xenconfig/xen_sxpr.c | 20 +- src/xenconfig/xen_xl.c | 12 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- ...-graphics-vnc-auto-unix-socket-with-listen.args | 22 + ...v-graphics-vnc-auto-unix-socket-with-listen.xml | 36 + ...qemuxml2argv-graphics-vnc-auto-unix-socket.args | 22 + .../qemuxml2argv-graphics-vnc-auto-unix-socket.xml | 34 + tests/qemuxml2argvtest.c | 8 +- 23 files changed, 1051 insertions(+), 945 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket-with-listen.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket-with-listen.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket.xml -- 2.7.4

3 42

[libvirt] [PATCH 0/2] host-validate: Don't build on Windows
by Andrea Bolognani 13 Apr '16

13 Apr '16

The recent fixes to virt-host-validate have caused the mingw build to fail[1]. Instead of working around Windows' quirks in the tool, just stop building it altogether - it's not like it made any sense to have it available on that OS anyway. Cheers. [1] https://ci.centos.org/view/libvirt-project/job/libvirt-mingw/1496/ Andrea Bolognani (2): tools: Reorganize conditional bits configure: Make virt-host-validate optional configure.ac | 29 ++++++++++++++++++----------- m4/virt-host-validate.m4 | 40 ++++++++++++++++++++++++++++++++++++++++ tools/Makefile.am | 35 ++++++++++++++++++----------------- 3 files changed, 76 insertions(+), 28 deletions(-) create mode 100644 m4/virt-host-validate.m4 -- 2.5.5

3 9

[libvirt] [PATCH 00/10] conf: disk xml parser refactors
by Peter Krempa 13 Apr '16

13 Apr '16

I unfortunately looked at this function. I did not like what I've seen. Let's start making it a bit more bearable. This series starts splitting and cleaning up virDomainDiskDefParseXML which is an unmaintainable spaghettti-code mess currently. Peter Krempa (10): util: Rename and move virStrIsPrint to virStringIsPrintable conf: disk: Don't initialize fields allocated by calloc conf: disk: Remove one unnecessary level of indentation conf: disk: Extract iotune parsing into a separate func conf: disk: Remove error label from virDomainDiskDefIotuneParse conf: virDomainDiskDefIotuneParse: simplfiy parsing conf: virDomainDiskDefIotuneParse: Report malformed number errors conf: disk: Split out parsing of disk mirror data conf: Refactor virDomainDiskDefMirrorParse conf: extract disk geometry parsing code src/conf/domain_conf.c | 777 ++++++++++++++++++++++------------------------- src/libvirt_private.syms | 2 +- src/util/virstring.c | 18 ++ src/util/virstring.h | 2 + src/util/virutil.c | 12 - src/util/virutil.h | 2 - 6 files changed, 377 insertions(+), 436 deletions(-) -- 2.8.0

4 24

[libvirt] [libxl] shutdown a domain before it finishes starting
by Zhangbo (Oscar) 13 Apr '16

13 Apr '16

Hi all: Suppose we have a guest domain which is pvops, for example, rhel6.4. Steps to produce the problem: 1 start the guest by virDomainCreate() 2 the API returns before the guest domain fully available, which means, the disks, network interfaces and some import services are not available inside the guest. 3 we call virDomainShutdown() to shutdown the guest. Expected result: The guest got shutdown. The result in fact: Because the guest is not available when we call virDomainShutdown(), it couldn't respond to our 'shutdown' xenstore request, the guest turns on later, rather than shutting down. So , the question is: In libxl_driver( xen-hypervisor environment), how can we tell that the guest is available or not, and is it suitable to shutdown the guest at that moment? Thanks in advance. Oscar.

2 4

[libvirt] How to get GCOV result of make check?
by Zhangbo (Oscar) 13 Apr '16

13 Apr '16

Hi all: I want to get the coverage result of 'make check', here is my way: 1. ./configure ***** 2. make clean -j *3*. find ./ -name Makefile |xargs sed -i "s/\= gcc/= gcc -fprofile-arcs -ftest-coverage/g" # add gcov-related cflags 4. make check -j 5. lcov -d . -c -o libvirt.info 6. genhtml libvirt.info -o libvirtresult My key work Is step 3, however, I don't think it's a graceful way to get gcov result. How do you usually get the gcov results, thanks! Oscar.

2 2

[libvirt] [PATCH v3] util: Add virGettextInitialize, convert the code
by Cole Robinson 13 Apr '16

13 Apr '16

Take setlocale/gettext error handling pattern from tools/virsh-* and use it for all standalone binaries via a new shared virGettextInitialize routine. The virsh* pattern differed slightly from other callers. All users now consistently: * Ignore setlocale errors. virsh has done this forever, presumably for good reason. This has been partially responsible for some bug reports: https://bugzilla.redhat.com/show_bug.cgi?id=1312688 https://bugzilla.redhat.com/show_bug.cgi?id=1026514 https://bugzilla.redhat.com/show_bug.cgi?id=1016158 * Report the failed function name * Report strerror --- v3: Fix make syntax-check; add a rule similar to the bindtextdomain check that checks for the new virGettextInitialize cfg.mk | 11 +++++++++ daemon/libvirtd.c | 6 ++--- src/Makefile.am | 2 ++ src/libvirt_private.syms | 4 ++++ src/locking/lock_daemon.c | 6 ++--- src/locking/sanlock_helper.c | 9 ++----- src/logging/log_daemon.c | 6 ++--- src/lxc/lxc_controller.c | 6 ++--- src/network/leaseshelper.c | 12 +++------- src/security/virt-aa-helper.c | 12 +++------- src/storage/parthelper.c | 9 ++----- src/util/iohelper.c | 13 +++------- src/util/virgettext.c | 56 +++++++++++++++++++++++++++++++++++++++++++ src/util/virgettext.h | 25 +++++++++++++++++++ tools/virsh.c | 15 ++---------- tools/virt-admin.c | 15 ++---------- tools/virt-host-validate.c | 15 ++---------- tools/virt-login-shell.c | 14 ++--------- tools/vsh.c | 2 -- 19 files changed, 127 insertions(+), 111 deletions(-) create mode 100644 src/util/virgettext.c create mode 100644 src/util/virgettext.h diff --git a/cfg.mk b/cfg.mk index 5372584..90bb709 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1037,6 +1037,15 @@ sc_prohibit_verbose_strcat: halt='Use strcat(a, b) instead of strncat(a, b, strlen(b))' \ $(_sc_search_regexp) +# Ensure that each .c file containing a "main" function also +# calls virGettextInitialize +sc_gettext_init: + @require='virGettextInitialize *\(' \ + in_vc_files='\.c$$' \ + containing='\<main *(' \ + halt='the above files do not call virGettextInitialize' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null @@ -1133,6 +1142,8 @@ _test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock exclude_file_name_regexp--sc_avoid_write = \ ^(src/($(_src1))|daemon/libvirtd|tools/virsh-console|tests/($(_test1)))\.c$$ +exclude_file_name_regexp--sc_bindtextdomain = .* + exclude_file_name_regexp--sc_gettext_init = ^(tests|examples)/ exclude_file_name_regexp--sc_copyright_usage = \ diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 3d38a46..5f66e8b 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -30,7 +30,6 @@ #include <getopt.h> #include <stdlib.h> #include <grp.h> -#include <locale.h> #include "libvirt_internal.h" #include "virerror.h" @@ -58,6 +57,7 @@ #include "locking/lock_manager.h" #include "viraccessmanager.h" #include "virutil.h" +#include "virgettext.h" #ifdef WITH_DRIVER_MODULES # include "driver.h" @@ -1172,9 +1172,7 @@ int main(int argc, char **argv) { {0, 0, 0, 0} }; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL || + if (virGettextInitialize() < 0 || virInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/Makefile.am b/src/Makefile.am index eda0365..38b9560 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -114,6 +114,7 @@ UTIL_SOURCES = \ util/virfile.c util/virfile.h \ util/virfirewall.c util/virfirewall.h \ util/virfirewallpriv.h \ + util/virgettext.c util/virgettext.h \ util/virgic.c util/virgic.h \ util/virhash.c util/virhash.h \ util/virhashcode.c util/virhashcode.h \ @@ -2321,6 +2322,7 @@ libvirt_setuid_rpc_client_la_SOURCES = \ util/virevent.c \ util/vireventpoll.c \ util/virfile.c \ + util/virgettext.c \ util/virhash.c \ util/virhashcode.c \ util/virjson.c \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 068bc00..af7de8a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1517,6 +1517,10 @@ virFirewallStartRollback; virFirewallStartTransaction; +# util/virgettext.h +virGettextInitialize; + + # util/virgic.h virGICVersionTypeFromString; virGICVersionTypeToString; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 973e691..bfdcfc6 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -28,7 +28,6 @@ #include <sys/stat.h> #include <getopt.h> #include <stdlib.h> -#include <locale.h> #include "lock_daemon.h" @@ -47,6 +46,7 @@ #include "virhash.h" #include "viruuid.h" #include "virstring.h" +#include "virgettext.h" #include "locking/lock_daemon_dispatch.h" #include "locking/lock_protocol.h" @@ -1179,9 +1179,7 @@ int main(int argc, char **argv) { privileged = geteuid() == 0; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL || + if (virGettextInitialize() < 0 || virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index d8d294f..57e1cfb 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -1,13 +1,12 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#include <locale.h> -#include "configmake.h" #include "internal.h" #include "virconf.h" #include "viralloc.h" #include "domain_conf.h" +#include "virgettext.h" static int @@ -70,12 +69,8 @@ main(int argc, char **argv) .cb = authCallback, }; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL) { - fprintf(stderr, _("%s: initialization failed\n"), argv[0]); + if (virGettextInitialize() < 0) exit(EXIT_FAILURE); - } if (getArgs(argc, argv, &uri, &uuid, &action) < 0) goto cleanup; diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index f674cbd..70339af 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -28,7 +28,6 @@ #include <sys/stat.h> #include <getopt.h> #include <stdlib.h> -#include <locale.h> #include "log_daemon.h" @@ -46,6 +45,7 @@ #include "virhash.h" #include "viruuid.h" #include "virstring.h" +#include "virgettext.h" #include "log_daemon_dispatch.h" #include "log_protocol.h" @@ -936,9 +936,7 @@ int main(int argc, char **argv) { privileged = geteuid() == 0; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL || + if (virGettextInitialize() < 0 || virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8b5ec4c..73e57e3 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -36,7 +36,6 @@ #include <signal.h> #include <getopt.h> #include <sys/mount.h> -#include <locale.h> #include <grp.h> #include <sys/stat.h> #include <time.h> @@ -66,6 +65,7 @@ #include "virdbus.h" #include "rpc/virnetdaemon.h" #include "virstring.h" +#include "virgettext.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -2505,9 +2505,7 @@ int main(int argc, char *argv[]) for (i = 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) ns_fd[i] = -1; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL || + if (virGettextInitialize() < 0 || virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 097cd11..16f6eb8 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -25,7 +25,6 @@ #include <config.h> -#include <locale.h> #include <stdio.h> #include <stdlib.h> @@ -38,6 +37,7 @@ #include "virjson.h" #include "virlease.h" #include "configmake.h" +#include "virgettext.h" #define VIR_FROM_THIS VIR_FROM_NETWORK @@ -115,14 +115,8 @@ main(int argc, char **argv) program_name = argv[0]; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL) { - fprintf(stderr, _("%s: initialization failed\n"), program_name); - exit(EXIT_FAILURE); - } - - if (virThreadInitialize() < 0 || + if (virGettextInitialize() < 0 || + virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), program_name); exit(EXIT_FAILURE); diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 50d2a08..5db9c02 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -35,7 +35,6 @@ #include <fcntl.h> #include <getopt.h> #include <sys/utsname.h> -#include <locale.h> #include "internal.h" #include "virbuffer.h" @@ -54,6 +53,7 @@ #include "configmake.h" #include "virrandom.h" #include "virstring.h" +#include "virgettext.h" #include "storage/storage_driver.h" @@ -1298,14 +1298,8 @@ main(int argc, char **argv) char *profile = NULL; char *include_file = NULL; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL) { - fprintf(stderr, _("%s: initialization failed\n"), argv[0]); - exit(EXIT_FAILURE); - } - - if (virThreadInitialize() < 0 || + if (virGettextInitialize() < 0 || + virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index d1df068..6695f23 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -39,13 +39,12 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> -#include <locale.h> #include "virutil.h" #include "virfile.h" #include "c-ctype.h" -#include "configmake.h" #include "virstring.h" +#include "virgettext.h" /* we don't need to include the full internal.h just for this */ #define STREQ(a, b) (strcmp(a, b) == 0) @@ -72,12 +71,8 @@ int main(int argc, char **argv) const char *partsep; bool devmap_nopartsep = false; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL) { - fprintf(stderr, _("%s: initialization failed\n"), argv[0]); + if (virGettextInitialize() < 0) exit(EXIT_FAILURE); - } if (argc == 3 && STREQ(argv[2], "-g")) { cmd = DISK_GEOMETRY; diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 8a3c377..275f993 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -27,7 +27,6 @@ #include <config.h> -#include <locale.h> #include <unistd.h> #include <fcntl.h> #include <stdio.h> @@ -38,9 +37,9 @@ #include "virfile.h" #include "viralloc.h" #include "virerror.h" -#include "configmake.h" #include "virrandom.h" #include "virstring.h" +#include "virgettext.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -230,14 +229,8 @@ main(int argc, char **argv) program_name = argv[0]; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL) { - fprintf(stderr, _("%s: initialization failed\n"), program_name); - exit(EXIT_FAILURE); - } - - if (virThreadInitialize() < 0 || + if (virGettextInitialize() < 0 || + virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), program_name); exit(EXIT_FAILURE); diff --git a/src/util/virgettext.c b/src/util/virgettext.c new file mode 100644 index 0000000..7e32043 --- /dev/null +++ b/src/util/virgettext.c @@ -0,0 +1,56 @@ +/* + * virgettext.c: gettext helper routines + * + * Copyright (C) 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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/>. + */ + +#include <config.h> + +#include <locale.h> +#include <stdio.h> + +#include "configmake.h" +#include "internal.h" +#include "virgettext.h" + + +/** + * virGettextInit: + * + * Initialize standard gettext setup + * Returns -1 on fatal error + */ +int +virGettextInitialize(void) +{ + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + return -1; + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); + return -1; + } + + return 0; +} diff --git a/src/util/virgettext.h b/src/util/virgettext.h new file mode 100644 index 0000000..4584d83 --- /dev/null +++ b/src/util/virgettext.h @@ -0,0 +1,25 @@ +/* + * virgettext.h: gettext helper routines + * + * Copyright (C) 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * 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/>. + */ +#ifndef __VIR_GETTEXT_H__ +# define __VIR_GETTEXT_H__ + +int virGettextInitialize(void); + +#endif /* __VIR_GETTEXT_H__ */ diff --git a/tools/virsh.c b/tools/virsh.c index fe33839..f632405 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -34,7 +34,6 @@ #include <getopt.h> #include <sys/time.h> #include <fcntl.h> -#include <locale.h> #include <time.h> #include <limits.h> #include <sys/stat.h> @@ -53,12 +52,12 @@ #include <libvirt/libvirt-qemu.h> #include <libvirt/libvirt-lxc.h> #include "virfile.h" -#include "configmake.h" #include "virthread.h" #include "vircommand.h" #include "conf/domain_conf.h" #include "virtypedparam.h" #include "virstring.h" +#include "virgettext.h" #include "virsh-console.h" #include "virsh-domain.h" @@ -933,18 +932,8 @@ main(int argc, char **argv) progname++; ctl->progname = progname; - if (!setlocale(LC_ALL, "")) { - perror("setlocale"); - /* failure to setup locale is not fatal */ - } - if (!bindtextdomain(PACKAGE, LOCALEDIR)) { - perror("bindtextdomain"); - return EXIT_FAILURE; - } - if (!textdomain(PACKAGE)) { - perror("textdomain"); + if (virGettextInitialize() < 0) return EXIT_FAILURE; - } if (isatty(STDIN_FILENO)) { ctl->istty = true; diff --git a/tools/virt-admin.c b/tools/virt-admin.c index f0a49a3..195088b 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -25,20 +25,19 @@ #include <errno.h> #include <getopt.h> -#include <locale.h> #if WITH_READLINE # include <readline/readline.h> # include <readline/history.h> #endif -#include "configmake.h" #include "internal.h" #include "viralloc.h" #include "virerror.h" #include "virfile.h" #include "virstring.h" #include "virthread.h" +#include "virgettext.h" /* Gnulib doesn't guarantee SA_SIGINFO support. */ #ifndef SA_SIGINFO @@ -689,18 +688,8 @@ main(int argc, char **argv) progname++; ctl->progname = progname; - if (!setlocale(LC_ALL, "")) { - perror("setlocale"); - /* failure to setup locale is not fatal */ - } - if (!bindtextdomain(PACKAGE, LOCALEDIR)) { - perror("bindtextdomain"); - return EXIT_FAILURE; - } - if (!textdomain(PACKAGE)) { - perror("textdomain"); + if (virGettextInitialize() < 0) return EXIT_FAILURE; - } if (isatty(STDIN_FILENO)) { ctl->istty = true; diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c index a8c2075..5b7fe9b 100644 --- a/tools/virt-host-validate.c +++ b/tools/virt-host-validate.c @@ -25,10 +25,9 @@ #include <stdlib.h> #include <gettext.h> #include <getopt.h> -#include <locale.h> #include "internal.h" -#include "configmake.h" +#include "virgettext.h" #include "virt-host-validate-common.h" #if WITH_QEMU @@ -80,18 +79,8 @@ main(int argc, char **argv) bool quiet = false; bool usedHvname = false; - if (!setlocale(LC_ALL, "")) { - perror("setlocale"); - /* failure to setup locale is not fatal */ - } - if (!bindtextdomain(PACKAGE, LOCALEDIR)) { - perror("bindtextdomain"); - return EXIT_FAILURE; - } - if (!textdomain(PACKAGE)) { - perror("textdomain"); + if (virGettextInitialize() < 0) return EXIT_FAILURE; - } while ((c = getopt_long(argc, argv, "hvq", argOptions, NULL)) != -1) { switch (c) { diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c index ec759dc..8f87227 100644 --- a/tools/virt-login-shell.c +++ b/tools/virt-login-shell.c @@ -24,7 +24,6 @@ #include <errno.h> #include <fnmatch.h> #include <getopt.h> -#include <locale.h> #include <signal.h> #include <stdarg.h> #include <stdio.h> @@ -41,6 +40,7 @@ #include "virstring.h" #include "viralloc.h" #include "vircommand.h" +#include "virgettext.h" #define VIR_FROM_THIS VIR_FROM_NONE static const char *conf_file = SYSCONFDIR "/libvirt/virt-login-shell.conf"; @@ -207,18 +207,8 @@ main(int argc, char **argv) virSetErrorLogPriorityFunc(NULL); progname = argv[0]; - if (!setlocale(LC_ALL, "")) { - perror("setlocale"); - /* failure to setup locale is not fatal */ - } - if (!bindtextdomain(PACKAGE, LOCALEDIR)) { - perror("bindtextdomain"); - return ret; - } - if (!textdomain(PACKAGE)) { - perror("textdomain"); + if (virGettextInitialize() < 0) return ret; - } while ((arg = getopt_long(argc, argv, "hV", opt, &longindex)) != -1) { switch (arg) { diff --git a/tools/vsh.c b/tools/vsh.c index 6bdc082..f033c05 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -35,7 +35,6 @@ #include <sys/time.h> #include "c-ctype.h" #include <fcntl.h> -#include <locale.h> #include <time.h> #include <limits.h> #include <sys/stat.h> @@ -55,7 +54,6 @@ #include <libvirt/libvirt-qemu.h> #include <libvirt/libvirt-lxc.h> #include "virfile.h" -#include "configmake.h" #include "virthread.h" #include "vircommand.h" #include "conf/domain_conf.h" -- 2.7.3

1 0

[libvirt] [PATCH 00/12] Add IV Secret Object support
by John Ferlan 13 Apr '16

13 Apr '16

The first 5 patches handle changing the current mechanism of getting the secret while building the command line into a mechanism where the secret is built and stored as part of the disk or hostdev private data and then parsed during command line generation. The end result is to remove the 'conn' parameter from the qemuBuildCommandLine. The next 5 patches deal with some hotplug cleanup that was necessary in order to "more easily" handle having a secret object as a possible option instead of relying on the '-drive' string to hold the secret. The last 2 patches are the resulting initialization vector patches. They haven't been fully tested or vetted, but I figured getting something "out there" for review would give me some more time to figure out a proper test environment. At the very least each of the first two groups of 5 patches could be their own series - it's just that they ended up being part of this code. John Ferlan (12): qemu: Introduce qemuDomainSecretInfo qemu: Introduce qemuDomainSecretPrepare and Destroy qemu: Introduce qemuDomainHostdevPrivatePtr qemu: Introduce qemuDomainSecretHostdevPrepare and Destroy qemu: Use qemuDomainSecretInfoPtr in qemuBuildNetworkDriveURI qemu: hotplug: Assume support for -device for attach virtio disk qemu: hotplug: Adjust error path for attach virtio disk qemu: hotplug: Adjust error path for attach scsi disk qemu: hotplug: Adjust error path for attach hostdev scsi disk qemu: hotplug: Fix possible memory leak of props qemu: Introduce qemuDomainSecretIV qemu: Utilize qemu secret objects for SCSI/RBD auth/secret configure.ac | 1 + src/conf/domain_conf.c | 28 ++- src/conf/domain_conf.h | 7 +- src/lxc/lxc_native.c | 4 +- src/qemu/qemu_alias.c | 23 ++ src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 321 ++++++++++++++++++-------- src/qemu/qemu_command.h | 20 +- src/qemu/qemu_domain.c | 508 +++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_domain.h | 81 ++++++- src/qemu/qemu_driver.c | 13 +- src/qemu/qemu_hotplug.c | 309 ++++++++++++++++--------- src/qemu/qemu_hotplug.h | 4 +- src/qemu/qemu_parse_command.c | 4 +- src/qemu/qemu_process.c | 13 +- src/vbox/vbox_common.c | 4 +- src/xenconfig/xen_common.c | 4 +- src/xenconfig/xen_sxpr.c | 4 +- tests/virhostdevtest.c | 3 +- 19 files changed, 1107 insertions(+), 246 deletions(-) -- 2.5.5

1 13

[libvirt] [PATCH] qemuxml2argvtest: Adapt to ethernet automatic tap creation
by Michal Privoznik 13 Apr '16

13 Apr '16

After 9c17d665fdc5 the tap device for ethernet network type is automatically precreated before spawning qemu. Problem is, the qemuxml2argvtest wasn't updated and thus is failing. Because of all the APIs that new code is calling, I had to mock a lot. Also, since the tap FDs are labeled separately from the rest of the devices/files I had to enable NOP security driver for the test too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- There are only 2 problems with this patch. All of them are in virNetDevTapCreate mock implementation: 1) new tap device has constant name. Even within one domain 2) new tap FDs are constant. Even within one domain I'm unable to come with better approach though. Having a static variable that is incremented each time the mock is called would not fly as it will give different results when combined with VIR_TEST_RANGE. Therefore I assume we are good so far with these two limitations. cfg.mk | 2 +- tests/qemuhotplugtest.c | 7 ---- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- .../qemuxml2argv-net-eth-ifname.args | 2 +- .../qemuxml2argv-net-eth-names.args | 4 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 2 +- tests/qemuxml2argvmock.c | 49 ++++++++++++++++++++-- tests/testutilsqemu.c | 9 ++++ 8 files changed, 61 insertions(+), 16 deletions(-) diff --git a/cfg.mk b/cfg.mk index 6f28eef..f5573db 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1139,7 +1139,7 @@ exclude_file_name_regexp--sc_copyright_usage = \ ^COPYING(|\.LESSER)$$ exclude_file_name_regexp--sc_flags_usage = \ - ^(docs/|src/util/virnetdevtap\.c$$|tests/(vir(cgroup|pci|usb)|nss)mock\.c$$) + ^(docs/|src/util/virnetdevtap\.c$$|tests/(vir(cgroup|pci|usb)|nss|qemuxml2argv)mock\.c$$) exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \ ^(src/rpc/gendispatch\.pl$$|tests/) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 2298a68..1eb2b6a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -341,7 +341,6 @@ mymain(void) { int ret = 0; struct qemuHotplugTestData data = {0}; - virSecurityManagerPtr mgr; #if !WITH_YAJL fputs("libvirt not compiled with yajl, skipping this test\n", stderr); @@ -369,12 +368,6 @@ mymain(void) if (!driver.lockManager) return EXIT_FAILURE; - if (!(mgr = virSecurityManagerNew("none", "qemu", - VIR_SECURITY_MANAGER_PRIVILEGED))) - return EXIT_FAILURE; - if (!(driver.securityManager = virSecurityManagerNewStack(mgr))) - return EXIT_FAILURE; - /* wait only 100ms for DEVICE_DELETED event */ qemuDomainRemoveDeviceWaitTime = 100; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args index 7ca17ae..8a29a7e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args @@ -26,7 +26,7 @@ id=virtio-disk0 \ media=cdrom,id=drive-ide0-1-0 \ -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ -device rtl8139,vlan=0,id=net0,mac=52:54:00:71:70:89,bus=pci.0,addr=0x7 \ --net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,fd=3,vlan=0,name=hostnet0 \ -serial pty \ -device usb-tablet,id=input0 \ -spice port=5900 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args index 22d6dd0..b96c933 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args @@ -20,4 +20,4 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device rtl8139,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ --net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0,name=hostnet0 +-net tap,fd=3,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args index 0704178..a2c3f87 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args @@ -20,7 +20,7 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device rtl8139,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ --net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,fd=3,vlan=0,name=hostnet0 \ -device e1000,vlan=1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x4 \ --net tap,script=/etc/qemu-ifup,vlan=1,name=hostnet1 \ +-net tap,fd=3,vlan=1,name=hostnet1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args index b69cf52..b96c933 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.args @@ -20,4 +20,4 @@ QEMU_AUDIO_DRV=none \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ -device rtl8139,vlan=0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \ --net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 +-net tap,fd=3,vlan=0,name=hostnet0 diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index b7dfebb..e2c19a6 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -21,12 +21,15 @@ #include <config.h> #include "internal.h" -#include "virnuma.h" +#include "vircommand.h" #include "virmock.h" -#include "virutil.h" +#include "virnetdev.h" +#include "virnetdevtap.h" +#include "virnuma.h" +#include "virscsi.h" #include "virstring.h" #include "virtpm.h" -#include "virscsi.h" +#include "virutil.h" #include <time.h> #include <unistd.h> @@ -98,3 +101,43 @@ virSCSIDeviceGetSgName(const char *sysfs_prefix ATTRIBUTE_UNUSED, ignore_value(VIR_STRDUP(ret, "sg0")); return ret; } + +int +virNetDevTapCreate(char **ifname, + const char *tunpath ATTRIBUTE_UNUSED, + int *tapfd, + size_t tapfdSize, + unsigned int flags ATTRIBUTE_UNUSED) +{ + size_t i; + + for (i = 0; i < tapfdSize; i++) + tapfd[i] = STDERR_FILENO + 1 + i; + + return VIR_STRDUP(*ifname, "vnet0"); +} + +int +virNetDevSetMAC(const char *ifname ATTRIBUTE_UNUSED, + const virMacAddr *macaddr ATTRIBUTE_UNUSED) +{ + return 0; +} + +int +virCommandRun(virCommandPtr cmd ATTRIBUTE_UNUSED, + int *exitstatus) +{ + if (exitstatus) + *exitstatus = 0; + + return 0; +} + +void +virCommandPassFD(virCommandPtr cmd ATTRIBUTE_UNUSED, + int fd ATTRIBUTE_UNUSED, + unsigned int flags ATTRIBUTE_UNUSED) +{ + /* nada */ +} diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 1f854f5..eb4c6c8 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -555,6 +555,8 @@ int qemuTestCapsCacheInsert(virQEMUCapsCachePtr cache, const char *binary, int qemuTestDriverInit(virQEMUDriver *driver) { + virSecurityManagerPtr mgr = NULL; + memset(driver, 0, sizeof(*driver)); if (virMutexInit(&driver->lock) < 0) @@ -588,9 +590,16 @@ int qemuTestDriverInit(virQEMUDriver *driver) if (qemuTestCapsCacheInsert(driver->qemuCapsCache, "empty", NULL) < 0) goto error; + if (!(mgr = virSecurityManagerNew("none", "qemu", + VIR_SECURITY_MANAGER_PRIVILEGED))) + goto error; + if (!(driver->securityManager = virSecurityManagerNewStack(mgr))) + goto error; + return 0; error: + virObjectUnref(mgr); qemuTestDriverFree(driver); return -1; } -- 2.7.3

4 3

[libvirt] [libvirt-php PATCH 00/35] Add PHP7 support and unit tests
by Neal Gompa 12 Apr '16

12 Apr '16

First, I apologize if this was sent twice to anyone. I had an error in my git send-email configuration. This patch set primarily adds support for PHP 7 to libvirt-php, but also adds the capability for libvirt-php to be built using the standard PHP extension build system method. Several tests have been updated and added by Remi Collet (Fedora PHP stack maintainer) and Frederic Mora (my colleague who graciously assisted in this effort). I intend to provide more tests over time, but I think this is a good start. These tests can be run through `make tests` in the new build system. Instructions for using the new build system is also included. The original build system still properly builds libvirt-php on either PHP 5.6 or PHP 7.0. This was tested using Remi's PHP 5.6 and PHP 7.0 software collections on CentOS 7.2. Most of this work was done by Remi Collet several weeks ago, with Chuck Roydhouse doing work to ensure that Vasiliy Tolstov's patches from the current git master could be incorporated into this work. They are included in this patch set, but should be the same as what is in the tree now. This work started before he posted his commits and they were merged, and were merged in to ensure that it could remain working. The version number was bumped to 0.5.2 by Remi, and I bumped it in the main build system simply for consistency. I would greatly appreciate a quick review and merge of this patch set. Chuck Roydhouse (1): add arginfo for libvirt_domain_block_commit and libvirt_domain_block_job_info Frederic Mora (1): Add more tests Neal Gompa (2): Commit short instructions to using the php extension build method Bump version to 0.5.2 Remi Collet (28): add config.m4 to allow standard PHP extension build system include config.h earlier add missing arginfo (wip) fix typo in config.m4 add missing arginfo, part 2 adapt RETURN_STRING work on zpp register + fetch resources + hash adapt add_assoc_string_ex clean ALLOC_INIT_ZVAL zend_hash_update add_next_index_string buildable with PHP 7 bump version 0.5.2-dev fix zpp fix missed (hidden) zpp calls fix PHP 5 compat fix libvirt_version + add test port test-connect.phpt to real phpt Switch all add_assoc_string_ex to add_assoc_string to avoid nul char management Fix max_connections management add test-conn-limit.phpt (as real phpt) add test-connect-get-emulator.phpt fix parse_array + build warnings convert test-install.phpt to real phpt convert test-domain-create-and-coredump.phpt to real phpt convert test-domain-create-and-get-xpath.phpt to real phpt fix PHP 5 compat again (nested macro issue) Vasiliy Tolstov (3): add some checks to prevent overflow add block_commit support and needed const add libvirt_domain_block_job_info

3 42