- Devel - libvirt List Archives

[libvirt] [PATCH 0/7] Add notification for memory hot-unplug failure
by Peter Krempa 13 Apr '16

13 Apr '16

Add a new libvirt event VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED that will handle failure to unplug a device if we are certain that it will not be unplugged and wire up the ACPI_DEVICE_OST qemu event that is emitted on memory hotunplug failure so that the event is propagated and the API fails in such case. Along with that a few refactors were necessary. Peter Krempa (7): qemu: hotplug: Properly handle errors in qemuDomainWaitForDeviceRemoval qemu: hotplug: Refactor semantics of qemuDomainWaitForDeviceRemoval qemu: Use domain condition for device removal singalling qemu: hotplug: Add support for signalling device unplug failure Add VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED event qemu: monitor: Add support for ACPI_DEVICE_OST event handling qemu: process: Wire up ACPI OST events to notify users of failed memory unplug daemon/remote.c | 36 +++++++++++++ include/libvirt/libvirt-domain.h | 21 ++++++++ src/conf/domain_event.c | 84 ++++++++++++++++++++++++++++++ src/conf/domain_event.h | 7 +++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 4 -- src/qemu/qemu_domain.h | 18 ++++++- src/qemu/qemu_hotplug.c | 110 +++++++++++++++++---------------------- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_monitor.c | 19 +++++++ src/qemu/qemu_monitor.h | 18 +++++++ src/qemu/qemu_monitor_json.c | 39 ++++++++++++++ src/qemu/qemu_process.c | 71 ++++++++++++++++++++++++- src/remote/remote_driver.c | 30 +++++++++++ src/remote/remote_protocol.x | 14 ++++- src/remote_protocol-structs | 6 +++ tools/virsh-domain.c | 18 +++++++ 17 files changed, 428 insertions(+), 72 deletions(-) -- 2.8.0

2 18

[libvirt] [PATCH 0/4] Test cleanups
by Ján Tomko 13 Apr '16

13 Apr '16

Noticed these while I was trying to look for an easy solution to the VIR_TEST_REGENERATE_OUTPUT problem. Ján Tomko (4): drop qemuBuildCommandLineCallbacks tests: clean up includes qemuxml2argvtest: drop FLAG_EXPECT_ERROR qemu: assign addresses before aliases src/qemu/qemu_command.c | 35 +++++++++++------------------------ src/qemu/qemu_command.h | 18 ++---------------- src/qemu/qemu_hotplug.c | 3 +-- src/qemu/qemu_process.c | 29 ++++++++++++++--------------- tests/qemuxml2argvtest.c | 35 ++++++++++------------------------- tests/qemuxml2xmltest.c | 2 +- tests/testutilsqemu.c | 19 ------------------- tests/testutilsqemu.h | 3 +-- 8 files changed, 40 insertions(+), 104 deletions(-) -- 2.7.3

2 8

[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 13 Apr '16

13 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

[libvirt] [PATCH v3 0/6] vz: change vz driver to be stateful driver and other enhancements
by Maxim Nestratov 13 Apr '16

13 Apr '16

There is no benefit in providing two ways of connecting to vz driver: by connecting via daemon and directly from client. Both ways finally come to a host where vz daemon sits. Always connecting via daemon allows us to have a single list of domains and share it among all connections. Since v1: removed patch "z: remove close callback implementations" building fixed close callback functions are added to libvirt_private.syms reworked not to lose event subscribers when connections drop Since v2: removed "vz: change vzConnectIsAlive behavior" addressed mostly all comments on previous series changed "vz: build driver as module and don't register it on client's side" Maxim Nestratov (6): vz: build driver as module and don't register it on client's side vz: introduce new vzDriver lockable structure and use it vz: lock driver when a new domain is created in prlsdkNewDomainByHandle vz: implement connectGetSysinfo hypervisor callback vz: remove vzDriverLock/Unlock function vz: minor cleanup daemon/Makefile.am | 4 + daemon/libvirtd.c | 9 ++ src/Makefile.am | 19 ++- src/libvirt.c | 7 - src/libvirt_private.syms | 7 + src/vz/vz_driver.c | 384 +++++++++++++++++++++++++++++------------------ src/vz/vz_sdk.c | 211 +++++++++++++------------- src/vz/vz_sdk.h | 30 ++-- src/vz/vz_utils.c | 27 ++-- src/vz/vz_utils.h | 34 +++-- 10 files changed, 431 insertions(+), 301 deletions(-) -- 2.4.3

1 6

[libvirt] [PATCH v2 00/10] vz: change vz driver to be stateful driver and other enhancements
by Maxim Nestratov 13 Apr '16

13 Apr '16

There is no benefit in providing two ways of connecting to vz driver: by connecting via daemon and directly from client. Both ways finally come to a host where vz daemon sits. Always connecting via daemon allows us to have a single list of domains and share it among all connections. Since v1: removed patch "z: remove close callback implementations" building fixed close callback functions are added to libvirt_private.syms reworked not to lose event subscribers when connections drop Maxim Nestratov (10): virsh: report when vz driver is compiled vz: change the order of capabilities reported vz: remove drivername field from vzConn structure vz: add Hypervisor prefix to vz and parallels Driver structures vz: build driver as module and don't register it on client's side vz: introduce new vzDriver lockable structure and use it vz: implement connectGetSysinfo hypervisor callback vz: remove vzDriverLock/Unlock function vz: minor cleanup vz: change vzConnectIsAlive behavior daemon/Makefile.am | 4 + daemon/libvirtd.c | 9 ++ src/Makefile.am | 20 ++- src/libvirt.c | 7 - src/libvirt_private.syms | 6 + src/vz/vz_driver.c | 414 +++++++++++++++++++++++++++++------------------ src/vz/vz_sdk.c | 211 ++++++++++++------------ src/vz/vz_sdk.h | 30 ++-- src/vz/vz_utils.c | 32 ++-- src/vz/vz_utils.h | 33 +++- tools/virsh.c | 3 + 11 files changed, 452 insertions(+), 317 deletions(-) -- 2.4.3

2 21

[libvirt] [PATCH v2] 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 --- v2: Add virGettextInitialize rather than duplicate the code everywhere 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 -- 18 files changed, 116 insertions(+), 111 deletions(-) create mode 100644 src/util/virgettext.c create mode 100644 src/util/virgettext.h 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/15] support for pxb and pxb-pcie controllers
by Laine Stump 12 Apr '16

12 Apr '16

These two controllers are used to create a new root bus on a 440fx (pxb) or q35 (pxb-pie) virtual machine. There may be other use cases, but the main reason for me taking the time to support a separate root bus is to have assigned devices be visible in the guest on a different NUMA node, so that the guest can be aware of the locality of the device wrt CPU and memory that are on different NUMA nodes - although you aren't required to, you can add a <node>N</node> subelement to the bus' <target> element to indicate which NUMA node it is on (it's up to the management application to place devices on that bus that really are on the given NUMA node in the host). There are several differences between pxb and pxb-pcie, which are detailed in the individual commit log messages, but in short: 1) pxb is for 440fx, pxb-pcie for q35 (they *might* work on other arches/machinetypes that have a PCI or PCIe bus, but I haven't enabled that) 2) pxb has an integrate d pci-bridge with 32 slots that are (should be) hotplug-capable, while pxb-pcie supplies only a single slot, and it will only accept a pcie-root-port (which will then accept a single device, hotplug-capable) or a pcie-switch-upstream-port. Along the way I encountered a few minor problems/ugliness that I took care of in patches 01/15 - 09/15. pxb support is in 10-12, and pxb-pcie is in 13-15 There is a bugzilla record associated with this: https://bugzilla.redhat.com/show_bug.cgi?id=1103314 Laine Stump (15): schema: make pci slot and function optional schema: rename uint8range/uint24range to uint8/uint24 schema: new basic type - uint16 schema: allow pci address attributes to be in decimal conf: use #define instead of literal for highest slot in upstream port conf: allow use of slot 0 in a dmi-to-pci-bridge conf/qemu: change the way VIR_PCI_CONNECT_TYPE_* flags work conf: utility function to convert PCI controller model into connect type qemu: set PCI controller default modelName in a separate function qemu: add capabilities bit for device "pxb" conf: new pci controller model pci-expander-bus qemu: support new pci controller model "pci-expander-bus" qemu: add capabilities bit for device "pxb-pcie" conf: new pci controller model pcie-expander-bus qemu: support new pci controller model "pcie-expander-bus" docs/formatdomain.html.in | 74 +++- docs/schemas/basictypes.rng | 63 ++-- docs/schemas/domaincommon.rng | 23 +- docs/schemas/networkcommon.rng | 12 +- docs/schemas/nwfilter.rng | 16 +- src/bhyve/bhyve_device.c | 10 +- src/conf/domain_addr.c | 119 +++++-- src/conf/domain_addr.h | 68 ++-- src/conf/domain_conf.c | 61 +++- src/conf/domain_conf.h | 11 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 74 ++++ src/qemu/qemu_domain.c | 42 +++ src/qemu/qemu_domain_address.c | 305 +++++++++------- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 3 + .../qemuxml2argv-aarch64-virtio-pci-default.args | 2 +- ...l2argv-aarch64-virtio-pci-manual-addresses.args | 2 +- .../qemuxml2argv-pci-expander-bus-bad-machine.xml | 167 +++++++++ .../qemuxml2argv-pci-expander-bus-bad-node.xml | 160 +++++++++ .../qemuxml2argv-pci-expander-bus.args | 87 +++++ .../qemuxml2argv-pci-expander-bus.xml | 167 +++++++++ .../qemuxml2argv-pcie-expander-bus-bad-machine.xml | 36 ++ .../qemuxml2argv-pcie-expander-bus.args | 123 +++++++ .../qemuxml2argv-pcie-expander-bus.xml | 247 +++++++++++++ .../qemuxml2argv-pcie-root-port.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 2 +- .../qemuxml2argv-pcie-switch-downstream-port.args | 2 +- .../qemuxml2argv-pcie-switch-upstream-port.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- .../qemuxml2argv-q35-pm-disable-fallback.args | 2 +- .../qemuxml2argv-q35-pm-disable.args | 2 +- .../qemuxml2argv-q35-usb2-multi.args | 2 +- .../qemuxml2argv-q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-usb-controller-default-q35.args | 2 +- .../qemuxml2argv-usb-controller-explicit-q35.args | 2 +- tests/qemuxml2argvtest.c | 25 ++ .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 2 +- ...2xmlout-aarch64-virtio-pci-manual-addresses.xml | 2 +- .../qemuxml2xmlout-pci-expander-bus.xml | 207 +++++++++++ .../qemuxml2xmlout-pcie-expander-bus.xml | 384 +++++++++++++++++++++ .../qemuxml2xmlout-pcie-root-port.xml | 2 +- .../qemuxml2xmlout-pcie-root.xml | 2 +- .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 2 +- .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 2 +- .../qemuxml2xmlout-pcihole64-q35.xml | 2 +- .../qemuxml2xmlout-q35-usb2-multi.xml | 2 +- .../qemuxml2xmlout-q35-usb2-reorder.xml | 2 +- .../qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- tests/qemuxml2xmltest.c | 10 + 57 files changed, 2296 insertions(+), 261 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-machine.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus-bad-node.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus-bad-machine.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-expander-bus.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-expander-bus.xml -- 2.5.5

