- Devel - libvirt List Archives

[libvirt] [PATCH v2] libxl: libxl_get_max_cpus returning a libxl error from 4.4 onward
by Dario Faggioli 18 Dec '13

18 Dec '13

Starting from commit 2e82c18c in Xen (will be included in Xen 4.4) both libxl_get_max_cpus() and libxl_get_max_ndoes() start returning a proper libxl error code, in case of failure. This patch fixes this in the libxl driver. Note that, although it is now basically impossible for them to return 0, that would, theoretically, still be wrong. Also, checking that the returned value is '<= 0' makes the code correct for both Xen 4.4 and Xen 4.3 (and 4.2), and that is why we go for it (rather than just '< 0'). Signed-off-by: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Ian Jackson <Ian.Jackson(a)eu.citrix.com> Cc: Martin Kletzander <mkletzan(a)redhat.com> --- Changes from v1: * taking care of libxl_get_max_nodes() too --- src/libxl/libxl_driver.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 692c3b7..29aa6c7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1101,9 +1101,11 @@ libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) cfg = libxlDriverConfigGet(driver); ret = libxl_get_max_cpus(cfg->ctx); - /* libxl_get_max_cpus() will return 0 if there were any failures, - e.g. xc_physinfo() failing */ - if (ret == 0) + /* On failure, libxl_get_max_cpus() will return ERROR_FAIL from Xen 4.4 + * onward, but it ever returning 0 is obviously wrong too (and it is + * what happens, on failure, on Xen 4.3 and earlier). Therefore, a 'less + * or equal' is the catchall we want. */ + if (ret <= 0) ret = -1; virObjectUnref(cfg); @@ -3980,6 +3982,7 @@ libxlDomainGetNumaParameters(virDomainPtr dom, for (i = 0; i < LIBXL_NUMA_NPARAM && i < *nparams; i++) { virMemoryParameterPtr param = &params[i]; + int numnodes; switch (i) { case 0: @@ -3998,8 +4001,12 @@ libxlDomainGetNumaParameters(virDomainPtr dom, /* Node affinity */ /* Let's allocate both libxl and libvirt bitmaps */ + numnodes = libxl_get_max_nodes(priv->ctx); + if (numnodes <= 0) + goto cleanup; + if (libxl_node_bitmap_alloc(priv->ctx, &nodemap, 0) || - !(nodes = virBitmapNew(libxl_get_max_nodes(priv->ctx)))) { + !(nodes = virBitmapNew(numnodes))) { virReportOOMError(); goto cleanup; }

2 2

[libvirt] [PATCH] Remove redefinition of bool type when --enable-test-locking
by Daniel P. Berrange 18 Dec '13

18 Dec '13

Old versions of CIL did not understand the 'bool' data type, but at least 1.7.3 does now cope. We can remove the old hack which redefined bool and no longer compiles successfully. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5446634..675f1fc 100644 --- a/configure.ac +++ b/configure.ac @@ -2129,7 +2129,7 @@ AC_ARG_ENABLE([test-locking], enable_locking=$enableval if test "$enable_locking" = "yes"; then - LOCK_CHECKING_CFLAGS="-Dbool=char -D_Bool=char -save-temps" + LOCK_CHECKING_CFLAGS="-save-temps" AC_SUBST([LOCK_CHECKING_CFLAGS]) fi AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) -- 1.8.4.2

2 1

[libvirt] libxl: cannot connect to PV console
by Dario Faggioli 18 Dec '13

18 Dec '13

Hey Jim, I'm on libvirt.git's trunk and I see the following: [xen@ghoul3 libvirt.git]$ sudo ./tools/virsh list Id Name State ---------------------------------------------------- 3 debian_32 running 4 fedora20_64 running [xen@ghoul3 libvirt.git]$ sudo ./tools/virsh console debian_32 Connected to domain debian_32 Escape character is ^] error: internal error: cannot find character device (null) [xen@ghoul3 libvirt.git]$ sudo ./tools/virsh console fedora20_64 Connected to domain fedora20_64 Escape character is ^] error: internal error: cannot find character device (null) And this: [xen@ghoul3 libvirt.git]$ sudo ./daemon/libvirtd -v [sudo] password for xen: 2013-12-17 13:19:35.366+0000: 22124: info : libvirt version: 1.2.1 2013-12-17 14:00:06.587+0000: 22122: error : libxlDomainOpenConsole:3885 : internal error: cannot find character device (null) 2013-12-17 14:00:15.705+0000: 22125: error : libxlDomainOpenConsole:3885 : internal error: cannot find character device (null) What I have in /var/log/libvirt/libxl does not look useful, while below it comes my xenstore-ls. What is it that is going wrong? [xen@ghoul3 libvirt.git]$ sudo xenstore-ls tool = "" xenstored = "" local = "" domain = "" 0 = "" name = "Domain-0" domid = "0" device-model = "" 0 = "" state = "running" memory = "" target = "13118716" static-max = "4294967292" freemem-slack = "317576" libxl = "" disable_udev = "1" backend = "" vbd = "" 3 = "" 51712 = "" frontend = "/local/domain/3/device/vbd/51712" params = "/dev/fedora_ghoul3/debian_32" script = "/etc/xen/scripts/block" physical-device = "fd:2" frontend-id = "3" online = "1" removable = "1" bootable = "1" state = "4" dev = "xvda" type = "phy" mode = "w" device-type = "disk" feature-flush-cache = "1" feature-discard = "0" feature-barrier = "1" feature-persistent = "1" feature-max-indirect-segments = "256" sectors = "10485760" info = "0" sector-size = "512" physical-sector-size = "512" 4 = "" 51712 = "" frontend = "/local/domain/4/device/vbd/51712" params = "/dev/fedora_ghoul3/fedora20_64" script = "/etc/xen/scripts/block" physical-device = "fd:3" frontend-id = "4" online = "1" removable = "1" bootable = "1" state = "4" dev = "xvda" type = "phy" mode = "w" device-type = "disk" feature-flush-cache = "1" feature-discard = "0" feature-barrier = "1" feature-persistent = "1" feature-max-indirect-segments = "256" sectors = "10485760" info = "0" sector-size = "512" physical-sector-size = "512" console = "" 3 = "" 0 = "" frontend = "/local/domain/3/console" frontend-id = "3" online = "1" state = "1" domain = "debian_32" protocol = "vt100" 4 = "" 0 = "" frontend = "/local/domain/4/console" frontend-id = "4" online = "1" state = "1" domain = "fedora20_64" protocol = "vt100" vif = "" 3 = "" 0 = "" frontend = "/local/domain/3/device/vif/0" frontend-id = "3" online = "1" state = "4" script = "/etc/xen/scripts/vif-bridge" mac = "00:16:3e:9f:ea:e6" bridge = "virbr0" handle = "0" type = "vif" feature-sg = "1" feature-gso-tcpv4 = "1" feature-rx-copy = "1" feature-rx-flip = "0" feature-split-event-channels = "1" hotplug-status = "connected" 4 = "" 0 = "" frontend = "/local/domain/4/device/vif/0" frontend-id = "4" online = "1" state = "4" script = "/etc/xen/scripts/vif-bridge" mac = "00:16:3e:a8:fd:05" bridge = "virbr0" handle = "0" type = "vif" feature-sg = "1" feature-gso-tcpv4 = "1" feature-rx-copy = "1" feature-rx-flip = "0" feature-split-event-channels = "1" hotplug-status = "connected" 3 = "" vm = "/vm/d3c586b2-f26d-4671-a6b3-6782fa01f49f" name = "debian_32" cpu = "" 0 = "" availability = "online" 1 = "" availability = "online" memory = "" static-max = "1048576" target = "1048577" videoram = "-1" device = "" suspend = "" event-channel = "" vbd = "" 51712 = "" backend = "/local/domain/0/backend/vbd/3/51712" backend-id = "0" state = "4" virtual-device = "51712" device-type = "disk" protocol = "x86_32-abi" ring-ref = "8" event-channel = "15" feature-persistent = "1" vif = "" 0 = "" backend = "/local/domain/0/backend/vif/3/0" backend-id = "0" state = "4" handle = "0" mac = "00:16:3e:9f:ea:e6" tx-ring-ref = "9" rx-ring-ref = "10" event-channel-tx = "16" event-channel-rx = "17" request-rx-copy = "1" feature-rx-notify = "1" feature-sg = "1" feature-gso-tcpv4 = "1" control = "" shutdown = "" platform-feature-multiprocessor-suspend = "1" platform-feature-xs_reset_watches = "1" data = "" domid = "3" store = "" port = "1" ring-ref = "1353957" console = "" backend = "/local/domain/0/backend/console/3/0" backend-id = "0" limit = "1048576" type = "xenconsoled" output = "pty" tty = "/dev/pts/2" port = "2" ring-ref = "2366273" 4 = "" vm = "/vm/d02acb9a-e99e-42ca-b2a4-9e32a65b9a0f" name = "fedora20_64" cpu = "" 0 = "" availability = "online" 1 = "" availability = "online" memory = "" static-max = "2097152" target = "2097153" videoram = "-1" device = "" suspend = "" event-channel = "" vbd = "" 51712 = "" backend = "/local/domain/0/backend/vbd/4/51712" backend-id = "0" state = "4" virtual-device = "51712" device-type = "disk" protocol = "x86_64-abi" ring-ref = "8" event-channel = "15" feature-persistent = "1" vif = "" 0 = "" backend = "/local/domain/0/backend/vif/4/0" backend-id = "0" state = "4" handle = "0" mac = "00:16:3e:a8:fd:05" tx-ring-ref = "135" rx-ring-ref = "136" event-channel-tx = "16" event-channel-rx = "17" request-rx-copy = "1" feature-rx-notify = "1" feature-sg = "1" feature-gso-tcpv4 = "1" control = "" shutdown = "" platform-feature-multiprocessor-suspend = "1" platform-feature-xs_reset_watches = "1" data = "" domid = "4" store = "" port = "1" ring-ref = "2486615" console = "" backend = "/local/domain/0/backend/console/4/0" backend-id = "0" limit = "1048576" type = "xenconsoled" output = "pty" tty = "/dev/pts/4" port = "2" ring-ref = "1364170" vm = "" 00000000-0000-0000-0000-000000000000 = "" memory = "12811" d3c586b2-f26d-4671-a6b3-6782fa01f49f = "" uuid = "d3c586b2-f26d-4671-a6b3-6782fa01f49f" name = "debian_32" image = "" ostype = "linux" kernel = "/var/run/xen/bootloader.3.d/boot_kernel.eYl1YW" ramdisk = "/var/run/xen/bootloader.3.d/boot_ramdisk.BxZLo9" cmdline = "root=UUID=9df3cd14-ed12-4cee-a252-d0cd29f75b55 ro quiet" start_time = "1387288160.47" d02acb9a-e99e-42ca-b2a4-9e32a65b9a0f = "" uuid = "d02acb9a-e99e-42ca-b2a4-9e32a65b9a0f" name = "fedora20_64" image = "" ostype = "linux" kernel = "/var/run/xen/bootloader.4.d/boot_kernel.w1Ntxo" ramdisk = "/var/run/xen/bootloader.4.d/boot_ramdisk.XU7an0" cmdline = "root=/dev/mapper/fedora-root ro rd.lvm.lv=fedora/swap rd.lvm.lv=fedora/root vconsole.font=latarcyrheb-sun16 LANG=en_US.UTF-8" start_time = "1387288245.20" libxl = "" 3 = "" dm-version = "qemu_xen" 4 = "" dm-version = "qemu_xen" Regards, Dario -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

3 4

[libvirt] [PATCH] build: fix building with '--enable-test-locking'
by Martin Kletzander 18 Dec '13

18 Dec '13

When test-locking is enabled, CFLAGS have -Dbool=char, which makes pipefd[bool] fail (obviously). Forcing the subscript to be bool by double negation fixes the build breaker. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I still can't build with '--enable-test-locking' and I'm not sure this is the proper way to fix it. Also, the code wasn't touched for months, so I'm not pushing it as a build-breaker. src/util/virfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 631cd06..88674ec 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -262,7 +262,7 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) } VIR_FORCE_CLOSE(*fd); - *fd = pipefd[output]; + *fd = pipefd[!!output]; return ret; error: -- 1.8.5.1

