- Devel - libvirt List Archives

[libvirt] Lxc support
by Jean-Philippe Menil 30 Oct '10

30 Oct '10

Hi, i'm trying to test the lxc support in libvirt, but but libvirt failed to start container with error "lxcContainerAvailable:897 : clone call returned Operation not permitted, container support is not enabled" Althought i've compiled libvirt with th lxc support: configure: Configuration summary configure: ===================== configure: configure: Drivers configure: configure: Xen: no configure: Proxy: no configure: QEMU: yes configure: UML: yes configure: OpenVZ: no configure: VBox: no configure: XenAPI: no configure: LXC: yes configure: PHYP: no configure: ONE: no configure: ESX: no configure: Test: yes configure: Remote: yes configure: Network: yes configure: Libvirtd: yes configure: netcf: no configure: macvtap: yes configure: virtport: no Here is my xml: <domain type='lxc'> <name>lxc1</name> <memory>500000</memory> <os> <type>exe</type> <init>/bin/sh</init> </os> <vcpu>1</vcpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/lib/libvirt/libvirt_lxc</emulator> <filesystem type='mount'> <source dir='/var/lib/lxc/lxc1/rootfs'/> <target dir='/'/> </filesystem> <interface type='bridge'> <source bridge='U13'/> <target dev='veth0'/> </interface> <console type='pty' > <target port='5'/> </console> </devices> </domain> And here are the errors: 10:41:09.968: debug : virCgroupNew:542 : New group / 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 0:cpu at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 1:cpuacct at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 2:cpuset at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 3:memory at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 4:devices at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 5:freezer at /var/local/cgroup in 10:41:09.968: debug : virCgroupNew:542 : New group /libvirt 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 0:cpu at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 1:cpuacct at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 2:cpuset at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 3:memory at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 4:devices at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 5:freezer at /var/local/cgroup in 10:41:09.968: debug : virCgroupMakeGroup:484 : Make group /libvirt 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/ 10:41:09.968: debug : virCgroupNew:542 : New group /libvirt/lxc 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 0:cpu at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 1:cpuacct at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 2:cpuset at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 3:memory at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 4:devices at /var/local/cgroup in 10:41:09.968: debug : virCgroupDetect:232 : Detected mount/mapping 5:freezer at /var/local/cgroup in 10:41:09.968: debug : virCgroupMakeGroup:484 : Make group /libvirt/lxc 10:41:09.968: debug : virCgroupMakeGroup:496 : Make controller /var/local/cgroup/libvirt/lxc/ 10:41:09.968: debug : lxcControllerRun:595 : Setting up private /dev/pts 10:41:10.012: debug : lxcControllerRun:621 : Mouting 'devpts' on /var/lib/lxc/lxc1/rootfs/dev/pts 10:41:10.012: debug : lxcControllerRun:636 : Opening tty on private /var/lib/lxc/lxc1/rootfs/dev/pts/ptmx 10:41:10.044: debug : lxcContainerAvailable:897 : clone call returned Operation not permitted, container support is not enabled 10:41:10.044: debug : lxcContainerStart:848 : Enable network namespaces 10:41:10.076: debug : lxcContainerStart:854 : clone() completed, new container PID is -1 10:41:10.076: error : lxcContainerStart:858 : Failed to run clone container: Operation not permitted 10:41:10.076: debug : vethDelete:159 : veth: veth1 10:41:10.076: debug : virRunWithHook:818 : ip link del veth1 Can someone tell me what i'm doing wrong? Many thanks. Regards.

5 8

[libvirt] [PATCH] build: cleanup declaration of xen tests.
by Diego Elio Pettenò 30 Oct '10

30 Oct '10

Only build statstest and reconnect if they should be used, so add them behind the ENABLE_XEN_TESTS conditional. --- tests/Makefile.am | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9720b6e..20b6805 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -73,11 +73,14 @@ EXTRA_DIST = \ qemuhelpdata check_PROGRAMS = virshtest conftest sockettest \ - nodeinfotest statstest qparamtest virbuftest + nodeinfotest qparamtest virbuftest if WITH_XEN check_PROGRAMS += xml2sexprtest sexpr2xmltest \ - reconnect xmconfigtest xencapstest + xmconfigtest xencapstest +if ENABLE_XEN_TESTS +check_PROGRAMS += statstest reconnect +endif endif if WITH_QEMU check_PROGRAMS += qemuxml2argvtest qemuxml2xmltest qemuargv2xmltest qemuhelptest @@ -149,7 +152,6 @@ EXTRA_DIST += $(test_scripts) TESTS = virshtest \ nodeinfotest \ - statstest \ qparamtest \ virbuftest \ sockettest \ @@ -161,7 +163,7 @@ TESTS += xml2sexprtest \ xmconfigtest \ xencapstest if ENABLE_XEN_TESTS -TESTS += reconnect +TESTS += reconnect statstest endif endif -- 1.7.3.2