3 24

[libvirt] [PATCH] Be consistent with setlocale error handling
by Cole Robinson 12 Apr '16

12 Apr '16

Take setlocale/gettext error handling pattern from tools/virsh-* and use it in all the other standalone binaries. The changes are * 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 --- daemon/libvirtd.c | 20 ++++++++++++++++---- src/locking/lock_daemon.c | 20 ++++++++++++++++---- src/locking/sanlock_helper.c | 16 ++++++++++++---- src/logging/log_daemon.c | 20 ++++++++++++++++---- src/lxc/lxc_controller.c | 20 ++++++++++++++++---- src/network/leaseshelper.c | 16 ++++++++++++---- src/security/virt-aa-helper.c | 16 ++++++++++++---- src/storage/parthelper.c | 16 ++++++++++++---- src/util/iohelper.c | 16 ++++++++++++---- 9 files changed, 124 insertions(+), 36 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 3d38a46..9488950 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1172,10 +1172,22 @@ int main(int argc, char **argv) { {0, 0, 0, 0} }; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL || - virInitialize() < 0) { + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); + exit(EXIT_FAILURE); + } + + if (virInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); } diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 973e691..fffbe1d 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1179,10 +1179,22 @@ int main(int argc, char **argv) { privileged = geteuid() == 0; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL || - virThreadInitialize() < 0 || + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); + exit(EXIT_FAILURE); + } + + if (virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index d8d294f..6b17fce 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -70,10 +70,18 @@ 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 (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); exit(EXIT_FAILURE); } diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index f674cbd..8a0de22 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -936,10 +936,22 @@ int main(int argc, char **argv) { privileged = geteuid() == 0; - if (setlocale(LC_ALL, "") == NULL || - bindtextdomain(PACKAGE, LOCALEDIR) == NULL || - textdomain(PACKAGE) == NULL || - virThreadInitialize() < 0 || + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); + exit(EXIT_FAILURE); + } + + if (virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8b5ec4c..612c0d7 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2505,10 +2505,22 @@ 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 || - virThreadInitialize() < 0 || + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); + exit(EXIT_FAILURE); + } + + if (virThreadInitialize() < 0 || virErrorInitialize() < 0) { fprintf(stderr, _("%s: initialization failed\n"), argv[0]); exit(EXIT_FAILURE); diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 097cd11..e753e75 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -115,10 +115,18 @@ 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); + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); exit(EXIT_FAILURE); } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 50d2a08..f47dc63 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1298,10 +1298,18 @@ 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]); + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); exit(EXIT_FAILURE); } diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index d1df068..c0f1f5a 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -72,10 +72,18 @@ 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 (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); exit(EXIT_FAILURE); } diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 8a3c377..0200bb1 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -230,10 +230,18 @@ 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); + if (!setlocale(LC_ALL, "")) { + perror("setlocale"); + /* failure to setup locale is not fatal */ + } + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) { + perror("bindtextdomain"); + exit(EXIT_FAILURE); + } + + if (!textdomain(PACKAGE)) { + perror("textdomain"); exit(EXIT_FAILURE); } -- 2.7.3

2 2

[libvirt] [PATCH] tests: fix xen-related tests
by Ján Tomko 12 Apr '16

12 Apr '16

My commit 6879be4 moved the addition of the implicit video device from the XML parser to the PostParse function, but did not regenerate all the tests. --- Technically a build breaker fix, but perhaps too big to push without review. tests/sexpr2xmldata/sexpr2xml-curmem.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-fv.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 3 +++ tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 3 +++ tests/xlconfigdata/test-disk-positional-parms-full.xml | 3 +++ tests/xlconfigdata/test-disk-positional-parms-partial.xml | 3 +++ tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml | 3 +++ tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml | 3 +++ tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml | 3 +++ tests/xlconfigdata/test-fullvirt-multiusb.xml | 3 +++ tests/xlconfigdata/test-fullvirt-nohap.xml | 3 +++ tests/xlconfigdata/test-new-disk.xml | 3 +++ tests/xlconfigdata/test-rbd-multihost-noauth.xml | 3 +++ tests/xlconfigdata/test-spice-features.xml | 3 +++ tests/xlconfigdata/test-spice.xml | 3 +++ tests/xlconfigdata/test-vif-rate.xml | 3 +++ tests/xmconfigdata/test-escape-paths.xml | 3 +++ tests/xmconfigdata/test-fullvirt-default-feature.xml | 3 +++ tests/xmconfigdata/test-fullvirt-force-hpet.xml | 3 +++ tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 3 +++ tests/xmconfigdata/test-fullvirt-localtime.xml | 3 +++ tests/xmconfigdata/test-fullvirt-net-netfront.xml | 3 +++ tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 3 +++ tests/xmconfigdata/test-fullvirt-nohap.xml | 3 +++ tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-file.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-null.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-pty.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-udp.xml | 3 +++ tests/xmconfigdata/test-fullvirt-serial-unix.xml | 3 +++ tests/xmconfigdata/test-fullvirt-sound.xml | 3 +++ tests/xmconfigdata/test-fullvirt-usbmouse.xml | 3 +++ tests/xmconfigdata/test-fullvirt-usbtablet.xml | 3 +++ tests/xmconfigdata/test-fullvirt-utc.xml | 3 +++ tests/xmconfigdata/test-no-source-cdrom.xml | 3 +++ tests/xmconfigdata/test-paravirt-net-e1000.xml | 3 +++ tests/xmconfigdata/test-paravirt-net-vifname.xml | 3 +++ tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml | 3 +++ tests/xmconfigdata/test-paravirt-new-pvfb.xml | 3 +++ tests/xmconfigdata/test-pci-devs.xml | 3 +++ 73 files changed, 219 insertions(+) diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml index 4ac263e..a2668d1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml +++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml @@ -34,6 +34,9 @@ <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml index 17522f1..c4b22f6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml @@ -50,6 +50,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='5925' autoport='yes' keymap='en-us'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml index 00907fe..17d4016 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml @@ -43,6 +43,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml index 7e014dc..20a0d76 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml @@ -46,6 +46,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml index 1fa8c14..13fb299 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml @@ -46,6 +46,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml index d82ca38..1380426 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml @@ -43,6 +43,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml index d5479dc..64111fe 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml @@ -44,6 +44,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml index 91afcc1..f362aee 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml @@ -48,6 +48,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml index b5bdf5c..4d3bdde 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml @@ -55,6 +55,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml index aca8f15..d3eaf82 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml @@ -51,6 +51,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml index ac754a2..0f209d6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml @@ -51,6 +51,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml index 3ed8c77..b157f63 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml @@ -49,6 +49,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml index 649b5e6..d9cd840 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml @@ -51,6 +51,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml index ef84402..2cffa65 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml @@ -49,6 +49,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml index 07bd1fa..6e473d4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml @@ -49,6 +49,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml index cd3031b..f03bd29 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml @@ -53,6 +53,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml index ab23196..2e9c629 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml @@ -53,6 +53,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml index fe89b9a..3f3f676 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml @@ -53,6 +53,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml index 344ea42..4f28511 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml @@ -51,6 +51,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml index caa856f..f934a85 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml @@ -45,6 +45,9 @@ <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <sound model='sb16'/> <sound model='es1370'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml index caa856f..f934a85 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml @@ -45,6 +45,9 @@ <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> <sound model='sb16'/> <sound model='es1370'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml index bf710ec..8b5887e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml @@ -44,6 +44,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml index 8e9fd80..3e4b366 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml @@ -44,6 +44,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml index 1d81991..9c2b9e3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml @@ -43,6 +43,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml index 1d81991..9c2b9e3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml @@ -43,6 +43,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml index 1d81991..9c2b9e3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml @@ -43,6 +43,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml index 310279d..97d9482 100644 --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml @@ -48,6 +48,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml index eacfc97..dbdacf9 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml @@ -29,6 +29,9 @@ <graphics type='vnc' port='5925' autoport='no' listen='0.0.0.0' keymap='ja'> <listen type='address' address='0.0.0.0'/> </graphics> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml index f5b80c8..c415aab 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml @@ -29,6 +29,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'> <listen type='address' address='0.0.0.0'/> </graphics> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml index 0aebf20..c1acba1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml @@ -32,6 +32,9 @@ <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml index 58b7dd0..45887e5 100644 --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml @@ -47,6 +47,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='ja'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml index 7fd1899..3d4868c 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml @@ -51,5 +51,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml index 7c42736..402f479 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml @@ -51,5 +51,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml index 1a27be6..686a409 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml @@ -48,5 +48,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml index 1a27be6..686a409 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml @@ -48,5 +48,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml index 1a27be6..686a409 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml @@ -48,5 +48,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml index 1686807..5ec72c4 100644 --- a/tests/xlconfigdata/test-fullvirt-multiusb.xml +++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml @@ -47,5 +47,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml index d9dad20..a997c7a 100644 --- a/tests/xlconfigdata/test-fullvirt-nohap.xml +++ b/tests/xlconfigdata/test-fullvirt-nohap.xml @@ -55,5 +55,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml index 7fd1899..3d4868c 100644 --- a/tests/xlconfigdata/test-new-disk.xml +++ b/tests/xlconfigdata/test-new-disk.xml @@ -51,5 +51,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml index 560080f..f8f663f 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml @@ -48,5 +48,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml index 0f81f3d..f9eb857 100644 --- a/tests/xlconfigdata/test-spice-features.xml +++ b/tests/xlconfigdata/test-spice-features.xml @@ -47,5 +47,8 @@ <mouse mode='client'/> <clipboard copypaste='yes'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml index e997654..fc2fa3f 100644 --- a/tests/xlconfigdata/test-spice.xml +++ b/tests/xlconfigdata/test-spice.xml @@ -47,5 +47,8 @@ <mouse mode='server'/> <clipboard copypaste='no'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml index 2d42fa7..0e13f2e 100644 --- a/tests/xlconfigdata/test-vif-rate.xml +++ b/tests/xlconfigdata/test-vif-rate.xml @@ -54,5 +54,8 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> </devices> </domain> diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 6aae9c7..6373fdf 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -53,6 +53,9 @@ </graphics> <sound model='sb16'/> <sound model='es1370'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml index 2eacbd9..6f4dae6 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.xml +++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml @@ -47,6 +47,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml index 2eacbd9..6f4dae6 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml @@ -47,6 +47,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml index 987096d..6015405 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml @@ -47,6 +47,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml index 29fcd56..5f81e25 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -45,6 +45,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml index 621955d..cb0615b 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml @@ -45,6 +45,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml index bc9865b..d29892e 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -45,6 +45,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml index 671c71b..f38366c 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.xml +++ b/tests/xmconfigdata/test-fullvirt-nohap.xml @@ -46,6 +46,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml index 081ad74..3269aee 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -50,6 +50,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml index 074cbcb..a20d6c8 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml @@ -57,6 +57,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml index 88a0293..8344da3 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml @@ -53,6 +53,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml index 7ac994f..b9439d7 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -53,6 +53,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml index bc47c4b..6e8196b 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -51,6 +51,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml index afaa64f..da0c9bd 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -53,6 +53,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml index ac68710..acff588 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -51,6 +51,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml index cf30786..6909053 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -51,6 +51,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index 4e943c1..a3fd449 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -55,6 +55,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml index f752be8..9dba76d 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -55,6 +55,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml index d70c5d8..3577f92 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -55,6 +55,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml index 9900179..919108b 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -53,6 +53,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml index abbe8df..0e85953 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -47,6 +47,9 @@ </graphics> <sound model='sb16'/> <sound model='es1370'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml index 460ecc7..8eb5aa5 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -46,6 +46,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml index e6e807a..dcdd951 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -46,6 +46,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml index bc9865b..d29892e 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -45,6 +45,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml index 7600085..d4c2fd6 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.xml +++ b/tests/xmconfigdata/test-no-source-cdrom.xml @@ -48,6 +48,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml index 0db020f..ad44d11 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -32,6 +32,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml index ff17aee..e94b685 100644 --- a/tests/xmconfigdata/test-paravirt-net-vifname.xml +++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml @@ -33,6 +33,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml index ce7bfb9..3ca3023 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml @@ -31,6 +31,9 @@ <graphics type='vnc' port='5925' autoport='no' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml index cba6dff..d97799a 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -31,6 +31,9 @@ <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'> <listen type='address' address='127.0.0.1'/> </graphics> + <video> + <model type='xen' heads='1' primary='yes'/> + </video> <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml index 74f17b0..4c3f5f2 100644 --- a/tests/xmconfigdata/test-pci-devs.xml +++ b/tests/xmconfigdata/test-pci-devs.xml @@ -48,6 +48,9 @@ <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes'/> + <video> + <model type='cirrus' heads='1' primary='yes'/> + </video> <hostdev mode='subsystem' type='pci' managed='no'> <source> <address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/> -- 2.4.10