3 6

[libvirt] libvirt live modify
by Umar Draz 18 Dec '13

18 Dec '13

Hi Can we modify a Virtual machine while its running, I want to update the <discription> and <title> Br. Umar

4 13

[libvirt] [PATCHv3] qemu: ask for -enable-fips when FIPS is required
by Eric Blake 18 Dec '13

18 Dec '13

On a system that is enforcing FIPS, most libraries honor the current mode by default. Qemu, on the other hand, refused to honor FIPS mode unless you add the '-enable-fips' command line option; worse, this option is not discoverable via QMP, and is only present on binaries built for Linux. So, if we detect FIPS mode, then we unconditionally ask for FIPS; either qemu is new enough to have the option and then correctly cripple insecure VNC passwords, or it is so old that we are correctly avoiding a FIPS violation by preventing qemu from starting. Meanwhile, if we don't detect FIPS mode, then omitting the argument is safe whether the qemu has the option (but it would do nothing because FIPS is disabled) or whether qemu lacks the option (including in the case where we are not running on Linux). The testsuite was a bit interesting: we don't want our test to depend on whether it is being run in FIPS mode, so I had to tweak things to set the capability bit outside of our normal interaction with capability parsing. This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1035474 * src/qemu/qemu_capabilities.h (QEMU_CAPS_ENABLE_FIPS): New bit. * src/qemu/qemu_capabilities.c (virQEMUCapsInitQMP): Conditionally set capability according to detection of FIPS mode. * src/qemu/qemu_command.c (qemuBuildCommandLine): Use it. * tests/qemucapabilitiestest.c (testQemuCaps): Conditionally set capability to test expected output. * tests/qemucapabilitiesdata/caps_1.2.2-1.caps: Update list. * tests/qemucapabilitiesdata/caps_1.6.0-1.caps: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v3: use virFileReadAll correctly src/qemu/qemu_capabilities.c | 27 ++++++++++++++++++++++++++- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 2 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiestest.c | 20 +++++++++++++++----- 6 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5e9c65e..4f64f87 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -245,7 +245,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "kvm-pit-lost-tick-policy", "boot-strict", /* 160 */ - "pvpanic", /* 161 */ + "pvpanic", + "enable-fips", ); struct _virQEMUCaps { @@ -2630,6 +2631,30 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, config.data.nix.path = monpath; config.data.nix.listen = false; + /* Qemu 1.2 and later have a binary flag -enable-fips that must be + * used for VNC auth to obey FIPS settings; but the flag only + * exists on Linux, and with no way to probe for it via QMP. Our + * solution: if FIPS mode is required, then unconditionally use + * the flag, regardless of qemu version, for the following matrix: + * + * old QEMU new QEMU + * FIPS enabled doesn't start VNC auth disabled + * FIPS disabled/missing VNC auth enabled VNC auth enabled + * + * Setting the flag here instead of in virQEMUCapsInitQMPMonitor + * or virQEMUCapsInitHelp also allows the testsuite to be + * independent of FIPS setting. + */ + if (virFileExists("/proc/sys/crypto/fips_enabled")) { + char *buf = NULL; + + if (virFileReadAll("/proc/sys/crypto/fips_enabled", 10, &buf) < 0) + goto cleanup; + if (STREQ(buf, "1\n")) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_FIPS); + VIR_FREE(buf); + } + VIR_DEBUG("Try to get caps via QMP qemuCaps=%p", qemuCaps); /* diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index bbf4972..efb3f43 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -200,6 +200,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ QEMU_CAPS_BOOT_STRICT = 160, /* -boot strict */ QEMU_CAPS_DEVICE_PANIC = 161, /* -device pvpanic */ + QEMU_CAPS_ENABLE_FIPS = 162, /* -enable-fips */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a80559e..d723dc8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7747,6 +7747,8 @@ qemuBuildCommandLine(virConnectPtr conn, } } virCommandAddArg(cmd, "-S"); /* freeze CPU */ + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_ENABLE_FIPS)) + virCommandAddArg(cmd, "-enable-fips"); if (qemuBuildMachineArgStr(cmd, def, qemuCaps) < 0) goto error; diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index 73a561d..c3ae814 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -112,4 +112,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='kvm-pit-lost-tick-policy'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index c7ce591..2d50cf9 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -138,4 +138,5 @@ <flag name='boot-strict'/> <flag name='pvpanic'/> <flag name='reboot-timeout'/> + <flag name='enable-fips'/> </qemuCaps> diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index d912171..3b34f78 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -31,6 +31,7 @@ typedef testQemuData *testQemuDataPtr; struct _testQemuData { virDomainXMLOptionPtr xmlopt; const char *base; + bool fips; }; static qemuMonitorTestPtr @@ -192,6 +193,12 @@ testQemuCaps(const void *opaque) qemuMonitorTestGetMonitor(mon)) < 0) goto cleanup; + /* So that our test does not depend on the contents of /proc, we + * hoisted the setting of ENABLE_FIPS to virQEMUCapsInitQMP. But + * we do want to test the effect of that flag. */ + if (data->fips) + virQEMUCapsSet(capsComputed, QEMU_CAPS_ENABLE_FIPS); + if (testQemuCapsCompare(capsProvided, capsComputed) < 0) goto cleanup; @@ -227,16 +234,19 @@ mymain(void) data.xmlopt = xmlopt; -#define DO_TEST(name) \ - data.base = name; \ - if (virtTestRun(name, testQemuCaps, &data) < 0) \ +#define DO_TEST_FULL(name, use_fips) \ + data.base = name; \ + data.fips = use_fips; \ + if (virtTestRun(name, testQemuCaps, &data) < 0) \ ret = -1 - DO_TEST("caps_1.2.2-1"); +#define DO_TEST(name) DO_TEST_FULL(name, false) + + DO_TEST_FULL("caps_1.2.2-1", true); DO_TEST("caps_1.3.1-1"); DO_TEST("caps_1.4.2-1"); DO_TEST("caps_1.5.3-1"); - DO_TEST("caps_1.6.0-1"); + DO_TEST_FULL("caps_1.6.0-1", true); DO_TEST("caps_1.6.50-1"); virObjectUnref(xmlopt); -- 1.8.4.2