2 1

[libvirt] [PATCH 1/2] support compression at virsh dump
by KAMEZAWA Hiroyuki 30 Oct '10

30 Oct '10

>From 4f74c4a69785432258ad5ea5e695d1b94aaa5b30 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki <kamezawa.hiroyu(a)jp.fujitsu.com> Date: Thu, 28 Oct 2010 16:31:46 +0900 Subject: [PATCH 1/2] add compression support for "virsh dump" Add dump_image_format[] to qemu.conf and support compressed dump at virsh dump. coredump compression is important for saving disk space in an environment where multiple guests run. In general, "disk space for dump" is specially allocated and will be a dead space in the system. It's used only at emergency. So, it's better to have both of save_image_format and dump_image_format. "save" is done in scheduled manner with enough calculated disk space for it. This code reuses some of save_image_format[] and supports the same format. Changelog: - modified libvirtd_qemu.aug - modified test_libvirtd_qemu.aug - fixed error handling of qemudSaveCompressionTypeFromString() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 +++ src/qemu/qemu_conf.c | 11 ++++++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 41 ++++++++++++++++++++++++++++++++------ src/qemu/test_libvirtd_qemu.aug | 2 + 6 files changed, 53 insertions(+), 7 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index b9ace3e..66994fd 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -36,6 +36,7 @@ module Libvirtd_qemu = | str_array_entry "cgroup_controllers" | str_array_entry "cgroup_device_acl" | str_entry "save_image_format" + | str_entry "dump_image_format" | str_entry "hugetlbfs_mount" | bool_entry "relaxed_acs_check" | bool_entry "vnc_allow_host_audio" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 53b76e7..e2c581e 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -145,7 +145,11 @@ # saving a domain in order to save disk space; the list above is in descending # order by performance and ascending order by compression ratio. # +# save_image_format is used when you use 'virsh save' at scheduled saving. +# dump_image_format is used when you use 'virsh dump' at emergency crashdump. +# # save_image_format = "raw" +# dump_image_format = "raw" # If provided by the host and a hugetlbfs mount point is configured, diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 5bd3d4c..b5c17b5 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -325,6 +325,17 @@ int qemudLoadDriverConfig(struct qemud_driver *driver, } } + p = virConfGetValue (conf, "dump_image_format"); + CHECK_TYPE ("dump_image_format", VIR_CONF_STRING); + if (p && p->str) { + VIR_FREE(driver->dumpImageFormat); + if (!(driver->dumpImageFormat = strdup(p->str))) { + virReportOOMError(); + virConfFree(conf); + return -1; + } + } + p = virConfGetValue (conf, "hugetlbfs_mount"); CHECK_TYPE ("hugetlbfs_mount", VIR_CONF_STRING); if (p && p->str) { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 530dcdb..bbe6887 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -164,6 +164,7 @@ struct qemud_driver { virSecurityDriverPtr securitySecondaryDriver; char *saveImageFormat; + char *dumpImageFormat; pciDeviceList *activePciHostdevs; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b119ca1..51ad50b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5907,11 +5907,22 @@ static int qemudDomainCoreDump(virDomainPtr dom, int resume = 0, paused = 0; int ret = -1, fd = -1; virDomainEventPtr event = NULL; - const char *args[] = { - "cat", - NULL, - }; + int compress; qemuDomainObjPrivatePtr priv; + /* + * We reuse "save" flag for "dump" here. Then, we can support the same + * format in "save" and "dump". + */ + compress = QEMUD_SAVE_FORMAT_RAW; + if (driver->dumpImageFormat) { + compress = qemudSaveCompressionTypeFromString(driver->dumpImageFormat); + if (compress < 0) { + qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Invalid dump image format specified in " + "configuration file")); + return -1; + } + } qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -5978,9 +5989,25 @@ static int qemudDomainCoreDump(virDomainPtr dom, } qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorMigrateToFile(priv->mon, - QEMU_MONITOR_MIGRATE_BACKGROUND, - args, path, 0); + if (compress == QEMUD_SAVE_FORMAT_RAW) { + const char *args[] = { + "cat", + NULL, + }; + ret = qemuMonitorMigrateToFile(priv->mon, + QEMU_MONITOR_MIGRATE_BACKGROUND, + args, path, 0); + } else { + const char *prog = qemudSaveCompressionTypeToString(compress); + const char *args[] = { + prog, + "-c", + NULL, + }; + ret = qemuMonitorMigrateToFile(priv->mon, + QEMU_MONITOR_MIGRATE_BACKGROUND, + args, path, 0); + } qemuDomainObjExitMonitorWithDriver(driver, vm); if (ret < 0) goto endjob; diff --git a/src/qemu/test_libvirtd_qemu.aug b/src/qemu/test_libvirtd_qemu.aug index 6788346..efbf642 100644 --- a/src/qemu/test_libvirtd_qemu.aug +++ b/src/qemu/test_libvirtd_qemu.aug @@ -94,6 +94,8 @@ cgroup_device_acl = [ \"/dev/null\", \"/dev/full\", \"/dev/zero\" ] save_image_format = \"gzip\" +dump_image_format = \"gzip\" + hugetlbfs_mount = \"/dev/hugepages\" set_process_name = 1 -- 1.7.2.3