2 1

[libvirt] [PATCH 0/3] vz: simplify getting strings from vz sdk
by Nikolay Shirokovskiy 12 Apr '16

12 Apr '16

Nikolay Shirokovskiy (3): vz: simplify getting strings from vzsdk vz: fix memory leak vz: simplify getting fixed size strings from vzsdk src/vz/vz_sdk.c | 203 +++++++++++++++++++++----------------------------------- 1 file changed, 77 insertions(+), 126 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH 0/4] vz: use disk bus and target name as disk id
by Nikolay Shirokovskiy 12 Apr '16

12 Apr '16

This series is a preparation to implement device update functionality. In case of disk updates disk bus and disk target name pair is considered disk id. We already have places in vz driver code where we use disk source as id. These places are either not critical (see boot patch) or correct (see detach patch) so we need not to fix them immediately to use more rubust id. But as this id will be introduced anyway for disk updates let's move to new id in existing code. This way we have single id for disks. Nikolay Shirokovskiy (4): vz: introduce vzsdk disk id function vz: fix detach disk to use new disk id vz: fix boot check to use new disk id vz: cleanup: remove trivial function src/vz/vz_sdk.c | 265 +++++++++++++++++++++++++++----------------------------- 1 file changed, 126 insertions(+), 139 deletions(-) -- 1.8.3.1

1 4

[libvirt] [PATCH v3 0/2] vz: implement memory setting functions in driver
by Nikolay Shirokovskiy 12 Apr '16

12 Apr '16

Changes from v2: 1. factor out common code first and reuse utility code to resolve 'current' flag. 2. drop supporting 'maximum' flag Nikolay Shirokovskiy (2): vz: factor out config update flags checks vz: implement memory setting functions src/vz/vz_driver.c | 98 +++++++++++++++++++++++++++++++++--------------------- src/vz/vz_sdk.c | 24 +++++++++++++ src/vz/vz_sdk.h | 2 ++ 3 files changed, 86 insertions(+), 38 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH 0/7] Mark implicit video device as primary
by Ján Tomko 12 Apr '16

12 Apr '16

Patch 2 fixes startup of transient qemu domains with no <video> element: https://bugzilla.redhat.com/show_bug.cgi?id=1325757 Ján Tomko (7): conf: move default video addition after XML parsing conf: also mark the implicit video as primary conf: use the iterator directly when parsing video devices conf: use insertAt instead of j conf: delete useless primaryVideo variable conf: reduce indentation in virDomainDefAddImplicitVideo conf: use VIR_APPEND_ELEMENT in virDomainDefAddImplicitVideo src/conf/domain_conf.c | 80 ++++++++++++---------- .../qemuargv2xml-graphics-sdl-fullscreen.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml | 2 +- .../qemuargv2xml-graphics-vnc-policy.xml | 2 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 2 +- .../qemuargv2xml-graphics-vnc-socket.xml | 2 +- .../qemuargv2xml-graphics-vnc-tls.xml | 2 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 2 +- tests/vmx2xmldata/vmx2xml-annotation.xml | 2 +- tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml | 2 +- .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-cdrom-scsi-passthru.xml | 2 +- .../vmx2xml-cdrom-scsi-raw-auto-detect.xml | 2 +- .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-datacenterpath.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-custom.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-generated.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-nat.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-other.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-static.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml | 2 +- tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml | 2 +- tests/vmx2xmldata/vmx2xml-floppy-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-floppy-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml | 2 +- tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-harddisk-transient.xml | 2 +- tests/vmx2xmldata/vmx2xml-minimal-64bit.xml | 2 +- tests/vmx2xmldata/vmx2xml-minimal.xml | 2 +- tests/vmx2xmldata/vmx2xml-parallel-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-parallel-file.xml | 2 +- tests/vmx2xmldata/vmx2xml-scsi-driver.xml | 2 +- tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml | 2 +- tests/vmx2xmldata/vmx2xml-serial-device.xml | 2 +- tests/vmx2xmldata/vmx2xml-serial-file.xml | 2 +- .../vmx2xmldata/vmx2xml-serial-network-client.xml | 2 +- .../vmx2xmldata/vmx2xml-serial-network-server.xml | 2 +- tests/vmx2xmldata/vmx2xml-serial-pipe.xml | 2 +- tests/vmx2xmldata/vmx2xml-sharedfolder.xml | 2 +- tests/vmx2xmldata/vmx2xml-smbios.xml | 2 +- tests/vmx2xmldata/vmx2xml-svga.xml | 2 +- tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml | 2 +- tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml | 2 +- 68 files changed, 112 insertions(+), 102 deletions(-) -- 2.7.3

2 14

[libvirt] [PATCH] domain_conf: fix graphics parsing
by Pavel Hrdina 12 Apr '16

12 Apr '16

