- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: Add VSH_OFLAG_EMPTY_OK for attach-disk command
by Xu He Jie 09 Nov '11

09 Nov '11

As the description of removing CDROM media from http://wiki.libvirt.org/page/QEMUSwitchToLibvirt#eject_DEV Add flag 'VSH_OFLAG_EMPTY_OK' to the option 'source' of attach-disk Signed-off-by: Xu He Jie <xuhj(a)linux.vnet.ibm.com> --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5544a41..e7eae74 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -11569,7 +11569,7 @@ static const vshCmdInfo info_attach_disk[] = { static const vshCmdOptDef opts_attach_disk[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, - {"source", VSH_OT_DATA, VSH_OFLAG_REQ, N_("source of disk device")}, + {"source", VSH_OT_DATA, VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK, N_("source of disk device")}, {"target", VSH_OT_DATA, VSH_OFLAG_REQ, N_("target of disk device")}, {"driver", VSH_OT_STRING, 0, N_("driver of disk device")}, {"subdriver", VSH_OT_STRING, 0, N_("subdriver of disk device")}, -- 1.7.5.4

3 5

[libvirt] [PATCHv2] build: fix build on platforms without ptsname_r
by Eric Blake 08 Nov '11

08 Nov '11

MacOS lacks ptsname_r, and gnulib doesn't (yet) provide it. But we can avoid it altogether, by using gnulib openpty() instead. Note that we do _not_ want the pt_chown module; all systems that we currently port to can either properly do openpty() and/or grantpt(), or lack ptys altogether; we are not porting to any system that requires us to deal with the hassle of installing a setuid pt_chown helper just to satisfy gnulib's ability to provide openpty() on even more platforms. * .gnulib: Update to latest, for openpty fixes * bootstrap.conf (gnulib_modules): Add openpty, ttyname_r. (gnulib_tool_option_extras): Exclude pt_chown module. * src/util/util.c (virFileOpenTty): Rewrite in terms of openpty and ttyname_r. * src/util/util.h (virFileOpenTtyAt): Delete dead prototype. --- Alas, this is just complicated enough that I don't feel comfortable pushing it under the build-breaker rule, even though I have verified that it fixes builds on both FreeBSD and Cygwin, as well as still behaves correctly with LXC containers on Linux. Anyone willing to give this a review before 0.9.7 gets released? .gnulib | 2 +- bootstrap.conf | 3 ++ src/util/util.c | 73 ++++++++++++++++++++++++++++++++++++++++-------------- src/util/util.h | 5 ---- 4 files changed, 58 insertions(+), 25 deletions(-) diff --git a/.gnulib b/.gnulib index 2394a60..0031e4f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 2394a603e7586e671226478e5b15d924c3841f42 +Subproject commit 0031e4f6353cc7077a9d0dad0c793bd6e3dc7aaa diff --git a/bootstrap.conf b/bootstrap.conf index 0faa2e2..4557d2d 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -68,6 +68,7 @@ mkstemps mktempd netdb nonblocking +openpty passfd perror physmem @@ -101,6 +102,7 @@ sys_wait termios time_r timegm +ttyname_r uname useless-if-before-free usleep @@ -168,6 +170,7 @@ tests_base=gnulib/tests gnulib_tool_option_extras="\ --lgpl=2\ --with-tests\ + --avoid=pt_chown\ " # Convince bootstrap to use multiple m4 directories. diff --git a/src/util/util.c b/src/util/util.c index bd52b21..959c224 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -45,10 +45,11 @@ #include <string.h> #include <signal.h> #include <termios.h> +#include <pty.h> + #if HAVE_LIBDEVMAPPER_H # include <libdevmapper.h> #endif -#include "c-ctype.h" #ifdef HAVE_PATHS_H # include <paths.h> @@ -65,6 +66,7 @@ # include <mntent.h> #endif +#include "c-ctype.h" #include "dirname.h" #include "virterror_internal.h" #include "logging.h" @@ -1172,52 +1174,85 @@ virFileBuildPath(const char *dir, const char *name, const char *ext) return path; } +/* Open a non-blocking master side of a pty. If ttyName is not NULL, + * then populate it with the name of the slave. If rawmode is set, + * also put the master side into raw mode before returning. */ #ifndef WIN32 int virFileOpenTty(int *ttymaster, char **ttyName, int rawmode) { - int rc = -1; - - if ((*ttymaster = posix_openpt(O_RDWR|O_NOCTTY|O_NONBLOCK)) < 0) - goto cleanup; + /* XXX A word of caution - on some platforms (Solaris and HP-UX), + * additional ioctl() calls are needs after opening the slave + * before it will cause isatty() to return true. Should we make + * virFileOpenTty also return the opened slave fd, so the caller + * doesn't have to worry about that mess? */ + int ret = -1; + int slave = -1; + char *name = NULL; - if (unlockpt(*ttymaster) < 0) - goto cleanup; + /* Unfortunately, we can't use the name argument of openpty, since + * there is no guarantee on how large the buffer has to be. + * Likewise, we can't use the termios argument: we have to use + * read-modify-write since there is no portable way to initialize + * a struct termios without use of tcgetattr. */ + if (openpty(ttymaster, &slave, NULL, NULL, NULL) < 0) + return -1; - if (grantpt(*ttymaster) < 0) + /* What a shame that openpty cannot atomically set FD_CLOEXEC, but + * that using posix_openpt/grantpt/unlockpt/ptsname is not + * thread-safe, and that ptsname_r is not portable. */ + if (virSetNonBlock(*ttymaster) < 0 || + virSetCloseExec(*ttymaster) < 0) goto cleanup; + /* While Linux supports tcgetattr on either the master or the + * slave, Solaris requires it to be on the slave. */ if (rawmode) { struct termios ttyAttr; - if (tcgetattr(*ttymaster, &ttyAttr) < 0) + if (tcgetattr(slave, &ttyAttr) < 0) goto cleanup; cfmakeraw(&ttyAttr); - if (tcsetattr(*ttymaster, TCSADRAIN, &ttyAttr) < 0) + if (tcsetattr(slave, TCSADRAIN, &ttyAttr) < 0) goto cleanup; } + /* ttyname_r on the slave is required by POSIX, while ptsname_r on + * the master is a glibc extension, and the POSIX ptsname is not + * thread-safe. Since openpty gave us both descriptors, guess + * which way we will determine the name? :) */ if (ttyName) { - if (VIR_ALLOC_N(*ttyName, PATH_MAX) < 0) { - errno = ENOMEM; + /* Initial guess of 64 is generally sufficient; rely on ERANGE + * to tell us if we need to grow. */ + size_t len = 64; + int rc; + + if (VIR_ALLOC_N(name, len) < 0) goto cleanup; - } - if (ptsname_r(*ttymaster, *ttyName, PATH_MAX) != 0) { - VIR_FREE(*ttyName); + while ((rc = ttyname_r(slave, name, len)) == ERANGE) { + if (VIR_RESIZE_N(name, len, len, len) < 0) + goto cleanup; + } + if (rc != 0) { + errno = rc; goto cleanup; } + *ttyName = name; + name = NULL; } - rc = 0; + ret = 0; cleanup: - if (rc != 0) + if (ret != 0) VIR_FORCE_CLOSE(*ttymaster); + VIR_FORCE_CLOSE(slave); + VIR_FREE(name); - return rc; + return ret; } #else /* WIN32 */ int virFileOpenTty(int *ttymaster ATTRIBUTE_UNUSED, diff --git a/src/util/util.h b/src/util/util.h index e869f1b..d8176a8 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -121,11 +121,6 @@ int virFileAbsPath(const char *path, int virFileOpenTty(int *ttymaster, char **ttyName, int rawmode); -int virFileOpenTtyAt(const char *ptmx, - int *ttymaster, - char **ttyName, - int rawmode); - char *virArgvToString(const char *const *argv); -- 1.7.4.4

2 4

[libvirt] [libvirt-glib 00/24] libvirt-gconfig patches
by Christophe Fergeau 08 Nov '11

08 Nov '11