3 5

[libvirt] [PATCH] qemu_driver: add virCgroupMounted
by Lai Jiangshan 30 Oct '10

30 Oct '10

When wen mount any cgroup without "-o devices", we will fail to start vms: # virsh start vm1 error: Failed to start domain vm1 error: Unable to deny all devices for vm1: No such file or directory When wen mount any cgroup without "-o cpu", we will fail to get schedinfo: # virsh schedinfo vm1 Scheduler : posix error: unable to get cpu shares tunable: No such file or directory We should only use the cgroup controllers which are mounted on host. So I add virCgroupMounted() for qemuCgroupControllerActive() Signed-off-by: Lai Jiangshan <laijs(a)cn.fujitsu.com> --- diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3b127d6..5885ad8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -61,6 +61,7 @@ virConfWriteMem; # cgroup.h virCgroupForDomain; virCgroupForDriver; +virCgroupMounted; virCgroupRemove; virCgroupFree; virCgroupAddTask; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 16f34f7..f09d029 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -724,6 +724,8 @@ static int qemuCgroupControllerActive(struct qemud_driver *driver, { if (driver->cgroup == NULL) return 0; + if (!virCgroupMounted(driver->cgroup, controller)) + return 0; if (driver->cgroupControllers & (1 << controller)) return 1; return 0; diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 7e887dc..8fac389 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -71,6 +71,17 @@ void virCgroupFree(virCgroupPtr *group) VIR_FREE(*group); } +/** + * virCgroupMounted: query whether a cgroup subsystem is mounted or not + * + * @cgroup: The group structure to be queried + * @controller: cgroup subsystem id + */ +bool virCgroupMounted(virCgroupPtr cgroup, int controller) +{ + return !!cgroup->controllers[controller].mountPoint; +} + #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R /* * Process /proc/mounts figuring out what controllers are diff --git a/src/util/cgroup.h b/src/util/cgroup.h index b8f2d08..9e1c61f 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -83,5 +83,6 @@ int virCgroupGetFreezerState(virCgroupPtr group, char **state); int virCgroupRemove(virCgroupPtr group); void virCgroupFree(virCgroupPtr *group); +bool virCgroupMounted(virCgroupPtr cgroup, int controller); #endif /* CGROUP_H */

3 2

[libvirt] [PATCH] vbox: Don't warn when the linker search path doesn't contain VBoxXPCOMC.so
by Matthias Bolte 29 Oct '10

29 Oct '10

This is actually a workaround, to unbreak make check on systems without VirtualBox. --- src/vbox/vbox_XPCOMCGlue.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index 7648e54..15a9622 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -124,7 +124,14 @@ static int tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing) g_hVBoxXPCOMC = dlopen(name, RTLD_NOW | RTLD_LOCAL); if (g_hVBoxXPCOMC == NULL) { - VIR_WARN("Could not dlopen '%s': %s", name, dlerror()); + /* + * FIXME: Don't warn in this case as it currently breaks make check + * on systems without VirtualBox. + */ + if (dir != NULL) { + VIR_WARN("Could not dlopen '%s': %s", name, dlerror()); + } + goto cleanup; } -- 1.7.0.4