Commit dc98a5bc refactored the code a lot and forget about checking if listen attribute is specified. This ensures that listen attribute and first listen element are compared only if both exist. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 3 +- .../qemuxml2argv-graphics-vnc-no-listen-attr.args | 22 ++++++++++++ .../qemuxml2argv-graphics-vnc-no-listen-attr.xml | 36 +++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-graphics-vnc-no-listen-attr.xml | 41 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9e547b4..d2cf8d5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10741,7 +10741,8 @@ virDomainGraphicsListensParseXML(virDomainGraphicsDefPtr def, if (STREQ_NULLABLE(listenAddr, "")) VIR_FREE(listenAddr); - if (address && STRNEQ_NULLABLE(address->address, listenAddr)) { + if (address && listenAddr && + STRNEQ_NULLABLE(address->address, listenAddr)) { virReportError(VIR_ERR_XML_ERROR, _("graphics listen attribute %s must match address " "attribute of first listen element (found %s)"), diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args new file mode 100644 index 0000000..f374cff --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args @@ -0,0 +1,22 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \ +-no-acpi \ +-boot c \ +-usb \ +-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 \ +-vnc '[2001:1:2:3:4:5:1234:1234]:3' \ +-vga cirrus diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.xml new file mode 100644 index 0000000..f80a010 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.xml @@ -0,0 +1,36 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='5903' autoport='no'> + <listen type='address' address='2001:1:2:3:4:5:1234:1234'/> + </graphics> + <video> + <model type='cirrus' vram='16384' heads='1'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index f1b2a8d..975e358 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -891,6 +891,7 @@ mymain(void) DO_TEST("graphics-vnc-socket", QEMU_CAPS_VNC); DO_TEST("graphics-vnc-websocket", QEMU_CAPS_VNC, QEMU_CAPS_VNC_WEBSOCKET); DO_TEST("graphics-vnc-policy", QEMU_CAPS_VNC, QEMU_CAPS_VNC_SHARE_POLICY); + DO_TEST("graphics-vnc-no-listen-attr", QEMU_CAPS_VNC); driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml new file mode 100644 index 0000000..0627bbd --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-no-listen-attr.xml @@ -0,0 +1,41 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'> + <listen type='address' address='2001:1:2:3:4:5:1234:1234'/> + </graphics> + <video> + <model type='cirrus' vram='16384' heads='1' primary='yes'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </video> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 0735677..dddc775 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -430,6 +430,7 @@ mymain(void) DO_TEST("graphics-vnc-websocket"); DO_TEST("graphics-vnc-sasl"); DO_TEST("graphics-vnc-tls"); + DO_TEST("graphics-vnc-no-listen-attr"); DO_TEST("graphics-sdl"); DO_TEST("graphics-sdl-fullscreen"); DO_TEST("graphics-spice"); -- 2.8.1

4 5

[libvirt] [PATCH/GSoC] Use virGetLastErrorMessage() rather than open code it
by Hui Yiqun 11 Apr '16

11 Apr '16

getting err using virGetLastError() and then retrieving message from err make developer have to test the value of err and err->message and default to self-defined unkown error message. It's better to avoid it and using uniform virGetLastErrorMessage --- daemon/libvirtd.c | 8 +--- examples/object-events/event-test.c | 9 ++--- src/bhyve/bhyve_driver.c | 3 +- src/libvirt.c | 3 +- src/libxl/libxl_domain.c | 3 +- src/libxl/libxl_driver.c | 3 +- src/locking/lock_daemon.c | 8 +--- src/logging/log_daemon.c | 8 +--- src/lxc/lxc_container.c | 8 +--- src/lxc/lxc_controller.c | 7 +--- src/lxc/lxc_domain.c | 3 +- src/lxc/lxc_process.c | 6 +-- src/network/bridge_driver.c | 3 +- src/node_device/node_device_hal.c | 3 +- src/rpc/virnettlscontext.c | 3 +- src/secret/secret_driver.c | 6 +-- src/storage/storage_driver.c | 16 ++------ src/uml/uml_driver.c | 3 +- src/util/iohelper.c | 8 +--- src/util/virhook.c | 3 +- src/util/virhostdev.c | 20 ++++----- src/util/virpci.c | 4 +- tests/commandtest.c | 81 +++++++++++++------------------------ tests/libvirtdconftest.c | 3 +- tests/openvzutilstest.c | 6 +-- tests/securityselinuxlabeltest.c | 6 +-- tests/securityselinuxtest.c | 6 +-- tests/virnettlscontexttest.c | 3 +- 28 files changed, 75 insertions(+), 168 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 3d38a46..e526e55 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1273,12 +1273,8 @@ int main(int argc, char **argv) { /* Read the config file if it exists*/ if (remote_config_file && daemonConfigLoadFile(config, remote_config_file, implicit_conf) < 0) { - virErrorPtr err = virGetLastError(); - if (err && err->message) - VIR_ERROR(_("Can't load config file: %s: %s"), - err->message, remote_config_file); - else - VIR_ERROR(_("Can't load config file: %s"), remote_config_file); + VIR_ERROR(_("Can't load config file: %s: %s"), + virGetLastErrorMessage(), remote_config_file); exit(EXIT_FAILURE); } diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 7be1d21..4a4ef86 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -654,9 +654,8 @@ int main(int argc, char **argv) } if (virEventRegisterDefaultImpl() < 0) { - virErrorPtr err = virGetLastError(); fprintf(stderr, "Failed to register event implementation: %s\n", - err && err->message ? err->message: "Unknown error"); + virGetLastErrorMessage()); goto cleanup; } @@ -794,17 +793,15 @@ int main(int argc, char **argv) goto cleanup; if (virConnectSetKeepAlive(dconn, 5, 3) < 0) { - virErrorPtr err = virGetLastError(); fprintf(stderr, "Failed to start keepalive protocol: %s\n", - err && err->message ? err->message : "Unknown error"); + virGetLastErrorMessage()); run = 0; } while (run) { if (virEventRunDefaultImpl() < 0) { - virErrorPtr err = virGetLastError(); fprintf(stderr, "Failed to run event loop: %s\n", - err && err->message ? err->message : "Unknown error"); + virGetLastErrorMessage()); } } diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9219890..6f2423c 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -88,9 +88,8 @@ bhyveAutostartDomain(virDomainObjPtr vm, void *opaque) ret = virBhyveProcessStart(data->conn, data->driver, vm, VIR_DOMAIN_RUNNING_BOOTED, 0); if (ret < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to autostart VM '%s': %s"), - vm->def->name, err ? err->message : _("unknown error")); + vm->def->name, virGetLastErrorMessage()); } } virObjectUnlock(vm); diff --git a/src/libvirt.c b/src/libvirt.c index dd58e9c..99b1c47 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -777,10 +777,9 @@ virStateInitialize(bool privileged, if (virStateDriverTab[i]->stateInitialize(privileged, callback, opaque) < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Initialization of %s state driver failed: %s"), virStateDriverTab[i]->name, - err && err->message ? err->message : _("Unknown problem")); + virGetLastErrorMessage()); return -1; } } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index c8d09b1..a814ae5 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -514,9 +514,8 @@ libxlDomainShutdownThread(void *opaque) libxlDomainDestroyInternal(driver, vm); libxlDomainCleanup(driver, vm); if (libxlDomainStart(driver, vm, false, -1) < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to restart VM '%s': %s"), - vm->def->name, err ? err->message : _("unknown error")); + vm->def->name, virGetLastErrorMessage()); } endjob: diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 87ec5a5..767ebbc 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -324,10 +324,9 @@ libxlAutostartDomain(virDomainObjPtr vm, if (vm->autostart && !virDomainObjIsActive(vm) && libxlDomainStart(driver, vm, false, -1) < 0) { - err = virGetLastError(); VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, - err ? err->message : _("unknown error")); + virGetLastErrorMessage()); goto endjob; } diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 973e691..b755a02 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1266,12 +1266,8 @@ int main(int argc, char **argv) { /* Read the config file if it exists*/ if (remote_config_file && virLockDaemonConfigLoadFile(config, remote_config_file, implicit_conf) < 0) { - virErrorPtr err = virGetLastError(); - if (err && err->message) - VIR_ERROR(_("Can't load config file: %s: %s"), - err->message, remote_config_file); - else - VIR_ERROR(_("Can't load config file: %s"), remote_config_file); + VIR_ERROR(_("Can't load config file: %s: %s"), + virGetLastErrorMessage(), remote_config_file); exit(EXIT_FAILURE); } diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 68f0647..83f0475 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -1023,12 +1023,8 @@ int main(int argc, char **argv) { /* Read the config file if it exists*/ if (remote_config_file && virLogDaemonConfigLoadFile(config, remote_config_file, implicit_conf) < 0) { - virErrorPtr err = virGetLastError(); - if (err && err->message) - VIR_ERROR(_("Can't load config file: %s: %s"), - err->message, remote_config_file); - else - VIR_ERROR(_("Can't load config file: %s"), remote_config_file); + VIR_ERROR(_("Can't load config file: %s: %s"), + virGetLastErrorMessage(), remote_config_file); exit(EXIT_FAILURE); } diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 348bbfb..4daba3a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2290,12 +2290,8 @@ static int lxcContainerChild(void *data) if (ret != 0) { VIR_DEBUG("Tearing down container"); - virErrorPtr err = virGetLastError(); - if (err && err->message) - fprintf(stderr, "%s\n", err->message); - else - fprintf(stderr, "%s\n", - _("Unknown failure in libvirt_lxc startup")); + fprintf(stderr, "Failure in libvirt_lxc startup%s\n", + virGetLastErrorMessage()); } virCommandFree(cmd); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 8b5ec4c..b20a46f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2731,12 +2731,7 @@ int main(int argc, char *argv[]) cleanup: if (rc < 0) { - virErrorPtr err = virGetLastError(); - if (err && err->message) - fprintf(stderr, "%s\n", err->message); - else - fprintf(stderr, "%s\n", - _("Unknown failure in libvirt_lxc startup")); + fprintf(stderr, "Failure in libvirt_lxc startup: %s\n", virGetLastErrorMessage()); } virPidFileDelete(LXC_STATE_DIR, name); diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 3177a62..5267797 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -221,8 +221,7 @@ virLXCDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, unsigned long long thepid; if (virXPathULongLong("string(./init[1]/@pid)", ctxt, &thepid) < 0) { - virErrorPtr err = virGetLastError(); - VIR_WARN("Failed to load init pid from state %s", err ? err->message : "null"); + VIR_WARN("Failed to load init pid from state %s", virGetLastErrorMessage()); priv->initpid = 0; } else { priv->initpid = thepid; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 5e0bbe2..6f6df84 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -757,10 +757,9 @@ static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_UNUSED priv->initpid = initpid; if (virLXCProcessGetNsInode(initpid, "pid", &inode) < 0) { - virErrorPtr err = virGetLastError(); VIR_WARN("Cannot obtain pid NS inode for %llu: %s", (unsigned long long)initpid, - err && err->message ? err->message : "<unknown>"); + virGetLastErrorMessage()); virResetLastError(); } virDomainAuditInit(vm, initpid, inode); @@ -1619,10 +1618,9 @@ virLXCProcessAutostartDomain(virDomainObjPtr vm, VIR_DOMAIN_RUNNING_BOOTED); virDomainAuditStart(vm, "booted", ret >= 0); if (ret < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to autostart VM '%s': %s"), vm->def->name, - err ? err->message : ""); + virGetLastErrorMessage()); } else { virObjectEventPtr event = virDomainEventLifecycleNewFromObj(vm, diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a09a7e4..f82ad24 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -694,9 +694,8 @@ networkStateInitialize(bool privileged, #ifdef HAVE_FIREWALLD if (!(sysbus = virDBusGetSystemBus())) { - virErrorPtr err = virGetLastError(); VIR_WARN("DBus not available, disabling firewalld support " - "in bridge_network_driver: %s", err->message); + "in bridge_network_driver: %s", virGetLastErrorMessage()); } else { /* add matches for * NameOwnerChanged on org.freedesktop.DBus for firewalld start/stop diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 6d18a87..6ddfad0 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -641,9 +641,8 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, dbus_error_init(&err); if (!(sysbus = virDBusGetSystemBus())) { - virErrorPtr verr = virGetLastError(); VIR_ERROR(_("DBus not available, disabling HAL driver: %s"), - verr->message); + virGetLastErrorMessage()); ret = 0; goto failure; } diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 947038d..6e78623 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -1141,8 +1141,7 @@ int virNetTLSContextCheckCertificate(virNetTLSContextPtr ctxt, virObjectLock(ctxt); virObjectLock(sess); if (virNetTLSContextValidCertificate(ctxt, sess) < 0) { - virErrorPtr err = virGetLastError(); - VIR_WARN("Certificate check failed %s", err && err->message ? err->message : "<unknown>"); + VIR_WARN("Certificate check failed %s", virGetLastErrorMessage()); if (ctxt->requireValidCert) { virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Failed to verify peer's certificate")); diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 4d15797..b9c82c6 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -484,11 +484,9 @@ secretLoadAllConfigs(virSecretObjPtr *dest, VIR_FREE(base64name); if (!(secret = secretLoad(&list, de->d_name, path, base64path))) { - virErrorPtr err = virGetLastError(); - VIR_ERROR(_("Error reading secret: %s"), - err != NULL ? err->message: _("unknown error")); - virResetError(err); + virGetLastErrorMessage()); + virResetLastError(); VIR_FREE(path); VIR_FREE(base64path); continue; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 1d96618..ccf1fc1 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -97,10 +97,8 @@ storagePoolUpdateState(virStoragePoolObjPtr pool) active = false; if (backend->checkPool && backend->checkPool(pool, &active) < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to initialize storage pool '%s': %s"), - pool->def->name, err ? err->message : - _("no error message found")); + pool->def->name, virGetLastErrorMessage()); goto error; } @@ -111,12 +109,10 @@ storagePoolUpdateState(virStoragePoolObjPtr pool) if (active) { virStoragePoolObjClearVols(pool); if (backend->refreshPool(NULL, pool) < 0) { - virErrorPtr err = virGetLastError(); if (backend->stopPool) backend->stopPool(NULL, pool); VIR_ERROR(_("Failed to restart storage pool '%s': %s"), - pool->def->name, err ? err->message : - _("no error message found")); + pool->def->name, virGetLastErrorMessage()); goto error; } } @@ -175,10 +171,8 @@ storageDriverAutostart(void) !virStoragePoolObjIsActive(pool)) { if (backend->startPool && backend->startPool(conn, pool) < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to autostart storage pool '%s': %s"), - pool->def->name, err ? err->message : - _("no error message found")); + pool->def->name, virGetLastErrorMessage()); virStoragePoolObjUnlock(pool); continue; } @@ -194,14 +188,12 @@ storageDriverAutostart(void) if (!stateFile || virStoragePoolSaveState(stateFile, pool->def) < 0 || backend->refreshPool(conn, pool) < 0) { - virErrorPtr err = virGetLastError(); if (stateFile) unlink(stateFile); if (backend->stopPool) backend->stopPool(conn, pool); VIR_ERROR(_("Failed to autostart storage pool '%s': %s"), - pool->def->name, err ? err->message : - _("no error message found")); + pool->def->name, virGetLastErrorMessage()); } else { pool->active = true; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 84e1df8..923c3f6 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -188,9 +188,8 @@ umlAutostartDomain(virDomainObjPtr vm, ret = umlStartVMDaemon(data->conn, data->driver, vm, false); virDomainAuditStart(vm, "booted", ret >= 0); if (ret < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to autostart VM '%s': %s"), - vm->def->name, err ? err->message : _("unknown error")); + vm->def->name, virGetLastErrorMessage()); } else { virObjectEventPtr event = virDomainEventLifecycleNewFromObj(vm, diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 8a3c377..9fe0f81 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -310,12 +310,6 @@ main(int argc, char **argv) return 0; error: - err = virGetLastError(); - if (err) { - fprintf(stderr, "%s: %s\n", program_name, err->message); - } else { - fprintf(stderr, _("%s: unknown failure with %s\n"), - program_name, path); - } + fprintf(stderr, "%s: %s\n", program_name, virGetLastErrorMessage()); exit(EXIT_FAILURE); } diff --git a/src/util/virhook.c b/src/util/virhook.c index ba50598..d37d6da 100644 --- a/src/util/virhook.c +++ b/src/util/virhook.c @@ -297,9 +297,8 @@ virHookCall(int driver, ret = virCommandRun(cmd, NULL); if (ret < 0) { /* Convert INTERNAL_ERROR into known error. */ - virErrorPtr err = virGetLastError(); virReportError(VIR_ERR_HOOK_SCRIPT_FAILED, "%s", - err ? err->message : _("unknown error")); + virGetLastErrorMessage()); } virCommandFree(cmd); diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index b397b79..42c146a 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -801,10 +801,9 @@ virHostdevReattachPCIDevice(virHostdevManagerPtr mgr, VIR_DEBUG("Reattaching PCI device %s", virPCIDeviceGetName(actual)); if (virPCIDeviceReattach(actual, mgr->activePCIHostdevs, mgr->inactivePCIHostdevs) < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to re-attach PCI device: %s"), - err ? err->message : _("unknown error")); - virResetError(err); + virGetLastErrorMessage()); + virResetLastError(); } } @@ -829,10 +828,9 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, virObjectLock(mgr->inactivePCIHostdevs); if (!(pcidevs = virHostdevGetPCIHostDeviceList(hostdevs, nhostdevs))) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to allocate PCI device list: %s"), - err ? err->message : _("unknown error")); - virResetError(err); + virGetLastErrorMessage()); + virResetLastError(); goto cleanup; } @@ -883,10 +881,9 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, if (!actual || virPCIDeviceListAdd(mgr->inactivePCIHostdevs, actual) < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to add PCI device %s to the inactive list"), - err ? err->message : _("unknown error")); - virResetError(err); + virGetLastErrorMessage()); + virResetLastError(); } } @@ -928,10 +925,9 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr mgr, VIR_DEBUG("Resetting PCI device %s", virPCIDeviceGetName(pci)); if (virPCIDeviceReset(pci, mgr->activePCIHostdevs, mgr->inactivePCIHostdevs) < 0) { - virErrorPtr err = virGetLastError(); VIR_ERROR(_("Failed to reset PCI device: %s"), - err ? err->message : _("unknown error")); - virResetError(err); + virGetLastErrorMessage()); + virResetLastError(); } } diff --git a/src/util/virpci.c b/src/util/virpci.c index f7921f8..2349d7f 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -989,12 +989,10 @@ virPCIDeviceReset(virPCIDevicePtr dev, ret = virPCIDeviceTrySecondaryBusReset(dev, fd, inactiveDevs); if (ret < 0) { - virErrorPtr err = virGetLastError(); virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to reset PCI device %s: %s"), dev->name, - err ? err->message : - _("no FLR, PM reset or bus reset available")); + virGetLastErrorMessage()); } cleanup: diff --git a/tests/commandtest.c b/tests/commandtest.c index cf5f44a..6430e20 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -178,8 +178,7 @@ static int test2(const void *unused ATTRIBUTE_UNUSED) int ret; if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -190,8 +189,7 @@ static int test2(const void *unused ATTRIBUTE_UNUSED) } if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -218,8 +216,7 @@ static int test3(const void *unused ATTRIBUTE_UNUSED) VIR_COMMAND_PASS_FD_CLOSE_PARENT); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -260,8 +257,7 @@ static int test4(const void *unused ATTRIBUTE_UNUSED) virCommandDaemonize(cmd); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -294,8 +290,7 @@ static int test5(const void *unused ATTRIBUTE_UNUSED) virCommandAddEnvPassCommon(cmd); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -318,8 +313,7 @@ static int test6(const void *unused ATTRIBUTE_UNUSED) virCommandAddEnvPassBlockSUID(cmd, "DOESNOTEXIST", NULL); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -343,8 +337,7 @@ static int test7(const void *unused ATTRIBUTE_UNUSED) virCommandAddEnvPassBlockSUID(cmd, "DOESNOTEXIST", NULL); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -368,8 +361,7 @@ static int test8(const void *unused ATTRIBUTE_UNUSED) virCommandAddEnvPair(cmd, "USER", "test"); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -406,8 +398,7 @@ static int test9(const void *unused ATTRIBUTE_UNUSED) } if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -432,8 +423,7 @@ static int test10(const void *unused ATTRIBUTE_UNUSED) virCommandAddArgSet(cmd, args); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -456,8 +446,7 @@ static int test11(const void *unused ATTRIBUTE_UNUSED) virCommandPtr cmd = virCommandNewArgs(args); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -478,8 +467,7 @@ static int test12(const void *unused ATTRIBUTE_UNUSED) virCommandSetInputBuffer(cmd, "Hello World\n"); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); virCommandFree(cmd); return -1; } @@ -506,8 +494,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) virCommandSetOutputBuffer(cmd, &outactual); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } if (!outactual) @@ -559,8 +546,7 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) virCommandSetErrorBuffer(cmd, &erractual); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } if (!outactual || !erractual) @@ -573,8 +559,7 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) virCommandSetOutputBuffer(cmd, &jointactual); virCommandSetErrorBuffer(cmd, &jointactual); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } if (!jointactual) @@ -620,8 +605,7 @@ static int test15(const void *unused ATTRIBUTE_UNUSED) virCommandSetUmask(cmd, 002); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -651,8 +635,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) virCommandAddArg(cmd, "G H"); if ((outactual = virCommandToString(cmd)) == NULL) { - virErrorPtr err = virGetLastError(); - printf("Cannot convert to string: %s\n", err->message); + printf("Cannot convert to string: %s\n", virGetLastErrorMessage()); goto cleanup; } if ((fd = open(abs_builddir "/commandhelper.log", @@ -697,8 +680,7 @@ static int test17(const void *unused ATTRIBUTE_UNUSED) } if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -720,8 +702,7 @@ static int test17(const void *unused ATTRIBUTE_UNUSED) } if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -756,8 +737,7 @@ static int test18(const void *unused ATTRIBUTE_UNUSED) alarm(5); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } alarm(0); @@ -798,8 +778,7 @@ static int test19(const void *unused ATTRIBUTE_UNUSED) alarm(5); if (virCommandRunAsync(cmd, &pid) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -848,8 +827,7 @@ static int test20(const void *unused ATTRIBUTE_UNUSED) virCommandSetInputBuffer(cmd, buf); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -891,8 +869,7 @@ static int test21(const void *unused ATTRIBUTE_UNUSED) virCommandDoAsyncIO(cmd); if (virCommandRunAsync(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -930,8 +907,7 @@ test22(const void *unused ATTRIBUTE_UNUSED) cmd = virCommandNewArgList("/bin/sh", "-c", "exit 3", NULL); if (virCommandRun(cmd, &status) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } if (status != 3) { @@ -941,8 +917,7 @@ test22(const void *unused ATTRIBUTE_UNUSED) virCommandRawStatus(cmd); if (virCommandRun(cmd, &status) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } if (!WIFEXITED(status) || WEXITSTATUS(status) != 3) { @@ -960,8 +935,7 @@ test22(const void *unused ATTRIBUTE_UNUSED) virCommandRawStatus(cmd); if (virCommandRun(cmd, &status) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } if (!WIFSIGNALED(status) || WTERMSIG(status) != SIGKILL) { @@ -1057,8 +1031,7 @@ static int test24(const void *unused ATTRIBUTE_UNUSED) virCommandPassListenFDs(cmd); if (virCommandRun(cmd, NULL) < 0) { - virErrorPtr err = virGetLastError(); - printf("Cannot run child %s\n", err->message); + printf("Cannot run child %s\n", virGetLastErrorMessage()); goto cleanup; } diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c index 61d861d..06830bb 100644 --- a/tests/libvirtdconftest.c +++ b/tests/libvirtdconftest.c @@ -212,8 +212,7 @@ mymain(void) } if (virFileReadAll(filename, 1024*1024, &filedata) < 0) { - virErrorPtr err = virGetLastError(); - fprintf(stderr, "Cannot load %s for testing: %s", filename, err->message); + fprintf(stderr, "Cannot load %s for testing: %s", filename, virGetLastErrorMessage()); ret = -1; goto cleanup; } diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index ccde636..57a8601 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -110,16 +110,14 @@ testReadNetworkConf(const void *data ATTRIBUTE_UNUSED) def->os.type = VIR_DOMAIN_OSTYPE_EXE; if (openvzReadNetworkConf(def, 1) < 0) { - err = virGetLastError(); - fprintf(stderr, "ERROR: %s\n", err != NULL ? err->message : "<unknown>"); + fprintf(stderr, "ERROR: %s\n", virGetLastErrorMessage()); goto cleanup; } actual = virDomainDefFormat(def, NULL, VIR_DOMAIN_DEF_FORMAT_INACTIVE); if (actual == NULL) { - err = virGetLastError(); - fprintf(stderr, "ERROR: %s\n", err != NULL ? err->message : "<unknown>"); + fprintf(stderr, "ERROR: %s\n", virGetLastErrorMessage()); goto cleanup; } diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index c82b3f2..f6caa30 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -332,8 +332,7 @@ testSELinuxLabeling(const void *opaque) } VIR_FREE(files); if (ret < 0) { - virErrorPtr err = virGetLastError(); - VIR_TEST_VERBOSE("%s\n", err ? err->message : "<unknown>"); + VIR_TEST_VERBOSE("%s\n", virGetLastErrorMessage()); } return ret; } @@ -354,9 +353,8 @@ mymain(void) if (!(mgr = virSecurityManagerNew("selinux", "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED | VIR_SECURITY_MANAGER_PRIVILEGED))) { - virErrorPtr err = virGetLastError(); VIR_TEST_VERBOSE("Unable to initialize security driver: %s\n", - err->message); + virGetLastErrorMessage()); return EXIT_FAILURE; } diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 49694f3..3423e66 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -230,8 +230,7 @@ testSELinuxGenLabel(const void *opaque) goto cleanup; if (virSecurityManagerGenLabel(data->mgr, def) < 0) { - virErrorPtr err = virGetLastError(); - fprintf(stderr, "Cannot generate label: %s\n", err->message); + fprintf(stderr, "Cannot generate label: %s\n", virGetLastErrorMessage()); goto cleanup; } @@ -275,9 +274,8 @@ mymain(void) if (!(mgr = virSecurityManagerNew("selinux", "QEMU", VIR_SECURITY_MANAGER_DEFAULT_CONFINED | VIR_SECURITY_MANAGER_PRIVILEGED))) { - virErrorPtr err = virGetLastError(); fprintf(stderr, "Unable to initialize security driver: %s\n", - err->message); + virGetLastErrorMessage()); return EXIT_FAILURE; } diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index a3e24a3..d33b896 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -90,13 +90,12 @@ static int testTLSContextInit(const void *opaque) goto cleanup; } } else { - virErrorPtr err = virGetLastError(); if (!data->expectFail) { VIR_WARN("Unexpected failure %s against %s", data->cacrt, data->crt); goto cleanup; } - VIR_DEBUG("Got error %s", err ? err->message : "<unknown>"); + VIR_DEBUG("Got error %s", virGetLastErrorMessage()); } ret = 0; -- 2.7.4

