- Devel - libvirt List Archives

[libvirt] [PATCH] Make virInitialize be called in multithreading environment
by Guannan Ren 15 Feb '12

15 Feb '12

When initializing libvirt shared library, calling virOnce to make load hypervisor drivers and create thread local key only once. --- src/libvirt.c | 131 +++++++++++++++++++------------------------ src/util/threads-pthread.c | 8 ++- 2 files changed, 64 insertions(+), 75 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index a55d823..4656779 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -106,7 +106,8 @@ static int virNWFilterDriverTabCount = 0; static virStateDriverPtr virStateDriverTab[MAX_DRIVERS]; static int virStateDriverTabCount = 0; #endif -static int initialized = 0; +static int virInitResult = 0; +static virOnceControl virOnceKey = VIR_ONCE_CONTROL_INITIALIZER; #if defined(POLKIT_AUTH) static int virConnectAuthGainPolkit(const char *privilege) { @@ -379,30 +380,19 @@ static struct gcry_thread_cbs virTLSThreadImpl = { } while (0) /** - * virInitialize: - * - * Initialize the library. It's better to call this routine at startup - * in multithreaded applications to avoid potential race when initializing - * the library. - * - * Calling virInitialize is mandatory, unless your first API call is one of - * virConnectOpen*. - * - * Returns 0 in case of success, -1 in case of error + * Initialize global variable and load supported + * hypervisor drivers once. */ -int -virInitialize(void) +static void +virInitializeOnce(void) { - if (initialized) - return 0; - - initialized = 1; + if (virInitResult < 0) + return; - if (virThreadInitialize() < 0 || - virErrorInitialize() < 0 || + if (virErrorInitialize() < 0 || virRandomInitialize(time(NULL) ^ getpid()) || virNodeSuspendInit() < 0) - return -1; + goto failed; gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl); gcry_check_version(NULL); @@ -414,12 +404,9 @@ virInitialize(void) VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H - if (winsock_init () == -1) return -1; + if (winsock_init () == -1) goto failed; #endif - if (!bindtextdomain(PACKAGE, LOCALEDIR)) - return -1; - /* * Note that the order is important: the first ones have a higher * priority when calling virConnectOpen. @@ -459,36 +446,65 @@ virInitialize(void) # endif #else # ifdef WITH_TEST - if (testRegister() == -1) return -1; + if (testRegister() == -1) goto failed; # endif # ifdef WITH_XEN - if (xenRegister () == -1) return -1; + if (xenRegister () == -1) goto failed; # endif # ifdef WITH_OPENVZ - if (openvzRegister() == -1) return -1; + if (openvzRegister() == -1) goto failed; # endif # ifdef WITH_VMWARE - if (vmwareRegister() == -1) return -1; + if (vmwareRegister() == -1) goto failed; # endif # ifdef WITH_PHYP - if (phypRegister() == -1) return -1; + if (phypRegister() == -1) goto failed; # endif # ifdef WITH_VBOX - if (vboxRegister() == -1) return -1; + if (vboxRegister() == -1) goto failed; # endif # ifdef WITH_ESX - if (esxRegister() == -1) return -1; + if (esxRegister() == -1) goto failed; # endif # ifdef WITH_HYPERV - if (hypervRegister() == -1) return -1; + if (hypervRegister() == -1) goto failed; # endif # ifdef WITH_XENAPI - if (xenapiRegister() == -1) return -1; + if (xenapiRegister() == -1) goto failed; # endif # ifdef WITH_REMOTE - if (remoteRegister () == -1) return -1; + if (remoteRegister () == -1) goto failed; # endif #endif + return; + +failed: + virInitResult = -1; +} + +/** + * virInitialize: + * + * Initialize the library. It could be either called directly + * or be called via one of virConnectOpen* in multithreaded + * applications. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virInitialize(void) +{ + int ret; + + if (virThreadInitialize() < 0) + return -1; + + if (!bindtextdomain(PACKAGE, LOCALEDIR)) + return -1; + + ret = virOnce(&virOnceKey, virInitializeOnce); + if (ret < 0 || virInitResult < 0) + return -1; return 0; } @@ -573,9 +589,6 @@ DllMain (HINSTANCE instance ATTRIBUTE_UNUSED, int virRegisterNetworkDriver(virNetworkDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -606,9 +619,6 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) int virRegisterInterfaceDriver(virInterfaceDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -639,9 +649,6 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) int virRegisterStorageDriver(virStorageDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -672,9 +679,6 @@ virRegisterStorageDriver(virStorageDriverPtr driver) int virRegisterDeviceMonitor(virDeviceMonitorPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -705,9 +709,6 @@ virRegisterDeviceMonitor(virDeviceMonitorPtr driver) int virRegisterSecretDriver(virSecretDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -738,9 +739,6 @@ virRegisterSecretDriver(virSecretDriverPtr driver) int virRegisterNWFilterDriver(virNWFilterDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -774,9 +772,6 @@ virRegisterDriver(virDriverPtr driver) { VIR_DEBUG("driver=%p name=%s", driver, driver ? NULLSTR(driver->name) : "(null)"); - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -814,9 +809,6 @@ virRegisterDriver(virDriverPtr driver) int virRegisterStateDriver(virStateDriverPtr driver) { - if (virInitialize() < 0) - return -1; - if (driver == NULL) { virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__); return -1; @@ -844,9 +836,6 @@ virRegisterStateDriver(virStateDriverPtr driver) int virStateInitialize(int privileged) { int i, ret = 0; - if (virInitialize() < 0) - return -1; - for (i = 0 ; i < virStateDriverTabCount ; i++) { if (virStateDriverTab[i]->initialize && virStateDriverTab[i]->initialize(privileged) < 0) { @@ -942,9 +931,8 @@ virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, { VIR_DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; if (libVer == NULL) goto error; @@ -1342,9 +1330,8 @@ virConnectPtr virConnectOpen (const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); ret = do_open (name, NULL, 0); @@ -1376,9 +1363,8 @@ virConnectPtr virConnectOpenReadOnly(const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); ret = do_open (name, NULL, VIR_CONNECT_RO); @@ -1414,9 +1400,8 @@ virConnectOpenAuth(const char *name, unsigned int flags) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); ret = do_open (name, auth, flags); diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c index ea64887..15d1407 100644 --- a/src/util/threads-pthread.c +++ b/src/util/threads-pthread.c @@ -42,10 +42,14 @@ void virThreadOnExit(void) int virOnce(virOnceControlPtr once, virOnceFunc init) { - return pthread_once(&once->once, init); + int ret; + if ((ret = pthread_once(&once->once, init)) != 0) { + errno = ret; + return -1; + } + return 0; } - int virMutexInit(virMutexPtr m) { int ret; -- 1.7.7.5

1 0

[libvirt] [PATCH libvirt-glib] Avoid triggering deprecation warnings on newest GLib
by Daniel P. Berrange 15 Feb '12