2 1

[libvirt] [PATCH C#] Don't add a column per item in the Mono virConnectOpenAuth example
by Matthias Bolte 29 Oct '10

29 Oct '10

--- .../MonoDevelop/virConnectOpenAuth/MainWindow.cs | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs index d02acd4..4a3411d 100644 --- a/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs +++ b/examples/MonoDevelop/virConnectOpenAuth/MainWindow.cs @@ -36,6 +36,10 @@ public partial class MainWindow : Gtk.Window treeview1.AppendColumn(tvcDomains); treeview1.Model = domainListStore; + + CellRendererText crtDomainCell = new CellRendererText(); + tvcDomains.PackStart(crtDomainCell, true); + tvcDomains.AddAttribute(crtDomainCell, "text", 0); } protected void OnDeleteEvent (object sender, DeleteEventArgs a) @@ -137,9 +141,6 @@ public partial class MainWindow : Gtk.Window private void AddDomainInTreeView(string domainName) { domainListStore.AppendValues(domainName); - CellRendererText crtDomainCell = new CellRendererText(); - tvcDomains.PackStart(crtDomainCell, true); - tvcDomains.AddAttribute(crtDomainCell, "text", 0); } private static int AuthCallback(ref ConnectCredential[] creds, IntPtr cbdata) -- 1.7.0.4

3 4

[libvirt] [PATCH] vbox: Stop hardcoding a single path for VBoxXPCOMC.so
by Matthias Bolte 29 Oct '10

29 Oct '10

