- Devel - libvirt List Archives

[libvirt] [PATCH] doc: Add missing space in <clock> documentation
by Christophe Fergeau 17 Jan '14

17 Jan '14

--- Pushed under the trivial rule. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 68860ef..80d9495 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1348,7 +1348,7 @@ </dl> <p> A <code>clock</code> may have zero or more - <code>timer</code>sub-elements. <span class="since">Since + <code>timer</code> sub-elements. <span class="since">Since 0.8.0</span> </p> </dd> -- 1.8.4.2

1 0

[libvirt] [PATCH] build: add $(prefix) to SYSTEMD_UNIT_DIR
by Laine Stump 17 Jan '14

17 Jan '14

I noticed this problem when adding systemd support to netcf, because I setup the configure.ac to automatically prefer using systemd over initscripts when possible - although I had copied the install-data-local target from the example of libvirt's "libvirt-guests" service more or less verbatim, "make distcheck" would fail because it was trying to install the service file directly into /lib/systemd/system rather than into /home/user/some/unimportant/name/lib/systemd/system. This is caused by the install/uninstall rules for the systemd unit files relying on $(DESTDIR) pointing the installed files to the right place, but in reality $(DESTDIR) is empty during this part of make distcheck - it instead sets $(prefix) with the toplevel directory used for its test build/install/uninstall cycle. (This problem hasn't been seen when running "make distcheck" in libvirt because libvirt will never build/install systemd support unless explicitly told to do so on the configure commandline, and "make distcheck" doesn't put the "--with-initscript=..." option on the configure commandline.) I verified that the same problem does exist in libvirt by modifying libvirt's configure.ac to set: init_systemd=yes with_init_script=systemd+redhat This forces a build/install of the systemd unit files during distcheck, which yields an error like this: /usr/bin/install -c -m 644 virtlockd.service \ /lib/systemd/system/ libtool: install: warning: relinking `libvirt-qemu.la' /usr/bin/install: cannot remove '/lib/systemd/system/virtlockd.service': Permission denied make[4]: *** [install-systemd] Error 1 After adding $(prefix) to all the definitions of SYSTEMD_UNIT_DIR, make distcheck now completes successfully with the modified configure.ac, and the above lines change to something like this: /usr/bin/install -c -m 644 virtlockd.service \ /home/laine/devel/libvirt/libvirt-1.2.1/_inst/lib/systemd/system/ --- daemon/Makefile.am | 4 ++-- src/Makefile.am | 4 ++-- tools/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e5c5db8..00221ab 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2013 Red Hat, Inc. +## Copyright (C) 2005-2014 Red Hat, Inc. ## ## This library is free software; you can redistribute it and/or ## modify it under the terms of the GNU Lesser General Public @@ -387,7 +387,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system BUILT_SOURCES += libvirtd.service install-init-systemd: install-sysconfig libvirtd.service diff --git a/src/Makefile.am b/src/Makefile.am index 57e163f..8f77658 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2013 Red Hat, Inc. +## Copyright (C) 2005-2014 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 @@ -2220,7 +2220,7 @@ EXTRA_DIST += \ if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system BUILT_SOURCES += virtlockd.service virtlockd.socket DISTCLEANFILES += virtlockd.service virtlockd.socket diff --git a/tools/Makefile.am b/tools/Makefile.am index 256a8f3..6847f13 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2013 Red Hat, Inc. +## Copyright (C) 2005-2014 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 @@ -306,7 +306,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh EXTRA_DIST += libvirt-guests.service.in -SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -- 1.8.4.2

2 1

[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