3 5

[libvirt] [PATCH] qemu: Free priv->machineName
by Martin Kletzander 11 Apr '16

11 Apr '16

Commit c3bd0019c0e3 forgot to cleanup after itself. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_cgroup.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index c76d5857f715..1e04a68e0488 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1123,5 +1123,7 @@ qemuRemoveCgroup(virDomainObjPtr vm) VIR_DEBUG("Failed to terminate cgroup for %s", vm->def->name); } + VIR_FREE(priv->machineName); + return virCgroupRemove(priv->cgroup); } -- 2.8.1

2 2

[libvirt] [PATCH] tools: virsh: Add some example values to attach-disk --help
by Cole Robinson 11 Apr '16

11 Apr '16

https://bugzilla.redhat.com/show_bug.cgi?id=982630 --- tools/virsh-domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 36d0353..46598bb 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -322,11 +322,11 @@ static const vshCmdOptDef opts_attach_disk[] = { }, {.name = "driver", .type = VSH_OT_STRING, - .help = N_("driver of disk device") + .help = N_("driver of disk device (qemu|...)") }, {.name = "subdriver", .type = VSH_OT_STRING, - .help = N_("subdriver of disk device") + .help = N_("subdriver of disk device (raw|qcow2|vmdk|...)") }, {.name = "iothread", .type = VSH_OT_STRING, @@ -338,7 +338,7 @@ static const vshCmdOptDef opts_attach_disk[] = { }, {.name = "type", .type = VSH_OT_STRING, - .help = N_("target device type") + .help = N_("target device type (disk|cdrom|floppy|...)") }, {.name = "shareable", .type = VSH_OT_ALIAS, @@ -346,11 +346,11 @@ static const vshCmdOptDef opts_attach_disk[] = { }, {.name = "mode", .type = VSH_OT_STRING, - .help = N_("mode of device reading and writing") + .help = N_("mode of device reading and writing (readonly|shareable)") }, {.name = "sourcetype", .type = VSH_OT_STRING, - .help = N_("type of source (block|file)") + .help = N_("type of source (block|file|...)") }, {.name = "serial", .type = VSH_OT_STRING, -- 2.7.3