15 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> --- libvirt-glib/libvirt-glib-event.c | 4 ++++ libvirt-glib/libvirt-glib-main.c | 4 ++++ libvirt-gobject/libvirt-gobject-compat.h | 5 +++++ libvirt-gobject/libvirt-gobject-manager.c | 1 + 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index c1761e8..6d54b10 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -31,6 +31,10 @@ #include "libvirt-glib/libvirt-glib.h" +#if GLIB_CHECK_VERSION(2, 31, 0) +#define g_mutex_new() g_new0(GMutex, 1) +#endif + struct gvir_event_handle { int watch; diff --git a/libvirt-glib/libvirt-glib-main.c b/libvirt-glib/libvirt-glib-main.c index 8f50cc8..0cb2dd5 100644 --- a/libvirt-glib/libvirt-glib-main.c +++ b/libvirt-glib/libvirt-glib-main.c @@ -63,8 +63,12 @@ gboolean gvir_init_check(int *argc G_GNUC_UNUSED, GError **err G_GNUC_UNUSED) { virSetErrorFunc(NULL, gvir_error_func); + + /* Threading is always enabled from 2.31.0 onwards */ +#if !GLIB_CHECK_VERSION(2, 31, 0) if (!g_thread_supported()) g_thread_init(NULL); +#endif virInitialize(); diff --git a/libvirt-gobject/libvirt-gobject-compat.h b/libvirt-gobject/libvirt-gobject-compat.h index 0c37537..839dfe1 100644 --- a/libvirt-gobject/libvirt-gobject-compat.h +++ b/libvirt-gobject/libvirt-gobject-compat.h @@ -26,6 +26,11 @@ #include <glib-object.h> #include <gio/gio.h> +#if GLIB_CHECK_VERSION(2, 31, 0) +#define g_mutex_new() g_new0(GMutex, 1) +#define g_mutex_free(m) g_free(m) +#endif + #if !GLIB_CHECK_VERSION(2,26,0) #define G_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) G_DEFINE_BOXED_TYPE_WITH_CODE (TypeName, type_name, copy_func, free_func, {}) #define G_DEFINE_BOXED_TYPE_WITH_CODE(TypeName, type_name, copy_func, free_func, _C_) _G_DEFINE_BOXED_TYPE_BEGIN (TypeName, type_name, copy_func, free_func) {_C_;} _G_DEFINE_TYPE_EXTENDED_END() diff --git a/libvirt-gobject/libvirt-gobject-manager.c b/libvirt-gobject/libvirt-gobject-manager.c index aef519f..da5d31d 100644 --- a/libvirt-gobject/libvirt-gobject-manager.c +++ b/libvirt-gobject/libvirt-gobject-manager.c @@ -28,6 +28,7 @@ #include "libvirt-glib/libvirt-glib.h" #include "libvirt-gobject/libvirt-gobject.h" +#include "libvirt-gobject/libvirt-gobject-compat.h" #define GVIR_MANAGER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_TYPE_MANAGER, GVirManagerPrivate)) -- 1.7.7.6

2 1

[libvirt] [PATCH 0/2 v3] Implement DomainPMSuspendForDuration for qemu
by Michal Privoznik 15 Feb '12

15 Feb '12

This is basically v3 for: https://www.redhat.com/archives/libvir-list/2012-February/msg00533.html This time, I've split it into 2 patches so it can be reviewed easier. Michal Privoznik (2): qemu: Set capabilities based on supported monitor commands qemu: Implement DomainPMSuspendForDuration src/qemu/qemu_agent.c | 31 +++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 87 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 21 +++++----- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 15 ++++--- src/qemu/qemu_monitor_json.h | 5 ++- src/qemu/qemu_process.c | 2 +- 10 files changed, 149 insertions(+), 20 deletions(-) -- 1.7.3.4

2 5

[libvirt] libvirtError: internal error cannot create rule since ebtables tool is missing.
by Phantomcircuit 15 Feb '12

15 Feb '12

# libvirtd --version libvirtd (libvirt) 0.9.8 # which ebtables /sbin/ebtables 2012-02-15 09:40:59.083+0000: 17675: error : ebtablesCreateRuleInstance:1943 : internal error cannot create rule since ebtables tool is missing. 2012-02-15 09:40:59.107+0000: 17675: error : virNetDevGetIndex:656 : Unable to get index for interface vnet0: No such device ebtables_cmd_path = virFindFileInPath("ebtables"); I can't figure out why ebtables_cmd_path is NULL when

1 0

[libvirt] Fail to import available VM image
by Jun Koi 15 Feb '12

15 Feb '12

hi, i am trying to import an available KVM image to use with libvirt. i am not sure if this is the problem of libvirt or not, so bear in me if that is not the case. i run the following command, and got error: # virt-install -n winxp -r 800 -f img.winxp --accelerate --vnc --noautoconsole -v --import ERROR [Errno 10] No child processes all the softwares are of latest version (libvirt 0.9.10 and virtinst-0.60.1) where am i wrong? many thanks, Jun

3 9

[libvirt] [PATCH] storage: Allow runtime detection of scrub
by Michal Privoznik 14 Feb '12

14 Feb '12

Currently, if scrub (used for wiping algorithms) is not present at compile time, we don't support any other wiping algorithms than zeroing, even if it was installed later. Switch to runtime detection instead. --- configure.ac | 30 ++++-------------------------- src/storage/storage_driver.c | 4 ---- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/configure.ac b/configure.ac index 67351d9..5320f71 100644 --- a/configure.ac +++ b/configure.ac @@ -213,6 +213,8 @@ AC_PATH_PROG([UDEVSETTLE], [udevsettle], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([MODPROBE], [modprobe], [], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([SCRUB], [scrub], [], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) @@ -232,6 +234,8 @@ if test -n "$MODPROBE"; then AC_DEFINE_UNQUOTED([MODPROBE],["$MODPROBE"], [Location or name of the modprobe program]) fi +AC_DEFINE_UNQUOTED([SCRUB],["$SCRUB"], + [Location or name of the scrub program (for wiping algorithms)]) dnl Specific dir for HTML output ? AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path], @@ -2500,32 +2504,6 @@ AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) AC_SUBST([LIBNL_CFLAGS]) AC_SUBST([LIBNL_LIBS]) -dnl scrub program for different volume wiping algorithms - -AC_ARG_WITH([scrub], - AC_HELP_STRING([--with-scrub], [enable different volume wiping algorithms - @<:@default=check@:>@]), - [with_macvtap=${withval}], - [with_scrub=check]) - -if test "$with_scrub" != "no"; then - AC_PATH_PROG([SCRUB], [scrub]) - if test -z "$SCRUB" ; then - if test "$with_scrub" = "check"; then - with_scrub=no - else - AC_MSG_ERROR([You must install the 'scrub' binary to enable - different volume wiping algorithms]) - fi - else - with_scrub=yes - fi - if test "$with_scrub" = "yes"; then - AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"], - [Location of the scrub program]) - fi -fi - # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. # Copy one to the other, but only if this is a srcdir-build. diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 9170a17..df0e291 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1918,7 +1918,6 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, if (algorithm != VIR_STORAGE_VOL_WIPE_ALG_ZERO) { const char *alg_char ATTRIBUTE_UNUSED = NULL; switch (algorithm) { -#ifdef SCRUB case VIR_STORAGE_VOL_WIPE_ALG_NNSA: alg_char = "nnsa"; break; @@ -1943,13 +1942,11 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, case VIR_STORAGE_VOL_WIPE_ALG_RANDOM: alg_char = "random"; break; -#endif default: virStorageReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), algorithm); } -#ifdef SCRUB cmd = virCommandNew(SCRUB); virCommandAddArgList(cmd, "-f", "-p", alg_char, def->target.path, NULL); @@ -1958,7 +1955,6 @@ storageVolumeWipeInternal(virStorageVolDefPtr def, goto out; ret = 0; -#endif goto out; } else { if (S_ISREG(st.st_mode) && st.st_blocks < (st.st_size / DEV_BSIZE)) { -- 1.7.3.4