2 2

[libvirt] [PATCH] Fix race leading to crash when setting up dbus watches
by Daniel P. Berrange 18 Dec '13

18 Dec '13

Currently the virDBusAddWatch does virEventAddHandle(fd, flags, virDBusWatchCallback, watch, NULL); dbus_watch_set_data(watch, info, virDBusWatchFree); Unfortunately this is racy - since the event loop is in a different thread, the virDBusWatchCallback method may be run before we get to calling dbus_watch_set_data. We must reverse the order of these calls See https://bugzilla.redhat.com/show_bug.cgi?id=885445 Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virdbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 4e4c267..a0cbbfe 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -238,15 +238,15 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch, # else fd = dbus_watch_get_fd(watch); # endif + dbus_watch_set_data(watch, info, virDBusWatchFree); info->bus = (DBusConnection *)data; info->watch = virEventAddHandle(fd, flags, virDBusWatchCallback, watch, NULL); if (info->watch < 0) { - VIR_FREE(info); + dbus_watch_set_data(watch, NULL, NULL); return 0; } - dbus_watch_set_data(watch, info, virDBusWatchFree); return 1; } -- 1.8.4.2

2 1

[libvirt] [PATCH] configure: make --with-test-suite work
by Martin Kletzander 18 Dec '13

18 Dec '13