Hi, Here is a set of patches which start to implement functionality to libvirt-gconfig. The end result is that the "name", "memory" and "features" properties are implemented for the Domain class. Most of the work is about reworking the low-level plumbing to make the implementation as easy as possible. I chose to remove the xmlDocPtr and the xml string that were stored in GVirConfigObject objects and to replace this with a xmlNodePtr. This is useful when creating children objects (eg devices) when parsing a domain XML because the xmlNodePtr will point at the right position in the XML document. One caveat with that approach is that we need to refcount the xmlDocPtr associated with the xmlNodePtr to know when to free it, but this is not implemented yet (though gupnp seems to have code doing exactly this). Then most of the work is adding properties and helpers to make the code easier to write. And thinking about what API we want to expose to clients :) The two test programs should show how the API can be used as it is now. While writing this, I realized we had to do some "useless" work to return strings from libxml2 to glib, ie I g_strdup the string and xmlFree the source so that the caller can free it with g_free. While writing this code, there were at least 2 questions that arose, some input would be welcome :) * I don't know how to handle XMLs where the same node appears multiple times (eg "name"). If it's the latest name that wins, what do we do when changing the name on such an XML document? only modify the last name node? Drop all the redundant name nodes? * I'm also not sure how to make it possible to check whether a given property is set or not. For strings, this is easy, NULL means that the property was not set, but for integers, this is less obvious. Any thoughts on that? Next I'll have to start looking at more complicated properties :) More API questions on the way I guess... Christophe Christophe Fergeau (23): Add helpers in libvirt-gconfig-helpers.[ch] gvir_config_object_parse: don't parse empty documents Add getters for GVirConfig xmlNode and xmlDoc Add GVirConfigObject::node property Add GVir::Config::Domain::name property Rename gvir_config_domain_new Add gvir_config_domain_new to create an empty domain Implement gvir_config_domain_set_name Make the GVirConfigDomain::name property writable Add gvir_config_object_to_xml Use gvir_config_object_to_xml Add domain creation/parsing test Remove GVirConfigObject::docHandle Remove xml parsing from gvir_config_*_new functions Only do XML parsing when creating config objects Remove GError argument from GVirConfigObject::node getter Remove GVirConfigObject::doc Add gvir_config_object_get_node_content Add gvir_config_object_set_node_content Add test-domain-duplicate.xml which currently fails Validate document in parsing test Add GVirConfigDomain::memory Add GVirConfigDomain::features configure.ac | 1 + examples/Makefile.am | 1 + libvirt-gconfig/Makefile.am | 4 + libvirt-gconfig/libvirt-gconfig-capabilities.c | 10 +- libvirt-gconfig/libvirt-gconfig-capabilities.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain-snapshot.c | 9 +- libvirt-gconfig/libvirt-gconfig-domain-snapshot.h | 2 +- libvirt-gconfig/libvirt-gconfig-domain.c | 186 ++++++++++++++++- libvirt-gconfig/libvirt-gconfig-domain.h | 12 +- libvirt-gconfig/libvirt-gconfig-helpers.c | 179 +++++++++++++++ libvirt-gconfig/libvirt-gconfig-helpers.h | 48 ++++ libvirt-gconfig/libvirt-gconfig-interface.c | 12 +- libvirt-gconfig/libvirt-gconfig-interface.h | 2 +- libvirt-gconfig/libvirt-gconfig-network-filter.c | 8 +- libvirt-gconfig/libvirt-gconfig-network-filter.h | 2 +- libvirt-gconfig/libvirt-gconfig-network.c | 8 +- libvirt-gconfig/libvirt-gconfig-network.h | 2 +- libvirt-gconfig/libvirt-gconfig-node-device.c | 9 +- libvirt-gconfig/libvirt-gconfig-node-device.h | 2 +- libvirt-gconfig/libvirt-gconfig-object.c | 244 ++++++++++++--------- libvirt-gconfig/libvirt-gconfig-object.h | 17 ++- libvirt-gconfig/libvirt-gconfig-secret.c | 8 +- libvirt-gconfig/libvirt-gconfig-secret.h | 2 +- libvirt-gconfig/libvirt-gconfig-storage-pool.c | 8 +- libvirt-gconfig/libvirt-gconfig-storage-pool.h | 2 +- libvirt-gconfig/libvirt-gconfig-storage-vol.c | 12 +- libvirt-gconfig/libvirt-gconfig-storage-vol.h | 2 +- libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 11 +- libvirt-gconfig/tests/Makefile.am | 16 ++ libvirt-gconfig/tests/test-domain-create.c | 68 ++++++ libvirt-gconfig/tests/test-domain-duplicate.xml | 7 + libvirt-gconfig/tests/test-domain-invalid.xml | 6 + libvirt-gconfig/tests/test-domain-noname.xml | 4 + libvirt-gconfig/tests/test-domain-parse.c | 87 ++++++++ libvirt-gconfig/tests/test-domain.xml | 7 + libvirt-gobject/Makefile.am | 2 + libvirt-gobject/libvirt-gobject-connection.c | 2 +- libvirt-gobject/libvirt-gobject-domain-snapshot.c | 3 + libvirt-gobject/libvirt-gobject-domain.c | 6 +- libvirt-gobject/libvirt-gobject-interface.c | 3 + libvirt-gobject/libvirt-gobject-network-filter.c | 3 + libvirt-gobject/libvirt-gobject-network.c | 3 + libvirt-gobject/libvirt-gobject-node-device.c | 4 + libvirt-gobject/libvirt-gobject-secret.c | 4 + libvirt-gobject/libvirt-gobject-storage-pool.c | 5 +- libvirt-gobject/libvirt-gobject-storage-vol.c | 3 + 47 files changed, 895 insertions(+), 145 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-helpers.c create mode 100644 libvirt-gconfig/libvirt-gconfig-helpers.h create mode 100644 libvirt-gconfig/tests/Makefile.am create mode 100644 libvirt-gconfig/tests/test-domain-create.c create mode 100644 libvirt-gconfig/tests/test-domain-duplicate.xml create mode 100644 libvirt-gconfig/tests/test-domain-invalid.xml create mode 100644 libvirt-gconfig/tests/test-domain-noname.xml create mode 100644 libvirt-gconfig/tests/test-domain-parse.c create mode 100644 libvirt-gconfig/tests/test-domain.xml -- 1.7.6.4

3 62

[libvirt] qemu error: Could not allocate dynamic translator buffer
by Richard W.M. Jones 08 Nov '11

08 Nov '11

I'm getting a very odd error from qemu: 2011-11-08 13:06:03.403: starting up LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-system-x86_64 -S -M pc-0.14 -no-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name fedora15_x86_64 -uuid a88161b0-c4c9-42bf-a7b5-5bccf8b65197 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/fedora15_x86_64.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-reboot -kernel /var/lib/libvirt/images/fedora15_x86_64-kernel -initrd /var/lib/libvirt/images/fedora15_x86_64-ramdisk -append method=http://mirror.bytemark.co.uk/fedora/linux/releases/15/Fedora/x86_64/os/ ks=file:/ks.cfg -drive file=/var/lib/libvirt/images/fedora15_x86_64.dsk,if=none,id=drive-virtio-disk0,format=raw -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 -netdev tap,fd=24,id=hostnet0 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:26:9f:d6,bus=pci.0,addr=0x3 -chardev socket,id=charserial0,host=127.0.0.1,port=64900,server,nowait -device isa-serial,chardev=charserial0,id=serial0 -usb -vnc 127.0.0.1:0 -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 Could not allocate dynamic translator buffer 2011-11-08 13:06:04.062: shutting down Now I understand that qemu gives this error when it cannot allocate memory, specifically it can't mmap a TCG translation buffer. 800 MBytes according to the source code. However the guest where I'm running this command has plenty of free memory available: $ free -m total used free shared buffers cached Mem: 5659 872 4787 0 26 351 -/+ buffers/cache: 493 5166 Swap: 1983 0 1983 That's surely easily enough for 1G of RAM + a translation buffer? Anyway, my question is this: Can I somehow get libvirt to strace qemu and put that output somewhere? I tried the strace trick here: https://fedoraproject.org/wiki/How_to_debug_Virtualization_problems#strace but for some reason it doesn't trace into the qemu process. Not sure why, since surely the qemu process is a child of libvirtd? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

1 1

[libvirt] build failed with warning " failed to load external entity "api.html.tmp"
by Wenyi Gao 08 Nov '11

08 Nov '11

I got the latest code and build it with following error on Ubuntu 11.10: ...... make all-am make[3]: Entering directory `/home/wayne/workspace/project/libvirt/tools' CC virsh-console.o CC virsh-virsh.o CCLD virsh GEN virt-xml-validate GEN virt-pki-validate make[3]: Leaving directory `/home/wayne/workspace/project/libvirt/tools' make[2]: Leaving directory `/home/wayne/workspace/project/libvirt/tools' Making all in docs make[2]: Entering directory `/home/wayne/workspace/project/libvirt/docs' Validating api.html warning: failed to load external entity "api.html.tmp" make[2]: *** [api.html] Error 1 make[2]: Leaving directory `/home/wayne/workspace/project/libvirt/docs' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/wayne/workspace/project/libvirt' make: *** [all] Error 2 I think some dependent packages are missed on my build environment. But the error information doesn't show some hint. Does anyone know the reason? Thanks. Wenyi Gao

2 1

[libvirt] Release of libvirt-0.9.7
by Daniel Veillard 08 Nov '11

08 Nov '11