2 1

[libvirt] [PATCHv3 0/3] Xen: Fix <clock> handling
by Philipp Hahn 14 Feb '12

14 Feb '12

Before version 3.1 xen only implemented clock/@offset='utc' and 'localtime'. With the introduction of managed domains in 3.1 xend keeps track of the rtc_timeoffset, even over reboots. This translates to libvirts clock/@offset='variable' variant. Be advised that only HV domains have a RTC. In addition xen also supports a variant where the offset is tracked to 'localtime', which is currently not supported by libvirt. To make matters worse, this was somehow broken in some versions of xen and was finally fixed with version xen-3.4. The following patch set ... * adds support for handling variable offsets relative to localtime, * fixes libvirt to use clock/@offset='variable' for newer xen versions, * adapts the test suit accordingly I've tested this on CenOS5 (xend-3.0.3 + 3.1.2 hypervisor?), UCS-2.3 (xen-3.2.1), UCS-2.4 (xen-3.4.3) and UCS-3.0 (xen-4.1.2). Since v1: + fix handling of direct-PV-domains + added handling of localtime=1 + rtc_timeoffset + fixed test suite Since v2: (on feedback by Eric) + add the adjustment='reset' attribute to force the old behaviour + handle adjustment='$timeDelta' as a short-cut for the conversion to variable. + simplify error path handling + update version numbers to 0.9.11 Philipp Hahn (3): Support clock=variable relative to localtime Xen: Fix <clock> handling Xen: Adapt <clock> tests docs/formatdomain.html.in | 18 ++- docs/schemas/domaincommon.rng | 30 +++- src/conf/domain_conf.c | 60 +++++++- src/conf/domain_conf.h | 17 ++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_process.c | 2 +- src/xenxs/xen_sxpr.c | 167 +++++++++++++++----- src/xenxs/xen_xm.c | 123 ++++++++++++--- .../qemuxml2argv-clock-variable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 2 +- .../sexpr2xml-disk-block-shareable.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 +- .../sexpr2xml-disk-drv-blktap-raw.xml | 2 +- .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-escape-paths.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- .../test-fullvirt-usbtablet-no-bus.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.xml | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 157 files changed, 525 insertions(+), 200 deletions(-)

1 4

[libvirt] [PATCHv2 0/3] Xen: Fix <clock> handling
by Philipp Hahn 14 Feb '12

14 Feb '12

Before version 3.1 xen only implemented clock/@offset='utc' and 'localtime'. With the introduction of managed domains in 3.1 xend keeps track of the rtc_timeoffset, even over reboots. This translates to libvirts clock/@offset='variable' variant. Be advised that only HV domains have a RTC. In addition xen also supports a variant where the offset is tracked to 'localtime', which is currently not supported by libvirt. To make matters worse, this was somehow broken in some versions of xen and was finally fixed with version xen-3.4. The following patch set ... * adds support for handling variable offsets relative to localtime, * fixes libvirt to use clock/@offset='variable' for newer xen versions, * adapts the test suit accordingly I've tested this on CenOS5 (xend-3.0.3 + 3.1.2 hypervisor?), UCS-2.3 (xen-3.2.1), UCS-2.4 (xen-3.4.3) and UCS-3.0 (xen-4.1.2). Since v1: + fix handling of direct-PV-domains + added handling of localtime=1 + rtc_timeoffset + fixed test suite Questions: 1. Handling of legacy XML domain configurations I'm reluctant to define LIBVIRT_XEND_CLOCK_STRICT, since this would probably break many existing XML configuration files, since they would be rejected libvirt now for still using clock/@offset='utc'/'localtime'. Luckily for us libvirt doesn't support snapshots with xen, because then this XML configuration would be stored in the snapshot meta data, rendering them all invalid. 2. Error path handling There are now a lot of different cases (PV, HV<3.1, HV>3.1), which all have the same error path. This is somehow ugly to code in C, I hope it's okay to use vmlocaltime=-1 to indicate an error instead of using "goto". But if you have a better idea, please feel free to comments. 3. libvirt-0.9.10 or .11 This patch-series should probably receive some more testing, so for 0.9.10 it's too late. If it's not included, I'd need to update the reference to the version when this patch will get in. Philipp Hahn (3): Support clock=variable relative to localtime Xen: Fix <clock> handling Xen: Adapt <clock> tests docs/formatdomain.html.in | 7 +- docs/schemas/domaincommon.rng | 8 + src/conf/domain_conf.c | 24 +++- src/conf/domain_conf.h | 15 ++- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 8 +- src/qemu/qemu_process.c | 2 +- src/xenxs/xen_sxpr.c | 161 +++++++++++++++----- src/xenxs/xen_xm.c | 116 +++++++++++--- .../qemuxml2argv-clock-variable.xml | 2 +- tests/xmconfigdata/sexpr2xml-pv-bootloader.cfg | 1 + tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 1 + tests/xmconfigdata/test-paravirt-net-vifname.cfg | 1 + .../test-paravirt-new-pvfb-vncdisplay.cfg | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 1 + .../test-paravirt-old-pvfb-vncdisplay.cfg | 1 + tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 1 + .../xml2sexpr-disk-block-shareable.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 4 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 4 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 1 + .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 3 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 1 + tests/xml2sexprdata/xml2sexpr-pv.sexpr | 2 +- 72 files changed, 363 insertions(+), 108 deletions(-)

2 9

[libvirt] virsh bash completion file
by Serge E. Hallyn 14 Feb '12

14 Feb '12