3 2

[libvirt] [PATCH] virtlogd: Fix a couple minor memory leaks
by Cole Robinson 11 Apr '16

11 Apr '16

https://bugzilla.redhat.com/show_bug.cgi?id=1303885 --- src/logging/log_daemon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 68f0647..f674cbd 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -1212,6 +1212,8 @@ int main(int argc, char **argv) { VIR_FREE(sock_file); VIR_FREE(state_file); VIR_FREE(run_dir); + VIR_FREE(remote_config_file); + virLogDaemonConfigFree(config); return ret; no_memory: -- 2.7.3

2 1

[libvirt] [PATCH] qemu: agent: Fix incorrect and weird debug/warning log entries
by Peter Krempa 11 Apr '16

11 Apr '16

Replace the nonsensical debug statement by adding the expected event code into the existing debug statement. Since the monitor code always notifies the agent on guest reboot/shutdown even if that was not initiated by the agent the warning emitted later is bogus and pollutes the logs in such cases. Delete it and keep just the original debug message where this info can be inferred. --- src/qemu/qemu_agent.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index bee8d4c..559d79f 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1230,19 +1230,14 @@ qemuAgentMakeStringsArray(const char **strings, unsigned int len) void qemuAgentNotifyEvent(qemuAgentPtr mon, qemuAgentEvent event) { - VIR_DEBUG("mon=%p event=%d", mon, event); + VIR_DEBUG("mon=%p event=%d await_event=%d", mon, event, mon->await_event); if (mon->await_event == event) { - VIR_DEBUG("Waking up a tragedian"); mon->await_event = QEMU_AGENT_EVENT_NONE; /* somebody waiting for this event, wake him up. */ if (mon->msg && !mon->msg->finished) { mon->msg->finished = 1; virCondSignal(&mon->notify); } - } else { - /* shouldn't happen but one never knows */ - VIR_WARN("Received unexpected event %d (expected %d)", - event, mon->await_event); } } -- 2.8.0

2 2

[libvirt] [PATCH] configure: Fix check for --with-login-shell on Windows
by Andrea Bolognani 11 Apr '16

11 Apr '16

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

2 2

[libvirt] [PATCH v2 0/2] host-validate: Be more careful when checking for cgroups
by Andrea Bolognani 11 Apr '16

11 Apr '16

Changes from [v1]: * use strchr() instead of strstr() * make sure that the mount type is 'cgroup' before looking for mount options Both suggested by Thomas Huth. Cheers. [v1] https://www.redhat.com/archives/libvir-list/2016-April/msg00136.html Andrea Bolognani (2): host-validate: Be more careful when checking for cgroup support host-validate: Be more careful when checking for cgroup mounts tools/virt-host-validate-common.c | 69 +++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 13 deletions(-) -- 2.5.5

2 11

[libvirt] [PATCH] po: Really fix po/POTFILES.in ordering
by Erik Skultety 11 Apr '16

11 Apr '16

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

2 2

[libvirt] [PATCH] po: fix POTFILES.in file ordering
by Erik Skultety 11 Apr '16

11 Apr '16

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

3 4

[libvirt] Automatic Guest Resolution Adjustment not functional with GRsec guests
by bancfc＠openmailbox.org 11 Apr '16

11 Apr '16

A VM's QXL driver can no longer automatically adjust the screen resolution resize when running a GRsecurity kernel in the guest. The screen still responds to xrandr however but "scale display: always" in virt-manager doesn't work as it used to. What can be causing this?

2 2

[libvirt] [PATCH] qemu: fix build without gnutls installed
by Roman Bogorodskiy 10 Apr '16

10 Apr '16

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

2 2

[libvirt] [PATCH] build: work around gcc 6.0 warnings
by Eric Blake 10 Apr '16

10 Apr '16

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

8 12

[libvirt] [PATCH] nss: properly include syms files to dist
by Roman Bogorodskiy 09 Apr '16

09 Apr '16

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

2 2

[libvirt] [PATCH] nss: fix typo in configure help string
by Roman Bogorodskiy 09 Apr '16

09 Apr '16

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

1 0

[libvirt] [PATCH v2] Add macro for handling exponential backoff loops.
by Richard W.M. Jones 09 Apr '16

09 Apr '16

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.

2 3

[libvirt] [PATCH] docs: Remove unused div.body CSS rule
by Andrea Bolognani 08 Apr '16

08 Apr '16

