- Devel - libvirt List Archives

[libvirt] [libvirt-security-notice PATCH] templates: Include charset info in <head/>
by Michal Privoznik 17 Jan '14

17 Jan '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- templates/lsn2html.xsl | 3 ++- templates/lsn2indexhtml.xsl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/lsn2html.xsl b/templates/lsn2html.xsl index aaac6e8..46501ab 100644 --- a/templates/lsn2html.xsl +++ b/templates/lsn2html.xsl @@ -21,7 +21,8 @@ <html> <head> <title>Libvirt Security Notice: LSN-<xsl:value-of select="lsn:id"/></title> - <link rel="stylesheet" type="text/css" href="../main.css" /> + <link rel="stylesheet" type="text/css" href="../main.css" /> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> <body> <h1>Libvirt Security Notice: LSN-<xsl:value-of select="lsn:id"/></h1> diff --git a/templates/lsn2indexhtml.xsl b/templates/lsn2indexhtml.xsl index 3573ac3..2e6f9c2 100644 --- a/templates/lsn2indexhtml.xsl +++ b/templates/lsn2indexhtml.xsl @@ -12,7 +12,8 @@ <html> <head> <title>Libvirt Security Notice Index</title> - <link rel="stylesheet" type="text/css" href="main.css" /> + <link rel="stylesheet" type="text/css" href="main.css" /> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> </head> <body> <h1>Libvirt Security Notice Index</h1> -- 1.8.5.2

2 2

[libvirt] Libvirt Security Notices
by Daniel P. Berrange 17 Jan '14

17 Jan '14

Hi Folks, After much work I've finally got a formal Libvirt Security Notice (LSN) setup worked out. Every security issue that is reported & confirmed on the libvirt security mailing list will have a formal LSN prepared. This is a simple XML document containing metadata & other information about the issue we deem relevant. Initially this will be private if there is an embargo applied. Once the issue is made public, will the LSN notices will be added to the following public GIT repository: http://libvirt.org/git/?p=libvirt-security-notice.git;a=summary This GIT repository is used to populate a new public website http://security.libvirt.org/ A plain text rendering of the LSN will also be sent to the mailing list libvirt-announce(a)redhat.com Every issue is available in text, html and xml formats eg http://security.libvirt.org/2014/0002.txt http://security.libvirt.org/2014/0002.html http://security.libvirt.org/2014/0002.xml If anyone backports a fix for a security issue to various -maint branches, the LSN notice in GIT should be updated with GIT hash of the backports. If a maint release is created, the tag should also be added to the LSN. After countless hours investigation I have populated the repository with a list of all historical issues in libvirt that I'm aware of. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 1

[libvirt] Add GVirConfigDomainDiskDriver
by Christophe Fergeau 17 Jan '14

17 Jan '14

Hey, I wanted to add support in libvirt-gconfig for the 'discard' attribute of the disk driver node. If I follow the way the API is currently done, it would be an additional method to GVirConfigDomainDisk. However, there are quite a few attributes attached to the disk driver node, so I felt it was preferrable to have a dedicated GVirConfigDomainDiskDriver class. This also matches better other places of libvirt-gconfig API. I've implemented support for most of the attributes of the disk driver node, as a result the corresponding methods in GVirConfigDomainDisk have been deprecated. Christophe

4 18

[libvirt] [PATCH] virSecuritySELinuxSetFileconHelper: Don't fail on read-only NFS
by Michal Privoznik 17 Jan '14

17 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=996543 When starting up a domain, the SELinux labeling is done depending on current configuration. If the labeling fails we check for possible causes, as not all labeling failures are fatal. For example, if the labeled file is on NFS which lacks SELinux support, the file can still be readable to qemu process. These cases are distinguished by the errno code: NFS without SELinux support returns EOPNOTSUPP. However, we were missing one scenario. In case there's a read-only disk on a read-only NFS (and possibly any FS) and the labeling is just optional (not explicitly requested in the XML) there's no need to make the labeling error fatal. In other words, read-only file on read-only NFS can fail to be labeled, but be readable at the same time. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/security/security_selinux.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 11c0c3b..c70ac77 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -896,13 +896,14 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon, bool optional) freecon(econ); } - /* if the error complaint is related to an image hosted on - * an nfs mount, or a usbfs/sysfs filesystem not supporting - * labelling, then just ignore it & hope for the best. - * The user hopefully set one of the necessary SELinux - * virt_use_{nfs,usb,pci} boolean tunables to allow it... + /* If the error complaint is related to an image hosted on a (possibly + * read-only) NFS mount, or a usbfs/sysfs filesystem not supporting + * labelling, then just ignore it & hope for the best. The user + * 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 && setfilecon_errno != ENOTSUP && + setfilecon_errno != EROFS) { virReportSystemError(setfilecon_errno, _("unable to set security context '%s' on '%s'"), tcon, path); -- 1.8.5.2

2 1

[libvirt] [PATCH v2] BSD: implement nodeGetCPUStats
by Roman Bogorodskiy 17 Jan '14

17 Jan '14

Implementation obtains CPU usage information using kern.cp_time and kern.cp_times sysctl(8)s and reports CPU utilization. --- include/libvirt/libvirt.h.in | 8 ++++ src/nodeinfo.c | 104 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh-host.c | 11 ++++- 3 files changed, 121 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 018a5ce..88afe20 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -692,6 +692,14 @@ typedef enum { #define VIR_NODE_CPU_STATS_IOWAIT "iowait" /** + * VIR_NODE_CPU_STATS_INTR: + * + * The cumulative interrupt CPU time, + * since the node booting up (in nanoseconds). + */ +#define VIR_NODE_CPU_STATS_INTR "intr" + +/** * VIR_NODE_CPU_STATS_UTILIZATION: * * The CPU utilization of a node. diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 05bc038..fd2f8c8 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -34,8 +34,10 @@ #include "conf/domain_conf.h" #if defined(__FreeBSD__) || defined(__APPLE__) +# include <sys/time.h> # include <sys/types.h> # include <sys/sysctl.h> +# include <sys/resource.h> #endif #include "c-ctype.h" @@ -99,8 +101,108 @@ appleFreebsdNodeGetMemorySize(unsigned long *memory) #endif /* defined(__FreeBSD__) || defined(__APPLE__) */ #ifdef __FreeBSD__ +# define BSD_CPU_STATS_ALL 4 # define BSD_MEMORY_STATS_ALL 4 +# define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / (stathz ? stathz : hz)) + +static int +freebsdNodeGetCPUStats(int cpuNum, + virNodeCPUStatsPtr params, + int *nparams) +{ + const char *sysctl_name; + long *cpu_times; + struct clockinfo clkinfo; + size_t i, j, cpu_times_size, clkinfo_size; + int cpu_times_num, offset, hz, stathz, ret = -1; + struct field_cpu_map { + const char *field; + int idx[CPUSTATES]; + } cpu_map[] = { + {VIR_NODE_CPU_STATS_KERNEL, {CP_SYS}}, + {VIR_NODE_CPU_STATS_USER, {CP_USER, CP_NICE}}, + {VIR_NODE_CPU_STATS_IDLE, {CP_IDLE}}, + {VIR_NODE_CPU_STATS_INTR, {CP_INTR}}, + {NULL, {0}} + }; + + if ((*nparams) == 0) { + *nparams = BSD_CPU_STATS_ALL; + return 0; + } + + if ((*nparams) != BSD_CPU_STATS_ALL) { + virReportInvalidArg(*nparams, + _("nparams in %s must be equal to %d"), + __FUNCTION__, BSD_CPU_STATS_ALL); + return -1; + } + + clkinfo_size = sizeof(clkinfo); + if (sysctlbyname("kern.clockrate", &clkinfo, &clkinfo_size, NULL, 0) < 0) { + virReportSystemError(errno, + _("sysctl failed for '%s'"), + "kern.clockrate"); + return -1; + } + + stathz = clkinfo.stathz; + hz = clkinfo.hz; + + if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { + sysctl_name = "kern.cp_time"; + cpu_times_num = 1; + offset = 0; + } else { + sysctl_name = "kern.cp_times"; + cpu_times_num = appleFreebsdNodeGetCPUCount(); + + if (cpuNum >= cpu_times_num) { + virReportInvalidArg(cpuNum, + _("Invalid cpuNum in %s"), + __FUNCTION__); + return -1; + } + + offset = cpu_times_num * CPUSTATES; + } + + cpu_times_size = sizeof(long) * cpu_times_num * CPUSTATES; + + if (VIR_ALLOC_N(cpu_times, cpu_times_num * CPUSTATES) < 0) + goto cleanup; + + if (sysctlbyname(sysctl_name, cpu_times, &cpu_times_size, NULL, 0) < 0) { + virReportSystemError(errno, + _("sysctl failed for '%s'"), + sysctl_name); + goto cleanup; + } + + for (i = 0; cpu_map[i].field != NULL; i++) { + virNodeCPUStatsPtr param = &params[i]; + + if (virStrcpyStatic(param->field, cpu_map[i].field) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field '%s' too long for destination"), + cpu_map[i].field); + goto cleanup; + } + + param->value = 0; + for (j = 0; j < ARRAY_CARDINALITY(cpu_map[i].idx); j++) + param->value += cpu_times[offset + cpu_map[i].idx[j]] * TICK_TO_NSEC; + } + + ret = 0; + +cleanup: + VIR_FREE(cpu_times); + + return ret; +} + static int freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params, int *nparams) @@ -1066,6 +1168,8 @@ int nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED, return ret; } +#elif defined(__FreeBSD__) + return freebsdNodeGetCPUStats(cpuNum, params, nparams); #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node CPU stats not implemented on this platform")); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 1d1bb97..ac41177 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -347,9 +347,10 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) unsigned long long sys; unsigned long long idle; unsigned long long iowait; + unsigned long long intr; unsigned long long util; } cpu_stats[2]; - double user_time, sys_time, idle_time, iowait_time, total_time; + double user_time, sys_time, idle_time, iowait_time, intr_time, total_time; double usage; if (vshCommandOptInt(cmd, "cpu", &cpuNum) < 0) { @@ -390,6 +391,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) cpu_stats[i].idle = value; } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_IOWAIT)) { cpu_stats[i].iowait = value; + } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_INTR)) { + cpu_stats[i].intr = value; } else if (STREQ(params[j].field, VIR_NODE_CPU_STATS_UTILIZATION)) { cpu_stats[i].util = value; flag_utilization = true; @@ -406,6 +409,7 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%-15s %20llu\n", _("system:"), cpu_stats[0].sys); vshPrint(ctl, "%-15s %20llu\n", _("idle:"), cpu_stats[0].idle); vshPrint(ctl, "%-15s %20llu\n", _("iowait:"), cpu_stats[0].iowait); + vshPrint(ctl, "%-15s %20llu\n", _("intr:"), cpu_stats[0].intr); } } else { if (flag_utilization) { @@ -418,7 +422,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) sys_time = cpu_stats[1].sys - cpu_stats[0].sys; idle_time = cpu_stats[1].idle - cpu_stats[0].idle; iowait_time = cpu_stats[1].iowait - cpu_stats[0].iowait; - total_time = user_time + sys_time + idle_time + iowait_time; + intr_time = cpu_stats[1].intr - cpu_stats[0].intr; + total_time = user_time + sys_time + idle_time + iowait_time + intr_time; usage = (user_time + sys_time) / total_time * 100; @@ -432,6 +437,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) _("idle:"), idle_time / total_time * 100); vshPrint(ctl, "%-15s %5.1lf%%\n", _("iowait:"), iowait_time / total_time * 100); + vshPrint(ctl, "%-15s %5.1lf%%\n", + _("intr:"), intr_time / total_time * 100); } } -- 1.8.4.3

2 1

[libvirt] [PATCH v2] bhyve: add a basic driver
by Roman Bogorodskiy 17 Jan '14

17 Jan '14