Hi, I've been trying out a bash autocompletion file by Geoff Low (slight hack by me, don't blame him for my hack), and it's working pretty nicely. I'm not sure where to put it in the git tree, but it seems like it'd be nice to have upstream? thanks, -serge ==================================================== #!/bin/bash ############################################################################# # # virsh bash completion # Author: Geoff Low (glow(a)cmedresearch.com) # ############################################################################ VIRSH=$(which virsh) function get_main_option_list { # assume options are specified as [--option1 | --option2 | ...] OPTIONS=$(${VIRSH} help | grep '|' | sed -e 's/.*\[$.*$\]/\1/g;s/|//g') } function get_option_list { # get the options for a choice local option=$1; # assume options are specified as [--option1 | --option2 | ...] OPTIONS=$(${VIRSH} help ${option} 2> /dev/null | grep '|' | sed -e 's/.*\[$.*$\]/\1/g;s/|//g') } function _virsh_complete() { local cur prev opts COMPREPLY=() cur="${COMP_WORDS[COMP_CWORD]}" prev="${COMP_WORDS[COMP_CWORD-1]}" cnxn="" i=0 while [[ $i -lt $COMP_CWORD ]]; do if [ ${COMP_WORDS[i]} = "-c" ]; then tgt=`echo ${COMP_LINE} | sed -e 's/^.* -c $[^ \t]*$.*$/\1/'` cnxn="-c $tgt" break fi let i++ done if [ ! -z $tgt ]; then if [ $COMP_CWORD -eq 5 ]; then prev="${COMP_WORDS[0]}" fi fi _all_domains=$(${VIRSH} ${cnxn} --q list --all 2> /dev/null | grep -E "(running|shut off)$" | awk '{print $2,$3}') all_domains=$(echo "$_all_domains" | cut -d " " -f 1) all_networks=$(${VIRSH} --q net-list --all 2> /dev/null | grep 'active' | cut -d " " -f 1) live_domains=$(echo "$_all_domains" | grep -E "running$" | awk '{print $1}') shutoff_domains=$(echo "$_all_domains" | grep -E "shut$" | awk '{print $1}') case "${prev}" in virsh | --help) get_main_option_list ALL_OPTS=$(${VIRSH} -q help 2> /dev/null | sed '1,2d' | awk '{print $1}') COMPREPLY=( $(compgen -W "$OPTIONS $ALL_OPTS" -- ${cur}) ) ;; list) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS" -- ${cur}) ) ;; autostart | dominfo | domuuid | domid | dominfo | domname | dumpxml | setmem ) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS $all_domains" -- ${cur}) ) ;; start | undefine) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS $shutoff_domains" -- ${cur}) ) ;; create | define) get_option_list ${prev} xml_files=$(ls *.xml) COMPREPLY=( $(compgen -W "$OPTIONS $xml_files" -- ${cur}) ) ;; shutdown | domstate | console | destroy | reboot | save | suspend | resume | vcpuinfo | vncdisplay) get_option_list ${prev} COMPREPLY=( $(compgen -W "$OPTIONS $live_domains" -- ${cur}) ) ;; connect) get_option_list ${prev} URI_TEMPLATES="xen:// qemu:// test:// xen+ssh:// test+tcp:// qemu+unix:// qemu+tls:// qemu+ssh://" COMPREPLY=( $(compgen -W "$OPTIONS $URI_TEMPLATES" -- ${cur}) ) ;; *) COMPREPLY=( $(compgen -f -- ${cur}) ) return 0 ;; esac } complete -F _virsh_complete virsh

4 8

[libvirt] [PATCH v2] qemu: Implement DomainPMSuspendForDuration
by Michal Privoznik 14 Feb '12

14 Feb '12