With a bit of delay to catch the last set of patches, the release is finally out ! You can get 0.9.7 from ftp://libvirt.org/libvirt/ This is a release mostly focusing on bug fixes and cleanup though there is some features too, including a lot of improvements on the snapshot code. There is also a notable set of portability patches, hopefully all issues raised there were fixed ! Features: - esx: Support vSphere 5.x (Patrice LACHANCE) - vbox: Add support for VirtualBox 4.1 (Matthias Bolte) - Introduce the virDomainOpenGraphics API (Daniel P. Berrange) - Add AHCI support to qemu driver (Jim Fehlig) - snapshot: many improvements and 2 new APIs (Eric Blake) - api: Add public api for 'reset' (Xu He Jie) Documentation: - Add <deviceboot> capability. (Philipp Hahn) - API: document scheduler parameter names (Eric Blake) - improve typed parameter documentation (Eric Blake) - fix typo in <disk>/<target> example (Eric Blake) - python: Fix documentation of virStream recv (Matthias Bolte) - Add documentation about migration. (Daniel P. Berrange) - Document filesystem type='block' for LXC (Ryota Ozaki) - fix incorrect info about routed networks (Laine Stump) - document managed=yes of hostdev passthrough (Eric Blake) - trivial spelling fix (Philipp Hahn) - Fix virt-sanlock-cleanup documentation (Philipp Hahn) - Fix two comments related to error handling (Philipp Hahn) - fix network XML documentation (Laine Stump) - Clarify semantics of virDomainMigrate2 (Jiri Denemark) - Update examples for probing with systemtap (Daniel P. Berrange) - fix html bug (Eric Blake) - virsh: Update the help information for undefine command. (tangchen) - Document STREQ_NULLABLE and STRNEQ_NULLABLE (Guido Günther) - Document that ff callbacks need to be invoked from a clean stack. (Guido Günther) - formatdomain.html.in: fix tickpolicy (Douglas Schilling Landgraf) - virsh: describe attach-interface parameter target (Daniel Veillard) - virsh: update man page for cpu_shares parameter (Daniel Veillard) - document node device XML (Eric Blake) - document virsh nodedev-* commands (Eric Blake) - snapshot: fix man page typos (Eric Blake) - virsh: Better document --copy-storage migrate options (Jiri Denemark) - virsh: Enhance documentation of commands starting jobs (Jiri Denemark) - virsh: Improve virsh manual for virsh memtune command (Peter Krempa) Portability: - build: fix build on platforms without ptsname_r (Eric Blake) - build: silence compiler warning on BSD (Eric Blake) - build: fix linking on BSD (Eric Blake) - remote: fix mingw32 build (Laine Stump) - build: fix deep VPATH builds (Eric Blake) - Use ENAMETOOLONG if the the socket path is longer than UNIX_PATH_MAX (Guido Günther) - build: avoid RHEL 5 build failure on LXC (Eric Blake) - build: use gnulib fdatasync (Eric Blake) - Fix virFileOpenTty definition on Win32 (Daniel P. Berrange) - compile: fix undefined reference to gnutls_x509_crt_get_dn with gcc-4.6.1 (Xu He Jie) - Fix VPATH build (Jiri Denemark) - build: fix 'make dist' error (Wen Congyang) - Fix syntax problem in mingw32-libvirt.spec.in (Daniel P. Berrange) - spec: mingw cleanups (Eric Blake) - build: fix mingw build without sasl (Eric Blake) - build: fix 'make rpm' (Eric Blake) - build: fix 'make distcheck' (Eric Blake) - disable xenlight for non-Xen platforms (Dan Horák) - build: Fix VPATH build with new probes (Jiri Denemark) - build: fix 'make distcheck' with pdwtags installed (Eric Blake) - spec: F15 still uses cgconfig, RHEL lacks hyperv (Eric Blake) Bug Fixes: - Fix sending/receiving of FDs when stream returns EAGAIN (Daniel P. Berrange) - lxc: avoid use-after-free (Eric Blake) - conf: Don't free uninitialized pointer (Jiri Denemark) - Fix default console type setting (Daniel P. Berrange) - Fix crash formatting virtio console (Daniel P. Berrange) - Fix off-by-one printing month in logging code (Daniel P. Berrange) - Add missing param initialization in qemuDomainBlockStatsFlags (Daniel P. Berrange) - fix crash when starting network (Wen Congyang) - Don't overwrite error message during VM cleanup (Daniel P. Berrange) - Correctly handle '*' in /etc/filesystems (Daniel P. Berrange) - Fix URI alias prefix matching (Wen Ruo Lv) - ServerClient: Flush cached data (Michal Privoznik) - Fix storage pool source comparison to avoid comparing with self (Daniel P. Berrange) - qemu: plug memory leak (Alex Jia) - qemu: Restore the original states of PCI device when restarting daemon (Osier Yang) - macvtap: Fix error return value convention/inconsistencies (Roopa Prabhu) - pci address conflict when virtio disk with drive type (Xu He Jie) - qemu: plug memory leak (Alex Jia) - qemu: avoid leaking uninit data from hotplug to dumpxml (Eric Blake) - util: Fix virUUIDGeneratePseudoRandomBytes (Ryota Ozaki) - lxc: Revert zeroing count of allocated items if VIR_REALLOC_N fails (Peter Krempa) - lxc: avoid null deref on lxcSetupLoopDevices failure (Alex Jia) - lxc: avoid missing '{' in the function (Alex Jia) - storage: avoid null deref on qemu-img failure (Eric Blake) - storage: make previous leak less likely to regress (Eric Blake) - storage: plug iscsi memory leak (Eric Blake) - qemu: avoid leaking uninit data from hotplug to dumpxml (Eric Blake) - qemu: Do not wait if the PCI device is not managed when reattaching (Osier Yang) - Add missing strdup return value check (Roopa Prabhu) - macvtap: avoid invalid free (Roopa Prabhu) - util: Fix typo in virGetHostname description (Jiri Denemark) - macvtap: plug memory leak for 802.1Qbh (Eric Blake) - qemu: plug memory leak on migration (Eric Blake) - conf: plug memory leak on error (Eric Blake) - storage: plug memory leak on error (Eric Blake) - util: Make getaddrinfo failure nonfatal in virGetHostname (Jiri Denemark) - qemu: fix text block info parsing (Eric Blake) - qemu: avoid text monitor null deref (Eric Blake) - qemu: check for json allocation failure (Eric Blake) - virFDStream: close also given errfd (fd leak) (Marc-André Lureau) - command: avoid fd leak on failure (Eric Blake) - qemu: Check for domain being active on successful job acquire (Michal Privoznik) - xen: Return tap2 for tap2 disks (Philipp Hahn) - xen: fix PyGrub boot device order (Philipp Hahn) - build: fix 'make check' linkage with dtrace (Eric Blake) - Fix deps for probes.o to ensure correct build ordering (Daniel P. Berrange) - If receiving a stream error, mark EOF on the stream (Daniel P. Berrange) - xen_xs: Guard against set but empty kernel argument (Guido Günther) - snapshot: avoid accidental renames with snapshot-edit (Eric Blake) - storage: Do not use comma as seperator for lvs output (Osier Yang) - qemuDomainAttach: Initialize pidfile variable (Michal Privoznik) - lxc: fix logic bug (Eric Blake) - Don't send back unknown program errors for async messages (Daniel P. Berrange) - Fix deadlock when the RPC program is unknown (Daniel P. Berrange) - remote_driver: Avoid double free in EventControl building (Michal Privoznik) - xenParseXM: don't dereference NULL pointer when script is empty (Guido Günther) - qemu: Fix migration with dname (Jiri Denemark) - virsh: do not unlink NULL file (Marc-André Lureau) - qemu: Fix error message mentioning VNC instead of SPICE (Peter Krempa) - qemu: Check for ejected media during startup and migration (Michal Privoznik) - qemu: add return value check (Alex Jia) - qemu: Always remove domain object if MigratePrepare fails (Jiri Denemark) - fix AppArmor driver for pipe character devices (Jamie Strandboge) - daemon: Don't remove pidfiles in init scripts (Peter Krempa) - storage: Do not break the whole vol lookup process in the middle (Osier Yang) - Fix synchronous reading of stream data (Daniel P. Berrange) Improvements: - Add missing defaultConsoleTargetType callback for AppArmour (Daniel P. Berrange) - Fix naming of constant for disk event (Daniel P. Berrange) - lxc: use common code for process cleanup (Eric Blake) - Set aliases for LXC/UML console devices (Daniel P. Berrange) - Default console target type with no <target> element (Daniel P. Berrange) - Add support for multiple consoles in LXC (Daniel P. Berrange) - Rewrite LXC I/O forwarding to use main event loop (Daniel P. Berrange) - Allow multiple consoles per virtual guest (Daniel P. Berrange) - virnetsockettest: Use a temporary directory in /tmp (Guido Günther) - xen: allow getting < max typed parameters (Eric Blake) - lxc: allow getting < max typed parameters (Eric Blake) - libxl: allow getting < max typed parameters (Eric Blake) - esx: allow getting < max typed parameters (Eric Blake) - qemu: allow getting < max typed parameters (Eric Blake) - Add support for probing filesystem with libblkid (Daniel P. Berrange) - Fix error message when failing to detect filesystem (Daniel P. Berrange) - Workaround for broken kernel autofs mounts (Daniel P. Berrange) - Ensure errno is valid when returning from lxcContainerWaitForContinue (Daniel P. Berrange) - Create /var/lib/libvirt/filesystems for LXC trees (Daniel P. Berrange) - esx: Support folders in the path of vpx:// connection URIs (Matthias Bolte) - qemu: pass virConnectPtr into Domain{Attach,Detach}* (Sage Weil) - vbox: Support shared folders (Matthias Bolte) - xenapi: Improve error reporting in xenapiOpen once again (Matthias Bolte) - Use a common xml type for ceph secret usage. (Josh Durgin) - storage: add auth to virDomainDiskDef (Josh Durgin) - secret: add Ceph secret type (Sage Weil) - Implement RPC driver support for virDomainOpenGraphics (Daniel P. Berrange) - Extend RPC server to allow FD passing (Daniel P. Berrange) - Add client side support for FD passing (Daniel P. Berrange) - Extend RPC protocol to allow FD passing (Daniel P. Berrange) - Add APIs for virNetSocket for sending/receiving file descriptors (Daniel P. Berrange) - Wire up QEMU implementation for virDomainOpenGraphics (Daniel P. Berrange) - Extend graphics event to include UNIX socket (Daniel P. Berrange) - virsh: Fix error message on vol-create-from failure (Ryota Ozaki) - bridge: modify for use when sVirt is enabled with qemu (Tyler Coumbes) - Use virXMLSaveFile when writing XML config (Jiri Denemark) - Introduce virXMLSaveFile as a wrapper for virFileRewrite (Jiri Denemark) - Introduce virFileRewrite for safe file rewrite (Jiri Denemark) - Add a systemtap script for watching QEMU monitor interactions (Daniel P. Berrange) - qemu: simplify use of HAVE_YAJL (Eric Blake) - snapshot: simplify indentation of disk encryption xml (Eric Blake) - snapshot: simplify indentation of nwfilter (Eric Blake) - Add REMOTE_PROC_DOMAIN_EVENT_DISK_CHANGE to remote_protocol-structs (Daniel P. Berrange) - nwfilter: extend schema to support new targets (Stefan Berger) - util: Add virFileAccessibleAs to private symbols (Michal Privoznik) - startupPolicy: Emit event on disk source dropping (Michal Privoznik) - qemu: implement startupPolicy (Michal Privoznik) - qemu: Move device alias assigning before command line construction (Michal Privoznik) - util: Create virFileAccessibleAs function (Michal Privoznik) - conf: Introduce optional startupPolicy attribute for cdrom and floppy (Michal Privoznik) - waitpid: improve safety (Eric Blake) - virsh: Fix vol-info's 'Type' output (Ryota Ozaki) - support continue/return targets in nwfilter (David L Stevens) - snapshot: simplify indentation of network xml (Eric Blake) - snapshot: simplify indentation of cpu features (Eric Blake) - snapshot: simplify indentation of sysinfo (Eric Blake) - snapshot: test domainsnapshot indentation (Eric Blake) - snapshot: indent domain xml when nesting (Eric Blake) - virbuf: add auto-indentation support (Eric Blake) - virbuf: more detailed error reporting (Eric Blake) - virbuf: improve testsuite reporting (Eric Blake) - virbuf: fix const-correctness (Eric Blake) - qemu: allow json in domxml-to-native (tangchen) - support setting bandwidth from virsh attach-interface (Hu Tao) - lxc: use hand-rolled code in place of unlockpt and grantpt (Serge E. Hallyn) - qemu: Test name-space handling (Philipp Hahn) - qemu: Fix name-space handling (Philipp Hahn) - Replace virBufferAdd with virBufferAddLit for const string (Daniel P. Berrange) - Allow for URI aliases when connecting to libvirt (Daniel P. Berrange) - Add support for autodestroy of guests to the LXC and UML drivers (Daniel P. Berrange) - Use virBufferEscapeShell in cmdEcho (Guido Günther) - qemu: replace qemuMonitorEscapeShell by virBufferEscapeShell (Guido Günther) - virBufferEscapeShell: Emit quotes for the empty string (Guido Günther) - snapshot: detect when qemu lacks disk-snapshot support (Eric Blake) - virBufferEscapeShell: Fix escaping of single quotes. (Guido Günther) - compile: Add a missing function 'pciDeviceListFind' to libvirt_private.syms (Xu He Jie) - snapshot: implement LIST_LEAVES flag in esx (Eric Blake) - qemu: Relax -no-shutdown check to [0.14.0, 0.15.0] (Jiri Denemark) - qemu: Honor the orginal PCI dev properties when reattaching (Osier Yang) - qemu: Do not reattach PCI device used by other domain when shutdown (Osier Yang) - Xen: Fake versions in xencapstest (Philipp Hahn) - Xen: move versions to struct (Philipp Hahn) - Use virBufferEscapeShell in virNetSocketNewConnectSSH (Guido Günther) - Add virBufferEscapeShell (Guido Günther) - Autodetect if the remote nc command supports the -q option (Guido Günther) - qemu: Make sure BeginJob is always followed by EndJob (Jiri Denemark) - qemu: Log debug messages when changing job (Jiri Denemark) - build: add compiler attributes to virUUIDParse (Eric Blake) - Fix typo in lxc_controller (Serge E. Hallyn) - build: update to latest gnulib (Eric Blake) - events: Propose a separate lock for event queue (Michal Privoznik) - qemu: Implement VIR_DUMP_RESET (Michal Privoznik) - virDomainCoreDump: Introduce VIR_DUMP_RESET flag (Michal Privoznik) - example: Support debug output and loop switch (Philipp Hahn) - example: Redirect --help output to stdout/stderr (Philipp Hahn) - example: Fix argument handling (Philipp Hahn) - snapshot: implement LIST_LEAVES flag in qemu (Eric Blake) - snapshot: add API for filtering by leaves (Eric Blake) - tests: Add support for skipping tests (Philipp Hahn) - Introduce <driver> under <filesystem> to support open-by-handle (Harsh Prateek Bora) - buf: implement generic virBufferEscape (Sage Weil) - daemon: Always advertise libvirtd service (Osier Yang) - snapshot: take advantage of new relations (Eric Blake) - snapshot: track qemu snapshot relations (Eric Blake) - snapshot: framework for more efficient relation traversal (Eric Blake) - snapshot: use correct qmp monitor command (Eric Blake) - snapshot: virsh shorthand for operating on current snap (Eric Blake) - build: ship helper scripts (Eric Blake) - Rewrite all the DTrace/SystemTAP probing (Daniel P. Berrange) - Fix missing lock calls on virNetTLSContextRef (Daniel P. Berrange) - Refactor TLS to facilitate dynamic probing (Daniel P. Berrange) - Add virSocketRef API to facilitate dynamic probing (Daniel P. Berrange) - Make libvirt.so include the RPC server code (Daniel P. Berrange) - snapshot: implement snapshot children listing in esx (Eric Blake) - snapshot: implement snapshot children listing in qemu (Eric Blake) - snapshot: remote protocol for snapshot children (Eric Blake) - snapshot: virsh fallback for snapshot-list --descendants --from (Eric Blake) - snapshot: virsh fallback for snapshot-list --from children (Eric Blake) - snapshot: virsh fallback for snapshot-list --tree --from (Eric Blake) - snapshot: virsh snapshot-list and children (Eric Blake) - xen: add error handling to UUID parsing (Guido Günther) - maint: typo fixes (Eric Blake) - snapshot: sort snapshot-list --tree (Eric Blake) - snapshot: simplify redefinition of disk snapshot (Eric Blake) - snapshot: let virsh edit disk snapshots (Eric Blake) - snapshot: fix virsh error message typo (Eric Blake) - qemu: add separate rerror_policy for disk errors (Laine Stump) - qemu: leave rerror policy at default when enospace is requested (Laine Stump) - qemu: enable multifunction for older qemu (Eric Blake) - Make LXC work with new network configuration types (Daniel P. Berrange) - init: raise default system aio limits (Eric Blake) - maint: fix minor issues in virterror public header (Eric Blake) - snapshot: enforce REVERT_FORCE on qemu (Eric Blake) - snapshot: use qemu-img on disks in use at time of snapshot (Eric Blake) - snapshot: add REVERT_FORCE to API (Eric Blake) - snapshot: implement snapshot roots listing in vbox (Eric Blake) - qemu: Don't fail virDomainGetInfo if we can't update balloon info (Jiri Denemark) - snapshot: simplify esx snapshot name lookup (Eric Blake) - snapshot: implement snapshot roots listing in esx (Eric Blake) - qemu: correct misspelled 'enospc' option, and only use for werror (Laine Stump) - snapshot: better virsh handling of missing current, parent (Eric Blake) - Allow passing of command line args to LXC container (Daniel P. Berrange) - Add support for bandwidth filtering on LXC guests (Daniel P. Berrange) - network: fill in bandwidth from portgroup for all forward modes (Laine Stump) - bridge_driver.c: Fix autoconf setting (Neil Wilson) - Set to NULL members that have been freed to prevent crashes (Marc-André Lureau) - snapshot: implement getparent for vbox (Eric Blake) - snapshot: implement getparent for esx (Eric Blake) - qemu: make PCI multifunction support more manual (Laine Stump) - lvm storage backend: handle command_names=1 in lvm.conf (Serge E. Hallyn) - qemu: Check for outstanding async job too (Michal Privoznik) - virsh: Add 'reset' command for virsh (Xu He Jie) - remote: Implement 'reset' for remote driver (Xu He Jie) - qemu: Implement 'reset' for qemu driver (Xu He Jie) - logging: Add date to log timestamp (Jiri Denemark) - logging: Do not log timestamp through syslog (Jiri Denemark) - hyperv: Report an error for acceptable URI schemes with a transport (Matthias Bolte) - esx: Report an error for acceptable URI schemes with a transport (Matthias Bolte) - snapshot: implement getparent in qemu (Eric Blake) - snapshot: add virsh snapshot-list --tree (Eric Blake) - snapshot: refactor virsh snapshot parent computation (Eric Blake) - snapshot: remote protocol for getparent (Eric Blake) - security: properly chown/label bidirectional and unidirectional fifos (Laine Stump) - qemu: Preserve fakeReboot flag in domain status (Jiri Denemark) - qemu: Finish domain shutdown on reconnect (Jiri Denemark) - qemu: Check domain status details when reconnecting monitor (Jiri Denemark) - virsh: Allow using complete <capabilities> elements with cpu-baseline (Peter Krempa) - virsh: Allow using domain and capabilities XMLs with cpu-compare (Peter Krempa) - qemu: add ability to set PCI device "rombar" on or off (Laine Stump) - qemu: Relax -no-shutdown check to [0.14.0, 0.15.50) (Jiri Denemark) - virLockManagerNopInit: Rename flags to unused_flags (Michal Privoznik) - debug: Annotate some variables as unused (Michal Privoznik) - maint: update authors (Peter Krempa) - Add unsafe cache mode support for disk driver (Oskari Saarenmaa) - selinux: Correctly report warning if virt_use_nfs not set (Michal Privoznik) - virsh: Do not ignore the specified flags for cmdSaveImageDefine (Osier Yang) - qemu: Transfer inactive XML among cookie (Michal Privoznik) Cleanups: - Remove translations in socket test case (Daniel P. Berrange) - test: drop redundant check (Eric Blake) - startupPolicty: Minor cleanups (Michal Privoznik) - secret: fix bad patch application (Eric Blake) - Remove trailing whitespace from all xfig files (Daniel P. Berrange) - Fix typo in virFileAccessibleAs (Daniel P. Berrange) - snapshot: minor cleanups from reviewing indentation (Eric Blake) - build: ignore test executable (Eric Blake) - esx: drop dead code to silence Coverity (Eric Blake) - snapshot: drop dead parameters (Eric Blake) - qemu: silence Coverity false positive (Eric Blake) - conf: remove unused VIR_ENUM_DECL (Laine Stump) thanks to everybody who helped for this release, by reporting bugs, providing ideas, patches, or documentation ! 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/