The 'body' CSS class is not used anywhere in the HTML files, so we can get rid of the definition as well. --- docs/generic.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/generic.css b/docs/generic.css index c0c6215..4f98b26 100644 --- a/docs/generic.css +++ b/docs/generic.css @@ -11,11 +11,6 @@ p:first-line { margin-right: 1em; } -div.body p:first-letter { - font-size: 1.2em; - font-weight: bold; -} - p, ul, ol, dl { padding: 0px; margin: 0px; -- 2.5.5

2 2

[libvirt] [PATCH 0/2] FreeBSD build fixes
by Andrea Bolognani 08 Apr '16

08 Apr '16

Applying these fixes building on FreeBSD, at least on my local builder (10.3-RELEASE). Cheers. Andrea Bolognani (2): configure: Move check for <gnutls/crypto.h> netdev: Use the correct pointer type for virSocketAddrFormat() configure.ac | 10 +++++----- src/util/virnetdev.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH] util: netdev: Don't crash in virNetDevSetIPAddress if @peer is NULL
by Peter Krempa 08 Apr '16

08 Apr '16

VIR_SOCKET_ADDR_VALID dereferences the pointer, thus if we pass NULL into virNetDevSetIPAddress it crashes. Regression introduced by b3d069872ce53eb. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1325120 --- src/util/virnetdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 712c3bc..0d030a3 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1129,7 +1129,7 @@ int virNetDevSetIPAddress(const char *ifname, unsigned int recvbuflen; /* The caller needs to provide a correct address */ - if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && !VIR_SOCKET_ADDR_VALID(peer)) { + if (VIR_SOCKET_ADDR_FAMILY(addr) == AF_INET && peer && !VIR_SOCKET_ADDR_VALID(peer)) { /* compute a broadcast address if this is IPv4 */ if (VIR_ALLOC(broadcast) < 0) return -1; -- 2.8.0

3 4

[libvirt] [PATCH v3 00/11] Introduce worker tuning APIs
by Erik Skultety 08 Apr '16

08 Apr '16

since v2: - all getters are now protected by threadpool mutex to prevent torn reads in concurrent execution - some checks in adminDispatchServerGetThreadpoolParameters were redundant, thus were optimizes out - fixed memory leak in adminDispatchServerGetThreadpoolParameters when allocating a newlist although typed params serialization already does that - fixed some cosmetic issues like exporting a function prototype one patch earlier than it should actually be introduced - a mistake that got there by interactive rebase Erik Skultety (11): po: Fix record ordering in POTFILES.in libvirt-host: Move virTypedParam* to libvirt-common admin: Enable usage of typed parameters util: Refactor thread creation by introducing virThreadPoolExpand util: Report system error when virThreadCreateFull fails util: Use a mutex when retrieving threadpool data util: Add more getters to threadpool parameters admin: Prepare admin protocol for future worker related procedures admin: Introduce virAdmServerGethreadPoolParameters admin: Introduce virAdmServerSetThreadPoolParameters virt-admin: Introduce srv-workertune command cfg.mk | 2 +- daemon/admin.c | 88 +++++++++++++ daemon/admin_server.c | 110 +++++++++++++++++ daemon/admin_server.h | 11 ++ include/libvirt/libvirt-admin.h | 71 +++++++++++ include/libvirt/libvirt-common.h.in | 185 ++++++++++++++++++++++++++++ include/libvirt/libvirt-host.h | 186 ---------------------------- po/POTFILES.in | 4 +- src/admin/admin_protocol.x | 54 +++++++- src/admin/admin_remote.c | 77 ++++++++++++ src/admin_protocol-structs | 45 +++++++ src/libvirt-admin.c | 83 +++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 2 + src/libvirt_private.syms | 4 + src/rpc/virnetserver.c | 37 ++++++ src/rpc/virnetserver.h | 13 ++ src/util/virthreadpool.c | 238 +++++++++++++++++++++++++----------- src/util/virthreadpool.h | 8 ++ tools/virt-admin.c | 132 ++++++++++++++++++++ 20 files changed, 1096 insertions(+), 257 deletions(-) -- 2.4.11

1 12

[libvirt] [PATCH] Add macro for handling exponential backoff loops.
by Richard W.M. Jones 08 Apr '16

08 Apr '16

In a few places in libvirt we busy-wait for events, for example qemu creating a monitor socket. This is problematic because: - We need to choose a sufficiently small polling period so that libvirt doesn't add unnecessary delays. - We need to choose a sufficiently large polling period so that the effect of busy-waiting doesn't affect the system. The solution to this conflict is to use an exponential backoff. This patch adds a macro VIR_WHILE_EXPONENTIAL_BACKOFF to hide the details, and modifies a few places where we currently busy-wait. --- src/fdstream.c | 8 ++++---- src/libvirt_private.syms | 2 ++ src/qemu/qemu_agent.c | 8 ++++---- src/qemu/qemu_monitor.c | 8 ++++---- src/util/virtime.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/virtime.h | 39 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 12 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index a85cf9d..7a311f5 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -42,6 +42,7 @@ #include "virfile.h" #include "configmake.h" #include "virstring.h" +#include "virtime.h" #define VIR_FROM_THIS VIR_FROM_STREAMS @@ -516,8 +517,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, bool abstract) { struct sockaddr_un sa; - size_t i = 0; - int timeout = 3; + virTimeBackOffVar timeout; int ret; int fd = socket(AF_UNIX, SOCK_STREAM, 0); @@ -537,7 +537,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, goto error; } - do { + VIR_WHILE_EXPONENTIAL_BACKOFF(timeout, 1, 3*1000 /* ms */) { ret = connect(fd, (struct sockaddr *)&sa, sizeof(sa)); if (ret == 0) break; @@ -549,7 +549,7 @@ int virFDStreamConnectUNIX(virStreamPtr st, } goto error; - } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); + } if (virFDStreamOpenInternal(st, fd, NULL, -1, 0) < 0) goto error; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 068bc00..b69d2e0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2360,6 +2360,8 @@ virThreadPoolSendJob; # util/virtime.h +virTimeBackOffCondition; +virTimeBackOffInit; virTimeFieldsNow; virTimeFieldsNowRaw; virTimeFieldsThen; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index bee8d4c..adf38c5 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -42,6 +42,7 @@ #include "virtime.h" #include "virobject.h" #include "virstring.h" +#include "virtime.h" #include "base64.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -173,9 +174,8 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) { struct sockaddr_un addr; int monfd; - int timeout = 3; /* In seconds */ + virTimeBackOffVar timeout; int ret; - size_t i = 0; *inProgress = false; @@ -207,7 +207,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) goto error; } - do { + VIR_WHILE_EXPONENTIAL_BACKOFF(timeout, 1, 3*1000 /* ms */) { ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); if (ret == 0) @@ -232,7 +232,7 @@ qemuAgentOpenUnix(const char *monitor, pid_t cpid, bool *inProgress) _("failed to connect to monitor socket")); goto error; - } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); + } if (ret != 0) { virReportSystemError(errno, "%s", diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 10a6713..52f0d20 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -42,6 +42,7 @@ #include "virobject.h" #include "virprobe.h" #include "virstring.h" +#include "virtime.h" #ifdef WITH_DTRACE_PROBES # include "libvirt_qemu_probes.h" @@ -327,9 +328,8 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) { struct sockaddr_un addr; int monfd; - int timeout = 30; /* In seconds */ + virTimeBackOffVar timeout; int ret; - size_t i = 0; if ((monfd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { virReportSystemError(errno, @@ -345,7 +345,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) goto error; } - do { + VIR_WHILE_EXPONENTIAL_BACKOFF(timeout, 1, 30*1000 /* ms */) { ret = connect(monfd, (struct sockaddr *) &addr, sizeof(addr)); if (ret == 0) @@ -362,7 +362,7 @@ qemuMonitorOpenUnix(const char *monitor, pid_t cpid) _("failed to connect to monitor socket")); goto error; - } while ((++i <= timeout*5) && (usleep(.2 * 1000000) <= 0)); + } if (ret != 0) { virReportSystemError(errno, "%s", diff --git a/src/util/virtime.c b/src/util/virtime.c index 9d365d5..78622e7 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -34,14 +34,18 @@ #include <config.h> #include <stdio.h> +#include <unistd.h> #include <sys/time.h> #include "virtime.h" #include "viralloc.h" #include "virerror.h" +#include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("util.time"); + /* We prefer clock_gettime if available because that is officially * async signal safe according to POSIX. Many platforms lack it * though, so fallback to gettimeofday everywhere else @@ -363,3 +367,41 @@ virTimeLocalOffsetFromUTC(long *offset) *offset = current - utc; return 0; } + +void +virTimeBackOffInit(virTimeBackOffVar *var, + unsigned long long first, unsigned long long limit) +{ + ignore_value(virTimeMillisNowRaw(&var->start_t)); + var->next = first; + var->limit = var->start_t + limit; +} + +int +virTimeBackOffCondition(virTimeBackOffVar *var) +{ + unsigned long long t, next; + + ignore_value(virTimeMillisNowRaw(&t)); + + VIR_DEBUG("t=%llu, limit=%llu", t, var->limit); + + if (t > var->limit) + return 0; /* ends the while loop */ + + next = var->next; + var->next *= 2; + + /* If sleeping would take us beyond the limit, then shorten the + * sleep. This is so we always run the body just before the final + * timeout. + */ + if (t + next > var->limit) { + next = var->limit - t - 2; + } + + VIR_DEBUG("sleeping for %llu ms", next); + + usleep(next * 1000); + return 1; +} diff --git a/src/util/virtime.h b/src/util/virtime.h index 8ebad38..723a93a 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -64,4 +64,43 @@ char *virTimeStringThen(unsigned long long when); int virTimeLocalOffsetFromUTC(long *offset) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; +/** + * VIR_WHILE_EXPONENTIAL_BACKOFF: + * @var: A scratch variable used by the loop (with type virTimeBackOffVar). + * @first: First time period to wait, in milliseconds. + * @limit: Total time we run before the loop times out, in milliseconds. + * + * This macro is a while loop that runs the body of the code + * repeatedly, with an exponential backoff. It first waits for @first + * ms, then runs the body, then waits for 2*@first ms, then runs the + * body again. Then 4*@first ms, and so on. + * + * When @limit ms (total running time) is reached, the while loop + * ends. + * + * The body should use "break" or "goto" when whatever condition it is + * testing for succeeds (or there is an unrecoverable error). + * + * NOTE: VIR_WHILE_EXPONENTIAL_BACKOFF is not a single atomic C + * statement (unfortunately), so you will get incorrect code if you + * write something like: + * + * if (foo) + * VIR_WHILE_EXPONENTIAL_BACKOFF(...) { + * } + */ +#define VIR_WHILE_EXPONENTIAL_BACKOFF(var, first, limit) \ + virTimeBackOffInit(&(var), (first), (limit)); \ + while (virTimeBackOffCondition(&(var))) + +typedef struct { + unsigned long long start_t; + unsigned long long next; + unsigned long long limit; +} virTimeBackOffVar; + +void virTimeBackOffInit(virTimeBackOffVar *var, + unsigned long long first, unsigned long long limit); +int virTimeBackOffCondition(virTimeBackOffVar *var); + #endif -- 2.7.4

1 1

[libvirt] [PATCH] qemu: support virt-2.6 machine type on arm
by Ján Tomko 08 Apr '16

08 Apr '16

Some places already check for "virt-" prefix as well as plain "virt". virQEMUCapsHasPCIMultiBus did not, resulting in multiple PCI devices having assigned the same unnumbered "pci" alias. Add a test for the "virt-2.6" machine type which also omits the <model type='virtio'/> in <interface>, to check if qemuDomainDefaultNetModel works too. https://bugzilla.redhat.com/show_bug.cgi?id=1325085 --- src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_domain.c | 3 +- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 37 +++++++++++++++++ ...ml2argv-aarch64-virt-2.6-virtio-pci-default.xml | 47 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 5 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5d09dc8..b73c296 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2174,7 +2174,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, /* If 'virt' supports PCI, it supports multibus. * No extra conditions here for simplicity. */ - if (STREQ(def->os.machine, "virt")) + if (STREQ(def->os.machine, "virt") || + STRPREFIX(def->os.machine, "virt-")) return true; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 55dcba8..30dee4d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1730,7 +1730,8 @@ qemuDomainDefaultNetModel(const virDomainDef *def, if (STREQ(def->os.machine, "versatilepb")) return "smc91c111"; - if (STREQ(def->os.machine, "virt")) + if (STREQ(def->os.machine, "virt") || + STRPREFIX(def->os.machine, "virt-")) return "virtio"; /* Incomplete. vexpress (and a few others) use this, but not all diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args new file mode 100644 index 0000000..93c181d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args @@ -0,0 +1,37 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 \ +-name aarch64test \ +-S \ +-M virt-2.6 \ +-cpu cortex-a53 \ +-m 1024 \ +-smp 1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-nographic \ +-nodefconfig \ +-nodefaults \ +-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \ +-boot c \ +-kernel /aarch64.kernel \ +-initrd /aarch64.initrd \ +-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb \ +-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \ +-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \ +-device virtio-serial-device,id=virtio-serial0 \ +-usb \ +-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 \ +-serial pty \ +-chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-device virtio-balloon-device,id=balloon0 \ +-object rng-random,id=objrng0,filename=/dev/random \ +-device virtio-rng-device,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml new file mode 100644 index 0000000..e745101 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml @@ -0,0 +1,47 @@ +<domain type="qemu"> + <name>aarch64test</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch="aarch64" machine="virt-2.6">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <dtb>/aarch64.dtb</dtb> + <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <cpu match='exact'> + <model>cortex-a53</model> + </cpu> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <source file='/aarch64.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + <console type='pty'/> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='virtio'/> +  + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5f492cb..df42d9c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1661,6 +1661,12 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE); + DO_TEST("aarch64-virt-2.6-virtio-pci-default", + QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE); /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ DO_TEST("aarch64-virtio-pci-manual-addresses", -- 2.7.3

2 1

[libvirt] [PATCH v2] util: move ENODATA redefine to internal.h
by Roman Bogorodskiy 08 Apr '16

08 Apr '16

FreeBSD lacks ENODATA, and viruuid.c redefines it to EIO, but it's not actually using it. On the other hand, we have virrandom.c that's using ENODATA. So make this re-definition common by moving it to internal.h, so all the current and possible future users don't need to care about that. --- src/internal.h | 4 ++++ src/util/viruuid.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/internal.h b/src/internal.h index db26fb0..9ebaf3c 100644 --- a/src/internal.h +++ b/src/internal.h @@ -517,4 +517,8 @@ enum { EXIT_ENOENT = 127, /* Could not find program to exec */ }; +# ifndef ENODATA +# define ENODATA EIO +# endif + #endif /* __VIR_INTERNAL_H__ */ diff --git a/src/util/viruuid.c b/src/util/viruuid.c index 1fcc954..16e57db 100644 --- a/src/util/viruuid.c +++ b/src/util/viruuid.c @@ -46,10 +46,6 @@ VIR_LOG_INIT("util.uuid"); -#ifndef ENODATA -# define ENODATA EIO -#endif - static unsigned char host_uuid[VIR_UUID_BUFLEN]; static int -- 2.7.4

2 2

[libvirt] latest libvirt for centos 7
by Vasiliy Tolstov 08 Apr '16

08 Apr '16

Hi! Does centos have virt-preview like repo to try latest libvirt ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH v5 0/5] migration: add multithread compression
by Nikolay Shirokovskiy 08 Apr '16

08 Apr '16

Add means to turn multithread compression on during migration. Add means to pass compression parameters in migration command. WARNING! This should be pushed only after https://www.redhat.com/archives/libvir-list/2016-March/msg01506.html or virsh domain will break. Changes from v4 =============== 1. Clean up documentation and comments. 2. Stop keeping compression options in flags internally. Move flags data into generic compression structure. 3. Use existing libvirt enum infrastructure to deal with compression methods. This makes parse and dump function less painful. 4. Use booleans for 'set' flags instead of bitsets. 5. Othes minor changes on Jiri comments. Eli Qiao (1): qemumonitorjsontest: add test for getting multithread compress params Nikolay Shirokovskiy (2): migration: qemu: add option to select compression methods qemu: migration: support setting compession parameters ShaoHe Feng (2): qemu: monitor: add migration parameters accessors virsh: add compression options for migration include/libvirt/libvirt-domain.h | 42 +++++++ src/qemu/qemu_driver.c | 40 +++++- src/qemu/qemu_migration.c | 262 +++++++++++++++++++++++++++++++++++---- src/qemu/qemu_migration.h | 36 ++++++ src/qemu/qemu_monitor.c | 24 +++- src/qemu/qemu_monitor.h | 18 +++ src/qemu/qemu_monitor_json.c | 110 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 + tests/qemumonitorjsontest.c | 61 +++++++++ tools/virsh-domain.c | 76 ++++++++++++ tools/virsh.pod | 18 ++- 11 files changed, 656 insertions(+), 36 deletions(-) -- 1.8.3.1

1 6

[libvirt] [PATCH v2] add func to set shared drivers after libvirtd init
by Mikhail Feoktistov 08 Apr '16

08 Apr '16

Diff from v1: Remove vz prefix from the title of this letter. Because this is the common case for all drivers in libvirt. Description: Built-in drivers in libvirt are initialized before libvirtd initialization. Libvirt loads shared drivers on libvirtd initialization step. For built-in drivers we can't set shared drivers, because they are not initialized yet. This patch adds function to set shared drivers after libvirtd init. --- daemon/libvirtd.c | 4 ++++ src/libvirt.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 1 + 4 files changed, 47 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 250094b..aac1826 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -431,6 +431,10 @@ static void daemonInitialize(void) bhyveRegister(); # endif #endif +# ifdef WITH_VZ + virAssignSharedDrivers("vz"); + virAssignSharedDrivers("Parallels"); +# endif } diff --git a/src/libvirt.c b/src/libvirt.c index 25a0040..1763be7 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1433,3 +1433,44 @@ virTypedParameterValidateSet(virConnectPtr conn, } return 0; } + +/** + * virAssignSharedDrivers: + * @name: name of connection driver + * + * This function fills in any empty pointers for shared drivers + * in connect driver structure + * + * Returns 0 in case of success, -1 in case of error +*/ +int +virAssignSharedDrivers(const char *name) +{ + size_t i; + + if (name == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Driver name must be specified")); + return -1; + } + + for (i = 0; i < virConnectDriverTabCount; i++) { + if (STREQ(virConnectDriverTab[i]->hypervisorDriver->name, name)) { + if (virConnectDriverTab[i]->interfaceDriver == NULL) + virConnectDriverTab[i]->interfaceDriver = virSharedInterfaceDriver; + if (virConnectDriverTab[i]->networkDriver == NULL) + virConnectDriverTab[i]->networkDriver = virSharedNetworkDriver; + if (virConnectDriverTab[i]->nodeDeviceDriver == NULL) + virConnectDriverTab[i]->nodeDeviceDriver = virSharedNodeDeviceDriver; + if (virConnectDriverTab[i]->nwfilterDriver == NULL) + virConnectDriverTab[i]->nwfilterDriver = virSharedNWFilterDriver; + if (virConnectDriverTab[i]->secretDriver == NULL) + virConnectDriverTab[i]->secretDriver = virSharedSecretDriver; + if (virConnectDriverTab[i]->storageDriver == NULL) + virConnectDriverTab[i]->storageDriver = virSharedStorageDriver; + break; + } + } + + return 0; +} diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 1313b58..2a7227b 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -289,4 +289,5 @@ virTypedParameterValidateSet(virConnectPtr conn, virTypedParameterPtr params, int nparams); +int virAssignSharedDrivers(const char *name); #endif diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a835f18..a0fcdf5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -943,6 +943,7 @@ virFDStreamSetInternalCloseCb; # libvirt_internal.h +virAssignSharedDrivers; virConnectSupportsFeature; virDomainMigrateBegin3; virDomainMigrateBegin3Params; -- 1.8.3.1

2 3

[libvirt] Unsupported network type ethernet
by sonia verma 08 Apr '16

08 Apr '16

Hi Team I need to launch LXC VM using ethernet network type using libvirt.While trying the same, I'm getting below errors .. *error: internal error: Unsupported network type ethernet* Is there any patch available to add ethernet support to Libvirt with LXC VM ? Please let me know regarding this. Thanks Sonia Verma

3 3

[libvirt] [PATCH] libxl: libxl_domain_create_restore has an extra argument
by Wei Liu 08 Apr '16

08 Apr '16

In the latest libxenlight code, libxl_domain_create_restore accepts a new argument. Update libvirt's libxl driver for that. Use the macro provided by libxenlight to detect which version should be used. The new parameter (send_back_fd) is set to -1 because libvirt provides no such fd. Signed-off-by: Wei Liu <wei.liu2(a)citrix.com> --- Build test with Xen 4.6.1 (old API) and Xen unstable (new API). --- src/libxl/libxl_domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 04962a0..aed904b 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1070,7 +1070,12 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ret = libxl_domain_create_new(cfg->ctx, &d_config, &domid, NULL, &aop_console_how); } else { -#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS +#if defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_SEND_BACK_FD) + params.checkpointed_stream = 0; + ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, + restore_fd, -1, &params, NULL, + &aop_console_how); +#elif defined(LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS) params.checkpointed_stream = 0; ret = libxl_domain_create_restore(cfg->ctx, &d_config, &domid, restore_fd, &params, NULL, -- 2.1.4

4 6