Our option '--with-test-suite' could have never worked since it was defined as AC_ARG_ENABLE([with-test-suite], ...), thus working only as '--enable-with-test-suite', but documented in configure.ac as AC_HELP_STRING([--with-test-suite], ...). In my optinion, the help string is as it should be, but the option is wrong. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index 5446634..2ebb941 100644 --- a/configure.ac +++ b/configure.ac @@ -2035,14 +2035,14 @@ dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python2 python]) AC_PATH_PROG([PERL], [perl]) -AC_ARG_ENABLE([with-test-suite], - [AS_HELP_STRING([--with-test-suite], - [build test suite by default @<:@default=check@:>@])], - [case "${withval}" in - yes|no|check) ;; - *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; - esac], - [withval=check]) +AC_ARG_WITH([test-suite], + [AS_HELP_STRING([--with-test-suite], + [build test suite by default @<:@default=check@:>@])], + [case "${withval}" in + yes|no|check) ;; + *) AC_MSG_ERROR([bad value ${withval} for tests option]) ;; + esac], + [withval=check]) AC_MSG_CHECKING([Whether to build test suite by default]) if test "$withval" = "check" ; then -- 1.8.5.1

2 2

[libvirt] [PATCH] lxc: simplify command when connecting lxc multi console
by Chen Hanxiao 18 Dec '13