1 0

[libvirt] [PATCH] [configure] Fix libvirt dependency, and use $VAPIGEN
by nirbheek＠gentoo.org 08 Nov '11

08 Nov '11

This is a rather trivial patch to raise the minimum libvirt dependency; at least 0.9.4 is required. In addition, it fixes the direct usage of `vapigen`, and uses the result of the AC_PATH_PROG(VAPIGEN ...) call earlier so that the binary to be used can be overridden as that macro was meant to allow. Thanks! configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

5 6

[libvirt] [PATCH] Add missing defaultConsoleTargetType callback for AppArmour
by Daniel P. Berrange 07 Nov '11

07 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Every instance of virCapsPtr must have the defaultConsoleTargetType field set. * src/security/virt-aa-helper.c: Add defaultConsoleTargetType to virCapsPtr --- src/security/virt-aa-helper.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 71a4586..e8e77ba 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -685,6 +685,11 @@ caps_mockup(vahControl * ctl, const char *xmlStr) return rc; } +static int aaDefaultConsoleType(const char *ostype ATTRIBUTE_UNUSED) +{ + return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; +} + static int get_definition(vahControl * ctl, const char *xmlStr) { @@ -703,6 +708,8 @@ get_definition(vahControl * ctl, const char *xmlStr) goto exit; } + caps->defaultConsoleTargetType = aaDefaultConsoleType; + if ((guest = virCapabilitiesAddGuest(ctl->caps, ctl->hvm, ctl->arch, -- 1.7.6.4

2 1

[libvirt] Failing pool deletion testcase
by Guido Günther 07 Nov '11

07 Nov '11

Hi, when running libvirt-tck I'm seeing this test failure: # Failed test 'deleted pool' # at /usr/share/libvirt-tck/tests/storage/110-disk-pool.t line 120. # died: Sys::Virt::Error (libvirt error code: 3, message: this function is not supported by the connection driver: pool does not support pool deletion # ) because pool deletion isn't supported by the disk storage backend. Since the test is there I wonder if there are patches floating around already to implement it? If not I guess wiping the partition table followed by a "blockdev --reread-pt" would be the right approach? Cheers, -- Guido

2 2

[libvirt] [PATCH] libvirt-tck: Skip Test when no security model is in use
by Guido Günther 07 Nov '11

07 Nov '11

Hi, if I'm reading this test correctly it's supposed to fail without a security model at work. The file images are always readable/writeable to the libvirt user and group without one. Cheers, -- Guido --- scripts/qemu/205-qcow2-double-backing-file.t | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/qemu/205-qcow2-double-backing-file.t b/scripts/qemu/205-qcow2-double-backing-file.t index 7ae278d..d3a5e33 100644 --- a/scripts/qemu/205-qcow2-double-backing-file.t +++ b/scripts/qemu/205-qcow2-double-backing-file.t @@ -52,17 +52,22 @@ my $conn = eval { $tck->setup(); }; BAIL_OUT "failed to setup test harness: $@" if $@; END { $tck->cleanup if $tck; } +my $info; +eval { + $info = $conn->get_node_security_model(); +}; + SKIP: { skip "Only relevant to QEMU driver", 26 unless $conn->get_type() eq "QEMU"; skip "Only relevant when run as root", 26 unless $< == 0; skip "Only relevant for system driver", 26 unless $conn->get_uri() =~ m/system/; - + skip "Only relevant when using a security model", 26 unless + $info && $info->{model}; my $xml = $tck->generic_pool("dir") ->mode("0755")->as_xml; - diag "Defining transient storage pool $xml"; my $pool; ok_pool(sub { $pool = $conn->define_storage_pool($xml) }, "define transient storage pool"); -- 1.7.7

2 2

[libvirt] [PATCH] Add ability to managed save libvirt domains
by Pavel Odintsov 07 Nov '11

07 Nov '11

--- src/libvirt-php.c | 21 +++++++++++++++++++++ src/libvirt-php.h | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index f590595..1c39e31 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -91,6 +91,7 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_core_dump, NULL) PHP_FE(libvirt_domain_shutdown, NULL) PHP_FE(libvirt_domain_suspend, NULL) + PHP_FE(libvirt_domain_managedsave, NULL) PHP_FE(libvirt_domain_undefine, NULL) PHP_FE(libvirt_domain_reboot, NULL) PHP_FE(libvirt_domain_define_xml, NULL) @@ -3625,6 +3626,26 @@ PHP_FUNCTION(libvirt_domain_suspend) } /* + Function name: libvirt_domain_managedsave + Since version: 0.4.1(-1) + Description: Function is used to managed save the domain (domain was unloaded from memory and its state was saved to disk) identified by it's resource + Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + Returns: TRUE for success, FALSE on error +*/ +PHP_FUNCTION(libvirt_domain_managedsave) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + int retval; + + GET_DOMAIN_FROM_ARGS("r",&zdomain); + retval=virDomainManagedSave(domain->domain, 0); + DPRINTF("%s: virDomainManagedSave(%p) returned %d\n", PHPFUNC, domain->domain, retval); + if (retval != 0) RETURN_FALSE; + RETURN_TRUE; +} + +/* Function name: libvirt_domain_undefine Since version: 0.4.1(-1) Description: Function is used to undefine the domain identified by it's resource diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 2addae2..8a3f4ff 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -237,6 +237,7 @@ PHP_FUNCTION(libvirt_domain_resume); PHP_FUNCTION(libvirt_domain_core_dump); PHP_FUNCTION(libvirt_domain_shutdown); PHP_FUNCTION(libvirt_domain_suspend); +PHP_FUNCTION(libvirt_domain_managedsave); PHP_FUNCTION(libvirt_domain_undefine); PHP_FUNCTION(libvirt_domain_reboot); PHP_FUNCTION(libvirt_domain_define_xml); -- 1.7.2.5

1 0

[libvirt] [PATCH] qemu: drop driver lock around sleep
by Eric Blake 07 Nov '11

07 Nov '11

qemu/THREADS.txt is explicit that the driver lock must not be held for long lengths of time, as it blocks all attempts to manage any other vms on the same connection. We were violating this by sleep()ing while waiting for a qemu child process to finish execution during actions such as destroy. * src/qemu/qemu_process.h (qemuProcessKill): Alter signature. * src/qemu/qemu_process.c (qemuProcessKill): Add parameter. (qemuProcessFakeReboot, qemuProcessShutdownOrReboot) (qemuProcessStop): Update callers. * src/qemu/qemu_driver.c (qemuDomainDestroyFlags): Likewise. --- Without this patch, problems in halting one domain could lock out actions on all other domains for more than 3 seconds, which is awfully long. This doesn't solve all the problems - it is still possible to have a stuck NFS server being the reason for difficulties in stopping a domain, such as an lstat() call while attempting to relabel file systems, and those calls are still done while the driver lock is held; but I'll be submitting further patches as I try and reduce the critical section sizes. I'm not sure whether this qualifies for 0.9.7 or should wait for post-release. src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 35 ++++++++++++++++++++++++++++------- src/qemu/qemu_process.h | 3 ++- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 118197a..2a152e8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1692,7 +1692,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, * can kill the process even if a job is active. Killing * it now means the job will be released */ - qemuProcessKill(vm, false); + qemuProcessKill(driver, vm, false); if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_DESTROY) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2882ef8..6867d26 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -419,7 +419,7 @@ endjob: cleanup: if (vm) { if (ret == -1) - qemuProcessKill(vm, false); + qemuProcessKill(driver, vm, false); if (virDomainObjUnref(vm) > 0) virDomainObjUnlock(vm); } @@ -450,12 +450,12 @@ qemuProcessShutdownOrReboot(virDomainObjPtr vm) qemuProcessFakeReboot, vm) < 0) { VIR_ERROR(_("Failed to create reboot thread, killing domain")); - qemuProcessKill(vm, true); + qemuProcessKill(qemu_driver, vm, true); /* Safe to ignore value since ref count was incremented above */ ignore_value(virDomainObjUnref(vm)); } } else { - qemuProcessKill(vm, true); + qemuProcessKill(qemu_driver, vm, true); } } @@ -3249,17 +3249,26 @@ cleanup: } -void qemuProcessKill(virDomainObjPtr vm, bool gracefully) +/* Called while owning the vm lock, but not necessarily a job on the + * vm. This function returns immediately if gracefully is true, + * otherwise it may block while waiting for the qemu process. If + * driver is non-NULL, then also drop the driver lock before sleeping + * and re-acquire before returning. */ +void qemuProcessKill(struct qemud_driver *driver, virDomainObjPtr vm, + bool gracefully) { int i; - VIR_DEBUG("vm=%s pid=%d gracefully=%d", - vm->def->name, vm->pid, gracefully); + VIR_DEBUG("driver=%p vm=%s pid=%d gracefully=%d", + driver, vm->def->name, vm->pid, gracefully); if (!virDomainObjIsActive(vm)) { VIR_DEBUG("VM '%s' not active", vm->def->name); return; } + if (driver && !gracefully) + qemuDriverUnlock(driver); + /* This loop sends SIGTERM, then waits a few iterations * (1.6 seconds) to see if it dies. If still alive then * it does SIGKILL, and waits a few more iterations (1.6 @@ -3288,6 +3297,18 @@ void qemuProcessKill(virDomainObjPtr vm, bool gracefully) usleep(200 * 1000); } + + if (driver && !gracefully) { + /* Must hold extra reference while dropping vm lock, since we + * do not necessarily have an active job to guarantee a + * reference. */ + virDomainObjRef(vm); + virDomainObjUnlock(vm); + qemuDriverLock(driver); + virDomainObjLock(vm); + /* Safe to ignore value since ref count was incremented above */ + ignore_value(virDomainObjUnref(vm)); + } } @@ -3370,7 +3391,7 @@ void qemuProcessStop(struct qemud_driver *driver, } /* shut it off for sure */ - qemuProcessKill(vm, false); + qemuProcessKill(driver, vm, false); /* Stop autodestroy in case guest is restarted */ qemuProcessAutoDestroyRemove(driver, vm); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index ef422c4..19ed8a1 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -68,7 +68,8 @@ int qemuProcessAttach(virConnectPtr conn, virDomainChrSourceDefPtr monConfig, bool monJSON); -void qemuProcessKill(virDomainObjPtr vm, bool gracefully); +void qemuProcessKill(struct qemud_driver *driver, virDomainObjPtr vm, + bool gracefully); int qemuProcessAutoDestroyInit(struct qemud_driver *driver); void qemuProcessAutoDestroyRun(struct qemud_driver *driver, -- 1.7.4.4

3 2

[libvirt] [PATCH 0/7] Allow multiple console devices for each guest
by Daniel P. Berrange 07 Nov '11

07 Nov '11

The current XML schema only allows for a single <console> element per guest. Many hypervisors support multiple paravirt consoles, and it'd be desirable to support that. This series does just that, enabling multiple consoles for UML, QEMU and LXC

3 19

[libvirt] [PATCHv6 0/5] expose per-device blkio weight tuning, via string param
by Eric Blake 07 Nov '11

07 Nov '11

This is v6 of Hu's original proposal: v1: https://www.redhat.com/archives/libvir-list/2011-September/msg00334.html v4: https://www.redhat.com/archives/libvir-list/2011-October/msg00444.html v5: https://www.redhat.com/archives/libvir-list/2011-November/msg00060.html Patches 1-3 are solid in my testing. When I first started working on these patches, I was thinking it would be worth having VIR_TYPED_PARAM_STRING in 0.9.7; however, now that I've spent longer on it, I'm reluctant to push this new virTypedParameter API without at least one other API that takes advantage of a typed string. I tested 1-3 by using patches 4 and 5, using all 4 combinations of pre- and post-patch clients and servers. If either (or both) sides were old, then behavior is unchanged from 0.9.6 (no strings are present, a new client won't confuse an old server, a new server won't confuse an old client, and all non-string parameters are still passed in all cases); if both sides are new, then the string passing works as designed. Patch 4 is close to feature-complete, and would be the first API to take advantage of patches 1-3, but it is pointless to apply it without at least one driver implementation. Also, it has a user interface issue, in that '/path/to/dev1,weight;/path/to/dev2,weight' is awkward to type in a virsh command line; it might be nicer if if we used the string '/path/to/dev1,weight,/path/to/dev2,weight' instead, but that would mean some further parsing alterations. Note that in patch 4, I renamed the virsh option to 'virsh blkiotune --device-weight', in part because having both '--weight-device' and '--weight' would interfere with my (future) plans to make virsh do unambiguous option prefix parsing, and in part because the XML is laid out with device as the primary name, with weight as a sub-feature of each device (just because cgroups named things backwards doesn't mean that we have to repeat that mistake). Patch 5 is broken. I've already spent too long on this series, so I'm hoping Hu can resume ownership of this series and post a working v7 that resolves my complaints. More details in that particular patch message; but the short summary is that 'virsh blkiotune --live' and 'virsh blkiotune --config' must give identically formatted output. Eric Blake (4): API: add VIR_TYPED_PARAM_STRING API: remote support for VIR_TYPED_PARAM_STRING API: add trivial qemu support for VIR_TYPED_PARAM_STRING blkiotune: add interface for blkiotune.device_weight Hu Tao (1): blkiotune: add qemu support for blkiotune.device_weight daemon/remote.c | 88 ++++++++++++----- docs/formatdomain.html.in | 29 +++++- docs/schemas/domaincommon.rng | 12 +++ include/libvirt/libvirt.h.in | 42 ++++++++- src/conf/domain_conf.c | 130 ++++++++++++++++++++++++- src/conf/domain_conf.h | 17 ++++ src/libvirt.c | 92 +++++++++++++++--- src/libvirt_internal.h | 9 ++- src/libvirt_private.syms | 3 + src/qemu/qemu_cgroup.c | 22 ++++ src/qemu/qemu_driver.c | 213 +++++++++++++++++++++++++++++++++++++++-- src/remote/remote_driver.c | 28 +++++- src/remote/remote_protocol.x | 2 + src/remote_protocol-structs | 2 + src/rpc/gendispatch.pl | 3 +- src/util/cgroup.c | 33 +++++++ src/util/cgroup.h | 4 + src/util/util.c | 14 +++ src/util/util.h | 2 + tools/virsh.c | 32 ++++++- tools/virsh.pod | 6 +- 21 files changed, 720 insertions(+), 63 deletions(-) -- 1.7.4.4