This partly reverts df90ca7661b0a789bd790ccf8258a4527c13eb8d. Don't disable the VirtualBox driver when configure can't find VBoxXPCOMC.so, rely on detection at runtime again instead. Keep --with-vbox=/path/to/virtualbox intact, added to for: https://bugzilla.redhat.com/show_bug.cgi?id=609185 Detection order for VBoxXPCOMC.so: 1. VBOX_APP_HOME environment variable 2. configure provided location 3. hardcoded list of known locations 4. dynamic linker search path Also cleanup the glue code and improve error reporting. --- Patch is based on Daniel's suggestion in: https://www.redhat.com/archives/libvir-list/2010-October/msg00852.html configure.ac | 53 +--------- po/POTFILES.in | 1 + src/vbox/vbox_XPCOMCGlue.c | 232 +++++++++++++++++++++++--------------------- src/vbox/vbox_XPCOMCGlue.h | 14 --- 4 files changed, 130 insertions(+), 170 deletions(-) diff --git a/configure.ac b/configure.ac index e41f2b5..40d6b69 100644 --- a/configure.ac +++ b/configure.ac @@ -225,8 +225,8 @@ AC_ARG_WITH([xenapi], AC_HELP_STRING([--with-xenapi], [add XenAPI support @<:@default=check@:>@]),[],[with_xenapi=check]) AC_ARG_WITH([vbox], AC_HELP_STRING([--with-vbox=@<:@PFX@:>@], - [VirtualBox XPCOMC location @<:@default=check@:>@]),[], - [with_vbox=check]) + [VirtualBox XPCOMC location @<:@default=yes@:>@]),[], + [with_vbox=yes]) AC_ARG_WITH([lxc], AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) AC_ARG_WITH([one], @@ -332,51 +332,10 @@ dnl vbox_xpcomc_dir= -if test "x$with_vbox" = "xyes" || test "x$with_vbox" = "xcheck"; then - AC_MSG_CHECKING([for VirtualBox XPCOMC location]) - - for vbox in \ - /usr/lib/virtualbox/VBoxXPCOMC.so \ - /usr/lib64/virtualbox/VBoxXPCOMC.so \ - /usr/lib/VirtualBox/VBoxXPCOMC.so \ - /opt/virtualbox/VBoxXPCOMC.so \ - /opt/VirtualBox/VBoxXPCOMC.so \ - /opt/virtualbox/i386/VBoxXPCOMC.so \ - /opt/VirtualBox/i386/VBoxXPCOMC.so \ - /opt/virtualbox/amd64/VBoxXPCOMC.so \ - /opt/VirtualBox/amd64/VBoxXPCOMC.so \ - /usr/local/lib/virtualbox/VBoxXPCOMC.so \ - /usr/local/lib/VirtualBox/VBoxXPCOMC.so \ - /Applications/VirtualBox.app/Contents/MacOS/VBoxXPCOMC.dylib \ - ; do - if test -f "$vbox"; then - vbox_xpcomc_dir=`AS_DIRNAME(["$vbox"])` - break - fi - done - - if test -n "$vbox_xpcomc_dir"; then - AC_MSG_RESULT([$vbox_xpcomc_dir]) - with_vbox=yes - else - if test "x$with_vbox" = "xcheck"; then - AC_MSG_RESULT([not found, disabling VirtualBox driver]) - with_vbox=no - else - AC_MSG_RESULT([not found]) - AC_MSG_ERROR([VirtualBox XPCOMC is required for the VirtualBox driver]) - fi - fi -else - if test "x$with_vbox" != "xno"; then - if test -f ${with_vbox}/VBoxXPCOMC.so || \ - test -f ${with_vbox}/VBoxXPCOMC.dylib; then - vbox_xpcomc_dir=$with_vbox - with_vbox=yes - else - AC_MSG_ERROR([$with_vbox does not contain VirtualBox XPCOMC]) - fi - fi +if test "x$with_vbox" != "xyes" && test "x$with_vbox" != "xno"; then + # intentionally don't do any further checks here on the provided path + vbox_xpcomc_dir=$with_vbox + with_vbox=yes fi AC_DEFINE_UNQUOTED([VBOX_XPCOMC_DIR], ["$vbox_xpcomc_dir"], diff --git a/po/POTFILES.in b/po/POTFILES.in index 541335e..dafef47 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -93,6 +93,7 @@ src/util/util.c src/util/virtaudit.c src/util/virterror.c src/util/xml.c +src/vbox/vbox_XPCOMCGlue.c src/vbox/vbox_driver.c src/vbox/vbox_tmpl.c src/xen/proxy_internal.c diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c index e8b0bd1..7648e54 100644 --- a/src/vbox/vbox_XPCOMCGlue.c +++ b/src/vbox/vbox_XPCOMCGlue.c @@ -32,13 +32,18 @@ #include <config.h> -#include <stdio.h> -#include <string.h> #include <stdlib.h> -#include <stdarg.h> #include <dlfcn.h> +#include <stdbool.h> #include "vbox_XPCOMCGlue.h" +#include "internal.h" +#include "memory.h" +#include "util.h" +#include "logging.h" +#include "virterror_internal.h" + +#define VIR_FROM_THIS VIR_FROM_VBOX /******************************************************************************* @@ -60,8 +65,6 @@ *******************************************************************************/ /** The dlopen handle for VBoxXPCOMC. */ void *g_hVBoxXPCOMC = NULL; -/** The last load error. */ -char g_szVBoxErrMsg[256]; /** Pointer to the VBoxXPCOMC function table. */ PCVBOXXPCOM g_pVBoxFuncs = NULL; /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */ @@ -69,104 +72,97 @@ PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions = NULL; /** - * Wrapper for setting g_szVBoxErrMsg. Can be an empty stub. - * - * @param fAlways When 0 the g_szVBoxErrMsg is only set if empty. - * @param pszFormat The format string. - * @param ... The arguments. - */ -static void setErrMsg(int fAlways, const char *pszFormat, ...) -{ -#ifndef LIBVIRT_VERSION - if ( fAlways - || !g_szVBoxErrMsg[0]) - { - va_list va; - va_start(va, pszFormat); - vsnprintf(g_szVBoxErrMsg, sizeof(g_szVBoxErrMsg), pszFormat, va); - va_end(va); - } -#else /* libvirt */ - (void)fAlways; - (void)pszFormat; -#endif /* libvirt */ -} - - -/** * Try load VBoxXPCOMC.so/dylib/dll from the specified location and resolve all * the symbols we need. * - * @returns 0 on success, -1 on failure. - * @param pszHome The director where to try load VBoxXPCOMC from. Can - * be NULL. - * @param fSetAppHome Whether to set the VBOX_APP_HOME env.var. or not - * (boolean). + * @returns 0 on success, -1 on failure and 1 if VBoxXPCOMC was not found. + * @param dir The directory where to try load VBoxXPCOMC from. Can + * be NULL. + * @param setAppHome Whether to set the VBOX_APP_HOME env.var. or not. + * @param ignoreMissing Whether to ignore missing library or not. */ -static int tryLoadOne(const char *pszHome, int fSetAppHome) +static int tryLoadOne(const char *dir, bool setAppHome, bool ignoreMissing) { - size_t cchHome = pszHome ? strlen(pszHome) : 0; - size_t cbBufNeeded; - char szName[4096]; - int rc = -1; + int result = -1; + char *name = NULL; + PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; + + if (dir != NULL) { + if (virAsprintf(&name, "%s/%s", dir, DYNLIB_NAME) < 0) { + virReportOOMError(); + return -1; + } - /* - * Construct the full name. - */ - cbBufNeeded = cchHome + sizeof("/" DYNLIB_NAME); - if (cbBufNeeded > sizeof(szName)) - { - setErrMsg(1, "path buffer too small: %u bytes needed", - (unsigned)cbBufNeeded); - return -1; - } - if (cchHome) - { - memcpy(szName, pszHome, cchHome); - szName[cchHome] = '/'; - cchHome++; + if (!virFileExists(name)) { + if (!ignoreMissing) { + VIR_ERROR(_("Libaray '%s' doesn't exist"), name); + } + + return -1; + } + } else { + name = strdup(DYNLIB_NAME); + + if (name == NULL) { + virReportOOMError(); + return -1; + } } - memcpy(&szName[cchHome], DYNLIB_NAME, sizeof(DYNLIB_NAME)); /* * Try load it by that name, setting the VBOX_APP_HOME first (for now). * Then resolve and call the function table getter. */ - if (fSetAppHome) - { - if (pszHome) - setenv("VBOX_APP_HOME", pszHome, 1 /* always override */); - else + if (setAppHome) { + if (dir != NULL) { + setenv("VBOX_APP_HOME", dir, 1 /* always override */); + } else { unsetenv("VBOX_APP_HOME"); + } } - g_hVBoxXPCOMC = dlopen(szName, RTLD_NOW | RTLD_LOCAL); - if (g_hVBoxXPCOMC) - { - PFNVBOXGETXPCOMCFUNCTIONS pfnGetFunctions; - pfnGetFunctions = (PFNVBOXGETXPCOMCFUNCTIONS) - dlsym(g_hVBoxXPCOMC, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME); - if (pfnGetFunctions) - { - g_pVBoxFuncs = pfnGetFunctions(VBOX_XPCOMC_VERSION); - if (g_pVBoxFuncs) - { - g_pfnGetFunctions = pfnGetFunctions; - return 0; - } - /* bail out */ - setErrMsg(1, "%.80s: pfnGetFunctions(%#x) failed", - szName, VBOX_XPCOMC_VERSION); - } - else - setErrMsg(1, "dlsym(%.80s/%.32s): %.128s", - szName, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, dlerror()); + g_hVBoxXPCOMC = dlopen(name, RTLD_NOW | RTLD_LOCAL); + + if (g_hVBoxXPCOMC == NULL) { + VIR_WARN("Could not dlopen '%s': %s", name, dlerror()); + goto cleanup; + } + + pfnGetFunctions = (PFNVBOXGETXPCOMCFUNCTIONS) + dlsym(g_hVBoxXPCOMC, VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME); + + if (pfnGetFunctions == NULL) { + VIR_ERROR(_("Could not dlsym %s from '%s': %s"), + VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, name, dlerror()); + goto cleanup; + } + + g_pVBoxFuncs = pfnGetFunctions(VBOX_XPCOMC_VERSION); + + if (g_pVBoxFuncs == NULL) { + VIR_ERROR(_("Calling %s from '%s' failed"), + VBOX_GET_XPCOMC_FUNCTIONS_SYMBOL_NAME, name); + goto cleanup; + } + + g_pfnGetFunctions = pfnGetFunctions; + result = 0; + + if (dir != NULL) { + VIR_DEBUG("Found %s in '%s'", DYNLIB_NAME, dir); + } else { + VIR_DEBUG("Found %s in dynamic linker search path", DYNLIB_NAME); + } + +cleanup: + if (g_hVBoxXPCOMC != NULL && result < 0) { dlclose(g_hVBoxXPCOMC); g_hVBoxXPCOMC = NULL; } - else - setErrMsg(0, "dlopen(%.80s): %.160s", szName, dlerror()); - return rc; + + VIR_FREE(name); + + return result; } @@ -175,34 +171,53 @@ static int tryLoadOne(const char *pszHome, int fSetAppHome) * function pointers. * * @returns 0 on success, -1 on failure. - * - * @remark This should be considered moved into a separate glue library since - * its its going to be pretty much the same for any user of VBoxXPCOMC - * and it will just cause trouble to have duplicate versions of this - * source code all around the place. */ int VBoxCGlueInit(void) { - /* - * If the user specifies the location, try only that. - */ - const char *pszHome = getenv("VBOX_APP_HOME"); - if (pszHome) - return tryLoadOne(pszHome, 0); + int i; + static const char *knownDirs[] = { + "/usr/lib/virtualbox", + "/usr/lib/virtualbox-ose", + "/usr/lib64/virtualbox", + "/usr/lib64/virtualbox-ose", + "/usr/lib/VirtualBox", + "/opt/virtualbox", + "/opt/VirtualBox", + "/opt/virtualbox/i386", + "/opt/VirtualBox/i386", + "/opt/virtualbox/amd64", + "/opt/VirtualBox/amd64", + "/usr/local/lib/virtualbox", + "/usr/local/lib/VirtualBox", + "/Applications/VirtualBox.app/Contents/MacOS" + }; + const char *home = getenv("VBOX_APP_HOME"); + + /* If the user specifies the location, try only that. */ + if (home != NULL) { + if (tryLoadOne(home, false, false) < 0) { + return -1; + } + } - /* - * Try the configured location. - */ - g_szVBoxErrMsg[0] = '\0'; + /* Try the additionally configured location. */ + if (VBOX_XPCOMC_DIR[0] != '\0') { + if (tryLoadOne(VBOX_XPCOMC_DIR, true, true) >= 0) { + return 0; + } + } - if (tryLoadOne(VBOX_XPCOMC_DIR, 1) == 0) - return 0; + /* Try the known locations. */ + for (i = 0; i < ARRAY_CARDINALITY(knownDirs); ++i) { + if (tryLoadOne(knownDirs[i], true, true) >= 0) { + return 0; + } + } - /* - * Finally try the dynamic linker search path. - */ - if (tryLoadOne(NULL, 1) == 0) + /* Finally try the dynamic linker search path. */ + if (tryLoadOne(NULL, false, true) >= 0) { return 0; + } /* No luck, return failure. */ return -1; @@ -214,14 +229,13 @@ int VBoxCGlueInit(void) */ void VBoxCGlueTerm(void) { - if (g_hVBoxXPCOMC) - { + if (g_hVBoxXPCOMC != NULL) { #if 0 /* VBoxRT.so doesn't like being reloaded. See @bugref{3725}. */ dlclose(g_hVBoxXPCOMC); #endif g_hVBoxXPCOMC = NULL; } + g_pVBoxFuncs = NULL; g_pfnGetFunctions = NULL; - memset(g_szVBoxErrMsg, 0, sizeof(g_szVBoxErrMsg)); } diff --git a/src/vbox/vbox_XPCOMCGlue.h b/src/vbox/vbox_XPCOMCGlue.h index c04eefa..6c44030 100644 --- a/src/vbox/vbox_XPCOMCGlue.h +++ b/src/vbox/vbox_XPCOMCGlue.h @@ -32,26 +32,12 @@ /* This has to be the oldest version we support. */ # include "vbox_CAPI_v2_2.h" -# ifdef __cplusplus -extern "C" { -# endif - -/** The dlopen handle for VBoxXPCOMC. */ -extern void *g_hVBoxXPCOMC; -/** The last load error. */ -extern char g_szVBoxErrMsg[256]; /** Pointer to the VBoxXPCOMC function table. */ extern PCVBOXXPCOM g_pVBoxFuncs; /** Pointer to VBoxGetXPCOMCFunctions for the loaded VBoxXPCOMC so/dylib/dll. */ extern PFNVBOXGETXPCOMCFUNCTIONS g_pfnGetFunctions; - int VBoxCGlueInit(void); void VBoxCGlueTerm(void); - -# ifdef __cplusplus -} -# endif - #endif -- 1.7.0.4