via user agent. --- diff to v1: -allow mem and hybrid targets iff system_wakeup monitor command is presented src/qemu/qemu_agent.c | 31 +++++++++++++++ src/qemu/qemu_agent.h | 2 + src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 87 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 21 +++++----- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 15 ++++--- src/qemu/qemu_monitor_json.h | 5 ++- src/qemu/qemu_process.c | 2 +- 10 files changed, 149 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 9df5546..a17d025 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1184,3 +1184,34 @@ cleanup: virJSONValueFree(reply); return ret; } + +VIR_ENUM_DECL(qemuAgentSuspendMode); + +VIR_ENUM_IMPL(qemuAgentSuspendMode, + VIR_NODE_SUSPEND_TARGET_LAST, + "guest-suspend-ram", + "guest-suspend-disk", + "guest-suspend-hybrid"); + +int +qemuAgentSuspend(qemuAgentPtr mon, + unsigned int target) +{ + int ret = -1; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + cmd = qemuAgentMakeCommand(qemuAgentSuspendModeTypeToString(target), + NULL); + if (!cmd) + return -1; + + ret = qemuAgentCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuAgentCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index df59ef7..98c23b0 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -69,4 +69,6 @@ int qemuAgentShutdown(qemuAgentPtr mon, int qemuAgentFSFreeze(qemuAgentPtr mon); int qemuAgentFSThaw(qemuAgentPtr mon); +int qemuAgentSuspend(qemuAgentPtr mon, + unsigned int target); #endif /* __QEMU_AGENT_H__ */ diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 426637c..6d35676 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -152,6 +152,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "fsdev-writeout", "drive-iotune", /* 85 */ + "system_wakeup", ); struct qemu_feature_flags { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 18d6bc8..b9666e1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -120,6 +120,7 @@ enum qemuCapsFlags { QEMU_CAPS_CPU_HOST = 83, /* support for -cpu host */ QEMU_CAPS_FSDEV_WRITEOUT = 84, /* -fsdev writeout supported */ QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ + QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 160cb37..d342fae 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12041,6 +12041,92 @@ cleanup: return ret; } +static int +qemuDomainPMSuspendForDuration(virDomainPtr dom, + unsigned int target, + unsigned long long duration, + unsigned int flags) +{ + struct qemud_driver *driver = dom->conn->privateData; + qemuDomainObjPrivatePtr priv; + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(0, -1); + + if (duration) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Duration not supported. Use 0 for now")); + return -1; + } + + if (!(target == VIR_NODE_SUSPEND_TARGET_MEM || + target == VIR_NODE_SUSPEND_TARGET_DISK || + target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("Unknown suspend target: %u"), + target); + return -1; + } + + qemuDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + qemuDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + priv = vm->privateData; + + if (!qemuCapsGet(priv->qemuCaps, QEMU_CAPS_WAKEUP) && + (target == VIR_NODE_SUSPEND_TARGET_MEM || + target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { + qemuReportError(VIR_ERR_INVALID_ARG, "%s", + _("Unable to suspend domain due to " + "missing system_wakeup monitor command")); + goto cleanup; + } + + if (priv->agentError) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("QEMU guest agent is not available due to an error")); + goto cleanup; + } + + if (!priv->agent) { + qemuReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", + _("QEMU guest agent is not configured")); + goto cleanup; + } + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + qemuDomainObjEnterAgent(driver, vm); + ret = qemuAgentSuspend(priv->agent, target); + qemuDomainObjExitAgent(driver, vm); + +endjob: + if (qemuDomainObjEndJob(driver, vm) == 0) + vm = NULL; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = "QEMU", @@ -12198,6 +12284,7 @@ static virDriver qemuDriver = { .domainGetDiskErrors = qemuDomainGetDiskErrors, /* 0.9.10 */ .domainSetMetadata = qemuDomainSetMetadata, /* 0.9.10 */ .domainGetMetadata = qemuDomainGetMetadata, /* 0.9.10 */ + .domainPMSuspendForDuration = qemuDomainPMSuspendForDuration, /* 0.9.10 */ }; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7872e3d..93f3505 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -996,9 +996,11 @@ int qemuMonitorEmitBlockJob(qemuMonitorPtr mon, -int qemuMonitorSetCapabilities(qemuMonitorPtr mon) +int qemuMonitorSetCapabilities(qemuMonitorPtr mon, + virBitmapPtr qemuCaps) { int ret; + int json_hmp; VIR_DEBUG("mon=%p", mon); if (!mon) { @@ -1009,19 +1011,16 @@ int qemuMonitorSetCapabilities(qemuMonitorPtr mon) if (mon->json) { ret = qemuMonitorJSONSetCapabilities(mon); - if (ret == 0) { - int hmp = qemuMonitorJSONCheckHMP(mon); - if (hmp < 0) { - /* qemu may quited unexpectedly when we call - * qemuMonitorJSONCheckHMP() */ - ret = -1; - } else { - mon->json_hmp = hmp > 0; - } - } + if (ret) + goto cleanup; + + ret = qemuMonitorJSONCheckCommands(mon, qemuCaps, &json_hmp); + mon->json_hmp = json_hmp > 0; } else { ret = 0; } + +cleanup: return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5945d3e..7c6c52b 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -29,6 +29,7 @@ # include "domain_conf.h" # include "qemu_conf.h" +# include "bitmap.h" # include "virhash.h" typedef struct _qemuMonitor qemuMonitor; @@ -135,7 +136,8 @@ qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm, void qemuMonitorClose(qemuMonitorPtr mon); -int qemuMonitorSetCapabilities(qemuMonitorPtr mon); +int qemuMonitorSetCapabilities(qemuMonitorPtr mon, + virBitmapPtr qemuCaps); int qemuMonitorCheckHMP(qemuMonitorPtr mon, const char *cmd); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index b0ae570..513788a 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -34,6 +34,7 @@ #include "qemu_monitor_text.h" #include "qemu_monitor_json.h" #include "qemu_command.h" +#include "qemu_capabilities.h" #include "memory.h" #include "logging.h" #include "driver.h" @@ -800,7 +801,9 @@ qemuMonitorJSONSetCapabilities(qemuMonitorPtr mon) * human-monitor-command worked or -1 on failure */ int -qemuMonitorJSONCheckHMP(qemuMonitorPtr mon) +qemuMonitorJSONCheckCommands(qemuMonitorPtr mon, + virBitmapPtr qemuCaps, + int *json_hmp) { int ret = -1; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-commands", NULL); @@ -828,13 +831,13 @@ qemuMonitorJSONCheckHMP(qemuMonitorPtr mon) !(name = virJSONValueObjectGetString(entry, "name"))) goto cleanup; - if (STREQ(name, "human-monitor-command")) { - ret = 1; - goto cleanup; - } + if (STREQ(name, "human-monitor-command")) + *json_hmp = 1; + + if (STREQ(name, "system_wakeup")) + qemuCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); } - /* human-monitor-command is not supported */ ret = 0; cleanup: diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index d221e59..d0b3000 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -28,6 +28,7 @@ # include "internal.h" # include "qemu_monitor.h" +# include "bitmap.h" int qemuMonitorJSONIOProcess(qemuMonitorPtr mon, const char *data, @@ -41,7 +42,9 @@ int qemuMonitorJSONHumanCommandWithFd(qemuMonitorPtr mon, int qemuMonitorJSONSetCapabilities(qemuMonitorPtr mon); -int qemuMonitorJSONCheckHMP(qemuMonitorPtr mon); +int qemuMonitorJSONCheckCommands(qemuMonitorPtr mon, + virBitmapPtr qemuCaps, + int *json_hmp); int qemuMonitorJSONStartCPUs(qemuMonitorPtr mon, virConnectPtr conn); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2d92d66..7afb585 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1086,7 +1086,7 @@ qemuConnectMonitor(struct qemud_driver *driver, virDomainObjPtr vm) qemuDomainObjEnterMonitorWithDriver(driver, vm); - ret = qemuMonitorSetCapabilities(priv->mon); + ret = qemuMonitorSetCapabilities(priv->mon, priv->qemuCaps); qemuDomainObjExitMonitorWithDriver(driver, vm); error: -- 1.7.3.4

2 2

[libvirt] [PATCH] python: Avoid memory leaks on libvirt_virNodeGetMemoryStats
by ajia＠redhat.com 14 Feb '12

14 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks are introduced in commit 17c7795. * python/libvirt-override.c (libvirt_virNodeGetMemoryStats): fix memory leaks and improve codes return value. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770944 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4e8a97e..ecb11ea 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2426,7 +2426,9 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject * libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *info, *ret; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2446,28 +2448,45 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { - VIR_FREE(stats); - return VIR_PY_NONE; + ret = VIR_PY_NONE; + goto cleanup; } } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; + if (!(info = PyDict_New())) { + ret = VIR_PY_NONE; + goto cleanup; } + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val) + goto cleanup; + + if (PyDict_SetItem(info, key, val) < 0) { + Py_DECREF(info); + goto cleanup; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); - return ret; + return info; + +cleanup: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return NULL; } static PyObject * -- 1.7.1

4 6

[libvirt] [PATCHv2] python: Avoid memory leaks on libvirt_virNodeGetMemoryStats
by ajia＠redhat.com 14 Feb '12

14 Feb '12

From: Alex Jia <ajia(a)redhat.com> Detected by valgrind. Leaks are introduced in commit 17c7795. * python/libvirt-override.c (libvirt_virNodeGetMemoryStats): fix memory leaks and improve codes return value. For details, please see the following link: RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=770944 Signed-off-by: Alex Jia <ajia(a)redhat.com> --- python/libvirt-override.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4e8a97e..594aae6 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -2426,7 +2426,9 @@ libvirt_virNodeGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) static PyObject * libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *ret; + PyObject *ret = VIR_PY_NONE; + PyObject *key = NULL; + PyObject *val = NULL; PyObject *pyobj_conn; virConnectPtr conn; unsigned int flags; @@ -2442,32 +2444,45 @@ libvirt_virNodeGetMemoryStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) c_retval = virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) - return VIR_PY_NONE; + return ret; if (nparams) { if (VIR_ALLOC_N(stats, nparams) < 0) - return VIR_PY_NONE; + return PyErr_NoMemory(); LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetMemoryStats(conn, cellNum, stats, &nparams, flags); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - VIR_FREE(stats); - return VIR_PY_NONE; - } - } - if (!(ret = PyDict_New())) { - VIR_FREE(stats); - return VIR_PY_NONE; + if (c_retval < 0) + goto error; } + if (!(ret = PyDict_New())) + goto error; + for (i = 0; i < nparams; i++) { - PyDict_SetItem(ret, - libvirt_constcharPtrWrap(stats[i].field), - libvirt_ulonglongWrap(stats[i].value)); + key = libvirt_constcharPtrWrap(stats[i].field); + val = libvirt_ulonglongWrap(stats[i].value); + + if (!key || !val) + goto error; + + if (PyDict_SetItem(ret, key, val) < 0) { + Py_DECREF(ret); + goto error; + } + + Py_DECREF(key); + Py_DECREF(val); } VIR_FREE(stats); return ret; + +error: + VIR_FREE(stats); + Py_XDECREF(key); + Py_XDECREF(val); + return ret; } static PyObject * -- 1.7.1