At this point it has a limited functionality and is highly experimental. Supported domain operations are: * define * start * destroy It's only possible to have only one disk device and only one network, which should be of type bridge. --- configure.ac | 37 ++++ daemon/libvirtd.c | 9 + include/libvirt/virterror.h | 1 + po/POTFILES.in | 2 + src/Makefile.am | 35 +++ src/bhyve/bhyve_driver.c | 514 ++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_driver.h | 28 +++ src/bhyve/bhyve_process.c | 393 +++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.h | 36 ++++ src/bhyve/bhyve_utils.h | 48 +++++ src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 3 + src/util/virerror.c | 1 + 15 files changed, 1111 insertions(+), 1 deletion(-) create mode 100644 src/bhyve/bhyve_driver.c create mode 100644 src/bhyve/bhyve_driver.h create mode 100644 src/bhyve/bhyve_process.c create mode 100644 src/bhyve/bhyve_process.h create mode 100644 src/bhyve/bhyve_utils.h diff --git a/configure.ac b/configure.ac index 2622dfd..edfe7d4 100644 --- a/configure.ac +++ b/configure.ac @@ -504,6 +504,10 @@ AC_ARG_WITH([parallels], [AS_HELP_STRING([--with-parallels], [add Parallels Cloud Server support @<:@default=check@:>@])]) m4_divert_text([DEFAULTS], [with_parallels=check]) +AC_ARG_WITH([bhyve], + [AS_HELP_STRING([--with-bhyve], + [add BHyVe support @<:@default=check@:>@])]) +m4_divert_text([DEFAULTS], [with_bhyve=check]) AC_ARG_WITH([test], [AS_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@])]) @@ -1011,6 +1015,38 @@ fi AM_CONDITIONAL([WITH_PARALLELS], [test "$with_parallels" = "yes"]) dnl +dnl Checks for bhyve driver +dnl + +if test "$with_bhyve" != "no"; then + AC_PATH_PROG([BHYVE], [bhyve], [], [$PATH:/usr/sbin]) + AC_PATH_PROG([BHYVECTL], [bhyvectl], [$PATH:/usr/sbin]) + AC_PATH_PROG([BHYVELOAD], [bhyveload], [$PATH:/usr/sbin/]) + + if test -z "$BHYVE" || test -z "$BHYVECTL" \ + test -z "$BHYVELOAD" || test "$with_freebsd" = "no"; then + if test "$with_bhyve" = "check"; then + with_bhyve="no" + else + AC_MSG_ERROR([The bhyve driver cannot be enabled]) + fi + else + with_bhyve="yes" + fi +fi + +if test "$with_bhyve" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_BHYVE], 1, [whether bhyve driver is enabled]) + AC_DEFINE_UNQUOTED([BHYVE], ["$BHYVE"], + [Location of the bhyve tool]) + AC_DEFINE_UNQUOTED([BHYVECTL], ["$BHYVECTL"], + [Location of the bhyvectl tool]) + AC_DEFINE_UNQUOTED([BHYVELOAD], ["$BHYVELOAD"], + [Location of the bhyveload tool]) +fi +AM_CONDITIONAL([WITH_BHYVE], [test "$with_bhyve" = "yes"]) + +dnl dnl check for shell that understands <> redirection without truncation, dnl needed by src/qemu/qemu_monitor_{text,json}.c. dnl @@ -2582,6 +2618,7 @@ AC_MSG_NOTICE([ PHYP: $with_phyp]) AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ Hyper-V: $with_hyperv]) AC_MSG_NOTICE([Parallels: $with_parallels]) +AC_MSG_NOTICE([ Bhyve: $with_bhyve]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) AC_MSG_NOTICE([ Network: $with_network]) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 49c42ad..b27c6fd 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -77,6 +77,9 @@ # ifdef WITH_VBOX # include "vbox/vbox_driver.h" # endif +# ifdef WITH_BHYVE +# include "bhyve/bhyve_driver.h" +# endif # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif @@ -405,6 +408,9 @@ static void daemonInitialize(void) # ifdef WITH_VBOX virDriverLoadModule("vbox"); # endif +# ifdef WITH_BHYVE + virDriverLoadModule("bhyve"); +# endif #else # ifdef WITH_NETWORK networkRegister(); @@ -442,6 +448,9 @@ static void daemonInitialize(void) # ifdef WITH_VBOX vboxRegister(); # endif +# ifdef WITH_BHYVE + bhyveRegister(); +# endif #endif } diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index e31e9c4..7915bbb 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -121,6 +121,7 @@ typedef enum { VIR_FROM_ACCESS = 55, /* Error from access control manager */ VIR_FROM_SYSTEMD = 56, /* Error from systemd code */ + VIR_FROM_BHYVE = 57, /* Error from bhyve driver */ # ifdef VIR_ENUM_SENTINELS VIR_ERR_DOMAIN_LAST # endif diff --git a/po/POTFILES.in b/po/POTFILES.in index 49dfc9c..b4f463b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,6 +8,8 @@ gnulib/lib/gai_strerror.c gnulib/lib/regcomp.c src/access/viraccessdriverpolkit.c src/access/viraccessmanager.c +src/bhyve/bhyve_driver.c +src/bhyve/bhyve_process.c src/conf/capabilities.c src/conf/cpu_conf.c src/conf/device_conf.c diff --git a/src/Makefile.am b/src/Makefile.am index 57e163f..718bef4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -772,6 +772,13 @@ PARALLELS_DRIVER_SOURCES = \ parallels/parallels_storage.c \ parallels/parallels_network.c +BHYVE_DRIVER_SOURCES = \ + bhyve/bhyve_driver.h \ + bhyve/bhyve_driver.c \ + bhyve/bhyve_process.c \ + bhyve/bhyve_process.h \ + bhyve/bhyve_utils.h + NETWORK_DRIVER_SOURCES = \ network/bridge_driver.h network/bridge_driver.c \ network/bridge_driver_platform.h \ @@ -1308,6 +1315,33 @@ libvirt_driver_parallels_la_CFLAGS = \ libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES) endif WITH_PARALLELS +if WITH_BHYVE +noinst_LTLIBRARIES += libvirt_driver_bhyve_impl.la +libvirt_driver_bhyve_la_SOURCES = +libvirt_driver_bhyve_la_LIBADD = libvirt_driver_bhyve_impl.la +if WITH_DRIVER_MODULES +mod_LTLIBRARIES += libvirt_driver_bhyve.la +libvirt_driver_bhyve_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_bhyve_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) +else ! WITH_DRIVER_MODULES +noinst_LTLIBRARIES += libvirt_driver_bhyve.la +endif ! WITH_DRIVER_MODULES + +libvirt_driver_bhyve_impl_la_CFLAGS = \ + -I$(top_srcdir)/src/conf \ + $(AM_CFLAGS) +libvirt_driver_bhyve_impl_la_LDFLAGS = $(AM_LDFLAGS) + + + +#noinst_LTLIBRARIES += libvirt_driver_bhyve.la +#libvirt_la_BUILT_LIBADD += libvirt_driver_bhyve.la +#libvirt_driver_bhyve_la_CFLAGS = \ +# -I$(top_srcdir)/src/conf $(AM_CFLAGS) +libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES) + +endif WITH_BHYVE + if WITH_NETWORK noinst_LTLIBRARIES += libvirt_driver_network_impl.la libvirt_driver_network_la_SOURCES = @@ -1642,6 +1676,7 @@ EXTRA_DIST += \ $(HYPERV_DRIVER_SOURCES) \ $(HYPERV_DRIVER_EXTRA_DIST) \ $(PARALLELS_DRIVER_SOURCES) \ + $(BHYVE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c new file mode 100644 index 0000000..ba62d1a --- /dev/null +++ b/src/bhyve/bhyve_driver.c @@ -0,0 +1,514 @@ +/* + * bhyve_driver.c: core driver methods for managing bhyve guests + * + * Copyright (C) 2013 Roman Bogorodskiy + * + * 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/>. + * + * Author: Roman Bogorodskiy + */ + +#include <config.h> + +#include "virerror.h" +#include "datatypes.h" +#include "virbuffer.h" +#include "viruuid.h" +#include "capabilities.h" +#include "configmake.h" +#include "viralloc.h" +#include "network_conf.h" +#include "interface_conf.h" +#include "domain_audit.h" +#include "domain_conf.h" +#include "snapshot_conf.h" +#include "fdstream.h" +#include "storage_conf.h" +#include "node_device_conf.h" +#include "virxml.h" +#include "virthread.h" +#include "virlog.h" +#include "virfile.h" +#include "virtypedparam.h" +#include "virrandom.h" +#include "virstring.h" +#include "cpu/cpu.h" + +#include "bhyve_driver.h" +#include "bhyve_process.h" +#include "bhyve_utils.h" + +#define VIR_FROM_THIS VIR_FROM_BHYVE + +bhyveConnPtr bhyve_driver = NULL; + +void +bhyveDriverLock(bhyveConnPtr driver) +{ + virMutexLock(&driver->lock); +} + +void +bhyveDriverUnlock(bhyveConnPtr driver) +{ + virMutexUnlock(&driver->lock); +} + +static virCapsPtr +bhyveBuildCapabilities(void) +{ + virCapsPtr caps; + virCapsGuestPtr guest; + + if ((caps = virCapabilitiesNew(virArchFromHost(), + 0, 0)) == NULL) + return NULL; + + if ((guest = virCapabilitiesAddGuest(caps, "hvm", + VIR_ARCH_X86_64, + "bhyve", + NULL, 0, NULL)) == NULL) + goto error; + + if (virCapabilitiesAddGuestDomain(guest, + "bhyve", NULL, NULL, 0, NULL) == NULL) + goto error; + + return caps; + +error: + virObjectUnref(caps); + return NULL; +} + +static char * +bhyveConnectGetCapabilities(virConnectPtr conn) +{ + bhyveConnPtr privconn = conn->privateData; + char *xml; + + bhyveDriverLock(privconn); + if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) + virReportOOMError(); + bhyveDriverUnlock(privconn); + + return xml; +} + +static virDomainObjPtr +bhyveDomObjFromDomain(virDomainPtr domain) +{ + virDomainObjPtr vm; + bhyveConnPtr privconn = domain->conn->privateData; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + vm = virDomainObjListFindByUUID(privconn->domains, domain->uuid); + if (!vm) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, domain->name); + return NULL; + } + + return vm; +} + +static virDrvOpenStatus +bhyveConnectOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) +{ + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + + if (!conn->uri) + return VIR_DRV_OPEN_DECLINED; + + if (!conn->uri->scheme || STRNEQ(conn->uri->scheme, "bhyve")) + return VIR_DRV_OPEN_DECLINED; + + if (conn->uri->server) + return VIR_DRV_OPEN_DECLINED; + + if (!STREQ_NULLABLE(conn->uri->path, "/system")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected bhyve URI path '%s', try bhyve:///system"), + conn->uri->path); + return VIR_DRV_OPEN_ERROR; + } + + if (bhyve_driver == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("bhyve state driver is not active")); + return VIR_DRV_OPEN_ERROR; + } + + conn->privateData = bhyve_driver; + + return VIR_DRV_OPEN_SUCCESS; +} + +static int +bhyveConnectClose(virConnectPtr conn) +{ + bhyveConnPtr privconn = conn->privateData; + + bhyveDriverLock(privconn); + virObjectUnref(privconn->caps); + virObjectUnref(privconn->xmlopt); + virObjectUnref(privconn->domains); + conn->privateData = NULL; + + bhyveDriverUnlock(privconn); + virMutexDestroy(&privconn->lock); + + VIR_FREE(privconn); + return 0; +} + +static char * +bhyveConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) +{ + return virGetHostname(); +} + +static int +bhyveConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *hvVer) +{ + if (virParseVersionString("0.0.1", hvVer, true) < 0) { + return -1; + } + + return 0; +} + +static int +bhyveDomainGetInfo(virDomainPtr domain ATTRIBUTE_UNUSED, virDomainInfoPtr info ATTRIBUTE_UNUSED) +{ + return 0; +} + +static virDomainPtr +bhyveDomainDefineXML(virConnectPtr conn, const char *xml) +{ + bhyveConnPtr privconn = conn->privateData; + virDomainPtr dom = NULL; + virDomainDefPtr def = NULL; + virDomainDefPtr oldDef = NULL; + virDomainObjPtr vm = NULL; + + bhyveDriverLock(privconn); + + if ((def = virDomainDefParseString(xml, privconn->caps, privconn->xmlopt, + 1 << VIR_DOMAIN_VIRT_BHYVE, + VIR_DOMAIN_XML_INACTIVE)) == NULL) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("Can't parse XML desc")); + goto cleanup; + } + + if (!(vm = virDomainObjListAdd(privconn->domains, def, + privconn->xmlopt, + 0, &oldDef))) + goto cleanup; + + VIR_INFO("Creating domain '%s'", vm->def->name); + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) dom->id = vm->def->id; + + if (virDomainSaveConfig(BHYVE_CONFIG_DIR, vm->def) < 0) { + goto cleanup; + } + +cleanup: + virDomainDefFree(def); + if (vm) + virObjectUnlock(vm); + + bhyveDriverUnlock(privconn); + return dom; +} + +static int +bhyveConnectListDomains(virConnectPtr conn, int *ids, int maxids) +{ + bhyveConnPtr privconn = conn->privateData; + int n; + + n = virDomainObjListGetActiveIDs(privconn->domains, ids, maxids, + NULL, NULL); + + return n; +} + +static int +bhyveConnectNumOfDomains(virConnectPtr conn) +{ + bhyveConnPtr privconn = conn->privateData; + int count; + + count = virDomainObjListNumOfDomains(privconn->domains, true, + NULL, NULL); + + return count; +} + +static int +bhyveConnectListDefinedDomains(virConnectPtr conn, char **const names, + int maxnames) +{ + bhyveConnPtr privconn = conn->privateData; + int n; + + memset(names, 0, sizeof(*names) * maxnames); + n = virDomainObjListGetInactiveNames(privconn->domains, names, + maxnames, NULL, NULL); + + return n; +} + +static int +bhyveConnectNumOfDefinedDomains(virConnectPtr conn) +{ + bhyveConnPtr privconn = conn->privateData; + int count; + + count = virDomainObjListNumOfDomains(privconn->domains, false, + NULL, NULL); + + return count; +} + +static int +bhyveConnectListAllDomains(virConnectPtr conn, + virDomainPtr **domains, + unsigned int flags) +{ + bhyveConnPtr privconn = conn->privateData; + int ret = -1; + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ALL, -1); + + ret = virDomainObjListExport(privconn->domains, conn, domains, + NULL, flags); + + return ret; +} + +static virDomainPtr +bhyveDomainLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) +{ + bhyveConnPtr privconn = conn->privateData; + virDomainObjPtr vm; + virDomainPtr dom = NULL; + + vm = virDomainObjListFindByUUID(privconn->domains, uuid); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + +cleanup: + if (vm) + virObjectUnlock(vm); + return dom; +} + +static virDomainPtr bhyveDomainLookupByName(virConnectPtr conn, + const char *name) +{ + bhyveConnPtr privconn = conn->privateData; + virDomainObjPtr vm; + virDomainPtr dom = NULL; + + vm = virDomainObjListFindByName(privconn->domains, name); + + if (!vm) { + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching name '%s'"), name); + goto cleanup; + } + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (dom) + dom->id = vm->def->id; + +cleanup: + if (vm) + virObjectUnlock(vm); + return dom; +} + +static int +bhyveDomainCreate(virDomainPtr dom) +{ + bhyveConnPtr privconn = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + if (!(vm = bhyveDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is already running")); + goto cleanup; + } + + ret = virBhyveProcessStart(dom->conn, privconn, vm, + VIR_DOMAIN_RUNNING_BOOTED); + +cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static int +bhyveDomainDestroy(virDomainPtr dom) +{ + bhyveConnPtr privconn = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + if (!(vm = bhyveDomObjFromDomain(dom))) + goto cleanup; + + ret = virBhyveProcessStop(privconn, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); + +cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static int +bhyveStateCleanup(void) +{ + VIR_INFO("bhyve state cleanup"); + + if (bhyve_driver == NULL) + return -1; + + virObjectUnref(bhyve_driver->domains); + + virMutexDestroy(&bhyve_driver->lock); + VIR_FREE(bhyve_driver); + + return 0; +} + +static int +bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, + virStateInhibitCallback callback ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + if (!priveleged) { + VIR_INFO("Not running priveleged, disabling driver"); + return 0; + } + + if (VIR_ALLOC(bhyve_driver) < 0) { + return -1; + } + + if (virMutexInit(&bhyve_driver->lock) < 0) { + VIR_FREE(bhyve_driver); + return -1; + } + + if (!(bhyve_driver->caps = bhyveBuildCapabilities())) + goto cleanup; + + if (!(bhyve_driver->xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL))) + goto cleanup; + + if (!(bhyve_driver->domains = virDomainObjListNew())) + goto cleanup; + + if (virFileMakePath(BHYVE_LOG_DIR) < 0) { + virReportSystemError(errno, + _("Failed to mkdir %s"), + BHYVE_LOG_DIR); + goto cleanup; + } + + if (virFileMakePath(BHYVE_STATE_DIR) < 0) { + virReportSystemError(errno, + _("Failed to mkdir %s"), + BHYVE_LOG_DIR); + goto cleanup; + } + + if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, + BHYVE_CONFIG_DIR, + NULL, 0, + bhyve_driver->caps, + bhyve_driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_BHYVE, + NULL, NULL) < 0) + goto cleanup; + + return 0; + +cleanup: + bhyveStateCleanup(); + return -1; +} + + +static virDriver bhyveDriver = { + .no = VIR_DRV_BHYVE, + .name = "bhyve", + .connectOpen = bhyveConnectOpen, + .connectClose = bhyveConnectClose, + .connectGetVersion = bhyveConnectGetVersion, + .connectGetHostname = bhyveConnectGetHostname, + .domainGetInfo = bhyveDomainGetInfo, + .connectGetCapabilities = bhyveConnectGetCapabilities, + .connectListDomains = bhyveConnectListDomains, + .connectNumOfDomains = bhyveConnectNumOfDomains, + .connectListAllDomains = bhyveConnectListAllDomains, + .connectListDefinedDomains = bhyveConnectListDefinedDomains, + .connectNumOfDefinedDomains = bhyveConnectNumOfDefinedDomains, + .domainCreate = bhyveDomainCreate, + .domainDestroy = bhyveDomainDestroy, + .domainLookupByUUID = bhyveDomainLookupByUUID, + .domainLookupByName = bhyveDomainLookupByName, + .domainDefineXML = bhyveDomainDefineXML, +}; + + +static virStateDriver bhyveStateDriver = { + .name= "bhyve", + .stateInitialize = bhyveStateInitialize, + .stateCleanup = bhyveStateCleanup, +}; + +int +bhyveRegister(void) +{ + virRegisterDriver(&bhyveDriver); + virRegisterStateDriver(&bhyveStateDriver); + return 0; +} diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h new file mode 100644 index 0000000..ffe91e5 --- /dev/null +++ b/src/bhyve/bhyve_driver.h @@ -0,0 +1,28 @@ +/* + * bhyve_driver.h: core driver methods for managing bhyve guests + * + * Copyright (C) 2013 Roman Bogorodskiy + * + * 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/>. + * + * Author: Roman Bogorodskiy <bogorodskiy(a)gmail.com> + */ + +#ifndef __BHYVE_DRIVER_H__ +# define __BHYVE_DRIVER_H__ + +int bhyveRegister(void); + +#endif /* __BHYVE_DRIVER_H__ */ diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c new file mode 100644 index 0000000..d481d58 --- /dev/null +++ b/src/bhyve/bhyve_process.c @@ -0,0 +1,393 @@ +/* + * bhyve_process.c: bhyve process management + * + * Copyright (C) 2013 Roman Bogorodskiy + * + * 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 <fcntl.h> +#include <sys/types.h> +#include <dirent.h> +#include <sys/ioctl.h> +#include <net/if.h> +#include <net/if_tap.h> + +#include "bhyve_process.h" +#include "datatypes.h" +#include "virerror.h" +#include "virlog.h" +#include "virfile.h" +#include "viralloc.h" +#include "vircommand.h" +#include "virstring.h" +#include "virpidfile.h" +#include "virprocess.h" +#include "virnetdev.h" +#include "virnetdevbridge.h" +#include "virnetdevtap.h" + +#define VIR_FROM_THIS VIR_FROM_BHYVE + +static char* +virTapGetRealDeviceName(char *name) +{ + /* This is an ugly hack, because if we rename + * tap device to vnet%d, its device name will be + * still /dev/tap%d, and bhyve tries too open /dev/tap%d, + * so we have to find the real name + */ + char *ret = NULL; + struct dirent *dp; + char *devpath = NULL; + int fd; + + DIR* dirp = opendir("/dev"); + if (dirp == NULL) { + return NULL; + } + + while ((dp = readdir(dirp)) != NULL) { + if (STRPREFIX(dp->d_name, "tap")) { + struct ifreq ifr; + if (virAsprintf(&devpath, "/dev/%s", dp->d_name) < 0) { + goto cleanup; + } + if ((fd = open(devpath, O_RDWR)) < 0) + goto cleanup; + + if (ioctl(fd, TAPGIFNAME, (void *)&ifr) < 0) + goto cleanup; + + if (STREQ(name, ifr.ifr_name)) { + /* we can ignore the return value + * because we still have nothing + * to do but return; + */ + ignore_value(VIR_STRDUP(ret, dp->d_name)); + goto cleanup; + } + + VIR_FREE(devpath); + VIR_FORCE_CLOSE(fd); + } + } + +cleanup: + VIR_FREE(devpath); + VIR_FORCE_CLOSE(fd); + closedir(dirp); + return ret; +} + +static virCommandPtr +virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + virCommandPtr cmd = virCommandNew(BHYVECTL); + + virCommandAddArg(cmd, "--destroy"); + virCommandAddArgPair(cmd, "--vm", vm->def->name); + + return cmd; +} + +static virCommandPtr +virBhyveProcessBuildLoadCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + virCommandPtr cmd; + virDomainDiskDefPtr disk = vm->def->disks[0]; + + cmd = virCommandNew(BHYVELOAD); + + /* Memory */ + virCommandAddArg(cmd, "-m"); + virCommandAddArgFormat(cmd, "%llu", + VIR_DIV_UP(vm->def->mem.max_balloon, 1024)); + + /* Image path */ + virCommandAddArg(cmd, "-d"); + virCommandAddArgFormat(cmd, disk->src); + + /* VM name */ + virCommandAddArg(cmd, vm->def->name); + + return cmd; +} + +static virCommandPtr +virBhyveProcessBuildBhyveCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + /* + * /usr/sbin/bhyve -c 2 -m 256 -AI -H -P \ + * -s 0:0,hostbridge \ + * -s 1:0,virtio-net,tap0 \ + * -s 2:0,ahci-hd,${IMG} \ + * -S 31,uart,stdio \ + * vm0 + */ + virCommandPtr cmd = NULL; + virDomainDiskDefPtr disk = vm->def->disks[0]; + virDomainNetDefPtr net = NULL; + char *brname = NULL; + char *realifname = NULL; + int *tapfd = NULL; + + if (vm->def->nnets > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Domain should have one and only one disk defined")); + return NULL; + } else if (vm->def->nnets == 1) + net = vm->def->nets[0]; + + if (net != NULL) { + int actualType = virDomainNetGetActualType(net); + + if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + if (VIR_STRDUP(brname, virDomainNetGetActualBridgeName(net)) < 0) + return NULL; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Network type %d is not supported"), + virDomainNetGetActualType(net)); + return NULL; + } + + if (!net->ifname || + STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || + strchr(net->ifname, '%')) { + VIR_FREE(net->ifname); + if (VIR_STRDUP(net->ifname, VIR_NET_GENERATED_PREFIX "%d") < 0) { + VIR_FREE(brname); + return NULL; + } + } + + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + vm->def->uuid, tapfd, 1, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + VIR_NETDEV_TAP_CREATE_IFUP | VIR_NETDEV_TAP_CREATE_PERSIST) < 0) { + VIR_FREE(net->ifname); + VIR_FREE(brname); + return NULL; + } + } + + realifname = virTapGetRealDeviceName(net->ifname); + + if (realifname == NULL) { + VIR_FREE(net->ifname); + VIR_FREE(brname); + return NULL; + } + + VIR_INFO("%s -> %s", net->ifname, realifname); + /* hack on top of other hack: we need to set + * interface to 'UP' again after re-opening to find its + * name + */ + if (virNetDevSetOnline(net->ifname, true) != 0) { + VIR_FREE(net->ifname); + VIR_FREE(brname); + return NULL; + } + + cmd = virCommandNew(BHYVE); + + /* CPUs */ + virCommandAddArg(cmd, "-c"); + virCommandAddArgFormat(cmd, "%d", vm->def->vcpus); + + /* Memory */ + virCommandAddArg(cmd, "-m"); + virCommandAddArgFormat(cmd, "%llu", + VIR_DIV_UP(vm->def->mem.max_balloon, 1024)); + + /* Options */ + virCommandAddArg(cmd, "-A"); /* Create an ACPI table */ + virCommandAddArg(cmd, "-I"); /* Present ioapic to the guest */ + virCommandAddArg(cmd, "-H"); /* vmexit from guest on hlt */ + virCommandAddArg(cmd, "-P"); /* vmexit from guest on pause */ + + /* Devices */ + virCommandAddArg(cmd, "-s"); + virCommandAddArg(cmd, "0:0,hostbridge"); + virCommandAddArg(cmd, "-s"); + virCommandAddArgFormat(cmd, "1:0,virtio-net,%s", realifname); + virCommandAddArg(cmd, "-s"); + virCommandAddArgFormat(cmd, "2:0,ahci-hd,%s", disk->src); + virCommandAddArg(cmd, "-S"); + virCommandAddArg(cmd, "31,uart"); + virCommandAddArg(cmd, vm->def->name); + + return cmd; +} + +int +virBhyveProcessStart(virConnectPtr conn, + bhyveConnPtr driver, + virDomainObjPtr vm, + virDomainRunningReason reason ATTRIBUTE_UNUSED) +{ + char *logfile = NULL; + int logfd = -1; + off_t pos = -1; + char ebuf[1024]; + virCommandPtr cmd = NULL; + bhyveConnPtr privconn = conn->privateData; + int ret = -1, status; + + if (vm->def->ndisks != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Domain should have one and only one disk defined")); + return -1; + } + + if (virAsprintf(&logfile, "%s/%s.log", + BHYVE_LOG_DIR, vm->def->name) < 0) + return -1; + + + if ((logfd = open(logfile, O_WRONLY | O_APPEND | O_CREAT, + S_IRUSR|S_IWUSR)) < 0) { + virReportSystemError(errno, + _("Failed to open '%s'"), + logfile); + goto cleanup; + } + + /* Call bhyveload to load a VM */ + if (!(cmd = virBhyveProcessBuildLoadCmd(driver, + vm))) + goto cleanup; + virCommandSetOutputFD(cmd, &logfd); + virCommandSetErrorFD(cmd, &logfd); + + /* Log generated command line */ + virCommandWriteArgLog(cmd, logfd); + if ((pos = lseek(logfd, 0, SEEK_END)) < 0) + VIR_WARN("Unable to seek to end of logfile: %s", + virStrerror(errno, ebuf, sizeof(ebuf))); + + VIR_INFO("Loading domain '%s'", vm->def->name); + if (virCommandRun(cmd, &status) < 0) + goto cleanup; + + if (status != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Guest failed to load: %d"), status); + goto cleanup; + } + + virCommandFree(cmd); + + VIR_FREE(privconn->pidfile); + if (!(privconn->pidfile = virPidFileBuildPath(BHYVE_STATE_DIR, + vm->def->name))) { + virReportSystemError(errno, + "%s", _("Failed to build pidfile path.")); + goto cleanup; + } + + if (unlink(privconn->pidfile) < 0 && + errno != ENOENT) { + virReportSystemError(errno, + _("Cannot remove state PID file %s"), + privconn->pidfile); + goto cleanup; + } + + /* Call bhyve to start the VM */ + if (!(cmd = virBhyveProcessBuildBhyveCmd(driver, + vm))) + goto cleanup; + virCommandSetOutputFD(cmd, &logfd); + virCommandSetErrorFD(cmd, &logfd); + virCommandWriteArgLog(cmd, logfd); + virCommandSetPidFile(cmd, privconn->pidfile); + virCommandDaemonize(cmd); + + VIR_INFO("Starting domain '%s'", vm->def->name); + ret = virCommandRun(cmd, NULL); + + if (ret == 0) { + if (virPidFileReadPath(privconn->pidfile, &vm->pid) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Domain %s didn't show up"), vm->def->name); + goto cleanup; + } + } else { + goto cleanup; + } + +cleanup: + VIR_FREE(logfile); + return ret; +} + +int +virBhyveProcessStop(bhyveConnPtr driver, + virDomainObjPtr vm, + virDomainShutoffReason reason ATTRIBUTE_UNUSED) +{ + size_t i; + int ret = -1; + int status; + virCommandPtr cmd = NULL; + + /* First, try to kill 'bhyve' process */ + if (virProcessKillPainfully(vm->pid, true) != 0) + VIR_WARN("Failed to gracefully stop bhyve VM '%s' (pid: %llu)", + vm->def->name, + (unsigned long long)vm->pid); + + for (i = 0; i < vm->def->nnets; i++) { + virDomainNetDefPtr net = vm->def->nets[i]; + int actualType = virDomainNetGetActualType(net); + + if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + ignore_value(virNetDevBridgeRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); + ignore_value(virNetDevTapDelete(net->ifname)); + } + } + + /* No matter if shutdown was successful or not, we + * need to unload the VM */ + if (!(cmd = virBhyveProcessBuildDestroyCmd(driver, vm))) + goto cleanup; + + if (virCommandRun(cmd, &status) < 0) + goto cleanup; + + if (status != 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Guest failed to stop: %d"), status); + goto cleanup; + } + + ret = 0; + +cleanup: + virCommandFree(cmd); + return ret; +} diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h new file mode 100644 index 0000000..70afe0e --- /dev/null +++ b/src/bhyve/bhyve_process.h @@ -0,0 +1,36 @@ +/* + * bhyve_process.h: bhyve process management + * + * Copyright (C) 2013 Roman Bogorodskiy + * + * 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 __BHYVE_PROCESS_H__ +# define __BHYVE_PROCESS_H__ + +# include "bhyve_utils.h" + +int virBhyveProcessStart(virConnectPtr conn, + bhyveConnPtr driver, + virDomainObjPtr vm, + virDomainRunningReason reason); + +int virBhyveProcessStop(bhyveConnPtr driver, + virDomainObjPtr vm, + virDomainShutoffReason reason); + +#endif /* __BHYVE_PROCESS_H__ */ diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h new file mode 100644 index 0000000..ed503cd --- /dev/null +++ b/src/bhyve/bhyve_utils.h @@ -0,0 +1,48 @@ +/* + * bhyve_utils.h: bhyve utils + * + * Copyright (C) 2013 Roman Bogorodskiy + * + * 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 __BHYVE_UTILS_H__ +# define __BHYVE_UTILS_H__ + +# include "driver.h" +# include "domain_conf.h" +# include "configmake.h" +# include "virthread.h" + +# define BHYVE_CONFIG_DIR (SYSCONFDIR "/libvirt/bhyve") +# define BHYVE_STATE_DIR (LOCALSTATEDIR "/run/libvirt/bhyve") +# define BHYVE_LOG_DIR (LOCALSTATEDIR "/log/libvirt/bhyve") + +struct _bhyveConn { + virMutex lock; + virDomainObjListPtr domains; + virCapsPtr caps; + virDomainXMLOptionPtr xmlopt; + char *pidfile; +}; + +typedef struct _bhyveConn bhyveConn; +typedef struct _bhyveConn *bhyveConnPtr; + +void bhyveDriverLock(bhyveConnPtr driver); +void bhyveDriverUnlock(bhyveConnPtr driver); + +#endif /* __BHYVE_UTILS_H__ */ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e65f3e3..928f5f5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -122,7 +122,8 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "hyperv", "vbox", "phyp", - "parallels") + "parallels", + "bhyve") VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, "fd", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 647d115..c82f598 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -196,6 +196,7 @@ enum virDomainVirtType { VIR_DOMAIN_VIRT_VBOX, VIR_DOMAIN_VIRT_PHYP, VIR_DOMAIN_VIRT_PARALLELS, + VIR_DOMAIN_VIRT_BHYVE, VIR_DOMAIN_VIRT_LAST }; diff --git a/src/driver.h b/src/driver.h index b6927ea..556f91f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -46,6 +46,7 @@ typedef enum { VIR_DRV_LIBXL = 14, VIR_DRV_HYPERV = 15, VIR_DRV_PARALLELS = 16, + VIR_DRV_BHYVE = 17, } virDrvNo; diff --git a/src/libvirt.c b/src/libvirt.c index b14af7e..b493f78 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -96,6 +96,9 @@ #ifdef WITH_PARALLELS # include "parallels/parallels_driver.h" #endif +#ifdef WITH_BHYVE +# include "bhyve/bhyve_driver.h" +#endif #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virerror.c b/src/util/virerror.c index d9a9fc4..8f4d1c1 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -124,6 +124,7 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "Access Manager", /* 55 */ "Systemd", + "Bhyve", ) -- 1.8.3.2

2 1

[libvirt] On Archbsd which uses Freebsd10 kernel and world the libvirt-glib with enable-introspection does not compile (using gcc or clang)
by Claudiu Traistaru 17 Jan '14

17 Jan '14

I have already posted a bug request about this. https://bugzilla.redhat.com/show_bug.cgi?id=1054657 The issue appears when trying to build with --enable-introspections flag. I think it would be super if somebody had a solution for this, because virt-manager is an nice tool to have.

1 0

[libvirt] ANNOUNCE: libvirt 1.1.3.3 maintenance release
by Cole Robinson 17 Jan '14

17 Jan '14

libvirt 1.1.3.3 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.3.tar.gz Changes in this version: * virt-login-shell: fix regressions in behavior * Fix race leading to crash when setting up dbus watches * event: filter global events by domain:getattr ACL [CVE-2014-0028] * Fix memory leak in virObjectEventCallbackListRemoveID() * virDomainEventCallbackListFree: Don't leak @list->callbacks * Really don't crash if a connection closes early * Don't crash if a connection closes early * qemu: Fix job usage in virDomainGetBlockIoTune * qemu: Fix job usage in qemuDomainBlockCopy * qemu: Fix job usage in qemuDomainBlockJobImpl * qemu: Avoid using stale data in virDomainGetBlockInfo * qemu: Do not access stale data in virDomainBlockStats * qemu: clean up migration ports when migration cancelled * qemu: Fix augeas support for migration ports * qemu: Make migration port range configurable * qemu: Avoid assigning unavailable migration ports * libxl: avoid crashing if calling `virsh numatune' on inactive domain * Fix crash in lxcDomainSetMemoryParameters * CVE-2013-6436: fix crash in lxcDomainGetMemoryParameters For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 1.0.5.9 maintenance release
by Cole Robinson 17 Jan '14

17 Jan '14

libvirt 1.0.5.9 maintenance release is now available. This is libvirt 1.0.5 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.0.5.9.tar.gz Changes in this version: * Fix race leading to crash when setting up dbus watches * Really don't crash if a connection closes early * Don't crash if a connection closes early * qemu: Fix job usage in virDomainGetBlockIoTune * qemu: Fix job usage in qemuDomainBlockCopy * qemu: Fix job usage in qemuDomainBlockJobImpl * qemu: Avoid using stale data in virDomainGetBlockInfo * qemu: Do not access stale data in virDomainBlockStats * tests: be more explicit on qcow2 versions in virstoragetest * qemu: clean up migration ports when migration cancelled * qemu: Fix augeas support for migration ports * qemu: Make migration port range configurable * qemu: Avoid assigning unavailable migration ports * Don't spam logs with "port 0 must be in range" errors * Fix crash in lxcDomainSetMemoryParameters * CVE-2013-6436: fix crash in lxcDomainGetMemoryParameters For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 0.9.12.3 maintenance release
by Guido Günther 16 Jan '14

16 Jan '14

libvirt 0.9.12.3 maintenance release is now available. This is libvirt 0.9.12 with additional bugfixes that have accumulated upstream since the initial release. It fixes CVE-2013-6458 and CVE-2014-1447. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.12.3.tar.gz md5sum: 0f596bceec120df4cd5aecb8f0128d5d libvirt-0.9.12.3.tar.gz sha1: 73e72812a3d3c1a096b515dc01803bdbff7c595a libvirt-0.9.12.3.tar.gz sha256: 404afb7fdd23d8f36645cffc77fecfed40d60617f8bcae707ac3b9f7925fc0fb libvirt-0.9.12.3.tar.gz Changes in this release: Prepare for 0.9.12.3 (Guido Günther) Really don't crash if a connection closes early (Jiri Denemark) Don't crash if a connection closes early (Jiri Denemark) qemu: Fix job usage in virDomainGetBlockIoTune (Jiri Denemark) qemu: Fix job usage in qemuDomainBlockJobImpl (Jiri Denemark) qemu: Avoid using stale data in virDomainGetBlockInfo (Jiri Denemark) qemu: Do not access stale data in virDomainBlockStats (Jiri Denemark) Introduce virReportError macro for general error reporting (Daniel P. Berrange) string: test VIR_STRDUP (Eric Blake) string: make VIR_STRDUP easier to use (Eric Blake) virstring: Introduce VIR_STRDUP and VIR_STRNDUP (Michal Privoznik) remote: fix regression in event deregistration (Zhou Yimin) For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Cheers, -- Guido

1 0

[libvirt] [libvirt-glib] config: Fix typo preventing clock removal from a domain
by Christophe Fergeau 16 Jan '14

16 Jan '14

Commit 1c8ce29 added a way to unset a GVirConfigDomainClock set on a GVirConfigDomain by calling gvir_config_domain_set_clock() with a NULL argument. However, a typo in a g_return_if_fail precondition prevents this code from ever being called: g_return_if_fail(clock != NULL) is used while it should have been g_return_if_fail(clock == NULL) as in all other preconditions in 1c8ce29. --- libvirt-gconfig/libvirt-gconfig-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 3c28a4a..6cd2f86 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -552,7 +552,7 @@ void gvir_config_domain_set_clock(GVirConfigDomain *domain, GVirConfigDomainClock *klock) { g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); - g_return_if_fail(klock != NULL || GVIR_CONFIG_IS_DOMAIN_CLOCK(klock)); + g_return_if_fail(klock == NULL || GVIR_CONFIG_IS_DOMAIN_CLOCK(klock)); gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(domain), "clock", -- 1.8.4.2

2 2

[libvirt] [PATCHv2 0/6] remaining cleanups to libvirt.c
by Eric Blake 16 Jan '14

16 Jan '14

v2 of my patch series started here, after applying all patches already reviewed in that thread: https://www.redhat.com/archives/libvir-list/2013-December/msg01284.html Patches 1-3 can be considered bug fixes (particularly patch 3), so I'd like them in 1.2.1 if they get a favorable review. Patches 4-6 are less urgent, but might as well finish the work all within one release. Patch 1 comes from 5/24 in v1 Patch 2 is new Patch 3 and 4 come from 23/24 in v1 Patch 5 is new Patch 6 comes from 24/24 in v1 Eric Blake (6): maint: don't leave garbage on early API exit maint: avoid nested use of virConnect{Ref,Close} maint: don't lose error on canceled migration maint: clean up error reporting in migration maint: simplify driver registration at startup maint: replace remaining virLib*Error with better names cfg.mk | 10 -- src/libvirt.c | 397 ++++++++++++++++++++----------------------- src/lxc/lxc_process.c | 11 +- src/qemu/qemu_driver.c | 12 +- src/qemu/qemu_migration.c | 14 +- src/qemu/qemu_process.c | 10 +- src/storage/storage_driver.c | 5 +- src/uml/uml_driver.c | 3 +- 8 files changed, 209 insertions(+), 253 deletions(-) -- 1.8.4.2

3 11

[libvirt] [libvirt-java] [PATCH 00/10] assorted fixes
by Claudio Bley 16 Jan '14

16 Jan '14

This fixes a few memleaks and other errors. Note, that the memleak patches depend on the error refactoring patches I posted to this list[1] [1] https://www.redhat.com/archives/libvir-list/2014-January/msg00415.html Claudio Bley (10): Implement equals and hashCode methods for Connect and Domain Fix warnings using raw types Fix warnings about accessing static methods Remove unused fields of Error class Fix Domain.getSchedulerParameters / getSchedulerType Fix memleak in Domain.snapshotListNames Fix memleak in StoragePool.listVolumes Fix memleak in DomainSnapshot.getXMLDesc Fix memleak in StorageVol.getPath Fix memleak in StorageVol.getXMLDesc src/main/java/org/libvirt/Connect.java | 35 +++++++ src/main/java/org/libvirt/Domain.java | 103 +++++++++++++++------ src/main/java/org/libvirt/DomainSnapshot.java | 10 +- src/main/java/org/libvirt/Error.java | 12 +-- src/main/java/org/libvirt/StoragePool.java | 13 ++- src/main/java/org/libvirt/StorageVol.java | 18 +++- src/main/java/org/libvirt/jna/Libvirt.java | 10 +- src/main/java/org/libvirt/jna/virConnectAuth.java | 4 +- .../java/org/libvirt/jna/virConnectCredential.java | 4 +- .../java/org/libvirt/jna/virDomainBlockInfo.java | 4 +- .../java/org/libvirt/jna/virDomainBlockStats.java | 4 +- src/main/java/org/libvirt/jna/virDomainInfo.java | 4 +- .../org/libvirt/jna/virDomainInterfaceStats.java | 4 +- .../java/org/libvirt/jna/virDomainJobInfo.java | 4 +- .../java/org/libvirt/jna/virDomainMemoryStats.java | 4 +- src/main/java/org/libvirt/jna/virError.java | 4 +- src/main/java/org/libvirt/jna/virNodeInfo.java | 4 +- .../java/org/libvirt/jna/virSchedParameter.java | 4 +- .../java/org/libvirt/jna/virStoragePoolInfo.java | 4 +- .../java/org/libvirt/jna/virStorageVolInfo.java | 4 +- src/main/java/org/libvirt/jna/virVcpuInfo.java | 4 +- src/test/java/org/libvirt/TestJavaBindings.java | 4 + 22 files changed, 187 insertions(+), 74 deletions(-) -- 1.8.5.2.msysgit.0

1 10

[libvirt] Libvirt testing
by Pavel Hrdina 16 Jan '14

16 Jan '14

Hi all, We've created a new wiki page [1] where we would like to create a list of areas that we should focus on testing. If there is something critical or important what you think that should be really tested please feel free to update the wiki page. You should write down what part or functionality of libvirt should be tested and how do you think it should be tested. Regards, Pavel [1] <http://wiki.libvirt.org/page/AreasToFocusOnTesting>

1 0

[libvirt] [PATCH 0/6] Fix some memory leaks and other issues find by coverity tool
by Pavel Hrdina 16 Jan '14

16 Jan '14

This patch series fixes few memory leaks found by coverity tool to make that tool happy. The last patch is adding only one comment to hide "double_close" error as coverity tool is wrong about this and we don't have to see it in every report. Check the patch for more information. Pavel Hrdina (6): Fix memory leak in openvz_conf.c Fix possible memory leak in phyp_driver.c Fix possible memory leak in util/virxml.c Fix possible memory leak in virsh-domain-monitor.c Fix memory leak in securityselinuxlabeltest.c Fix coverity complain in commandtest.c src/openvz/openvz_conf.c | 5 +++-- src/phyp/phyp_driver.c | 4 +++- src/util/virxml.c | 2 ++ tests/commandtest.c | 1 + tests/securityselinuxlabeltest.c | 5 ++++- tools/virsh-domain-monitor.c | 4 ++++ 6 files changed, 17 insertions(+), 4 deletions(-) -- 1.8.3.1

3 16

[libvirt] [PATCH] virsh nodecpustats returns incorrect stats of cpu on Linux when the number of online cpu exceed 9.
by mars＠linux.vnet.ibm.com 16 Jan '14

16 Jan '14

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function use STRPREFIX() to match the cpuid with the cpuid read from /proc/cpustat, it will cause obvious error. For example: 'virsh nodecpustats 12' will display stats of cpu1 if the latter is online. This patch fixes this bug. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/nodeinfo.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 05bc038..6d7926c 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -715,8 +715,9 @@ linuxNodeGetCPUStats(FILE *procstat, while (fgets(line, sizeof(line), procstat) != NULL) { char *buf = line; + char **buf_header = virStringSplit(buf, " ", 2); - if (STRPREFIX(buf, cpu_header)) { /* aka logical CPU time */ + if (STREQ(buf_header[0], cpu_header)) { /* aka logical CPU time */ size_t i; if (sscanf(buf, @@ -775,6 +776,7 @@ linuxNodeGetCPUStats(FILE *procstat, ret = 0; goto cleanup; } + virStringFreeList(buf_header); } virReportInvalidArg(cpuNum, @@ -782,6 +784,7 @@ linuxNodeGetCPUStats(FILE *procstat, __FUNCTION__); cleanup: + virStringFreeList(buf_header); return ret; } -- 1.7.7.6

5 6

[libvirt] [PATCH] virsh nodecpustats returns incorrect stats of cpu on Linux when the number of online cpu exceed 9.
by mars＠linux.vnet.ibm.com 16 Jan '14

16 Jan '14

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function simply uses STRPREFIX() to match the cpuid with the cpuid read from /proc/stat, it will cause obvious error. For example: 'virsh nodecpustats 1' will display stats of cpu1* if the latter is online and cpu1 is offline. This patch fixes this bug. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 05bc038..cba2fc1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -708,9 +708,9 @@ linuxNodeGetCPUStats(FILE *procstat, } if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { - strcpy(cpu_header, "cpu"); + strcpy(cpu_header, "cpu "); } else { - snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); + snprintf(cpu_header, sizeof(cpu_header), "cpu%d ", cpuNum); } while (fgets(line, sizeof(line), procstat) != NULL) { -- 1.7.7.6

2 1

[libvirt] [PATCH v2] lxcDomainShutdownFlags and lxcDomainReboot: Cleanup @flags usage
by Michal Privoznik 16 Jan '14

16 Jan '14

Currently, the @flags usage is a bit unclear at first sight to say the least. There's no need for such unclear code especially when we can borrow the working code from qemuDomainShutdownFlags(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -lxcDomainReboot adjusted too -drop @useInitctl -shorten the commit message a bit src/lxc/lxc_driver.c | 46 ++++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7e56a59..06263b9 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2701,7 +2701,8 @@ lxcDomainShutdownFlags(virDomainPtr dom, virDomainObjPtr vm; char *vroot = NULL; int ret = -1; - int rc; + int rc = 0; + bool initctlRequested, signalRequested; virCheckFlags(VIR_DOMAIN_SHUTDOWN_INITCTL | VIR_DOMAIN_SHUTDOWN_SIGNAL, -1); @@ -2730,25 +2731,21 @@ lxcDomainShutdownFlags(virDomainPtr dom, (unsigned long long)priv->initpid) < 0) goto cleanup; - if (flags == 0 || - (flags & VIR_DOMAIN_SHUTDOWN_INITCTL)) { - if ((rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, - vroot)) < 0) { + initctlRequested = !flags || flags & VIR_DOMAIN_SHUTDOWN_INITCTL; + signalRequested = !flags || flags & VIR_DOMAIN_SHUTDOWN_SIGNAL; + + if (initctlRequested) { + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, vroot); + if (rc < 0 && !signalRequested) goto cleanup; - } - if (rc == 0 && flags != 0 && - ((flags & ~VIR_DOMAIN_SHUTDOWN_INITCTL) == 0)) { + if (rc == 0 && !signalRequested) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Container does not provide an initctl pipe")); goto cleanup; } - } else { - rc = 0; } - if (rc == 0 && - (flags == 0 || - (flags & VIR_DOMAIN_SHUTDOWN_SIGNAL))) { + if (signalRequested || rc == 0) { if (kill(priv->initpid, SIGTERM) < 0 && errno != ESRCH) { virReportSystemError(errno, @@ -2781,7 +2778,8 @@ lxcDomainReboot(virDomainPtr dom, virDomainObjPtr vm; char *vroot = NULL; int ret = -1; - int rc; + int rc = 0; + bool initctlRequested, signalRequested; virCheckFlags(VIR_DOMAIN_REBOOT_INITCTL | VIR_DOMAIN_REBOOT_SIGNAL, -1); @@ -2810,25 +2808,21 @@ lxcDomainReboot(virDomainPtr dom, (unsigned long long)priv->initpid) < 0) goto cleanup; - if (flags == 0 || - (flags & VIR_DOMAIN_REBOOT_INITCTL)) { - if ((rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_REBOOT, - vroot)) < 0) { + initctlRequested = !flags || flags & VIR_DOMAIN_REBOOT_INITCTL; + signalRequested = !flags || flags & VIR_DOMAIN_REBOOT_SIGNAL; + + if (initctlRequested) { + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_REBOOT, vroot); + if (rc < 0) goto cleanup; - } - if (rc == 0 && flags != 0 && - ((flags & ~VIR_DOMAIN_SHUTDOWN_INITCTL) == 0)) { + if (rc == 0 && !signalRequested) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Container does not provide an initctl pipe")); goto cleanup; } - } else { - rc = 0; } - if (rc == 0 && - (flags == 0 || - (flags & VIR_DOMAIN_REBOOT_SIGNAL))) { + if (signalRequested || rc == 0) { if (kill(priv->initpid, SIGHUP) < 0 && errno != ESRCH) { virReportSystemError(errno, -- 1.8.5.1

2 3

[libvirt] [PATCH 00/10] Snapshots on gluster volumes
by Peter Krempa 16 Jan '14

16 Jan '14

This series has to be applied on top of http://www.redhat.com/archives/libvir-list/2014-January/msg00192.html Peter Krempa (10): storage: Introduce internal pool support storage: Add new argument for createVol backend API storage: gluster: Introduce dummy functions for creating a volume storage: Add internal API to create temporary storage pools and vols snapshot: Add support for specifying snapshot disk backing type snapshot: Test snapshot disk type specification storage: Implement ephemeral storage APIs for local disk volumes storage: gluster: Support conversion of gluster volumes to temp volumes qemu: snapshot: Switch snapshot file deletion to the new storage API qemu: snapshot: Add support for external active snapshots on gluster docs/formatsnapshot.html.in | 15 + docs/hvsupport.pl | 3 + docs/schemas/domainsnapshot.rng | 76 ++++- src/Makefile.am | 3 +- src/check-aclrules.pl | 3 + src/check-drivername.pl | 1 + src/conf/snapshot_conf.c | 25 +- src/conf/snapshot_conf.h | 15 +- src/conf/storage_conf.c | 3 + src/conf/storage_conf.h | 1 + src/driver.h | 13 + src/libvirt_internal.c | 71 ++++ src/libvirt_internal.h | 22 ++ src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 9 + src/qemu/qemu_driver.c | 228 ++++++++++--- src/storage/storage_backend.h | 2 +- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 30 +- src/storage/storage_backend_gluster.c | 68 ++++ src/storage/storage_backend_logical.c | 6 +- src/storage/storage_backend_rbd.c | 3 +- src/storage/storage_backend_sheepdog.c | 3 +- src/storage/storage_driver.c | 416 ++++++++++++++++++++++- tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 18 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 18 + 27 files changed, 979 insertions(+), 81 deletions(-) create mode 100644 src/libvirt_internal.c -- 1.8.5.2

2 23

[libvirt] About libvirt.py stdout redirection
by me,apporc 16 Jan '14

16 Jan '14

Dear developers, As we know libvirt.py using libvirtmod.so, eg: def defineXML(self, xml): """Define a domain, but does not start it. This definition is persistent, until explicitly undefined with virDomainUndefine(). A previous definition for this domain would be overriden if it already exists. """ ret = libvirtmod.virDomainDefineXML(self._o, xml) if ret is None:raise libvirtError('virDomainDefineXML() failed', conn=self) __tmp = virDomain(self,_obj=ret) return __tmp In my python program #test.py import libvirt conn=libvirt.open("qemu:///system") xml=... conn.defineXML(xml) # Because i need this xml to be wrong for feature testing here # Error will happen here, and error message is printed to stderr. The error message is annoying. I need to know how to hide the error message printing to stderr by libvirtmod. After i add sys.stderr = open('xxx', 'w') before invoking conn.defineXML(xml), the error message is still printed to the terminal. Which means, i can redirect stderr to anywhere else in my python program, but it changes back to terminal when control flow go to libvirtmod. Any ideas? -- Regards, apporc

2 1

[libvirt] [PATCH] Bump version to 1.2.2 for new dev cycle
by Christophe Fergeau 16 Jan '14

16 Jan '14

--- Hey, I've raised libvirt version to 1.2.2 right after release following https://www.redhat.com/archives/libvir-list/2013-December/msg00657.html I've pushed it directly as imo it qualifies as trivial. Christophe configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f5dccf1..146418f 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.1], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.2], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.8.4.2

2 1

[libvirt] Release of libvirt-python-1.2.1
by Daniel Veillard 16 Jan '14

16 Jan '14

I also pushed a new release of libvirt python, it is available at: ftp://libvirt.org/libvirt/python/ contains a few fixes and a number of improvement especially toward portability and compatibility with python3: Features: - Add python3 to the automated build and RPM (Daniel P. Berrange) - Added python binding for the new network events API (Cédric Bosdonnat) Portability: - Rewrite libvirt_charPtrUnwrap to work with Python 3.0->3.2 (Daniel P. Berrange) - sanitytest: Fix libvirtError class handling for Python 2.4 (Daniel P. Berrange) - override: Fix native module registration to work with Python3 (Daniel P. Berrange) - generator: Don't use 'list' as a variable name (Daniel P. Berrange) Bug fixes: - virStream.sendAll() fix raising an undeclared var (Doug Goldstein) - Fix return type in override method for virStreamRecv (Daniel P. Berrange) - Don't free passed in args in libvirt_charPtrWrap / libvirt_charPtrSizeWrap (Daniel P. Berrange) - Fix use of virDomainEventRegister in python bindings (Daniel P. Berrange) Improvements: - Add space after comma for consistency with code style (Doug Goldstein) - define __GNUC_PREREQ macro before using it (Doug Goldstein) - Skip network event callbacks in sanity test (Daniel P. Berrange) - sanitytest: remove use of string.lower() (Daniel P. Berrange) - sanitytest: Fix broken comparison between int and string (Daniel P. Berrange) - override: Switch virStreamSend wrapper to use libvirt_charPtrSizeUnwrap (Daniel P. Berrange) - override: Conditionalize use of PyString_Check and PyInt_Check (Daniel P. Berrange) - typewrappers: PyInt/PyLong merge for Python3 (Daniel P. Berrange) - typewrappers: Replace use of PyString class (Daniel P. Berrange) - override: Replace PyInt_AsLong with helper (Daniel P. Berrange) - override: Replace Py{Int,Long}_FromLong with helpers (Daniel P. Berrange) - override: Replace PyString_AsString with libvirt_charPtrUnwrap (Daniel P. Berrange) - override: Replace PyString_FromString with libvirt_constcharPtrWrap (Daniel P. Berrange) - examples: Ensure we write bytes to the self-pipe (Daniel P. Berrange) - examples: Invoke print("...") instead of print "..." (Daniel P. Berrange) - Added python binding for the new network events API (Cédric Bosdonnat) - test: Invoke print("...") instead of print "..." (Doug Goldstein) - override: Fix exception handling syntax (Doug Goldstein) - generator: Sort enums and functions when generating code (Daniel P. Berrange) - generator: Remove use of string.replace and string.find functions (Daniel P. Berrange) - generator: Update to use sort() 'key' param (Daniel P. Berrange) - generator: Remove use of 'has_key' function (Daniel P. Berrange) - Update exception catching in generated code (Doug Goldstein) - generator: Support exceptions in Python 2 and 3 (Doug Goldstein) - setup: Drop unused exception variable (Doug Goldstein) - generator: Cast iterators to a list() explicitly (Daniel P. Berrange) - Revert "Optimize callback lookup in event handlers" (Daniel P. Berrange) - generator: Invoke print("...") instead of print "..." (Daniel P. Berrange) - generator: Remove string.lower(XXX) with XXX.lower() (Daniel P. Berrange) - Optimize callback lookup in event handlers (Daniel P. Berrange) - setup: Use user requested python binary (Doug Goldstein) Cleanup: - Revert accidental change to exception handling syntax (Daniel P. Berrange) Thanks to everybody who contributed to this release ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Release of libvirt-1.2.1
by Daniel Veillard 16 Jan '14

16 Jan '14

As scheduled I just tagged the git tree and pushed the tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ the next relase is planned at the end of February. This is a bug fix release, we never had that many security advisories closed in a single release, and there is a lot of various bug fixes so users are really invited to upgrate to the new version ! One clearly identified new feature and a reasonable number of improvements too, so not just bugfixes though :) Features: - network events API (Cédric Bosdonnat) Security: - CVE-2014-0028 event: filter global events by domain:getattr ACL (Eric Blake) - CVE-2014-1447-2 Really don't crash if a connection closes early (Jiri Denemark) - CVE-2014-1447-1 Don't crash if a connection closes early (Jiri Denemark) - CVE-2013-6458-4 qemu: Fix job usage in virDomainGetBlockIoTune (Jiri Denemark) - CVE-2013-6458-3 qemu: Fix job usage in qemuDomainBlockJobImpl (Jiri Denemark) - CVE-2013-6458-2 qemu: Avoid using stale data in virDomainGetBlockInfo (Jiri Denemark) - CVE-2013-6458-1 qemu: Do not access stale data in virDomainBlockStats (Jiri Denemark) - CVE-2013-6457 libxl: avoid crashing if calling `virsh numatune' on inactive domain (Dario Faggioli) - CVE-2013-6436: fix crash in lxcDomainGetMemoryParameters (Martin Kletzander) Documentation: - mention maintenance branches (Eric Blake) - Fix docs for PMWakeup/PMSuspend callback types (Claudio Bley) - storage: fs: Fix comment for virStorageBackendFileSystemDelete (Peter Krempa) - Clarify documentation on possible return values in case of errors (Claudio Bley) - Add Documentation fields to systemd service files (Guido Günther) - add LXC multi console command docs and a example (Chen Hanxiao) - maint: fix comment typos in qemu numa code (Eric Blake) - return paragraph must be last (Eric Blake) - fix layout of code snippets (Eric Blake) - improve event-related documentation (Eric Blake) - virsh: man: Mention that volumes need to be in storage pool for undefine (Peter Krempa) - fix address type for disks (Martin Kletzander) - qemu: fix typo PCi => PCI (Martin Kletzander) - tools: Fix virsh connect man page (Jiri Denemark) - fix a typo in libvirt.h (Chen Hanxiao) - fix recent typo (Eric Blake) - Enhance memoryBacking/locked documentation (Jiri Denemark) - fix double articles bug (Wang Yufei) - Explicitly declaring that nodedev-destroy only works for vHBA (Osier Yang) - fix some typos (Eric Blake) - fix typo in previous patch (Eric Blake) - fix typos in libvirt.h.in (Chen Hanxiao) Portability: - build: fix build on mingw with winpthreads (Eric Blake) - BSD: implement nodeGetMemoryStats (Roman Bogorodskiy) - build: fix bootstrap with older autoconf (Eric Blake) - AArch64: Porting of armv7l conditons to run qemu for aarch64. (Pranavkumar Sawargaonkar) - vmware: os x support is broken (Denis Kondratenko) - tests: fix syntax in previous patch (Eric Blake) - aarch64: Fix sysinfo test. (Richard W.M. Jones) - aarch64: Disable -fstack-protector. (Richard W.M. Jones) - virnettlscontexttest fails with GNUTLS 3.0.28 (Cédric Bosdonnat) - Fix build when default python is python3 (Lénaïc Huard) - specfile: fix make rpm when with_driver_modules is 1 (Laine Stump) - object: require maximal alignment in base class (Eric Blake) - configure: Resolve compile issue in configure.ac (Adam Walters) Bug Fixes: - qemu: Avoid operations on NULL monitor if VM fails early (Peter Krempa) - Fix coverity complain in commandtest.c (Pavel Hrdina) - Fix memory leak in securityselinuxlabeltest.c (Pavel Hrdina) - Fix possible memory leak in util/virxml.c (Pavel Hrdina) - Fix possible memory leak in phyp_driver.c (Pavel Hrdina) - Fix memory leak in openvz_conf.c (Pavel Hrdina) - Fix memory leak in testDomainCreateXMLMixed() (Nehal J Wani) - schema: fix idmap validation (Eric Blake) - event: don't queue NULL event on OOM (Eric Blake) - virt-login-shell: fix regressions in behavior (Eric Blake) - storage: fix crash when listing volumes or undefining a pool (Martin Kletzander) - qemuBuildNicDevStr: Set vectors= on Multiqueue (Michal Privoznik) - libxl: Fix devid init in libxlMakeNicList (Stefan Bader) - LXC: create monitor socket under selinux context of domain (Gao feng) - virsh: Use inactive definition when removing disk from config (Peter Krempa) - virsh: Don't use legacy API if --current is used on device hot(un)plug (Peter Krempa) - virConnect(Un)registerCloseCallback: Unlock @conn prior to error dispatch (Michal Privoznik) - Allow to install apparmor profiles (Guido Günther) - Fix bridge configuration when OUTPUT policy is DROP on the host (Lénaïc Huard) - lxc_controller: Don't leak @name (Michal Privoznik) - qemu: Fix job usage in qemuDomainBlockCopy (Jiri Denemark) - Fix segmentation fault when accessing default qemu machine type (Yudai Yamagish) - event: make deregister return value match docs (Eric Blake) - qemuProcessStop: Don't overwrite any errors (Michal Privoznik) - Fix argument order of qemuMigrationPerformJob(). (Minoru Usui) - libxl: Fix initialization of nictype in libxl_device_nic (Jim Fehlig) - qemu: range check numa memory placement mode (Peter Krempa) - Fix explicit usage of default video PCI slots (Ján Tomko) - maint: avoid nested public calls (Eric Blake) - event: don't overwrite registration error message (Eric Blake) - tests: sysinfotest: Actual/expected were swapped in error message. (Richard W.M. Jones) - domain: don't try to interpret <driver> as virtio config for hostdev interfaces (Laine Stump) - virkeycode: Allow ANSI_A (Michal Privoznik) - interface: Take interface status into account when starting and destroying (Michal Privoznik) - event-test: Unregister close callback (Michal Privoznik) - qemu: re-add hostdev interfaces to hostdev array on libvirtd restart (Laine Stump) - qemu: avoid duplicate security label restore on hostdev attach failure (Laine Stump) - qemu: properly set MaxMemLock when hotplugging with VFIO (Laine Stump) - PanicCheckABIStability: Need to check for existence (John Ferlan) - libxl: fix segfault when domain create fail (Bamvor Jian Zhang) - Fix crash in lxcDomainSetMemoryParameters (Martin Kletzander) - storage: fix bogus target in gluster volume xml (Eric Blake) - Fix crash in virsystemdtest with dbus 1.7.6 (Cédric Bosdonnat) - Fix race leading to crash when setting up dbus watches (Daniel P. Berrange) - libxl: libxl_get_max_cpus returning a libxl error from 4.4 onward (Dario Faggioli) - virsh: domain: Fix undefine with storage of 'volume' disks (Peter Krempa) - qemu: ask for -enable-fips when FIPS is required (Eric Blake) - configure: make --with-test-suite work (Martin Kletzander) - Fix memory leak in virObjectEventCallbackListRemoveID() (Nehal J Wani) - qemu: check for reboot-timeout on monitor (Martin Kletzander) - lxc: return -1 if failed to kill lxc process (Chen Hanxiao) - Add another missing % on %{_libdir} macro (Laine Stump) - Add missing % on %{_libdir} macro in RPM (Daniel P. Berrange) - storage: fix omitted slash in gluster volume URI (Eric Blake) - qemu_process: Read errors from child (Michal Privoznik) - qemu: hotplug: Fix adding USB devices to the driver list (Cole Robinson) - qemu: hotplug: Fix double free on USB collision (Cole Robinson) - qemu: hotplug: Only label hostdev after checking device conflicts (Cole Robinson) - lxcContainerMountFSDevPTS: Unify @ret usage pattern (Chen Hanxiao) - conf: Fix XML formatting of RNG device info (Peter Krempa) - qemu: snapshot: Fix incorrect disk type for auto-generated disks (Peter Krempa) - virThreadPoolFree: Set n(Prio)Workers after the pool is locked (Michal Privoznik) - qemuAgentDispose: Reset lastError (Wangyufei (James)) - Fix memory leak in qemuBuildDriveStr() (Nehal J Wani) - Don't overwrite errors from virConfReadFile (Daniel P. Berrange) - virThreadPoolFree: Join worker threads (Michal Privoznik) - qemu: fix live pinning to memory node on NUMA system (Shivaprasad G Bhat) - storage_driver: Resolve Coverity CHECKED_RETURN warning (John Ferlan) - bridge_driver: Resolve Coverity CHECKED_RETURN warning (John Ferlan) - virnetserverclient: Fix conditional change HAVE_SASL to WITH_SASL (John Ferlan) - virnetserverclient: Remove Coverity DEADCODE warning (John Ferlan) - nwfilter: Remove Coverity DEADCODE warning (John Ferlan) - qemu: report error on attempt to live change virtio-net queues (Laine Stump) - daemon: Run virStateCleanup conditionally (Michal Privoznik) - qemu: default to vfio for nodedev-detach (Laine Stump) - Ensure to zero out the virDomainBlockJobInfo arg (Daniel P. Berrange) - snapshot: conf: Fix NULL dereference when <driver> element is empty (Peter Krempa) Improvements: - event: wire up RPC for server-side network event filtering (Eric Blake) - event: add notion of remoteID for filtering client network events (Eric Blake) - event: track callbackID on daemon side of RPC (Eric Blake) - tests: be more explicit on qcow2 versions in virstoragetest (Eric Blake) - Add Gao feng to the committers list (Gao feng) - maint: ignore transient files during tests (Eric Blake) - storage: FS: Tweak some comments and fix typos (Peter Krempa) - Exercise the ABI stability check code in test suite (Daniel P. Berrange) - storage: Improve error message when a storage backend is missing (Peter Krempa) - storage: lvm: Avoid forward decl of virStorageBackendLogicalDeleteVol (Peter Krempa) - maint: improve VIR_ERR_INVALID_DOMAIN_SNAPSHOT usage (Eric Blake) - maint: improve VIR_ERR_INVALID_NWFILTER usage (Eric Blake) - maint: improve VIR_ERR_INVALID_STREAM usage (Eric Blake) - maint: improve VIR_ERR_INVALID_SECRET usage (Eric Blake) - maint: improve VIR_ERR_INVALID_NODE_DEVICE usage (Eric Blake) - maint: improve VIR_ERR_INVALID_STORAGE_VOL usage (Eric Blake) - maint: improve VIR_ERR_INVALID_STORAGE_POOL usage (Eric Blake) - test driver: Add authentication to test driver. (Richard W.M. Jones) - maint: improve VIR_ERR_INVALID_INTERFACE usage (Eric Blake) - event: clean up client side RPC code (Eric Blake) - Make sure AC_ARG_WITH is always executed (Guido Günther) - maint: improve VIR_ERR_INVALID_NETWORK usage (Eric Blake) - conf: trivial typo fix (Martin Kletzander) - maint: inline VIR_IS*_DOMAIN macro (Eric Blake) - maint: improve VIR_ERR_INVALID_DOMAIN usage (Eric Blake) - event: make network events easier to use without casts (Eric Blake) - event: don't turn offline domain into global event (Eric Blake) - event: don't allow mix of old- and new-style registration (Eric Blake) - event: properly filter count of remaining events (Eric Blake) - Read PCI class from sysfs class file instead of config space. (Thadeu Lima de Souza Cascardo) - event: tighten scope of object_event (Eric Blake) - event: don't let old-style events clobber per-domain events (Eric Blake) - event: rename confusing variable in test, remote drivers (Eric Blake) - event: share state driver between test:///default connections (Eric Blake) - lxc_controller: Fix error message on missing --handshakefd (Michal Privoznik) - maint: inline VIR_IS_CONNECT macro (Eric Blake) - maint: Fix messy include of libvirt_internal.h (Peter Krempa) - maint: improve VIR_ERR_INVALID_CONN usage (Eric Blake) - maint: improve VIR_ERR_OPERATION_DENIED usage (Eric Blake) - qemu: Clean up qemuDomainSetNumaParameters (Peter Krempa) - storage: Use VIR_DELETE_ELEMENT instead of open coding (Peter Krempa) - event: use newer array management macros (Eric Blake) - event: use bool in more places (Eric Blake) - maint: improve VIR_ERR_NO_SUPPORT usage (Eric Blake) - event: remove unneeded virObjectEventGetEventID (Eric Blake) - event: fix doc typos, and doc more public methods (Eric Blake) - maint: reset error on entrance to public API (Eric Blake) - maint: improve error condition style in public API (Eric Blake) - maint: split long lines in invalidArg errors (Eric Blake) - maint: move debug statements first in public API (Eric Blake) - maint: improve debug of libvirt-{qemu,lxc} apis (Eric Blake) - maint: consistent formatting in libvirt.c (Eric Blake) - event: improve public API docs (Eric Blake) - tests: virnetsockettest: Print the error if getifaddrs fails. (Richard W.M. Jones) - maint: update to latest gnulib (Eric Blake) - maint: fix typo in error message (Eric Blake) - interface: Introduce netcfInterfaceObjIsActive (Michal Privoznik) - examples: Resurrect domsuspend example (Michal Privoznik) - libxl: correctly handle affinity reset in virDomainPinVcpu[Flags] (Dario Faggioli) - libxl: implement virDomainPinVcpuFlags (Dario Faggioli) - libxl: implement virDomainGetVcpuPinInfo (Dario Faggioli) - virt-login-shell: clean up usage (Eric Blake) - storage: Avoid forward declaration of virStorageVolDelete (Peter Krempa) - storage: Add gluster pool filter and fix virsh pool listing (Peter Krempa) - snapshot: schema: Split out snapshot disk driver definition (Peter Krempa) - Remove redefinition of bool type when --enable-test-locking (Daniel P. Berrange) - Set the 'container_ttys' env variable for LXC consoles (Daniel P. Berrange) - storage: resize vol against real allocated size (Michal Privoznik) - Support transient attribute on vmware disks (Wout Mertens) - LXC: Change incorrect error report in lxcContainerPivotRoot (Gao feng) - Add debug output when registering event handlers (Daniel P. Berrange) - Remove the event namespace concept (Daniel P. Berrange) - Associate a dispatch function with the event objects (Daniel P. Berrange) - Introduce abstract virNetworkEvent class (Daniel P. Berrange) - Add 'detail' arg to network lifecycle event internals (Daniel P. Berrange) - Update event demo program to support network events too (Daniel P. Berrange) - Move examples/domain-events/event-c to examples/object-events (Daniel P. Berrange) - qemu: add support for -device pvpanic (Hu Tao) - conf: add support for panic device (Hu Tao) - conf: introduce generic ISA address (Hu Tao) - Bump version to 1.2.1 for new dev cycle (Daniel P. Berrange) - rename virBlkioDeviceWeightPtr to virBlkioDevicePtr (Gao feng) - rename virBlkioDeviceWeightArrayClear to virBlkioDeviceArrayClear (Gao feng) - rename virDomainBlkioDeviceWeightParseXML to virDomainBlkioDeviceParseXML (Gao feng) - storage: show gluster option in virsh --version=long (Eric Blake) - Added default case with error for object event dispatching (Cédric Bosdonnat) - Fixed indentation in src/conf/*_event* (Cédric Bosdonnat) - Added network events to the bridged network driver (Cédric Bosdonnat) - Add network events to the remote driver (Cédric Bosdonnat) - Add network events unit tests (Cédric Bosdonnat) - test driver: implemented network events (Cédric Bosdonnat) - Added Network events API and virNetworkEventLifecycle. (Cédric Bosdonnat) - storage_backend_rbd: rename "stat" variable (Michael Chapman) - If we do not specify a readonly mount, we don't need to re-mount it again. (Chen Hanxiao) - daemon/remote.c: renamed remoteDispatchDomainEventSend (Cédric Bosdonnat) - test driver: renamed testDomainEventQueue into testObjectEventQueue (Cédric Bosdonnat) - Extracted common parts of domain_event.[ch] to object_event.[ch] (Cédric Bosdonnat) - Split the virObjectEvent and virDomainEvent* to separate them after (Cédric Bosdonnat) - Renamed virDomainEventTimer to virObjectEventTimer (Cédric Bosdonnat) - Add object event namespaces for the event IDs (Cédric Bosdonnat) - Use virObjectEventPtr instead of virDomainEventPtr (Cédric Bosdonnat) - Create virDomainEventDeviceRemoved and remove the huge union (Cédric Bosdonnat) - Create virDomainEventBalloonChange to get rid of the huge union (Cédric Bosdonnat) - Create virDomainEventTrayChange to get rid of the huge union (Cédric Bosdonnat) - Create virDomainEventDiskChange to get rid of the huge union (Cédric Bosdonnat) - Create virDomainEventBlockJob to get rid of the huge union (Cédric Bosdonnat) - Create virDomainEventGraphics to get rid of the huge union (Cédric Bosdonnat) - Create virDomainEventIOError to get rid of the huge union (Cédric Bosdonnat) - Create virDomainEventWatchdog to get rid of the huge union (Cédric Bosdonnat) - Create virDomainEventRTCChange to get rid of the huge union (Cédric Bosdonnat) - Renamed virDomainEventNewInternal to virDomainEventNew (Cédric Bosdonnat) - Renamed virDomainEventNew* to virDomainEventLifecycleNew* (Cédric Bosdonnat) - Create virDomainEventLifecycle to start removing the huge union (Cédric Bosdonnat) - virObject-ified virDomainEvent (Cédric Bosdonnat) - Created virObjectEventStateRegisterID (Cédric Bosdonnat) - Renamed virDomainEventCallbackList* to virObjectEventCallbackList* (Cédric Bosdonnat) - Renamed virDomainEventState to virObjectEventState (Cédric Bosdonnat) - Renamed virDomainEventQueue to virObjectEventQueue (Cédric Bosdonnat) - Renamed virDomainMeta to virObjectMeta (Cédric Bosdonnat) - Rename virDomainEventCallback to virObjectEventCallback (Cédric Bosdonnat) - Added domain start/stop/define/undefine event unit tests (Cédric Bosdonnat) - spec: clean up libvirtd and virtlockd service mgmt (Michael Chapman) - virtlockd: use common exit path when out-of-memory (Michael Chapman) - virtlockd: improve initscripts (Michael Chapman) - virtlockd: improve systemd units (Michael Chapman) - conf: don't format memtune with unlimited values (Martin Kletzander) - qemu: Fix minor inconsistency in error message (Martin Kletzander) - qemu: Report VIR_DOMAIN_MEMORY_PARAM_UNLIMITED properly (Martin Kletzander) - cgroups: Redefine what "unlimited" means wrt memory limits (Martin Kletzander) - spec: move driver-specific files to driver subpackages (Jim Fehlig) - spec: Define hypervisor-specific files together (Jim Fehlig) - spec: Conditionally specify some hypervisor-specific files (Jim Fehlig) - spec: Fix files list when building without driver modules (Jim Fehlig) - spec: Only add libvirt-daemon pre install script if building with qemu (Jim Fehlig) - spec: Fix unconditional references of nwfilter (Jim Fehlig) - Cgroup: Replace 'newpath' with 'newPath' (Zhou Yimin) - Add qxl ram size to ABI stability check (Ján Tomko) - qemu: Improve error when setting invalid count of vcpus via agent (Peter Krempa) - qemu: hotplug: Mark 2 private functions as static (Cole Robinson) - qemu: Fix indentation in qemuTranslateDiskSourcePool (Peter Krempa) - domainsnapshotxml2xmltest: Add test case for empty driver element (Peter Krempa) - domainsnapshotxml2xmltest: Add existing files as new tests (Peter Krempa) - domainsnapshotxml2xml: Move files with conflicting names (Peter Krempa) - domainsnapshotxml2xmltest: Allow for better testing of snapshots (Peter Krempa) - domainsnapshotxml2xmltest: Clean up labels and use bool instead of int (Peter Krempa) - maint: Kill usage of atoi() (Peter Krempa) - src: Align make output (Michal Privoznik) - tests: add forgotten boot-strict test files (Laine Stump) - qemu: add "-boot strict" to commandline whenever possible (Laine Stump) - qemu: snapshots: Declare supported and unsupported snapshot configs (Peter Krempa) - qemu: Clear old translated pool source (Peter Krempa) - qemu: Refactor disk source string formatting (Peter Krempa) - qemu: Unify formatting of RBD sources (Peter Krempa) - qemu: Split out NBD command generation (Peter Krempa) - qemu: Migrate sheepdog source generation into common function (Peter Krempa) - qemu: Use qemuBuildNetworkDriveURI to handle http/ftp and friends (Peter Krempa) - qemu: Simplify call pattern of qemuBuildDriveURIString (Peter Krempa) - qemu: Split out formatting of network disk source URI (Peter Krempa) - qemu: Refactor qemuTranslateDiskSourcePool (Peter Krempa) - virsh: improve grammar in error message (Eric Blake) - qemu: snapshot: Add functions similar to disk source pool translation (Peter Krempa) - qemu: snapshot: Touch up error message (Peter Krempa) - conf: Add helper do clear disk source authentication struct (Peter Krempa) - qemu: snapshot: Detect internal snapshots also for sheepdog and RBD (Peter Krempa) - conf: Add functions to copy and free network disk source definitions (Peter Krempa) - snapshot: conf: Use common parsing and formatting functions for source (Peter Krempa) - conf: Export disk source formatter and parser (Peter Krempa) - conf: Split out seclabel formating code for disk source (Peter Krempa) - conf: Clean up virDomainDiskSourceDefFormatInternal (Peter Krempa) - conf: Support disk source formatting without needing a virDomainDiskDefPtr (Peter Krempa) - tests: Fix comment for fake storage pool driver (Peter Krempa) - qemuxml2argv: Add test for disk type='volume' with iSCSI pools (Peter Krempa) - qemuxml2argv: Add test to verify correct usage of disk type="volume" (Peter Krempa) - test: Implement fake storage pool driver in qemuxml2argv test (Peter Krempa) - util: Use new array management macros (Osier Yang) Cleanups: - storage: Break long lines and clean up spaces in storage backend header (Peter Krempa) - event: fix typo in previous patch (Eric Blake) - Remove stray semicolon after pragma macros (Daniel P. Berrange) - examples: Remove broken bad example (Peter Krempa) Thanks everybody who contributed to the release in some way, be it with bug reports, ideas, patches, reviews, docs or localizations ! Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/2] v5: spice: expose the disable file transfer option
by Francesco Romani 16 Jan '14

16 Jan '14

Changes v4: Addressed Christophe's comment and changed the error value. Addressed Michal's comment and changed the capability is detected (thanks for the hint on query-command-line-output, I was looking in the wrong place). Changes v5: rebased and squashed (hopefully right this time). Francesco Romani (2): spice: detect if qemu can disable file transfer spice: expose the QEMU disable file transfer option docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 31 ++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 9 +++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 9 +++++ ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 40 ++++++++++++++++++++++ .../qemuxml2argv-graphics-spice.args | 5 +-- .../qemuxml2argv-graphics-spice.xml | 1 + tests/qemuxml2argvtest.c | 9 ++++- 15 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml -- 1.8.4.2

3 5

[libvirt] [PATCH] fix driver lost after detached a node device
by Jincheng Miao 16 Jan '14

16 Jan '14

If nodedev-detach with '--driver', it does not check whether host currentlly supports vfio passthrough. That will cause the detached node device failed to bind to vfio driver when iommu is off: "kernel: vfio-pci: probe of 0000:01:00.0 failed with error -22" https://bugzilla.redhat.com/show_bug.cgi?id=1046919 So it should check passthrough support before set stub driver. --- src/qemu/qemu_driver.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ebb77dc..0e0b170 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10793,6 +10793,8 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, int ret = -1; virNodeDeviceDefPtr def = NULL; char *xml = NULL; + bool supportsPassthroughKVM = qemuHostdevHostSupportsPassthroughLegacy(); + bool supportsPassthroughVFIO = qemuHostdevHostSupportsPassthroughVFIO(); virCheckFlags(0, -1); @@ -10815,22 +10817,35 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, goto cleanup; if (!driverName) { - /* prefer vfio */ - if (qemuHostdevHostSupportsPassthroughVFIO()) + /* decide a driver, prefer vfio */ + if (supportsPassthroughVFIO) driverName = "vfio"; - else if (qemuHostdevHostSupportsPassthroughLegacy()) + else if (supportsPassthroughKVM) driverName = "kvm"; + else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("neither VFIO nor kvm device assignment is " + "currently supported on this system")); + goto cleanup; + } } - if (!driverName) { - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("neither VFIO nor kvm device assignment is " - "currently supported on this system")); - goto cleanup; - } else if (STREQ(driverName, "vfio")) { + if (STREQ(driverName, "vfio")) { + if (!supportsPassthroughVFIO) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("VFIO device assignment is currently not " + "supported on this system")); + goto cleanup; + } if (virPCIDeviceSetStubDriver(pci, "vfio-pci") < 0) goto cleanup; } else if (STREQ(driverName, "kvm")) { + if (!supportsPassthroughKVM) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("kvm device assignment is currently not " + "supported on this system")); + goto cleanup; + } if (virPCIDeviceSetStubDriver(pci, "pci-stub") < 0) goto cleanup; } else { -- 1.8.3.1

2 2

[libvirt] [PATCH] qemu: remove memset params array to zero in qemuDomainGetPercpuStats
by Gao feng 16 Jan '14

16 Jan '14

the array params is allocated by VIR_ALLOC_N in cmdCPUStats. it had been set to zero. No need to reset it to zero again, and this reset here is incorrect too, nparams * ncpus is the array length not the size of params array. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9f71160..7a329f0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15820,7 +15820,6 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, if (virCgroupGetCpuacctPercpuUsage(priv->cgroup, &buf)) goto cleanup; pos = buf; - memset(params, 0, nparams * ncpus); /* return percpu cputime in index 0 */ param_idx = 0; -- 1.8.4.2

2 2

[libvirt] [PATCH 0/4] CVE-2014-0028: domain events vs. ACL filtering
by Eric Blake 16 Jan '14

16 Jan '14

I have pushed the following series to the master branch, as well as the the backport of patch 4 to all branches impacted by the CVE (v1.1.0 onwards). Basically, when ACLs permit fine-grained control of what domains a user can manage, a user that was denied domain:getattr for a particular domain, or denied connect:search_domains in general, could use the event registration API to gain access to domains that should have been hidden from that user. The patch was reviewed offlist during the time when the vulnerability was under embargo. In the process of fixing this, I made quite a few improvements to the underlying mechanisms for events. Among other things, I want to switch libvirt over to using server-side filtering rather than the current implementation of client-side filtering, for increased efficiency in the case where a hypervisor hosts many guests but the client only cares about events on a small subset of those guests. The existing RPC calls for domain events did not allow this, but the brand new network events had not yet had their RPC baked with a formal release. At one point, I had tried making the use of connect:search_networks conditional on whether a non-NULL network had been requested, which requires server-side filtering. The final incarnation of the CVE fix no longer bypasses connect:search_networks for a NULL network, so the first three patches are now technically unrelated to the CVE fix; but as the work is already done and reviewed and as it is easier to avoid bloat in the RPC protocol by getting it right from the beginning, I still pushed those patches to the master branch. NOTE: if you were testing network events with libvirt.git or with the 1.2.1 release candidates, you must ensure that you match your client's use of libvirt.so with the libvirtd - early users of network events are unable to communicate with the RPC wire representation that will actually be in 1.2.1 as a result of this series. I will also be posting a followup series, for application after 1.2.1 is released, which adds server-side filtering of domain events, as the counterpart of the network event filtering added in this series. There, we already have existing RPC code baked into releases, so there is no longer a rush to get the patches in before a release freezes a mistake. Eric Blake (4): event: track callbackID on daemon side of RPC event: add notion of remoteID for filtering client network events event: wire up RPC for server-side network event filtering event: filter global events by domain:getattr ACL [CVE-2014-0028] daemon/libvirtd.h | 7 +- daemon/remote.c | 131 +++++++++++++++++-------- src/access/viraccessperm.h | 6 +- src/conf/domain_event.c | 38 ++++++- src/conf/domain_event.h | 10 +- src/conf/network_event.c | 69 ++++++++++++- src/conf/network_event.h | 18 +++- src/conf/object_event.c | 212 ++++++++++++++++++++++++++++++++-------- src/conf/object_event.h | 30 +++--- src/conf/object_event_private.h | 31 ++++++ src/libvirt_private.syms | 1 - src/libxl/libxl_driver.c | 2 + src/lxc/lxc_driver.c | 2 + src/network/bridge_driver.c | 1 + src/qemu/qemu_driver.c | 2 + src/remote/remote_driver.c | 86 +++++++++------- src/remote/remote_protocol.x | 23 ++--- src/remote_protocol-structs | 9 +- src/test/test_driver.c | 6 +- src/uml/uml_driver.c | 2 + src/vbox/vbox_tmpl.c | 4 +- src/xen/xen_driver.c | 2 + 22 files changed, 527 insertions(+), 165 deletions(-) -- 1.8.4.2

1 5

[libvirt] [PATCH 0/5] server-side filtering of domain events
by Eric Blake 15 Jan '14

15 Jan '14

This work was originally done with the thought that the fix for CVE-2014-0028 would require server-side filtering to make the check of connect:search_domains conditional on whether the user passed NULL or a domain when registering for an event. The final version of the CVE fix no longer needs the conditional behavior, so there is no longer a rush to get this in to 1.2.1; but for 1.2.2, the code changes offer a nice efficiency gain for the use case of libvirtd managing lots of domains while a client only cares about events from a small subset of domains. While this will not be in 1.2.1 proper, I also tested that the entire series can be backported without breaking the .so versioning, if any downstream distro wants to include the efficiency gain as part of their value added maintenance of an older version. Eric Blake (5): event: dynamically manage server-side RPC domain events event: server RPC protocol tweaks for domain lifecycle events event: prepare client to track domain callbackID event: client RPC protocol tweaks for domain lifecycle events event: convert remaining domain events to new style daemon/libvirtd.h | 3 +- daemon/remote.c | 801 +++++++++++++++++++++++++++++----------- src/conf/domain_event.c | 78 +++- src/conf/domain_event.h | 22 ++ src/conf/network_event.c | 6 +- src/conf/object_event.c | 31 +- src/conf/object_event_private.h | 6 +- src/libvirt_internal.h | 7 +- src/remote/remote_driver.c | 784 ++++++++++++++++++++++++++++++++------- src/remote/remote_protocol.x | 192 +++++++++- src/remote_protocol-structs | 92 +++++ 11 files changed, 1649 insertions(+), 373 deletions(-) -- 1.8.4.2

1 6

[libvirt] [PATCH] BSD: implement nodeGetCPUStats
by Roman Bogorodskiy 15 Jan '14

15 Jan '14

I had doubts how to implement that. Looks like the current implementation is tied to Linux CPU metrics: user nice system idle iowait That list is hardcoded into virsh-host.c. FreeBSD has a slightly different set of metrics: user nice system intr idle I.e. it's interrupt time instead of i/o time. I decided to go without virsh-host.c modification and used VIR_NODE_CPU_STATS_UTILIZATION. If you know better way of doing that, I'm open for suggestions. Roman Bogorodskiy (1): BSD: implement nodeGetCPUStats src/nodeinfo.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) -- 1.8.4.3

2 4

[libvirt] [PATCH 0/2] Avoid issue when VM quits while attempting connection to the guest agent.
by Peter Krempa 15 Jan '14

15 Jan '14

Peter Krempa (2): DO NOT APPLY UPSTREAM: Reproducer qemu: Avoid operations on NULL monitor if VM fails early src/qemu/qemu_process.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) -- 1.8.5.2

2 4

[libvirt] [PATCHv2] tests: be more explicit on qcow2 versions in virstoragetest
by Eric Blake 15 Jan '14

15 Jan '14

While working on v1.0.5-maint (the branch in use on Fedora 19) with the host at Fedora 20, I got a failure in virstoragetest. I traced it to the fact that we were using qemu-img to create a qcow2 file, but qemu-img changed from creating v2 files by default in F19 to creating v3 files in F20. Rather than leaving it up to qemu-img, it is better to write the test to force testing of BOTH file formats (better code coverage and all). This patch alone does not fix all the failures in v1.0.5-maint; for that, we must decide to either teach the older branch to understand v3 files, or to reject them outright as unsupported. But for upstream, making the test less dependent on changing qemu-img defaults is always a good thing. * tests/virstoragetest.c (testPrepImages): Simplify creation of raw file; check if qemu supports compat and if so use it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: rebase to latest; still asking for inclusion in 1.2.1 tests/virstoragetest.c | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index e5c73f5..db0cf1c 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -87,6 +87,8 @@ testPrepImages(void) { int ret = EXIT_FAILURE; virCommandPtr cmd = NULL; + char *buf = NULL; + bool compat = false; qemuimg = virFindFileInPath("kvm-img"); if (!qemuimg) @@ -94,6 +96,18 @@ testPrepImages(void) if (!qemuimg) goto skip; + /* See if qemu-img supports '-o compat=xxx'. If so, we force the + * use of both v2 and v3 files; if not, it is v2 only but the test + * still works. */ + cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", + "-o?", "/dev/null", NULL); + virCommandSetOutputBuffer(cmd, &buf); + if (virCommandRun(cmd, NULL) < 0) + goto skip; + if (strstr(buf, "compat ")) + compat = true; + VIR_FREE(buf); + if (virAsprintf(&absraw, "%s/raw", datadir) < 0 || virAsprintf(&absqcow2, "%s/qcow2", datadir) < 0 || virAsprintf(&abswrap, "%s/wrap", datadir) < 0 || @@ -111,10 +125,8 @@ testPrepImages(void) goto cleanup; } - /* I'm lazy enough to use a shell one-liner instead of open/write/close */ - virCommandFree(cmd); - cmd = virCommandNewArgList("sh", "-c", "printf %1024d 0 > raw", NULL); - if (virCommandRun(cmd, NULL) < 0) { + if (virAsprintf(&buf, "%1024d", 0) < 0 || + virFileWriteStr("raw", buf, 0600) < 0) { fprintf(stderr, "unable to create raw file\n"); goto cleanup; } @@ -126,9 +138,10 @@ testPrepImages(void) /* Create a qcow2 wrapping relative raw; later on, we modify its * metadata to test other configurations */ virCommandFree(cmd); - cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", - "-obacking_file=raw,backing_fmt=raw", "qcow2", - NULL); + cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL); + virCommandAddArgFormat(cmd, "-obacking_file=raw,backing_fmt=raw%s", + compat ? ",compat=0.10" : ""); + virCommandAddArg(cmd, "qcow2"); if (virCommandRun(cmd, NULL) < 0) goto skip; /* Make sure our later uses of 'qemu-img rebase' will work */ @@ -146,8 +159,8 @@ testPrepImages(void) * can correctly avoid insecure probing. */ virCommandFree(cmd); cmd = virCommandNewArgList(qemuimg, "create", "-f", "qcow2", NULL); - virCommandAddArgFormat(cmd, "-obacking_file=%s,backing_fmt=qcow2", - absqcow2); + virCommandAddArgFormat(cmd, "-obacking_file=%s,backing_fmt=qcow2%s", + absqcow2, compat ? ",compat=1.1" : ""); virCommandAddArg(cmd, "wrap"); if (virCommandRun(cmd, NULL) < 0) goto skip; @@ -172,6 +185,7 @@ testPrepImages(void) ret = 0; cleanup: + VIR_FREE(buf); virCommandFree(cmd); if (ret) testCleanupImages(); -- 1.8.4.2

2 2

[libvirt] [PATCH] docs: mention maintenance branches
by Eric Blake 15 Jan '14

15 Jan '14

Mitre tried to assign us two separate CVEs for the fix for https://bugzilla.redhat.com/show_bug.cgi?id=1047577, on the grounds that the fixes were separated by more than an hour and thus triggered different hourly snapshots. But we explicitly do NOT want to treat transient security bugs as CVEs if they can only be triggered by patches in libvirt.git but where the problem is cleaned up before a formal release. Meanwhile, I noticed that while our wiki mentioned maintenance branches and releases, our formal documentation did not. * docs/downloads.html.in: Contrast hourly snapshots with maintenance branches. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Doc only, so suitable for 1.2.1 if it gets reviewed in time. docs/downloads.html.in | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 83b8751..ef03567 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -22,7 +22,9 @@ <p> Once an hour, an automated snapshot is made from the git server source tree. These snapshots should be usable, but we make no guarantees - about their stability: + about their stability; furthermore, they should NOT be + considered formal releases, and they may have transient security + problems that will not be assigned a CVE: </p> <ul> @@ -30,6 +32,27 @@ <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li> </ul> + <h2><a name="maintenance">Maintenance releases</a></h2> + <p> + In the git repository are several stable maintenance branches, + matching the + pattern <code>v<i>major</i>.<i>minor</i>.<i>micro</i>-maint</code>; + these branches are forked off the corresponding + <code>v<i>major</i>.<i>minor</i>.<i>micro</i></code> formal + release, and may have further releases of the + form <code>v<i>major</i>.<i>minor</i>.<i>micro</i>.<i>rel</i></code>. + These maintenance branches should only contain bug fixes, and no + new features, backported from the master branch, and are + supported. These maintenance branches are considered during + CVE analysis. + </p> + + <p> + For more details about contents of maintenance releases, see + <a href="http://wiki.libvirt.org/page/Maintenance_Releases">the + wiki page</a>. + </p> + <h2><a name="git">GIT source repository</a></h2> <p> -- 1.8.4.2

2 2

[libvirt] [PATCH] Fix docs for PMWakeup/PMSuspend callback types
by Claudio Bley 15 Jan '14

15 Jan '14

s/is waken up/is woken up/ A registered PMSuspendCallback is called when the domain is suspended, not when it is woken up. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- It's just a trivial fix, but I'd like some educated comment on the grammar fix. IMO it is correct, or is there a better way to express this? include/libvirt/libvirt.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 018a5ce..5bdb2bc 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4849,7 +4849,7 @@ typedef void (*virConnectDomainEventTrayChangeCallback)(virConnectPtr conn, * always passes 0 * @opaque: application specified data * - * This callback occurs when the guest is waken up. + * This callback occurs when the guest is woken up. * * The callback signature to use when registering for an event of type * VIR_DOMAIN_EVENT_ID_PMWAKEUP with virConnectDomainEventRegisterAny() @@ -4867,7 +4867,7 @@ typedef void (*virConnectDomainEventPMWakeupCallback)(virConnectPtr conn, * always passes 0 * @opaque: application specified data * - * This callback occurs when the guest is waken up. + * This callback occurs when the guest is suspended. * * The callback signature to use when registering for an event of type * VIR_DOMAIN_EVENT_ID_PMSUSPEND with virConnectDomainEventRegisterAny() -- 1.7.9.5

2 2

[libvirt] [PATCH v2] vbox: add support for v4.2.20+ and v4.3.4+
by Manuel VIVES 15 Jan '14

15 Jan '14

Hi, While working on adding virDomain*Stats support to the vbox driver, we found bugs in the VirtualBox API C bindings. These bugs have been fixed in versions 4.2.20 and 4.3.4. However, the changes in the C bindings are incompatible with the vbox_CAPI_v4_2.h and vbox_CAPI_v4_3.h files which are bundled in libvirt source code. This is why the following patch adds vbox_CAPI_v4_2_20.h and vbox_CAPI_v4_3_4.h. As stated by Matthias Bolte, the actual underlying problem here is that libvirt assumes that VirtualBox API can only change between release versions (4.2 -> 4.3), but we have a case here where it changed (or got fixed) between minor versions (4.2.18 -> 4.2.20). This patch makes the VBOX_API_VERSION represent the full API version number (i.e 4002 => 4002000) so there are specific version numbers for Vbox 4.2.20 (4002020) and 4.3.4 (4003004) As the patch is too big for the mailing list, it is publicly available at http://git-lab.diateam.net/cots/libvirt.git/ with the branch name 'vbox-4.2.20-4.3.4-support-v2' Regards, Manuel VIVES

2 1

[libvirt] [PATCH 0/2] v4: spice: expose the disable file transfer option
by Francesco Romani 15 Jan '14

15 Jan '14

Changes: Addressed Christophe's comment and changed the error value. Addressed Michal's comment and changed the capability is detected (thanks for the hint on query-command-line-output, I was looking in the wrong place). Francesco Romani (2): spice: detect if qemu can disable file transfer spice: expose the QEMU disable file transfer option docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 31 ++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 9 +++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 9 +++++ ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 40 ++++++++++++++++++++++ .../qemuxml2argv-graphics-spice.args | 5 +-- .../qemuxml2argv-graphics-spice.xml | 1 + tests/qemuxml2argvtest.c | 9 ++++- 15 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml -- 1.8.4.2

1 3

[libvirt] [PATCH] lxc: do cleanup when failed to create new string
by Chen Hanxiao 15 Jan '14

15 Jan '14

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index c51c4d5..fc399fb 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1045,7 +1045,7 @@ int virLXCProcessStart(virConnectPtr conn, if (virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name) < 0) - return -1; + goto cleanup; if (!(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; -- 1.8.2.1

2 4

[libvirt] [PATCH] Really don't crash if a connection closes early
by Jiri Denemark 15 Jan '14

15 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1047577 When writing commit 173c291, I missed the fact virNetServerClientClose unlocks the client object before actually clearing client->sock and thus it is possible to hit a window when client->keepalive is NULL while client->sock is not NULL. I was thinking client->sock == NULL was a better check for a closed connection but apparently we have to go with client->keepalive == NULL to actually fix the crash. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/rpc/virnetserverclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 7830b7f..52b4941 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1546,7 +1546,7 @@ virNetServerClientStartKeepAlive(virNetServerClientPtr client) /* The connection might have been closed before we got here and thus the * keepalive object could have been removed too. */ - if (!client->sock) { + if (!client->keepalive) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not open")); goto cleanup; -- 1.8.5.2

2 3

[libvirt] [PATCH] maint: ignore transient files during tests
by Eric Blake 14 Jan '14

14 Jan '14

I ran 'git add .' for a patch in progress, while in the middle of running 'make check' to test my work, and was surprised when it picked up some files I wasn't expecting. * .gitignore: Ignore *.pem. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 496c2ef..7005500 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *.loT *.o *.orig +*.pem *.pyc *.rej *.s -- 1.8.4.2

1 0

[libvirt] [PATCH] Add helper program to create custom leases
by Nehal J Wani 14 Jan '14

14 Jan '14

Introduce helper program to catch events from dnsmasq and maintain a custom lease file per network. It supports dhcpv4 and dhcpv6. The file is saved as "<interface-name>.status". The format of each lease is: <expiry-time (epoch time)> <mac> <iaid> <ip-address> <hostname> <clientid> Example of custom leases file content: 1385245780 52:54:00:2f:ba:76 * 192.168.150.153 * * 1385245781 52:54:00:2f:ba:76 3127926 2001:db8:ca2:2:1::6c * 00:04:76:00:cf:ae:b3:0b:fc:cd:0e:22:2e:97:76:65:74:ec 1385245964 52:54:00:44:7c:d7 * 192.168.150.219 iiit-ad885e4aa1 01:52:54:00:44:7c:d7 1385245964 52:54:00:44:7c:d7 * 192.168.150.219 * 01:52:54:00:44:7c:d7 1385246016 52:54:00:5d:99:92 * 192.168.150.212 iiit-ad885e4aa1 01:52:54:00:5d:99:92 1385246041 52:54:00:3b:16:e0 * 192.168.150.207 * * 1385246081 52:54:00:db:dd:98 * 192.168.150.234 * * 1385246088 52:54:00:db:dd:98 14409112 2001:db8:ca2:2:1::6d * 00:04:76:00:cf:ae:b3:0b:fc:cd:0e:22:2e:97:76:65:74:ec --- src/util/leaseshelper.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) create mode 100644 src/util/leaseshelper.c diff --git a/src/util/leaseshelper.c b/src/util/leaseshelper.c new file mode 100644 index 0000000..9ed22a6 --- /dev/null +++ b/src/util/leaseshelper.c @@ -0,0 +1,232 @@ +/* + * leasehelper.c: Helper program to create custom leases file + * + * Copyright (C) 2013 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/>. + * + * Author: Nehal J Wani <nehaljw.kkd1(a)gmail.com> + * + */ + +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> + +#include "virutil.h" +#include "virthread.h" +#include "virfile.h" +#include "virbuffer.h" +#include "virstring.h" +#include "virerror.h" +#include "viralloc.h" +#include "configmake.h" + +#define VIR_FROM_THIS VIR_FROM_NETWORK + +/** + * VIR_NETWORK_DHCP_LEASE_FIELDS: + * + * Macro providing the maximum number of fields in an entry in + * the leases file + */ +#define VIR_NETWORK_DHCP_LEASE_FIELDS 6 +/** + * VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX: + * + * Macro providing the upper limit on the size of leases file + */ +#define VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX 2097152 + +/* + * Use this when passing possibly-NULL strings to printf-a-likes. + */ +# define EMPTY_STR(s) ((s) ? (s) : "*") + +int +main(int argc, char **argv) { + + FILE *g = fopen("/tmp/wtf", "a"); + int j; + for (j = 0; j < argc; j++) + fprintf(g, "called :: : %s, ", argv[j]); + fprintf(g, "\n"); + fclose(g); + + /* Doesn't hurt to check */ + if (argc < 4) { + /* Refer man page of dnsmasq --dhcp-script for more details */ + fprintf(stderr, "Usage: $program $action ${mac|clientid} $ip\n"); + return -1; + } + + const char *program_name = argv[0]; + const char *action = argv[1]; + const char *interface = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_INTERFACE")); + const char *expirytime = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_LEASE_EXPIRES")); + const char *mac = argv[2]; + const char *ip = argv[3]; + const char *iaid = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_IAID")); + const char *hostname = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_SUPPLIED_HOSTNAME")); + const char *clientid = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_CLIENT_ID")); + const char *leases_str = NULL; + char *lease_file = NULL; + char *lease_entries = NULL; + char *lease_entry = NULL; + char **lease_fields = NULL; + bool delete = false; + bool add = false; + int rv = -1; + int lease_file_len = 0; + FILE *fp = NULL; + long long expirytime_tmp = 0; + virBuffer buf_new_lease = VIR_BUFFER_INITIALIZER; + virBuffer buf_all_leases = VIR_BUFFER_INITIALIZER; + + 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 || + virErrorInitialize() < 0) { + fprintf(stderr, _("%s: initialization failed\n"), program_name); + exit(EXIT_FAILURE); + } + + if (virAsprintf(&lease_file, "%s/%s.status", LOCALSTATEDIR + "/lib/libvirt/dnsmasq/", interface) < 0) + goto cleanup; + + if (virGetEnvAllowSUID("DNSMASQ_IAID")) { + mac = EMPTY_STR(virGetEnvAllowSUID("DNSMASQ_MAC")); + clientid = argv[2]; + } + + /* Make sure dnsmasq knows the interface, otherwise something is wrong */ + if (STREQ(interface, "*")) + goto cleanup; + + /* Make sure the file exists. If not, 'touch' it */ + if (virFileTouch(lease_file, 0644) < 0) + goto cleanup; + + /* Read entire contents */ + if ((lease_file_len = virFileReadAll(lease_file, + VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX, + &lease_entries)) < 0) { + goto cleanup; + } + + if (STREQ(action, "add") || STREQ(action, "old") || STREQ(action, "del")) { + if (mac || STREQ(action, "del")) { + /* Delete the corresponding lease */ + delete = true; + if (STREQ(action, "add") || STREQ(action, "old")) { + fprintf(stderr, "add|old\n"); + add = true; + /* Enter new lease */ + virBufferAsprintf(&buf_new_lease, "%s %s %s %s %s %s\n", + expirytime, mac, iaid, ip, hostname, clientid); + + if (virBufferError(&buf_new_lease)) { + virBufferFreeAndReset(&buf_new_lease); + virReportOOMError(); + goto cleanup; + } + } + } + } + + lease_entry = lease_entries[0] == '\0' ? NULL : lease_entries; + + while (lease_entry) { + int nfields = 0; + + char *eol = strchr(lease_entry, '\n'); + *eol = '\0'; + + /* Split the lease line */ + if (!(lease_fields = virStringSplit(lease_entry, " ", + VIR_NETWORK_DHCP_LEASE_FIELDS))) + goto cleanup; + + nfields = virStringListLength(lease_fields); + + /* Forward lease_entry to the next lease */ + lease_entry = strchr(lease_entry, '\0'); + if (lease_entry - lease_entries + 1 < lease_file_len) + lease_entry++; + else + lease_entry = NULL; + + if (nfields != VIR_NETWORK_DHCP_LEASE_FIELDS) + goto cleanup; + + if (virStrToLong_ll(lease_fields[0], NULL, 10, &expirytime_tmp) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to convert lease expiry time to integer: %s"), + lease_fields[0]); + goto cleanup; + } + + /* Check whether lease has expired or not */ + if (expirytime_tmp < (long long) time(NULL)) + continue; + else if (delete && STREQ(lease_fields[3], ip)) + continue; + else { + virBufferAsprintf(&buf_all_leases, "%s %s %s %s %s %s\n", + lease_fields[0], lease_fields[1], lease_fields[2], + lease_fields[3], lease_fields[4], lease_fields[5]); + + if (virBufferError(&buf_all_leases)) { + virBufferFreeAndReset(&buf_all_leases); + virReportOOMError(); + goto cleanup; + } + } + } + + if (add) { + virBufferAsprintf(&buf_all_leases, "%s", virBufferContentAndReset(&buf_new_lease)); + + if (virBufferError(&buf_all_leases)) { + virBufferFreeAndReset(&buf_all_leases); + virReportOOMError(); + goto cleanup; + } + } + + rv = 0; + + /* Write to file */ + leases_str = virBufferContentAndReset(&buf_all_leases); + if (!leases_str) + leases_str = ""; + + if (virFileWriteStr(lease_file, leases_str, 0) < 0) + rv = -1; + +cleanup: + VIR_FREE(lease_file); + VIR_FREE(lease_entries); + if (lease_fields) + virStringFreeList(lease_fields); + return rv; +} -- 1.8.1.4

1 1

[libvirt] [PATCH] Fix memory leak in testDomainCreateXMLMixed()
by Nehal J Wani 14 Jan '14

14 Jan '14

While running objecteventtest, it was found that valgrind pointed out the following memory leak: ==13025== 538 (56 direct, 482 indirect) bytes in 1 blocks are definitely lost in loss record 216 of 226 ==13025== at 0x4A06B6F: calloc (vg_replace_malloc.c:593) ==13025== by 0x4C65D8D: virAllocVar (viralloc.c:558) ==13025== by 0x4C9F055: virObjectNew (virobject.c:190) ==13025== by 0x4D2B2E8: virGetDomain (datatypes.c:220) ==13025== by 0x4D79180: testDomainDefineXML (test_driver.c:2962) ==13025== by 0x4D4977D: virDomainDefineXML (libvirt.c:8512) ==13025== by 0x4029C2: testDomainCreateXMLMixed (objecteventtest.c:226) ==13025== by 0x403A21: virtTestRun (testutils.c:138) ==13025== by 0x4021C2: mymain (objecteventtest.c:549) ==13025== by 0x4040C2: virtTestMain (testutils.c:593) ==13025== by 0x341F421A04: (below main) (libc-start.c:225) ==13025== --- tests/objecteventtest.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 65642a2..de57970 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -245,6 +245,12 @@ testDomainCreateXMLMixed(const void *data) if (id2 < 0) goto cleanup; + if (dom != NULL) { + virDomainUndefine(dom); + virDomainDestroy(dom); + virDomainFree(dom); + } + dom = virDomainCreateXML(test->conn, domainDef, 0); if (dom == NULL || virEventRunDefaultImpl() < 0) goto cleanup; -- 1.8.1.4

2 1

[libvirt] [PATCH v2] conf: Always use VIR_ERR_CONFIG_UNSUPPORTED on enumFromString() failures
by Christophe Fergeau 14 Jan '14

14 Jan '14

Currently, during XML parsing, when a call to a FromString() function to get an enum value fails, the error which is reported is either VIR_ERR_CONFIG_UNSUPPORTED, VIR_ERR_INTERNAL_ERROR or VIR_ERR_XML_ERROR. This commit makes such conversion failures consistently return VIR_ERR_CONFIG_UNSUPPORTED. --- Changes since v1: - return VIR_ERR_CONFIG_UNSUPPORTED instead of the too generic VIR_ERR_XML_ERROR src/conf/cpu_conf.c | 10 +- src/conf/domain_conf.c | 172 +++++++++++++++++------------------ src/conf/interface_conf.c | 2 +- src/conf/netdev_vlan_conf.c | 2 +- src/conf/netdev_vport_profile_conf.c | 2 +- src/conf/network_conf.c | 6 +- src/conf/node_device_conf.c | 4 +- src/conf/nwfilter_conf.c | 4 +- src/conf/secret_conf.c | 2 +- src/conf/snapshot_conf.c | 8 +- src/conf/storage_conf.c | 16 ++-- src/conf/storage_encryption_conf.c | 4 +- 12 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index c4917b8..3d015f2 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -221,7 +221,7 @@ virCPUDefParseXML(xmlNodePtr node, def->mode = virCPUModeTypeFromString(cpuMode); if (def->mode < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid mode attribute '%s'"), cpuMode); VIR_FREE(cpuMode); @@ -249,7 +249,7 @@ virCPUDefParseXML(xmlNodePtr node, VIR_FREE(match); if (def->match < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid match attribute for CPU " "specification")); goto error; @@ -265,7 +265,7 @@ virCPUDefParseXML(xmlNodePtr node, goto error; } if ((def->arch = virArchFromString(arch)) == VIR_ARCH_NONE) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown architecture %s"), arch); VIR_FREE(arch); goto error; @@ -285,7 +285,7 @@ virCPUDefParseXML(xmlNodePtr node, if ((fallback = virXPathString("string(./model[1]/@fallback)", ctxt))) { if ((def->fallback = virCPUFallbackTypeFromString(fallback)) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid fallback attribute")); goto error; } @@ -391,7 +391,7 @@ virCPUDefParseXML(xmlNodePtr node, VIR_FREE(strpolicy); if (policy < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Invalid CPU feature policy")); goto error; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 416d96e..f297ac7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3582,7 +3582,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, if (type) { if ((info->type = virDomainDeviceAddressTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown address type '%s'"), type); goto cleanup; } @@ -3687,7 +3687,7 @@ virDomainHostdevSubsysUsbDefParseXML(xmlNodePtr node, def->startupPolicy = virDomainStartupPolicyTypeFromString(startupPolicy); if (def->startupPolicy <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown startup policy '%s'"), startupPolicy); VIR_FREE(startupPolicy); @@ -4161,7 +4161,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if (type) { if ((def->source.subsys.type = virDomainHostdevSubsysTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown host device source address type '%s'"), type); goto error; @@ -4196,7 +4196,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if ((def->source.subsys.u.scsi.sgio = virDomainDeviceSGIOTypeFromString(sgio)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown sgio mode '%s'"), sgio); goto error; } @@ -4211,7 +4211,7 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node, if ((backendStr = virXPathString("string(./driver/@name)", ctxt)) && (((backend = virDomainHostdevSubsysPciBackendTypeFromString(backendStr)) < 0) || backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT)) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown PCI device <driver name='%s'/> " "has been specified"), backendStr); goto error; @@ -4265,7 +4265,7 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, if (type) { if ((def->source.caps.type = virDomainHostdevCapsTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown host device source address type '%s'"), type); goto error; @@ -4448,7 +4448,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt, def->type = virDomainSeclabelTypeFromString(p); VIR_FREE(p); if (def->type <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("invalid security type")); goto error; } @@ -4838,7 +4838,7 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node, if (mode && (source->mode = virDomainDiskSourcePoolModeTypeFromString(mode)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown source mode '%s' for volume type disk"), mode); goto cleanup; @@ -4890,7 +4890,7 @@ virDomainDiskSourceDefParse(xmlNodePtr node, } if ((*proto = virDomainDiskProtocolTypeFromString(protocol)) < 0){ - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown protocol type '%s'"), protocol); goto cleanup; } @@ -4913,7 +4913,7 @@ virDomainDiskSourceDefParse(xmlNodePtr node, if ((transport = virXMLPropString(child, "transport"))) { host.transport = virDomainDiskProtocolTransportTypeFromString(transport); if (host.transport < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown protocol transport type '%s'"), transport); goto cleanup; @@ -5058,7 +5058,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainDiskTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk type '%s'"), type); goto error; } @@ -5130,7 +5130,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (trans) { def->geometry.trans = virDomainDiskGeometryTransTypeFromString(trans); if (def->geometry.trans <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid translation value '%s'"), trans); goto error; @@ -5212,7 +5212,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, auth_secret_usage = virSecretUsageTypeTypeFromString(usageType); if (auth_secret_usage < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid secret type %s"), usageType); goto error; @@ -5379,7 +5379,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, device = virXMLPropString(node, "device"); if (device) { if ((def->device = virDomainDiskDeviceTypeFromString(device)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk device '%s'"), device); goto error; } @@ -5454,7 +5454,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (snapshot) { def->snapshot = virDomainSnapshotLocationTypeFromString(snapshot); if (def->snapshot <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk snapshot setting '%s'"), snapshot); goto error; @@ -5487,7 +5487,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (sgio) { if ((def->sgio = virDomainDeviceSGIOTypeFromString(sgio)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk sgio mode '%s'"), sgio); goto error; } @@ -5495,7 +5495,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (bus) { if ((def->bus = virDomainDiskBusTypeFromString(bus)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk bus type '%s'"), bus); goto error; } @@ -5520,7 +5520,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (tray) { if ((def->tray_status = virDomainDiskTrayTypeFromString(tray)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk tray status '%s'"), tray); goto error; } @@ -5539,7 +5539,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (removable) { if ((def->removable = virDomainFeatureStateTypeFromString(removable)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk removable status '%s'"), removable); goto error; } @@ -5570,14 +5570,14 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (cachetag && (def->cachemode = virDomainDiskCacheTypeFromString(cachetag)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk cache mode '%s'"), cachetag); goto error; } if (error_policy && (def->error_policy = virDomainDiskErrorPolicyTypeFromString(error_policy)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk error policy '%s'"), error_policy); goto error; } @@ -5586,7 +5586,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, (((def->rerror_policy = virDomainDiskErrorPolicyTypeFromString(rerror_policy)) <= 0) || (def->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE))) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk read error policy '%s'"), rerror_policy); goto error; @@ -5595,7 +5595,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, if (iotag) { if ((def->iomode = virDomainDiskIoTypeFromString(iotag)) < 0 || def->iomode == VIR_DOMAIN_DISK_IO_DEFAULT) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk io mode '%s'"), iotag); goto error; } @@ -5887,7 +5887,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainControllerTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown controller type '%s'"), type); goto error; } @@ -5906,7 +5906,7 @@ virDomainControllerDefParseXML(xmlNodePtr node, model = virXMLPropString(node, "model"); if (model) { if ((def->model = virDomainControllerModelTypeFromString(def, model)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown model type '%s'"), model); goto error; } @@ -6081,7 +6081,7 @@ virDomainFSDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->type = virDomainFSTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown filesystem type '%s'"), type); goto error; } @@ -6092,7 +6092,7 @@ virDomainFSDefParseXML(xmlNodePtr node, accessmode = virXMLPropString(node, "accessmode"); if (accessmode) { if ((def->accessmode = virDomainFSAccessModeTypeFromString(accessmode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown accessmode '%s'"), accessmode); goto error; } @@ -6259,7 +6259,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, goto error; } if ((actual->type = virDomainNetTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown type '%s' in interface's <actual> element"), type); goto error; } @@ -6302,7 +6302,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node, if (mode) { int m; if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown mode '%s' in interface <actual> element"), mode); goto error; @@ -6417,7 +6417,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, type = virXMLPropString(node, "type"); if (type != NULL) { if ((int)(def->type = virDomainNetTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface type '%s'"), type); goto error; } @@ -6684,7 +6684,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (mode != NULL) { int m; if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Unknown mode has been specified")); goto error; } @@ -6758,7 +6758,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, int name; if ((name = virDomainNetBackendTypeFromString(backend)) < 0 || name == VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown interface <driver name='%s'> " "has been specified"), backend); @@ -6770,7 +6770,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, int m; if ((m = virDomainNetVirtioTxModeTypeFromString(txmode)) < 0 || m == VIR_DOMAIN_NET_VIRTIO_TX_MODE_DEFAULT) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown interface <driver txmode='%s'> " "has been specified"), txmode); @@ -6951,7 +6951,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, if ((def->targetType = virDomainChrTargetTypeFromString(def, def->deviceType, targetType)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown target type '%s' specified for character device"), targetType); goto error; @@ -7198,7 +7198,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW; else if ((def->data.tcp.protocol = virDomainChrTcpProtocolTypeFromString(protocol)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown protocol '%s'"), protocol); goto error; } @@ -7329,7 +7329,7 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, if (type == NULL) { def->source.type = VIR_DOMAIN_CHR_TYPE_PTY; } else if ((def->source.type = virDomainChrTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown type presented to host for character device: %s"), type); goto error; @@ -7337,7 +7337,7 @@ virDomainChrDefParseXML(xmlXPathContextPtr ctxt, nodeName = (const char *) node->name; if ((def->deviceType = virDomainChrDeviceTypeFromString(nodeName)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown character device type: %s"), nodeName); } @@ -7417,7 +7417,7 @@ virDomainSmartcardDefParseXML(xmlNodePtr node, goto error; } if ((def->type = virDomainSmartcardTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown smartcard device mode: %s"), mode); goto error; @@ -7479,7 +7479,7 @@ virDomainSmartcardDefParseXML(xmlNodePtr node, goto error; } if ((def->data.passthru.type = virDomainChrTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown type presented to host for " "character device: %s"), type); goto error; @@ -7555,7 +7555,7 @@ virDomainTPMDefParseXML(xmlNodePtr node, model = virXMLPropString(node, "model"); if (model != NULL && (int)(def->model = virDomainTPMModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown TPM frontend model '%s'"), model); goto error; } else { @@ -7586,7 +7586,7 @@ virDomainTPMDefParseXML(xmlNodePtr node, } if ((int)(def->type = virDomainTPMBackendTypeFromString(backend)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown TPM backend type '%s'"), backend); goto error; @@ -7646,14 +7646,14 @@ virDomainInputDefParseXML(const char *ostype, } if ((def->type = virDomainInputTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown input device type '%s'"), type); goto error; } if (bus) { if ((def->bus = virDomainInputBusTypeFromString(bus)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown input bus type '%s'"), bus); goto error; } @@ -7739,7 +7739,7 @@ virDomainHubDefParseXML(xmlNodePtr node, unsigned int flags) } if ((def->type = virDomainHubTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown hub device type '%s'"), type); goto error; } @@ -7787,7 +7787,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, goto error; } if ((def->name = virDomainTimerNameTypeFromString(name)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer name '%s'"), name); goto error; } @@ -7809,7 +7809,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, tickpolicy = virXMLPropString(node, "tickpolicy"); if (tickpolicy != NULL) { if ((def->tickpolicy = virDomainTimerTickpolicyTypeFromString(tickpolicy)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer tickpolicy '%s'"), tickpolicy); goto error; } @@ -7819,7 +7819,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, track = virXMLPropString(node, "track"); if (track != NULL) { if ((def->track = virDomainTimerTrackTypeFromString(track)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer track '%s'"), track); goto error; } @@ -7838,7 +7838,7 @@ virDomainTimerDefParseXML(xmlNodePtr node, mode = virXMLPropString(node, "mode"); if (mode != NULL) { if ((def->mode = virDomainTimerModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown timer mode '%s'"), mode); goto error; } @@ -7982,7 +7982,7 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def, } if ((def->type = virDomainGraphicsListenTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown graphics listen type '%s'"), type); goto error; } @@ -8060,7 +8060,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((def->type = virDomainGraphicsTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown graphics device type '%s'"), type); goto error; } @@ -8332,7 +8332,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((defaultMode = virXMLPropString(node, "defaultMode")) != NULL) { if ((defaultModeVal = virDomainGraphicsSpiceChannelModeTypeFromString(defaultMode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown default spice channel mode %s"), defaultMode); VIR_FREE(defaultMode); @@ -8376,7 +8376,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((nameval = virDomainGraphicsSpiceChannelNameTypeFromString(name)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown spice channel name %s"), name); VIR_FREE(name); @@ -8384,7 +8384,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, goto error; } if ((modeval = virDomainGraphicsSpiceChannelModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown spice channel mode %s"), mode); VIR_FREE(name); @@ -8511,7 +8511,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((copypasteVal = virDomainGraphicsSpiceClipboardCopypasteTypeFromString(copypaste)) <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown copypaste value '%s'"), copypaste); VIR_FREE(copypaste); goto error; @@ -8530,7 +8530,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((modeVal = virDomainGraphicsSpiceMouseModeTypeFromString(mode)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown mouse mode value '%s'"), mode); VIR_FREE(mode); @@ -8571,7 +8571,7 @@ virDomainSoundCodecDefParseXML(xmlNodePtr node) type = virXMLPropString(node, "type"); if ((def->type = virDomainSoundCodecTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown codec type '%s'"), type); goto error; } @@ -8604,7 +8604,7 @@ virDomainSoundDefParseXML(xmlNodePtr node, model = virXMLPropString(node, "model"); if ((def->model = virDomainSoundModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown sound model '%s'"), model); goto error; } @@ -8677,7 +8677,7 @@ virDomainWatchdogDefParseXML(xmlNodePtr node, } def->model = virDomainWatchdogModelTypeFromString(model); if (def->model < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown watchdog model '%s'"), model); goto error; } @@ -8688,7 +8688,7 @@ virDomainWatchdogDefParseXML(xmlNodePtr node, else { def->action = virDomainWatchdogActionTypeFromString(action); if (def->action < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown watchdog action '%s'"), action); goto error; } @@ -8732,7 +8732,7 @@ virDomainRNGDefParseXML(xmlNodePtr node, } if ((def->model = virDomainRNGModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown RNG model '%s'"), model); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown RNG model '%s'"), model); goto error; } @@ -8767,7 +8767,7 @@ virDomainRNGDefParseXML(xmlNodePtr node, } if ((def->backend = virDomainRNGBackendTypeFromString(backend)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown RNG backend model '%s'"), backend); goto error; } @@ -8797,7 +8797,7 @@ virDomainRNGDefParseXML(xmlNodePtr node, def->source.chardev->type = virDomainChrTypeFromString(type); if (def->source.chardev->type < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown backend type '%s' for egd"), type); goto error; @@ -8851,7 +8851,7 @@ virDomainMemballoonDefParseXML(xmlNodePtr node, } if ((def->model = virDomainMemballoonModelTypeFromString(model)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memory balloon model '%s'"), model); goto error; } @@ -8923,7 +8923,7 @@ virSysinfoParseXML(xmlNodePtr node, goto error; } if ((def->type = virSysinfoTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown sysinfo type '%s'"), type); goto error; } @@ -9159,7 +9159,7 @@ virDomainVideoDefParseXML(xmlNodePtr node, if (type) { if ((def->type = virDomainVideoTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown video model '%s'"), type); goto error; } @@ -9245,7 +9245,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt, if (mode) { if ((def->mode = virDomainHostdevModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown hostdev mode '%s'"), mode); goto error; } @@ -9333,7 +9333,7 @@ virDomainRedirdevDefParseXML(xmlNodePtr node, bus = virXMLPropString(node, "bus"); if (bus) { if ((def->bus = virDomainRedirdevBusTypeFromString(bus)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown redirdev bus '%s'"), bus); goto error; } @@ -9344,7 +9344,7 @@ virDomainRedirdevDefParseXML(xmlNodePtr node, type = virXMLPropString(node, "type"); if (type) { if ((def->source.chr.type = virDomainChrTypeFromString(type)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown redirdev character device type '%s'"), type); goto error; } @@ -9599,7 +9599,7 @@ virDomainEventActionParseXML(xmlXPathContextPtr ctxt, } else { *val = convFunc(tmp); if (*val < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown %s action: %s"), name, tmp); VIR_FREE(tmp); return -1; @@ -9660,7 +9660,7 @@ virDomainDeviceDefParse(const char *xmlStr, xmlStrEqual(node->name, BAD_CAST "serial")) { dev->type = VIR_DOMAIN_DEVICE_CHR; } else { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown device type '%s'"), node->name); goto error; @@ -10619,7 +10619,7 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, goto cleanup; } if ((val = virDomainBootTypeFromString(dev)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown boot device '%s'"), dev); VIR_FREE(dev); @@ -11023,7 +11023,7 @@ virDomainDefParseXML(xmlDocPtr xml, } if ((def->virtType = virDomainVirtTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain type %s"), tmp); goto error; } @@ -11122,7 +11122,7 @@ virDomainDefParseXML(xmlDocPtr xml, /* and info about it */ if ((tmp = virXPathString("string(./memory[1]/@dumpCore)", ctxt)) && (def->mem.dump_core = virDomainMemDumpTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid memory core dump attribute value '%s'"), tmp); goto error; } @@ -11249,7 +11249,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (tmp) { if ((def->placement_mode = virDomainCpuPlacementModeTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported CPU placement mode '%s'"), tmp); goto error; @@ -11465,7 +11465,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (mode) { if ((def->numatune.memory.mode = virDomainNumatuneMemModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported NUMA memory " "tuning mode '%s'"), mode); @@ -11494,7 +11494,7 @@ virDomainDefParseXML(xmlDocPtr xml, if (placement) { if ((placement_mode = virNumaTuneMemPlacementModeTypeFromString(placement)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported memory placement " "mode '%s'"), placement); VIR_FREE(placement); @@ -11579,7 +11579,7 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { int val = virDomainFeatureTypeFromString((const char *)nodes[i]->name); if (val < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unexpected feature '%s'"), nodes[i]->name); goto error; } @@ -11640,7 +11640,7 @@ virDomainDefParseXML(xmlDocPtr xml, for (i = 0; i < n; i++) { feature = virDomainHypervTypeFromString((const char *)nodes[i]->name); if (feature < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported HyperV Enlightenment feature: %s"), nodes[i]->name); goto error; @@ -11660,7 +11660,7 @@ virDomainDefParseXML(xmlDocPtr xml, } if ((value = virDomainFeatureStateTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid value of state argument " "for HyperV Enlightenment feature '%s'"), nodes[i]->name); @@ -11681,7 +11681,7 @@ virDomainDefParseXML(xmlDocPtr xml, } if ((value = virDomainFeatureStateTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid value of state argument " "for HyperV Enlightenment feature '%s'"), nodes[i]->name); @@ -11755,7 +11755,7 @@ virDomainDefParseXML(xmlDocPtr xml, if ((tmp = virXPathString("string(./clock/@offset)", ctxt)) && (def->clock.offset = virDomainClockOffsetTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown clock offset '%s'"), tmp); goto error; } @@ -11799,7 +11799,7 @@ virDomainDefParseXML(xmlDocPtr xml, tmp = virXPathString("string(./clock/@basis)", ctxt); if (tmp) { if ((def->clock.data.variable.basis = virDomainClockBasisTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown clock basis '%s'"), tmp); goto error; } @@ -12686,7 +12686,7 @@ virDomainDefParseXML(xmlDocPtr xml, int mode; if ((mode = virDomainSmbiosModeTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown smbios mode '%s'"), tmp); goto error; } @@ -12770,7 +12770,7 @@ virDomainObjParseXML(xmlDocPtr xml, goto error; } if ((state = virDomainStateTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain state '%s'"), tmp); VIR_FREE(tmp); goto error; @@ -12779,7 +12779,7 @@ virDomainObjParseXML(xmlDocPtr xml, if ((tmp = virXPathString("string(./@reason)", ctxt))) { if ((reason = virDomainStateReasonFromString(state, tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid domain state reason '%s'"), tmp); VIR_FREE(tmp); goto error; @@ -12804,7 +12804,7 @@ virDomainObjParseXML(xmlDocPtr xml, if (str) { int flag = virDomainTaintTypeFromString(str); if (flag < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown taint flag %s"), str); VIR_FREE(str); goto error; diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index fd2e25e..8053307 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -662,7 +662,7 @@ virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType) { } type = virInterfaceTypeFromString(tmp); if (type == -1) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown interface type %s"), tmp); VIR_FREE(tmp); return NULL; diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index b2ed2b0..f58b4b8 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -82,7 +82,7 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de } if ((def->nativeMode = virNativeVlanModeTypeFromString(nativeMode)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid \"nativeMode='%s'\" " "in vlan <tag> element"), nativeMode); diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index a16a04a..8d403c4 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -48,7 +48,7 @@ virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags) if ((virtPortType = virXMLPropString(node, "type")) && (virtPort->virtPortType = virNetDevVPortTypeFromString(virtPortType)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown virtualport type %s"), virtPortType); goto error; } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 481fc5b..8803143 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1728,7 +1728,7 @@ virNetworkForwardDefParseXML(const char *networkName, def->type = VIR_NETWORK_FORWARD_NAT; } else { if ((def->type = virNetworkForwardTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown forwarding type '%s'"), type); goto cleanup; } @@ -1747,7 +1747,7 @@ virNetworkForwardDefParseXML(const char *networkName, = virNetworkForwardDriverNameTypeFromString(forwardDriverName); if (driverName <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown forward <driver name='%s'/> " "in network %s"), forwardDriverName, networkName); @@ -1873,7 +1873,7 @@ virNetworkForwardDefParseXML(const char *networkName, } if ((def->ifs[i].type = virNetworkForwardHostdevDeviceTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown address type '%s' in network %s"), type, networkName); goto cleanup; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 171cd7c..ea85cff 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -854,7 +854,7 @@ virNodeDevCapNetParseXML(xmlXPathContextPtr ctxt, int val = virNodeDevNetCapTypeFromString(tmp); VIR_FREE(tmp); if (val < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid network type supplied for '%s'"), def->name); goto out; @@ -1166,7 +1166,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt, } if ((val = virNodeDevCapTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown capability type '%s'"), tmp); VIR_FREE(tmp); goto error; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d280df5..30ec094 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2319,7 +2319,7 @@ virNWFilterRuleParse(xmlNodePtr node) } if ((ret->action = virNWFilterRuleActionTypeFromString(action)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown rule action attribute value")); goto err_exit; @@ -2333,7 +2333,7 @@ virNWFilterRuleParse(xmlNodePtr node) } if ((ret->tt = virNWFilterRuleDirectionTypeFromString(direction)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown rule direction attribute value")); goto err_exit; diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 282bc6e..c3252d1 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -82,7 +82,7 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt, } type = virSecretUsageTypeTypeFromString(type_str); if (type < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown secret usage type %s"), type_str); VIR_FREE(type_str); return -1; diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index c18b99b..fb0b4cc 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -121,7 +121,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, if (snapshot) { def->snapshot = virDomainSnapshotLocationTypeFromString(snapshot); if (def->snapshot <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk snapshot setting '%s'"), snapshot); goto cleanup; @@ -157,7 +157,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, if (driver) { def->format = virStorageFileFormatTypeFromString(driver); if (def->format <= 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown disk snapshot driver '%s'"), driver); VIR_FREE(driver); @@ -242,7 +242,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, } def->state = virDomainSnapshotStateTypeFromString(state); if (def->state < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid state '%s' in domain snapshot XML"), state); goto cleanup; @@ -282,7 +282,7 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, if (memorySnapshot) { def->memory = virDomainSnapshotLocationTypeFromString(memorySnapshot); if (def->memory <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown memory snapshot setting '%s'"), memorySnapshot); goto cleanup; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index ed492cf..e4232e9 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -527,7 +527,7 @@ virStoragePoolDefParseAuth(xmlXPathContextPtr ctxt, if ((source->authType = virStoragePoolAuthTypeTypeFromString(authType)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown auth type '%s'"), authType); goto cleanup; @@ -601,7 +601,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, source->format = options->formatFromString(format); if (source->format < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown pool format type %s"), format); VIR_FREE(format); goto cleanup; @@ -673,7 +673,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, if ((adapter_type = virXPathString("string(./adapter/@type)", ctxt))) { if ((source->adapter.type = virStoragePoolSourceAdapterTypeTypeFromString(adapter_type)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unknown pool adapter type '%s'"), adapter_type); goto cleanup; @@ -871,7 +871,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) } if ((ret->type = virStoragePoolTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown storage pool type %s"), type); goto error; } @@ -1305,7 +1305,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, type = virXPathString("string(./@type)", ctxt); if (type) { if ((ret->type = virStorageVolTypeFromString(type)) < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown volume type '%s'"), type); goto error; } @@ -1340,7 +1340,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, ret->target.format = (options->formatFromString)(format); if (ret->target.format < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown volume format type %s"), format); VIR_FREE(format); goto error; @@ -1370,7 +1370,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, ret->backingStore.format = (options->formatFromString)(format); if (ret->backingStore.format < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown volume format type %s"), format); VIR_FREE(format); goto error; @@ -1408,7 +1408,7 @@ virStorageVolDefParseXML(virStoragePoolDefPtr pool, int f = options->featureFromString((const char*)nodes[i]->name); if (f < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unsupported feature %s"), + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported feature %s"), (const char*)nodes[i]->name); goto error; } diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 86b5f96..c2fafe3 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -91,7 +91,7 @@ virStorageEncryptionSecretParse(xmlXPathContextPtr ctxt, } type = virStorageEncryptionSecretTypeTypeFromString(type_str); if (type < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown volume encryption secret type %s"), type_str); VIR_FREE(type_str); @@ -144,7 +144,7 @@ virStorageEncryptionParseXML(xmlXPathContextPtr ctxt) } format = virStorageEncryptionFormatTypeFromString(format_str); if (format < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown volume encryption format type %s"), format_str); VIR_FREE(format_str); -- 1.8.4.2

2 1

[libvirt] [PATCH v2] lxc: do cleanup when failed to create new string
by Chen Hanxiao 14 Jan '14

14 Jan '14

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- v2: fix an indent issue src/lxc/lxc_process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index c51c4d5..7d6c5d3 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1045,7 +1045,7 @@ int virLXCProcessStart(virConnectPtr conn, if (virAsprintf(&logfile, "%s/%s.log", cfg->logDir, vm->def->name) < 0) - return -1; + goto cleanup; if (!(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; -- 1.8.2.1

1 0

[libvirt] [PATCH] vbox: add support for v4.2.20+ and v4.3.4+
by Jean-Baptiste Rouault 14 Jan '14

14 Jan '14

While working on adding virDomain*Stats support to the vbox driver, we found bugs in the VirtualBox API C bindings. These bugs have been fixed in versions 4.2.20 and 4.3.4. However, the changes in the C bindings are incompatible with the vbox_CAPI_v4_2.h and vbox_CAPI_v4_3.h files which are bundled in libvirt source code. This is why the following patch adds vbox_CAPI_v4_2_20.h and vbox_CAPI_v4_3_4.h. We tried to keep compatibility with older VirtualBox 4.2.x and 4.3.x releases so we added a "SPECIAL_VERSION" identifier to conditionnaly include the right header. I'm not really pleased with this "SPECIAL_VERSION" identifier, maybe we could instead increase the precision of "VBOX_API_VERSION", for example 4002 would become 4002000. This would permit us to select the right header based on the VBOX_API_VERSION only, what do you think ? Jean-Baptiste Rouault (1): vbox: add support for v4.2.20+ and v4.3.4+ src/Makefile.am | 4 +- src/vbox/vbox_CAPI_v4_2_20.h | 9001 +++++++++++++++++++++++++++++++++++ src/vbox/vbox_CAPI_v4_3_4.h | 10321 +++++++++++++++++++++++++++++++++++++++++ src/vbox/vbox_V2_2.c | 1 + src/vbox/vbox_V3_0.c | 1 + src/vbox/vbox_V3_1.c | 1 + src/vbox/vbox_V3_2.c | 1 + src/vbox/vbox_V4_0.c | 1 + src/vbox/vbox_V4_1.c | 1 + src/vbox/vbox_V4_2.c | 1 + src/vbox/vbox_V4_2_20.c | 14 + src/vbox/vbox_V4_3.c | 1 + src/vbox/vbox_V4_3_4.c | 14 + src/vbox/vbox_driver.c | 20 +- src/vbox/vbox_tmpl.c | 12 +- 15 files changed, 19389 insertions(+), 5 deletions(-) create mode 100644 src/vbox/vbox_CAPI_v4_2_20.h create mode 100644 src/vbox/vbox_CAPI_v4_3_4.h create mode 100644 src/vbox/vbox_V4_2_20.c create mode 100644 src/vbox/vbox_V4_3_4.c -- 1.8.5.1

4 7

[libvirt] Entering freeze for 1.2.1
by Daniel Veillard 14 Jan '14

14 Jan '14

As planned, I just tagged Release Candidate 1 for libvirt and libvirt-python in git and pushed tarballs to the usual places: ftp://libvirt.org/libvirt ftp://libvirt.org/libvirt/python I think I will make a release candidate 2 during the week-end or early monday, to target a release on the 15th. Please give it a try ! thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] libvirt on armhf with selinux driver
by Ivan Gooten 13 Jan '14

13 Jan '14

hi, recently i've been busy with libvirt(d) v1.2.0 and v1.2.1 from GIT on armhf and i see, even if selinux sec driver is enabled on the configure stage, the driver is not finally created. i pass these configure parameters: --with-selinux --with-secdriver-selinux --with-selinux-mount=/sys/fs/selinux the /sys/fs/selinux is valid, selinux is running in permissive mode, got also libselinux DEV package installed, so no missing req. headers here. when trying to run libvirtd, i'm getting: error : virSecurityDriverLookup:78 : unsupported configuration: Security driver selinux not enabled error : lxcSecurityInit:1461 : Failed to initialise security drivers error : virStateInitialize:854 : Initialisation of LXC state driver failed: unsupported configuration: Security driver selinux not enabled error : daemonRunStateInit:909 : Driver state initialisation failed here i provide the configure summary: http://pastebin.com/un0UnFCP for me it looks okay, and below is is the sestatus: SELinux status: enabled SELinuxfs mount: /sys/fs/selinux SELinux root directory: /etc/selinux Loaded policy name: default Current mode: permissive Mode from config file: permissive Policy MLS status: enabled Policy deny_unknown status: allowed Max kernel policy version: 28 the platform is running custom kernel 3.10 with debian testing a.k.a. jessie. also, my friend with the same configuration on rpi, except for his newer kernel, is having same stranginess. someone got any clue what may be causing this and/or howto debug this? thanks, ivan gooten

1 0

[libvirt] [PATCHv2] storage: FS: Tweak some comments and fix typos
by Peter Krempa 13 Jan '14

13 Jan '14

--- Notes: Version 2: - tweak most of the messages I'm not going to push this without a review as I'm not a native speaker. src/storage/storage_backend_fs.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 6ebdd46..19add8a 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1,7 +1,7 @@ /* * storage_backend_fs.c: storage backend for FS and directory handling * - * Copyright (C) 2007-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -460,7 +460,7 @@ cleanup: * @pool storage pool to unmount * * Ensure that a FS storage pool is not mounted on its target location. - * If already unmounted, this is a no-op + * If already unmounted, this is a no-op. * * Returns 0 if successfully unmounted, -1 on error */ @@ -540,9 +540,8 @@ virStorageBackendFileSystemCheck(virConnectPtr conn ATTRIBUTE_UNUSED, * @conn connection to report errors against * @pool storage pool to start * - * Starts a directory or FS based storage pool. - * - * - If it is a FS based pool, mounts the unlying source device on the pool + * Starts a directory or FS based storage pool. If the pool is a FS based + * pool the underlying source device will be mounted. * * Returns 0 on success, -1 on error */ @@ -739,7 +738,7 @@ error: * VIR_STORAGE_POOL_BUILD_OVERWRITE is set, mkfs is always executed, * any existed data on the target device is overwritten unconditionally. * - * - If it is a FS based pool, mounts the unlying source device on the pool + * If the pool is a FS based pool the underlying source device is mounted. * * Returns 0 on success, -1 on error */ @@ -940,12 +939,12 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, /** * @conn connection to report errors against - * @pool storage pool to start + * @pool storage pool to stop * - * Stops a FS based storage pool. + * Stops a FS based storage pool. If @pool is a FS based pool the underlying + * source device is unmounted. All cached data about volumes is released. * - * - If it is a FS based pool, unmounts the unlying source device on the pool - * - Releases all cached data about volumes + * Returns 0 on success, -1 on error. */ #if WITH_STORAGE_FS static int -- 1.8.5.2

3 3

[libvirt] [PATCH] build: fix build on mingw with winpthreads
by Eric Blake 13 Jan '14

13 Jan '14

On my Fedora 20 box with mingw cross-compiler, the build failed with: ../../src/rpc/virnetclient.c: In function 'virNetClientSetTLSSession': ../../src/rpc/virnetclient.c:745:14: error: unused variable 'oldmask' [-Werror=unused-variable] sigset_t oldmask, blockedsigs; ^ I traced it to the fact that mingw64-winpthreads installs a header that does #define pthread_sigmask(...) 0, which means any argument only ever passeed to pthread_sigmask is reported as unused. This patch works around the compilation failure, with behavior no worse than what mingw already gives us regarding the function being a no-op. * configure.ac (pthread_sigmask): Probe for broken mingw macro. * src/util/virutil.h (pthread_sigmask): Rewrite to something that avoids unused variables. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Tested for both mingw and Linux; I'll probably push this under the build-breaker rule on Monday if I don't have a review first. configure.ac | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d02b9d2..f5dccf1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl Copyright (C) 2005-2013 Red Hat, Inc. +dnl Copyright (C) 2005-2014 Red Hat, Inc. dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public @@ -276,6 +276,22 @@ dnl LIB_PTHREAD and LIBMULTITHREAD were set during gl_INIT by gnulib. old_LIBS=$LIBS LIBS="$LIBS $LIB_PTHREAD $LIBMULTITHREAD" AC_CHECK_FUNCS([pthread_mutexattr_init]) +dnl At least mingw64-winpthreads #defines pthread_sigmask to 0, +dnl which in turn causes compilation to complain about unused variables. +dnl Expose this broken implementation, so we can work around it. +AC_CACHE_CHECK([whether pthread_sigmask does anything], + [lv_cv_pthread_sigmask_works], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include <sys/types.h> + #include <signal.h> + ]], [[ + int (*foo)(int, const sigset_t *, sigset_t *) = &pthread_sigmask; + return !foo; + ]])], [lv_cv_pthread_sigmask_works=yes], [lv_cv_pthread_sigmask_works=no])]) +if test "x$lv_cv_pthread_sigmask_works" != xyes; then + AC_DEFINE([FUNC_PTHREAD_SIGMASK_BROKEN], [1], + [Define to 1 if pthread_sigmask is not a real function]) +fi LIBS=$old_libs dnl Availability of various common headers (non-fatal if missing). -- 1.8.4.2

1 2

[libvirt] [PATCH] Don't crash if a connection closes early
by Jiri Denemark 13 Jan '14

13 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1047577 When a client closes its connection to libvirtd early during virConnectOpen, more specifically just after making REMOTE_PROC_CONNECT_SUPPORTS_FEATURE call to check if VIR_DRV_FEATURE_PROGRAM_KEEPALIVE is supported without even waiting for the result, libvirtd may crash due to a race in keep-alive initialization. Once receiving the REMOTE_PROC_CONNECT_SUPPORTS_FEATURE call, the daemon's event loop delegates it to a worker thread. In case the event loop detects EOF on the connection and calls virNetServerClientClose before the worker thread starts to handle REMOTE_PROC_CONNECT_SUPPORTS_FEATURE call, client->keepalive will be disposed by the time virNetServerClientStartKeepAlive gets called from remoteDispatchConnectSupportsFeature. Because the flow is common for both authenticated and read-only connections, even unprivileged clients may cause the daemon to crash. To void the crash, virNetServerClientStartKeepAlive needs to check if the connection is still open before starting keep-alive protocol. Every libvirt release since 0.9.8 is affected by this bug. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/rpc/virnetserverclient.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 8aebeb0..7830b7f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -1539,9 +1539,22 @@ cleanup: int virNetServerClientStartKeepAlive(virNetServerClientPtr client) { - int ret; + int ret = -1; + virObjectLock(client); + + /* The connection might have been closed before we got here and thus the + * keepalive object could have been removed too. + */ + if (!client->sock) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("connection not open")); + goto cleanup; + } + ret = virKeepAliveStart(client->keepalive, 0, 0); + +cleanup: virObjectUnlock(client); return ret; } -- 1.8.5.2

2 3

[libvirt] [PATCH 0/2] v3: spice: expose the disable file transfer option
by Francesco Romani 13 Jan '14

13 Jan '14

Addressed Christophe's comments. Added filetransfer check in another test. I think now the setting should survive a dumpxml roundtrip, any suggestion for further improvement is of course welcome. Francesco Romani (2): spice: detect if qemu can disable file transfer spice: expose the QEMU disable file transfer option docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 31 ++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 5 ++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 9 +++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 9 +++++ ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 40 ++++++++++++++++++++++ .../qemuxml2argv-graphics-spice.args | 5 +-- .../qemuxml2argv-graphics-spice.xml | 1 + tests/qemuxml2argvtest.c | 9 ++++- 15 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml -- 1.8.4.2

3 7

[libvirt] [PATCH 0/2] Trivial fixes for 1.2.1
by Peter Krempa 13 Jan '14

13 Jan '14

Peter Krempa (2): storage: Break long lines and clean up spaces in storage backend header storage: FS: Tweak some comments and fix typo src/storage/storage_backend.h | 56 ++++++++++++++++++++++++++-------------- src/storage/storage_backend_fs.c | 21 ++++++++------- 2 files changed, 48 insertions(+), 29 deletions(-) -- 1.8.5.2

2 4