4 11

[libvirt] Start of freeze for libvirt-0.9.7 and availability of rc1
by Daniel Veillard 05 Nov '11

05 Nov '11

We are now entering the freeze for libvirt-0.9.7 . We may make an exception for patch set which got a few round of reviews though, like Stefan's ones (v4 IIRC), and anything which we know may need fixing in the API before the release. I have made a release candidate 1 tarball (and associated rpms) at ftp://libvirt.org/libvirt/libvirt-0.9.7-rc1.tar.gz I think I will make an rc2 on Wed or Thu and then try to make the release around Friday of the end of the week if things looks good. 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/

8 24

[libvirt] [PATCH 1/2] build: fix linking on BSD
by Eric Blake 04 Nov '11

04 Nov '11

While building on FreeBSD (and after fixing a ptsname_r link error), I got this failure: ./.libs/libvirt_util.a(libvirt_util_la-threads.o)(.text+0x240): In function `virThreadCreate': util/threads-pthread.c:185: undefined reference to `pthread_create' It turns out that gnulib used only pthread_join for LIB_PTHREAD, but on FreeBSD, libc provides that (as a stub function); whereas the more complex pthread_create really does require -pthread, which gnulib tracked under [LT]LIBMULTITHREAD. * configure.ac (LIBS): Check LIBMULTITHREAD alongside LIB_PTHREAD. * src/Makefile.am (THREAD_LIBS): New variable. (libvirt_util_la_LIBADD, libvirt_lxc_LDADD): Use it. --- Pushing under the build-breaker rule. However, the build is still broken unless we also push: https://www.redhat.com/archives/libvir-list/2011-November/msg00210.html configure.ac | 4 ++-- src/Makefile.am | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5753c08..8754f18 100644 --- a/configure.ac +++ b/configure.ac @@ -141,9 +141,9 @@ AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. -dnl LIB_PTHREAD was set during gl_INIT by gnulib. +dnl LIB_PTHREAD and LIBMULTITHREAD were set during gl_INIT by gnulib. old_LIBS=$LIBS -LIBS="$LIBS $LIB_PTHREAD" +LIBS="$LIBS $LIB_PTHREAD $LIBMULTITHREAD" AC_CHECK_FUNCS([pthread_mutexattr_init]) LIBS=$old_libs diff --git a/src/Makefile.am b/src/Makefile.am index bf26b19..c419c94 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,6 +29,8 @@ CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = +THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) + if WITH_NETWORK UUID=$(shell uuidgen 2>/dev/null) endif @@ -548,7 +550,7 @@ libvirt_util_la_SOURCES = \ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ - $(LIB_PTHREAD) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) + $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) noinst_LTLIBRARIES += libvirt_conf.la @@ -1481,7 +1483,7 @@ libvirt_lxc_SOURCES = \ $(NWFILTER_PARAM_CONF_SOURCES) libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ - $(LIBXML_LIBS) $(NUMACTL_LIBS) $(LIB_PTHREAD) \ + $(LIBXML_LIBS) $(NUMACTL_LIBS) $(THREAD_LIBS) \ $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ ../gnulib/lib/libgnu.la if WITH_DTRACE -- 1.7.4.4