18 Dec '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we config more than one consoles for container, we always named them as "consoleN". We had to type a complex option "--devname consoleN". This patch enables option "--devname N" to be equal to "--devname consoleN". Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 61a90ca..13213a5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2439,6 +2439,7 @@ lxcDomainOpenConsole(virDomainPtr dom, int ret = -1; virDomainChrDefPtr chr = NULL; size_t i; + char *tmp_name = NULL; virCheckFlags(0, -1); @@ -2455,9 +2456,17 @@ lxcDomainOpenConsole(virDomainPtr dom, } if (dev_name) { + if (STRPREFIX(dev_name, "console")) { + if (VIR_STRDUP(tmp_name, dev_name) < 0) + goto cleanup; + } else { + if (virAsprintf(&tmp_name, "console%s", dev_name) < 0) + goto cleanup; + } + for (i = 0; i < vm->def->nconsoles; i++) { if (vm->def->consoles[i]->info.alias && - STREQ(vm->def->consoles[i]->info.alias, dev_name)) { + STREQ(vm->def->consoles[i]->info.alias, tmp_name)) { chr = vm->def->consoles[i]; break; } @@ -2490,6 +2499,7 @@ lxcDomainOpenConsole(virDomainPtr dom, cleanup: if (vm) virObjectUnlock(vm); + VIR_FREE(tmp_name); return ret; } -- 1.8.2.1