3 2

[libvirt] [PATCH] correct security_require_confined default value
by ajia＠redhat.com 14 Feb '12

14 Feb '12

From: Alex Jia <ajia(a)redhat.com> * src/qemu/qemu.conf: set security_require_confined default value to 0. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 95428c1..6cb3707 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -145,7 +145,7 @@ # If set to non-zero, then attempts to create unconfined # guests will be blocked. Defaults to 0. -# security_require_confined = 1 +# security_require_confined = 0 # The user ID for QEMU processes run by the system instance. #user = "root" -- 1.7.1

3 2

[libvirt] [PATCH 0/4 v2] New command for changing media
by Osier Yang 14 Feb '12

14 Feb '12

[PATCH 0/4] introduces two new helper functions: vshFindDisk is to find the disk XML node in xml doc with the flags (indicates it's normal disk or changeable disk). VshPrepareDiskXML is to prepare the disk XML for disk changing commands' use, such as detach-disk. The purpose of this patch is to prepare for upcoming new command "change-disk", which will use the two helper functions too. Please see [PATCH 4/4] for a overall description of the new command. v1 - v2 * No changes, only rebasing [PATCH 1/4] virsh: Two new helper functions for disk device changes [PATCH 2/4] virsh: Use vshFindDisk and vshPrepareDiskXML in [PATCH 3/4] virsh: New command cmdChangeMedia [PATCH 4/4] virsh: Add document for cmdChangeMedia Regards, Osier

3 14

[libvirt] [PATCH 0/3 v3] New command for changing media
by Osier Yang 14 Feb '12

14 Feb '12

[PATCH 0/3] introduces two new helper functions: vshFindDisk is to find the disk XML node in xml doc with the type (indicates it's normal disk or changeable disk). VshPrepareDiskXML is to prepare the disk XML for disk changing commands' use, such as detach-disk. The purpose of this patch is to prepare for upcoming new command "change-disk", which will use the two helper functions too. Please see [PATCH 3/3] for a overall description of the new command. v2 - v3 * Update vshFindDisk to support search the disk node with both the source path and target name. * Change names of the two new enums ([PATCH 1/3]). * Use virXMLParseStringCtxt instead of xmlReadDoc * Use VIR_ALLOC_N instead of vshCalloc. * [PATCH 3/4] and [PATCH 4/4] are merged into [PATCH 3/3] * Change option "--target" into "--path". * Defaults to use "--update" if none of "--eject", "--insert", and "--update" is specified. * Update docs to be consistent with the changes on codes. * Other nits. [PATCH 1/3] virsh: Two new helper functions for disk device changes [PATCH 2/3] virsh: Use vshFindDisk and vshPrepareDiskXML in cmdDetachDisk [PATCH 3/3] virsh: New command cmdChangeMedia Regards, Osier

1 3

[libvirt] Add a new api, get this error.gnutls_record_recv: A TLS packet with unexpected length was received.
by chang liu 14 Feb '12

14 Feb '12

hi all, Sorry to disturb you. I wanna to add a new api to get some sheepdog cluster info, but I has get this error, I don't know how to do. I have add a function to daemon/remote.c that call the libvirt.c 's api, remoteDispatchConnectExecuteCommand, and here i get the return value. struct remote_connect_execute_command_ret { remote_nonnull_string ret_val; }; typedef struct remote_connect_execute_command_ret remote_connect_execute_command_ret; static int remoteDispatchConnectExecuteCommand (struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, remote_message_header *hdr ATTRIBUTE_UNUSED, remote_error *rerr, remote_connect_execute_command_args *args, remote_connect_execute_command_ret *ret) the return value has been in ret->ret_val. I know the func remoteDispatchDomainDumpXml returns it's values by ret->xml. And after this, the things is the same, but when I dump xml, it's ok, but when i wanna to get my value, it's cause this error: error : qemudClientReadBuf:1708 : gnutls_record_recv: A TLS packet with unexpected length was received. Could any body tell me, if I wanna to get a string data, do I need to do any additional actions?

3 3

[libvirt] [ANNOUNCE] Perl binding Sys-Virt release 0.9.10
by Daniel P. Berrange 13 Feb '12

13 Feb '12

I am pleased to announce that release 0.9.10 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.10.tar.gz Changed in this release: - Add all new APIs in libvirt 0.9.10 - Add some constants missing from previous releases - Clarify docs for shutdown/destroy APIs (rt #73908) Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ 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 :|

1 0

[libvirt] [PATCH v4 0/1] Add netlink events to virnetlink
by D. Herrendoerfer 13 Feb '12

13 Feb '12

From: "D. Herrendoerfer" <d.herrendoerfer(a)herrendoerfer.name> This is the updated netlink event code based upon the updated virnetlink.[ch] files. Most of the previous remarks have been addressed. This has also seen some preliminary testing. D. Herrendoerfer (1): util: Add netlink event handling to virnetlink.c daemon/libvirtd.c | 8 + src/libvirt_private.syms | 6 + src/util/virnetlink.c | 436 +++++++++++++++++++++++++++++++++++++++++++++- src/util/virnetlink.h | 29 +++ 4 files changed, 478 insertions(+), 1 deletions(-) -- 1.7.7.5

2 2

[libvirt] [PATCH] qemu: make block io tuning smarter
by Eric Blake 13 Feb '12

13 Feb '12

When blkdeviotune was first committed in 0.9.8, we had the limitation that setting one value reset all others. But bytes and iops should be relatively independent. Furthermore, setting tuning values on a live domain followed by dumpxml did not output the new settings. * src/qemu/qemu_driver.c (qemuDiskPathToAlias): Add parameter, and update callers. (qemuDomainSetBlockIoTune): Don't lose previous unrelated settings. Make live changes reflect to dumpxml output. * tools/virsh.pod (blkdeviotune): Update documentation. --- src/qemu/qemu_driver.c | 45 +++++++++++++++++++++++++++++++++++++++++---- tools/virsh.pod | 5 +++-- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45c4100..dea52bf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11309,7 +11309,7 @@ cleanup: } static char * -qemuDiskPathToAlias(virDomainObjPtr vm, const char *path) +qemuDiskPathToAlias(virDomainObjPtr vm, const char *path, int *idx) { int i; char *ret = NULL; @@ -11320,6 +11320,8 @@ qemuDiskPathToAlias(virDomainObjPtr vm, const char *path) goto cleanup; disk = vm->def->disks[i]; + if (idx) + *idx = i; if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK && disk->type != VIR_DOMAIN_DISK_TYPE_FILE) @@ -11361,7 +11363,7 @@ qemuDomainBlockJobImpl(virDomainPtr dom, const char *path, const char *base, goto cleanup; } - device = qemuDiskPathToAlias(vm, path); + device = qemuDiskPathToAlias(vm, path, NULL); if (!device) { goto cleanup; } @@ -11529,11 +11531,14 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, qemuDomainObjPrivatePtr priv; virDomainDefPtr persistentDef = NULL; virDomainBlockIoTuneInfo info; + virDomainBlockIoTuneInfo *oldinfo; char uuidstr[VIR_UUID_STRING_BUFLEN]; const char *device = NULL; int ret = -1; int i; int idx = -1; + bool set_bytes = false; + bool set_iops = false; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -11564,7 +11569,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, goto cleanup; } - device = qemuDiskPathToAlias(vm, disk); + device = qemuDiskPathToAlias(vm, disk, &idx); if (!device) { goto cleanup; } @@ -11581,21 +11586,27 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC)) { info.total_bytes_sec = param->value.ul; + set_bytes = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC)) { info.read_bytes_sec = param->value.ul; + set_bytes = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC)) { info.write_bytes_sec = param->value.ul; + set_bytes = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC)) { info.total_iops_sec = param->value.ul; + set_iops = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC)) { info.read_iops_sec = param->value.ul; + set_iops = true; } else if (STREQ(param->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC)) { info.write_iops_sec = param->value.ul; + set_iops = true; } } @@ -11614,10 +11625,25 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, } if (flags & VIR_DOMAIN_AFFECT_LIVE) { + /* If the user didn't specify bytes limits, inherit previous + * values; likewise if the user didn't specify iops + * limits. */ + oldinfo = &vm->def->disks[idx]->blkdeviotune; + if (!set_bytes) { + info.total_bytes_sec = oldinfo->total_bytes_sec; + info.read_bytes_sec = oldinfo->read_bytes_sec; + info.write_bytes_sec = oldinfo->write_bytes_sec; + } + if (!set_iops) { + info.total_iops_sec = oldinfo->total_iops_sec; + info.read_iops_sec = oldinfo->read_iops_sec; + info.write_iops_sec = oldinfo->write_iops_sec; + } priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorSetBlockIoThrottle(priv->mon, device, &info); qemuDomainObjExitMonitorWithDriver(driver, vm); + vm->def->disks[idx]->blkdeviotune = info; if (ret < 0) goto endjob; } @@ -11627,6 +11653,17 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, idx = virDomainDiskIndexByName(persistentDef, disk, true); if (idx < 0) goto endjob; + oldinfo = &persistentDef->disks[idx]->blkdeviotune; + if (!set_bytes) { + info.total_bytes_sec = oldinfo->total_bytes_sec; + info.read_bytes_sec = oldinfo->read_bytes_sec; + info.write_bytes_sec = oldinfo->write_bytes_sec; + } + if (!set_iops) { + info.total_iops_sec = oldinfo->total_iops_sec; + info.read_iops_sec = oldinfo->read_iops_sec; + info.write_iops_sec = oldinfo->write_iops_sec; + } persistentDef->disks[idx]->blkdeviotune = info; ret = virDomainSaveConfig(driver->configDir, persistentDef); if (ret < 0) { @@ -11688,7 +11725,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, goto cleanup; } - device = qemuDiskPathToAlias(vm, disk); + device = qemuDiskPathToAlias(vm, disk, NULL); if (!device) { goto cleanup; diff --git a/tools/virsh.pod b/tools/virsh.pod index bd79b4c..a67c2eb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -604,8 +604,9 @@ I<--total_iops_sec> specifies total I/O operations limit per second. I<--read_iops_sec> specifies read I/O operations limit per second. I<--write_iops_sec> specifies write I/O operations limit per second. -When setting any value, all remaining values are reset to unlimited, -an explicit 0 also clears any limit. A non-zero value for a given total +Bytes and iops values are independent, but setting only one value (such +as --read_bytes_sec) resets the other two in that category to unlimited. +An explicit 0 also clears any limit. A non-zero value for a given total cannot be mixed with non-zero values for read or write. If I<--live> is specified, affect a running guest. -- 1.7.7.6

2 2

[libvirt] [PATCH] Install API XML desc to a standard location
by Daniel P. Berrange 13 Feb '12

13 Feb '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Language bindings may well want to use the libvirt-api.xml and libvirt-qemu-api.xml files to either auto-generate themselves, or sanity check the manually written bindings for completeness. Currently these XML files are not installed as standard, merely ending up as a %doc file in the RPM. This changes them to be installed into $prefix/share/libvirt/apis/ The *-refs.xml files are not installed, since those are only useful during generation of the online API doc files. The pkg-config file is enhanced so that you cann query the install location of the API files. eg # pkg-config --variable=libvirt_qemu_api libvirt /home/berrange/builder/i686-pc-mingw32/sys-root/mingw/share/libvirt/libvirt-qemu-api.xml * docs/Makefile.am: Install libvirt-api.xml & libvirt-qemu-api.xml * libvirt.pc.in: Add vars for querying API install location * libvirt.spec.in, mingw32-libvirt.spec.in: Include API XML files --- docs/Makefile.am | 3 +++ libvirt.pc.in | 3 +++ libvirt.spec.in | 4 ++++ mingw32-libvirt.spec.in | 4 ++++ 4 files changed, 14 insertions(+), 0 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 5644fe2..2bef982 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -85,6 +85,9 @@ qemu_xml = \ libvirt-qemu-api.xml \ libvirt-qemu-refs.xml +apidir = $(pkgdatadir)/api +api_DATA = libvirt-api.xml libvirt-qemu-api.xml + fig = \ libvirt-net-logical.fig \ libvirt-net-physical.fig \ diff --git a/libvirt.pc.in b/libvirt.pc.in index d7a5e55..c64a7ca 100644 --- a/libvirt.pc.in +++ b/libvirt.pc.in @@ -3,6 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +libvirt_api=@datadir@/libvirt/libvirt-api.xml +libvirt_qemu_api=@datadir@/libvirt/libvirt-qemu-api.xml + Name: libvirt Version: @VERSION@ Description: libvirt library diff --git a/libvirt.spec.in b/libvirt.spec.in index 62b0ed4..d04fba9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1249,6 +1249,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %doc %{_datadir}/gtk-doc/html/libvirt/*.png %doc %{_datadir}/gtk-doc/html/libvirt/*.css +%dir %{_datadir}/libvirt/apis/ +%{_datadir}/libvirt/apis/libvirt-api.xml +%{_datadir}/libvirt/apis/libvirt-qemu-api.xml + %doc docs/*.html docs/html docs/*.gif %doc docs/libvirt-api.xml %doc examples/hellolibvirt diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 7937e22..659d649 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -156,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT %{_mingw32_libdir}/libvirt-qemu.dll.a %{_mingw32_libdir}/libvirt-qemu.la +%dir %{_mingw32_datadir}/libvirt/apis/ +%{_mingw32_datadir}/libvirt/apis/libvirt-api.xml +%{_mingw32_datadir}/libvirt/apis/libvirt-qemu-api.xml + %dir %{_mingw32_datadir}/libvirt/ %dir %{_mingw32_datadir}/libvirt/schemas/ %{_mingw32_datadir}/libvirt/schemas/basictypes.rng -- 1.7.7.6

2 1

[libvirt] [PATCH 0/2] add ibmvscsi and virtio-scsi controller models
by Paolo Bonzini 13 Feb '12

13 Feb '12

Hi, these patches let you specify explicitly all supported controller models for QEMU, and add the new virtio-scsi model. Paolo Bonzini (2): qemu: add ibmvscsi controller model qemu: add virtio-scsi controller model docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 2 + src/conf/domain_conf.c | 4 ++- src/conf/domain_conf.h | 2 + src/qemu/qemu_command.c | 26 ++++++++++++++-- src/vmx/vmx.c | 10 ++++-- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 9 ++++++ .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 31 ++++++++++++++++++++ .../qemuxml2argv-disk-scsi-vscsi.args | 8 +++++ .../qemuxml2argv-disk-scsi-vscsi.xml | 31 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ tests/qemuxml2xmltest.c | 2 + 12 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml -- 1.7.7.1

4 8

[libvirt] Start of freeze for libvirt-0.9.10 and availability of rc1
by Daniel Veillard 13 Feb '12

13 Feb '12

We are now entering the freeze for libvirt-0.9.10 Hopefully all the API changes needed for that version are already commited to git head. I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.10-rc1.tar.gz and the git tree is tagged. I think I will make an release candidate 2 tarball on Wednesday, and I'm hoping for a final release next Monday the 13th. Please give it a try ! thanks in advance, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

9 23

[libvirt] [PATCH] virsh: Fix name of domain suspend command
by Michal Privoznik 13 Feb '12

13 Feb '12

It's dompmsuspend, not suspend-duration. --- Pushed under trivial rule. tools/virsh.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index bd79b4c..877533b 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1280,7 +1280,7 @@ Moves a domain out of the suspended state. This will allow a previously suspended domain to now be eligible for scheduling by the underlying hypervisor. -=item B<suspend-duration> I<domain-id> I<target> +=item B<dompmsuspend> I<domain-id> I<target> Suspend a running domain into one of these states (possible I<target> values): -- 1.7.3.4

1 0

[libvirt] [PATCH] virpidfile: Allow whitespace character on the end of pidfile
by Michal Privoznik 13 Feb '12

13 Feb '12

Some programs, notably dnsmasq, which are writing pidfiles on their own do append a whitespace character after pid, e.g. '\n'. --- src/util/virpidfile.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 34d1250..9c29967 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -34,7 +34,7 @@ #include "intprops.h" #include "logging.h" #include "virterror_internal.h" - +#include "c-ctype.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -119,6 +119,7 @@ int virPidFileReadPath(const char *path, ssize_t bytes; long long pid_value = 0; char pidstr[INT_BUFSIZE_BOUND(pid_value)]; + char *endptr = NULL; *pid = 0; @@ -135,7 +136,8 @@ int virPidFileReadPath(const char *path, } pidstr[bytes] = '\0'; - if (virStrToLong_ll(pidstr, NULL, 10, &pid_value) < 0 || + if (virStrToLong_ll(pidstr, &endptr, 10, &pid_value) < 0 || + !(*endptr == '\0' || c_isspace(*endptr)) || (pid_t) pid_value != pid_value) { rc = -1; goto cleanup; -- 1.7.3.4

2 2

[libvirt] [test-API][PATCH] Add 3 APIs in snapshotAPI
by Wayne Sun 13 Feb '12

13 Feb '12

* new APIs get_parent(self, domname, snapname, flag = 0) children_num(self, domname, snapname, flag) children_names_list(self, domname, snapname, flag) the flag in children_num and children_names_list could be in 0-7, which is the OR operation result of (VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS | VIR_DOMAIN_SNAPSHOT_LIST_METADATA | VIR_DOMAIN_SNAPSHOT_LIST_LEAVES) * deleted redundancy spaces and fixed a typo in function domain() * getConnect(), getDomain() and getName() API are not added in, current snapshotAPI requires user to offer connection obj, domain name and snapshot name. --- lib/snapshotAPI.py | 59 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 13 deletions(-) diff --git a/lib/snapshotAPI.py b/lib/snapshotAPI.py index 43ccb89..d866b60 100644 --- a/lib/snapshotAPI.py +++ b/lib/snapshotAPI.py @@ -24,14 +24,14 @@ import libvirt import re import os -def append_path(path): +def append_path(path): """Append root path of package""" if path in sys.path: pass else: sys.path.append(path) - -pwd = os.getcwd() + +pwd = os.getcwd() result = re.search('(.*)libvirt-test-API', pwd) append_path(result.group(0)) @@ -39,7 +39,7 @@ import exception class SnapshotAPI(object): def __init__(self, connection): - self.conn = connection + self.conn = connection def create(self, domname, xml_desc, flag = 0): try: @@ -57,7 +57,7 @@ class SnapshotAPI(object): except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def snapshot_name_list(self, domname, flag = 0): try: @@ -66,7 +66,7 @@ class SnapshotAPI(object): except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def snapshot_nums(self, domname, flag = 0): try: @@ -95,31 +95,64 @@ class SnapshotAPI(object): message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - + def delete(self, domname, snapname, flag = 0): try: - snap = self.snapshot_lookup_by_name(domname, snapname, flag = 0) + snap = self.snapshot_lookup_by_name(domname, snapname) return snap.delete(flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() - raise exception.LibvirtAPI(message, code) + raise exception.LibvirtAPI(message, code) def get_xml_desc(self, domname, snapname, flag = 0): try: - snap = self.snapshot_lookup_by_name(domname, snapname, flag = 0) + snap = self.snapshot_lookup_by_name(domname, snapname) return snap.getXMLDesc(flag) except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - def domain(self, domname): + def domain(self, domname, snapname): try: - snap = self.snapshot_lookup_by_name(domname, snapname, flag = 0) + snap = self.snapshot_lookup_by_name(domname, snapname) return snap.domain() except libvirt.libvirtError, e: message = e.get_error_message() code = e.get_error_code() raise exception.LibvirtAPI(message, code) - + + def get_parent(self, domname, snapname, flag = 0): + try: + snap = self.snapshot_lookup_by_name(domname, snapname) + return snap.getParent(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def children_num(self, domname, snapname, flag): + try: + snap = self.snapshot_lookup_by_name(domname, snapname) + return snap.numChildren(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + + def children_names_list(self, domname, snapname, flag): + try: + snap = self.snapshot_lookup_by_name(domname, snapname) + return snap.listChildrenNames(flag) + except libvirt.libvirtError, e: + message = e.get_error_message() + code = e.get_error_code() + raise exception.LibvirtAPI(message, code) + +# virDomainSnapshotListFlags +VIR_DOMAIN_SNAPSHOT_LIST_DESCENDANTS = 1 +VIR_DOMAIN_SNAPSHOT_LIST_ROOTS = 1 +VIR_DOMAIN_SNAPSHOT_LIST_METADATA = 2 +VIR_DOMAIN_SNAPSHOT_LIST_LEAVES = 4 + -- 1.7.1

2 1