1 1

[libvirt] [PATCH] Fix sending/receiving of FDs when stream returns EAGAIN
by Daniel P. Berrange 04 Nov '11

04 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> The code calling sendfd/recvfd was mistakenly assuming those calls would never block. They can in fact return EAGAIN and this is causing us to drop the client connection when blocking ocurrs while sending/receiving FDs. Fixing this is a little hairy on the incoming side, since at the point where we see the EAGAIN, we already thought we had finished receiving all data for the packet. So we play a little trick to reset bufferOffset again and go back into polling for more data. * src/rpc/virnetsocket.c, src/rpc/virnetsocket.h: Update virNetSocketSendFD/RecvFD to return 0 on EAGAIN, or 1 on success * src/rpc/virnetclient.c: Move decoding of header & fds out of virNetClientCallDispatch and into virNetClientIOHandleInput. Handling blocking when sending/receiving FDs * src/rpc/virnetmessage.h: Add a 'donefds' field to track how many FDs we've sent / received * src/rpc/virnetserverclient.c: Handling blocking when sending/receiving FDs --- src/rpc/virnetclient.c | 79 ++++++++++++++++++++++++++++-------------- src/rpc/virnetmessage.h | 1 + src/rpc/virnetserverclient.c | 62 ++++++++++++++++++++++++--------- src/rpc/virnetsocket.c | 34 +++++++++++++----- src/rpc/virnetsocket.h | 2 +- 5 files changed, 125 insertions(+), 53 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 2b5f67c..4b7d4a9 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -694,10 +694,6 @@ static int virNetClientCallDispatchStream(virNetClientPtr client) static int virNetClientCallDispatch(virNetClientPtr client) { - size_t i; - if (virNetMessageDecodeHeader(&client->msg) < 0) - return -1; - PROBE(RPC_CLIENT_MSG_RX, "client=%p len=%zu prog=%u vers=%u proc=%u type=%u status=%u serial=%u", client, client->msg.bufferLength, @@ -706,15 +702,7 @@ virNetClientCallDispatch(virNetClientPtr client) switch (client->msg.header.type) { case VIR_NET_REPLY: /* Normal RPC replies */ - return virNetClientCallDispatchReply(client); - case VIR_NET_REPLY_WITH_FDS: /* Normal RPC replies with FDs */ - if (virNetMessageDecodeNumFDs(&client->msg) < 0) - return -1; - for (i = 0 ; i < client->msg.nfds ; i++) { - if ((client->msg.fds[i] = virNetSocketRecvFD(client->sock)) < 0) - return -1; - } return virNetClientCallDispatchReply(client); case VIR_NET_MESSAGE: /* Async notifications */ @@ -737,22 +725,29 @@ static ssize_t virNetClientIOWriteMessage(virNetClientPtr client, virNetClientCallPtr thecall) { - ssize_t ret; + ssize_t ret = 0; - ret = virNetSocketWrite(client->sock, - thecall->msg->buffer + thecall->msg->bufferOffset, - thecall->msg->bufferLength - thecall->msg->bufferOffset); - if (ret <= 0) - return ret; + if (thecall->msg->bufferOffset < thecall->msg->bufferLength) { + ret = virNetSocketWrite(client->sock, + thecall->msg->buffer + thecall->msg->bufferOffset, + thecall->msg->bufferLength - thecall->msg->bufferOffset); + if (ret <= 0) + return ret; - thecall->msg->bufferOffset += ret; + thecall->msg->bufferOffset += ret; + } if (thecall->msg->bufferOffset == thecall->msg->bufferLength) { size_t i; - for (i = 0 ; i < thecall->msg->nfds ; i++) { - if (virNetSocketSendFD(client->sock, thecall->msg->fds[i]) < 0) + for (i = thecall->msg->donefds ; i < thecall->msg->nfds ; i++) { + int rv; + if ((rv = virNetSocketSendFD(client->sock, thecall->msg->fds[i])) < 0) return -1; + if (rv == 0) /* Blocking */ + return 0; + thecall->msg->donefds++; } + thecall->msg->donefds = 0; thecall->msg->bufferOffset = thecall->msg->bufferLength = 0; if (thecall->expectReply) thecall->mode = VIR_NET_CLIENT_MODE_WAIT_RX; @@ -821,12 +816,16 @@ virNetClientIOHandleInput(virNetClientPtr client) * EAGAIN */ for (;;) { - ssize_t ret = virNetClientIOReadMessage(client); + ssize_t ret; - if (ret < 0) - return -1; - if (ret == 0) - return 0; /* Blocking on read */ + if (client->msg.nfds == 0) { + ret = virNetClientIOReadMessage(client); + + if (ret < 0) + return -1; + if (ret == 0) + return 0; /* Blocking on read */ + } /* Check for completion of our goal */ if (client->msg.bufferOffset == client->msg.bufferLength) { @@ -842,6 +841,33 @@ virNetClientIOHandleInput(virNetClientPtr client) * next iteration. */ } else { + if (virNetMessageDecodeHeader(&client->msg) < 0) + return -1; + + if (client->msg.header.type == VIR_NET_REPLY_WITH_FDS) { + size_t i; + if (virNetMessageDecodeNumFDs(&client->msg) < 0) + return -1; + + for (i = client->msg.donefds ; i < client->msg.nfds ; i++) { + int rv; + if ((rv = virNetSocketRecvFD(client->sock, &(client->msg.fds[i]))) < 0) + return -1; + if (rv == 0) /* Blocking */ + break; + client->msg.donefds++; + } + + if (client->msg.donefds < client->msg.nfds) { + /* Because DecodeHeader/NumFDs reset bufferOffset, we + * put it back to what it was, so everything works + * again next time we run this method + */ + client->msg.bufferOffset = client->msg.bufferLength; + return 0; /* Blocking on more fds */ + } + } + ret = virNetClientCallDispatch(client); client->msg.bufferOffset = client->msg.bufferLength = 0; /* @@ -1257,6 +1283,7 @@ int virNetClientSend(virNetClientPtr client, goto cleanup; } + msg->donefds = 0; if (msg->bufferLength) call->mode = VIR_NET_CLIENT_MODE_WAIT_TX; else diff --git a/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h index ad63409..c54e7c6 100644 --- a/src/rpc/virnetmessage.h +++ b/src/rpc/virnetmessage.h @@ -48,6 +48,7 @@ struct _virNetMessage { size_t nfds; int *fds; + size_t donefds; virNetMessagePtr next; }; diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 2f5ae8f..cf97b58 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -771,9 +771,11 @@ static ssize_t virNetServerClientRead(virNetServerClientPtr client) static void virNetServerClientDispatchRead(virNetServerClientPtr client) { readmore: - if (virNetServerClientRead(client) < 0) { - client->wantClose = true; - return; /* Error */ + if (client->rx->nfds == 0) { + if (virNetServerClientRead(client) < 0) { + client->wantClose = true; + return; /* Error */ + } } if (client->rx->bufferOffset < client->rx->bufferLength) @@ -794,7 +796,7 @@ readmore: goto readmore; } else { /* Grab the completed message */ - virNetMessagePtr msg = virNetMessageQueueServe(&client->rx); + virNetMessagePtr msg = client->rx; virNetServerClientFilterPtr filter; size_t i; @@ -805,20 +807,40 @@ readmore: return; } + /* Now figure out if we need to read more data to get some + * file descriptors */ if (msg->header.type == VIR_NET_CALL_WITH_FDS && virNetMessageDecodeNumFDs(msg) < 0) { virNetMessageFree(msg); client->wantClose = true; - return; + return; /* Error */ } - for (i = 0 ; i < msg->nfds ; i++) { - if ((msg->fds[i] = virNetSocketRecvFD(client->sock)) < 0) { + + /* Try getting the file descriptors (may fail if blocking) */ + for (i = msg->donefds ; i < msg->nfds ; i++) { + int rv; + if ((rv = virNetSocketRecvFD(client->sock, &(msg->fds[i]))) < 0) { virNetMessageFree(msg); client->wantClose = true; return; } + if (rv == 0) /* Blocking */ + break; + msg->donefds++; + } + + /* Need to poll() until FDs arrive */ + if (msg->donefds < msg->nfds) { + /* Because DecodeHeader/NumFDs reset bufferOffset, we + * put it back to what it was, so everything works + * again next time we run this method + */ + client->rx->bufferOffset = client->rx->bufferLength; + return; } + /* Definitely finished reading, so remove from queue */ + virNetMessageQueueServe(&client->rx); PROBE(RPC_SERVER_CLIENT_MSG_RX, "client=%p len=%zu prog=%u vers=%u proc=%u type=%u status=%u serial=%u", client, msg->bufferLength, @@ -912,25 +934,30 @@ static void virNetServerClientDispatchWrite(virNetServerClientPtr client) { while (client->tx) { - ssize_t ret; - - ret = virNetServerClientWrite(client); - if (ret < 0) { - client->wantClose = true; - return; + if (client->tx->bufferOffset < client->tx->bufferLength) { + ssize_t ret; + ret = virNetServerClientWrite(client); + if (ret < 0) { + client->wantClose = true; + return; + } + if (ret == 0) + return; /* Would block on write EAGAIN */ } - if (ret == 0) - return; /* Would block on write EAGAIN */ if (client->tx->bufferOffset == client->tx->bufferLength) { virNetMessagePtr msg; size_t i; - for (i = 0 ; i < client->tx->nfds ; i++) { - if (virNetSocketSendFD(client->sock, client->tx->fds[i]) < 0) { + for (i = client->tx->donefds ; i < client->tx->nfds ; i++) { + int rv; + if ((rv = virNetSocketSendFD(client->sock, client->tx->fds[i])) < 0) { client->wantClose = true; return; } + if (rv == 0) /* Blocking */ + return; + client->tx->donefds++; } #if HAVE_SASL @@ -1041,6 +1068,7 @@ int virNetServerClientSendMessage(virNetServerClientPtr client, msg->bufferLength, msg->bufferOffset); virNetServerClientLock(client); + msg->donefds = 0; if (client->sock && !client->wantClose) { PROBE(RPC_SERVER_CLIENT_MSG_TX_QUEUE, "client=%p len=%zu prog=%u vers=%u proc=%u type=%u status=%u serial=%u", diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index d832c53..4517d16 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1142,6 +1142,9 @@ ssize_t virNetSocketWrite(virNetSocketPtr sock, const char *buf, size_t len) } +/* + * Returns 1 if an FD was sent, 0 if it would block, -1 on error + */ int virNetSocketSendFD(virNetSocketPtr sock, int fd) { int ret = -1; @@ -1154,12 +1157,15 @@ int virNetSocketSendFD(virNetSocketPtr sock, int fd) PROBE(RPC_SOCKET_SEND_FD, "sock=%p fd=%d", sock, fd); if (sendfd(sock->fd, fd) < 0) { - virReportSystemError(errno, - _("Failed to send file descriptor %d"), - fd); + if (errno == EAGAIN) + ret = 0; + else + virReportSystemError(errno, + _("Failed to send file descriptor %d"), + fd); goto cleanup; } - ret = 0; + ret = 1; cleanup: virMutexUnlock(&sock->lock); @@ -1167,9 +1173,15 @@ cleanup: } -int virNetSocketRecvFD(virNetSocketPtr sock) +/* + * Returns 1 if an FD was read, 0 if it would block, -1 on error + */ +int virNetSocketRecvFD(virNetSocketPtr sock, int *fd) { int ret = -1; + + *fd = -1; + if (!virNetSocketHasPassFD(sock)) { virNetError(VIR_ERR_INTERNAL_ERROR, _("Receiving file descriptors is not supported on this socket")); @@ -1177,13 +1189,17 @@ int virNetSocketRecvFD(virNetSocketPtr sock) } virMutexLock(&sock->lock); - if ((ret = recvfd(sock->fd, O_CLOEXEC)) < 0) { - virReportSystemError(errno, "%s", - _("Failed to recv file descriptor")); + if ((*fd = recvfd(sock->fd, O_CLOEXEC)) < 0) { + if (errno == EAGAIN) + ret = 0; + else + virReportSystemError(errno, "%s", + _("Failed to recv file descriptor")); goto cleanup; } PROBE(RPC_SOCKET_RECV_FD, - "sock=%p fd=%d", sock, ret); + "sock=%p fd=%d", sock, *fd); + ret = 1; cleanup: virMutexUnlock(&sock->lock); diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index 13cbb14..e444aef 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -97,7 +97,7 @@ ssize_t virNetSocketRead(virNetSocketPtr sock, char *buf, size_t len); ssize_t virNetSocketWrite(virNetSocketPtr sock, const char *buf, size_t len); int virNetSocketSendFD(virNetSocketPtr sock, int fd); -int virNetSocketRecvFD(virNetSocketPtr sock); +int virNetSocketRecvFD(virNetSocketPtr sock, int *fd); void virNetSocketSetTLSSession(virNetSocketPtr sock, virNetTLSSessionPtr sess); -- 1.7.6.4