3 3

[libvirt] [PATCH] Fix typo
by Hu Tao 29 Oct '10

29 Oct '10

--- include/libvirt/libvirt.h.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index b45f7ec..3379210 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2044,7 +2044,7 @@ typedef enum { /** - * virConnectDomainEventWatchdogCallback: + * virConnectDomainEventIOErrorCallback: * @conn: connection object * @dom: domain on which the event occurred * @srcPath: The host file on which the IO error occurred @@ -2064,7 +2064,7 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn, void *opaque); /** - * virConnectDomainEventWatchdogCallback: + * virConnectDomainEventIOErrorReasonCallback: * @conn: connection object * @dom: domain on which the event occurred * @srcPath: The host file on which the IO error occurred -- 1.7.3

3 2

[libvirt] Fwd: Re: Lxc support
by Jean-Philippe Menil 29 Oct '10

29 Oct '10

-------- Message original -------- Sujet: Re: [libvirt] Lxc support Date : Fri, 29 Oct 2010 13:13:16 +0200 De : Jean-Philippe Menil <jean-philippe.menil(a)univ-nantes.fr> Répondre à : jean-philippe.menil(a)univ-nantes.fr Organisation : IRTS - DSI - Université de Nantes Pour : Daniel P. Berrange <berrange(a)redhat.com> Le 29/10/2010 12:39, Daniel P. Berrange a écrit : > On Fri, Oct 29, 2010 at 12:27:59PM +0200, Jean-Philippe Menil wrote: >> Le 29/10/2010 12:00, Osier a écrit : >>> On 10/29/2010 04:42 PM, Jean-Philippe Menil wrote: >>>> Hi, >>>> >>>> i'm trying to test the lxc support in libvirt, but but libvirt failed to >>>> start container with error "lxcContainerAvailable:897 : clone call >>>> returned Operation not permitted, container support is not enabled" >>>> >>> >>> What's the kernel version you use? Just as the error message says, the >>> system call 'clone' failed, It's probly caused by lacking of kernel >>> support. >>> >>> At least you should make sure 'clone' support these flags: >>> >>> CLONE_NEWPID, CLONE_NEWNS, CLONE_NEWUTS, CLONE_NEWIPC, SIGCHLD > >> thanks for your response. >> The kernel is a 2.6.36 wit hthe following: >> root@redbreast:/tmp# cat /boot/config-2.6.36-dsiun-1a | grep -i pid >> CONFIG_PROC_PID_CPUSET=y >> CONFIG_PID_NS=y >> # CONFIG_SPI_SPIDEV is not set >> CONFIG_HID_PID=y > > You need to check for _NS= here, and want to see the following > > $ grep _NS= /boot/config-2.6.34.6-54.fc13.x86_64 > CONFIG_CGROUP_NS=y > CONFIG_UTS_NS=y > CONFIG_IPC_NS=y > CONFIG_USER_NS=y > CONFIG_PID_NS=y > CONFIG_NET_NS=y > > Daniel Sorry, forgot to cc the list Ok, So my kernel lokks fine: root@redbreast:/tmp# cat /boot/config-2.6.36-dsiun-1a | grep _NS CONFIG_CGROUP_NS=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y CONFIG_PID_NS=y CONFIG_NET_NS=y Libvirt was compiled with following: --with-qemu --with-qemu-user=libvirt-qemu --with-qemu-group=kvm --without-xen --without-openvz --without-avahi --without-sasl --without-polkit --without-udev --without-hal --with-storage-fs --with-storage-lvm --without-storage-iscsi --with-storage-disk --with-init-scripts=none --without-numactl --without-selinux --without-esx --without-libssh2 --without-capng --with-macvtap --enable-debug --with-lxc

1 0

[libvirt] [PATCH] qemu: Fix one memory leak in qemu driver.c
by Osier Yang 29 Oct '10

29 Oct '10

* src/qemu/qemu_driver.c (qemuDomainManagedSavePath) --- src/qemu/qemu_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89b4d11..976fb72 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5843,6 +5843,7 @@ qemuDomainManagedSavePath(struct qemud_driver *driver, virDomainObjPtr vm) { char *ret; if (virAsprintf(&ret, "%s/%s.save", driver->saveDir, vm->def->name) < 0) { + VIR_FREE(ret); virReportOOMError(); return(NULL); } -- 1.7.2.3

2 1