3 4

[libvirt] [PATCH] libxl: libxl_get_max_cpus returning a libxl error from 4.4 onward
by Dario Faggioli 18 Dec '13

18 Dec '13

Starting from commit 2e82c18c in Xen (will be included in Xen 4.4) libxl_get_max_cpus() start returning a proper libxl error code, in case of failure. It returning 0 is now basically impossible but, theoretically, still wrong, not to mention that using '<= 0' makes this correct for both Xen 4.4 and Xen 4.3 (and 4.2). That's why we go for it (rather than just '< 0'). Signed-off-by: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Ian Jackson <Ian.Jackson(a)eu.citrix.com> --- src/libxl/libxl_driver.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 692c3b7..a31b094 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1101,9 +1101,11 @@ libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED) cfg = libxlDriverConfigGet(driver); ret = libxl_get_max_cpus(cfg->ctx); - /* libxl_get_max_cpus() will return 0 if there were any failures, - e.g. xc_physinfo() failing */ - if (ret == 0) + /* On failure, libxl_get_max_cpus() will return ERROR_FAIL from Xen 4.4 + * onward, but it ever returning 0 is obviously wrong too (and it is + * what happens, on failure, on Xen 4.3 and earlier). Therefore, a 'less + * or equal' is the catchall we want. */ + if (ret <= 0) ret = -1; virObjectUnref(cfg);

2 2