2 1

[libvirt] [PATCH] remote: fix mingw32 build
by Laine Stump 04 Nov '11

04 Nov '11

tty is initialized, and later set in code that is compiled for all platforms, but is only used in a section that's inside #ifndef WIN32. --- src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ea7fb24..f3b8ad5 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -377,7 +377,7 @@ doRemoteOpen (virConnectPtr conn, */ char *name = NULL, *command = NULL, *sockname = NULL, *netcat = NULL; char *port = NULL, *authtype = NULL, *username = NULL; - bool sanity = true, verify = true, tty = true; + bool sanity = true, verify = true, tty ATTRIBUTE_UNUSED = true; char *pkipath = NULL, *keyfile = NULL; /* Return code from this function, and the private data. */ -- 1.7.7

2 1

[libvirt] [PATCH] lxc: avoid use-after-free
by Eric Blake 04 Nov '11

04 Nov '11

I got this weird failure: error: Failed to start domain simple error: internal error cannot mix caller fds with blocking execution and tracked it down to a use-after-free - virCommandSetOutputFD was storing the address of a stack-local variable, which then went out of scope before the virCommandRun that dereferenced it. Bug introduced in commit 451cfd05 (0.9.2). * src/lxc/lxc_driver.c (lxcBuildControllerCmd): Move log fd registration... (lxcVmStart): ...to caller. --- I have no idea how danpb got so lucky in being able to test recent lxc addtions, given the fact that booting an LXC domain has basically been broken for several months now, depending on whether the compiler happened to smash the stack variable in question. src/lxc/lxc_driver.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d6e5e20..37092bc 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1449,7 +1449,6 @@ lxcBuildControllerCmd(lxc_driver_t *driver, char **veths, int *ttyFDs, size_t nttyFDs, - int logfile, int handshakefd) { size_t i; @@ -1524,8 +1523,6 @@ lxcBuildControllerCmd(lxc_driver_t *driver, } virCommandPreserveFD(cmd, handshakefd); - virCommandSetOutputFD(cmd, &logfile); - virCommandSetErrorFD(cmd, &logfile); return cmd; cleanup: @@ -1747,8 +1744,10 @@ static int lxcVmStart(virConnectPtr conn, vm, nveths, veths, ttyFDs, nttyFDs, - logfd, handshakefds[1]))) + handshakefds[1]))) goto cleanup; + virCommandSetOutputFD(cmd, &logfd); + virCommandSetErrorFD(cmd, &logfd); /* Log timestamp */ if ((timestamp = virTimestamp()) == NULL) { -- 1.7.4.4

2 2

[libvirt] [PATCH] Fix naming of constant for disk event
by Daniel P. Berrange 04 Nov '11

04 Nov '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> All constants related to events should have a prefix of VIR_DOMAIN_EVENT_ * include/libvirt/libvirt.h.in, src/qemu/qemu_domain.c: Rename VIR_DOMAIN_DISK_CHANGE_MISSING_ON_START to VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START --- include/libvirt/libvirt.h.in | 4 ++-- src/qemu/qemu_domain.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 7181f62..aa320b6 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3069,12 +3069,12 @@ typedef void (*virConnectDomainEventBlockJobCallback)(virConnectPtr conn, void *opaque); /** - * virConnectDomainEventDisChangeReason: + * virConnectDomainEventDiskChangeReason: * * The reason describing why this callback is called */ typedef enum { - VIR_DOMAIN_DISK_CHANGE_MISSING_ON_START = 0, /* oldSrcPath is set */ + VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START = 0, /* oldSrcPath is set */ } virConnectDomainEventDiskChangeReason; /** diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5295783..3e755d7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1652,7 +1652,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, disk->dst, vm->def->name, uuid, disk->src); event = virDomainEventDiskChangeNewFromObj(vm, disk->src, NULL, disk->info.alias, - VIR_DOMAIN_DISK_CHANGE_MISSING_ON_START); + VIR_DOMAIN_EVENT_DISK_CHANGE_MISSING_ON_START); if (event) qemuDomainEventQueue(driver, event); -- 1.7.6.4

3 2

[libvirt] libvirt-guests - migrate/relocate on stop feature request
by Maurits van de Lande 04 Nov '11

04 Nov '11

Hello I'm using KVM in a clustered environment. When a host server shuts down or reboots the VM's should migrate to another cluster node. Currently I'm using a custom script for a two node cluster. It would be very nice if this feature could be incorporated into the libvirt-guests script. Or if a host could be specified as a relocation host. Is there any chance for this feature to be added to the script? Sincerely, Maurits van de Lande

2 3

[libvirt] [PATCH] conf: Don't free uninitialized pointer
by Jiri Denemark 04 Nov '11

04 Nov '11

This causes libvirtd to crash when both <boot dev='...'/> and <boot order='...'/> are used in one domain XML. Introduced by 5fa3d775a9f8cdb3423373eb084219aaf778df11 --- src/conf/domain_conf.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 238edfd..a85f837 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6430,7 +6430,8 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, { xmlNodePtr *nodes = NULL; int i, n; - char *bootstr, *useserial; + char *bootstr; + char *useserial = NULL; int ret = -1; unsigned long deviceBoot, serialPorts; -- 1.7.7.2

3 3

[libvirt] can't start domain with a corrupted disk attatched
by lvroyce 04 Nov '11

04 Nov '11

Hi all, I came across below issue when testing: 1.make a volume and attach it to a domain A 2.unplug the vg from the host in order to emulating a volume failure 3.start domain A(failed) In step 3 can't start domainA . because can't find disk listed in xml when create the Domain. I'm not sure if it is reasonable. In common sense, we can still start our system even if we have a corrupt data disk .And also ,if in data center we carelessly attatch a corrupt volumn to all the guest, it will result in all guests fail to boot . I suggest to automatically detach a disk if it can't be found and just give out a warning.Please let me know your opinion about if it is a bug or a feature.Thanks.

5 4

[libvirt] [RFC PATCH 00/10] use cpuset to manage numa
by Hu Tao 04 Nov '11

04 Nov '11

The goal of this series is to use cpuset to manage numa. Currently numa tuning is achieved by libnuma, the disadvantage is numa parameters can not be modified when the domain is running. By using cpuset, we can do this and more: - a new command, numatune, to get/set numa parameters - cpuset can migrate pages to new nodes if a domain's numa nodes is changed when running This is a draft for early reviews. Comments are welcome. TODO: - add --migrate option to numatune - docs for numatune Hu Tao (10): enable cgroup cpuset by default Add functions to set/get cpuset parameters use cpuset to manage numa remove dependence on libnuma new numa parameters add new API virDomain{G,S}etNumaParameters Implement main entries of virDomain{G,S}etNumaParameters Add virDomain{G,S}etNumaParameters support to the remote driver Implement virDomain{G,S}etNumaParameters for the qemu driver add new command numatune to virsh daemon/remote.c | 63 +++++++++ include/libvirt/libvirt.h.in | 23 +++ python/generator.py | 2 + src/conf/domain_conf.c | 35 ++--- src/conf/domain_conf.h | 3 +- src/driver.h | 15 ++ src/libvirt.c | 106 +++++++++++++++ src/libvirt_private.syms | 6 + src/libvirt_public.syms | 6 + src/qemu/qemu.conf | 5 +- src/qemu/qemu_cgroup.c | 37 +++++ src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_driver.c | 307 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_process.c | 111 --------------- src/remote/remote_driver.c | 50 +++++++ src/remote/remote_protocol.x | 25 ++++- src/remote_protocol-structs | 16 +++ src/util/cgroup.c | 80 +++++++++++ src/util/cgroup.h | 7 + tools/virsh.c | 187 +++++++++++++++++++++++++ 20 files changed, 950 insertions(+), 137 deletions(-) -- 1.7.3.1

2 13

[libvirt] [PATCH] build: fix deep VPATH builds
by Eric Blake 03 Nov '11

03 Nov '11

I ran into the following build failure: $ mkdir -p build1 build2/a/very/deep/hierarcy $ cd build2/a/very/deep/hierarcy $ ../../../../../configure && make $ cd ../../../../build1 $ ../configure && make ... ../../src/remote/remote_protocol.c:7:55: fatal error: ../../../../../src/remote/remote_protocol.h: No such file or directory Turns out that we were sometimes generating the remote_protocol.c file with information from the VPATH build, which is bad, since any file shipped in the tarball should be idempotent no matter how deep the VPATH build tree that created it. * src/rpc/genprotocol.pl: Don't embed VPATH into generated file. --- Pushing under the build-breaker rule. And yes, I really did create a directory by that name, while testing the earlier patches for the testsuite failure to create a UNIX socket in a deep location. :) src/rpc/genprotocol.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 7124e5c..166508b 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -59,7 +59,7 @@ while (<RPCGEN>) { s/xdr_u_quad_t/xdr_uint64_t/g; s/xdr_quad_t/xdr_int64_t/g; s/(?<!IXDR_GET_INT32 )IXDR_GET_LONG/IXDR_GET_INT32/g; - s,#include "remote/remote_protocol\.h",#include "remote_protocol.h",; + s,#include ".*remote/remote_protocol\.h",#include "remote_protocol.h",; if (m/^}/) { $in_function = 0; -- 1.7.4.4

1 0