- Devel - libvirt List Archives

[libvirt] [PATCH v4] json: fix interface locale dependency
by Martin Kletzander 14 Aug '12

14 Aug '12

libvirt creates invalid commands if wrong locale is selected. For example with locale that uses comma as a decimal point, JSON commands created with decimal numbers are invalid because comma separates the entries in JSON. Fortunately even when decimal point is affected, thousands grouping is not, because for grouping to be enabled with *printf, there has to be an apostrophe flag specified (and supported). This patch adds specific internal function for converting doubles to strings with C locale. -- v4: - changed according to Eric's suggestions --- bootstrap.conf | 1 + configure.ac | 4 +- src/libvirt_private.syms | 1 + src/util/json.c | 2 +- src/util/util.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/util.h | 3 ++ 6 files changed, 71 insertions(+), 3 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index c112ccd..a4e1c2f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -62,6 +62,7 @@ ioctl isatty largefile listen +localeconv maintainer-makefile manywarnings mkstemp diff --git a/configure.ac b/configure.ac index 8a04d91..3951012 100644 --- a/configure.ac +++ b/configure.ac @@ -132,8 +132,8 @@ AC_CHECK_SIZEOF([long]) dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ - getpwuid_r getuid initgroups kill mmap posix_fallocate posix_memalign \ - regexec sched_getaffinity]) + getpwuid_r getuid initgroups kill mmap newlocale posix_fallocate \ + posix_memalign regexec sched_getaffinity]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c023dbf..018d3a9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1140,6 +1140,7 @@ virArgvToString; virAsprintf; virBuildPathInternal; virDirCreate; +virDoubleToStr; virEnumFromString; virEnumToString; virEventAddHandle; diff --git a/src/util/json.c b/src/util/json.c index 5132989..40d50a1 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -201,7 +201,7 @@ virJSONValuePtr virJSONValueNewNumberDouble(double data) { virJSONValuePtr val = NULL; char *str; - if (virAsprintf(&str, "%lf", data) < 0) + if (virDoubleToStr(&str, data) < 0) return NULL; val = virJSONValueNewNumber(str); VIR_FREE(str); diff --git a/src/util/util.c b/src/util/util.c index e5bb27b..4a720d8 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -44,6 +44,7 @@ #include <signal.h> #include <termios.h> #include <pty.h> +#include <locale.h> #if HAVE_LIBDEVMAPPER_H # include <libdevmapper.h> @@ -2060,6 +2061,68 @@ int virEnumFromString(const char *const*types, return -1; } +/* In case thread-safe locales are available */ +#if HAVE_NEWLOCALE + +static locale_t virLocale; + +static int +virLocaleOnceInit(void) +{ + virLocale = newlocale(LC_ALL_MASK, "C", (locale_t)0); + if (!virLocale) + return -1; + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virLocale) +#endif + +/** + * virDoubleToStr + * + * converts double to string with C locale (thread-safe). + * + * Returns -1 on error, size of the string otherwise. + */ +int +virDoubleToStr(char **strp, double number) +{ + int ret = -1; + +#if HAVE_NEWLOCALE + + locale_t old_loc; + + if (virLocaleInitialize() < 0) + goto error; + + old_loc = uselocale(virLocale); + ret = virAsprintf(strp, "%lf", number); + uselocale(old_loc); + +#else + + char *radix, *tmp; + struct lconv *lc; + + if ((ret = virVasprintf(strp, "%lf", number) < 0) + goto error; + + lc = localeconv(); + radix = lc->decimal_point; + tmp = strstr(*strp, radix); + if (tmp) { + *tmp = '.'; + if (strlen(radix) > 1) + memmove(tmp + 1, tmp + strlen(radix), strlen(*strp) - (tmp - str)); + } + +#endif /* HAVE_NEWLOCALE */ + error: + return ret; +} + const char *virEnumToString(const char *const*types, unsigned int ntypes, int type) diff --git a/src/util/util.h b/src/util/util.h index d151c27..a5d892d 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -209,6 +209,9 @@ char *virStrcpy(char *dest, const char *src, size_t destbytes) ATTRIBUTE_RETURN_CHECK; # define virStrcpyStatic(dest, src) virStrcpy((dest), (src), sizeof(dest)) +int virDoubleToStr(char **strp, double number) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + int virDiskNameToIndex(const char* str); char *virIndexToDiskName(int idx, const char *prefix); -- 1.7.8.6

2 2

[libvirt] [PATCH] virsh: say save-image-edit failed only when it does
by Ján Tomko 14 Aug '12

14 Aug '12

The common code for editing files in virsh-edit.c expects EDIT_DEFINE to return 0 on failure. virDomainSaveImageDefineXML returns 0 on success. --- tools/virsh-domain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 33b1727..69e0133 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2973,7 +2973,7 @@ cmdSaveImageEdit(vshControl *ctl, const vshCmd *cmd) "not changed.\n"), file); \ ret = true; goto edit_cleanup; #define EDIT_DEFINE \ - virDomainSaveImageDefineXML(ctl->conn, file, doc_edited, define_flags) + (virDomainSaveImageDefineXML(ctl->conn, file, doc_edited, define_flags) == 0) #define EDIT_FREE /* */ #include "virsh-edit.c" -- 1.7.8.6

2 1

[libvirt] [PATCH] Do not unlink sanlock lockspace if registering with sanlock daemon returns error
by Asad Saeed 14 Aug '12

14 Aug '12

This is a patch for bug 847848 If registering an existing lockspace with the sanlock daemon returns an error, libvirt should not proceed to unlink the lockspace. Signed-off-by: Asad Saeed <asad.saeed(a)acidseed.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 9ec99dd..f046102 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -242,7 +242,7 @@ static int virLockManagerSanlockSetupLockspace(void) virReportSystemError(-rv, _("Unable to add lockspace %s"), path); - goto error_unlink; + goto error; } else { VIR_DEBUG("Lockspace %s is already registered", path); } -- 1.7.1

2 1

[libvirt] ANNOUNCE: libvirt 0.9.6.2 maintenance release
by Cole Robinson 14 Aug '12

14 Aug '12

libvirt 0.9.6.2 maintenance release is now available. This is libvirt 0.9.6 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.6.2.tar.gz Changes in this version: * Prep for release 0.9.6.2 * build: drop check for ANSI compiler * tests: avoid seclabeltest crash * Remove unused <dirent.h> imports to appease syntax-check * Appease gnulib sc_makefile_at_at_check * test: fix segfault in networkxml2argvtest * tests: dynamically replace dnsmasq path * daemon: Fix crash in virTypedParameterArrayClear * build: update to latest gnulib, for secure tarball * build: update to latest gnulib * build: update to latest gnulib For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH] qemu: snapshot: Wire up revert for disk only snapshots
by Cole Robinson 14 Aug '12

14 Aug '12

This just uses the existing plumping to update the guest XML to point at the chosen snapshot disk images. It requires the VM to be inactive. --- Reverting to a snapshot with children and then running the guest is probably unsafe, since the backing image will change state on the child snapshots. How do internal snapshots work around this? src/qemu/qemu_driver.c | 72 ++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9bf89bb..53f5340 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11205,6 +11205,65 @@ qemuDomainSnapshotRevertInactive(struct qemud_driver *driver, return ret > 0 ? -1 : ret; } +/* The domain is expected to be locked */ +static int qemuDomainRevertToSnapshotDisk(virDomainSnapshotObjPtr snap, + virDomainObjPtr vm, + virDomainDefPtr config, + unsigned int flags) +{ + int ret = -1; + int i; + + if (virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain must be stopped to revert to a " + "disk only snapshot")); + goto cleanup; + } + + if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | + VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain can only be shutoff after reverting to a" + "disk only snapshot")); + goto cleanup; + } + + if (!config) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain XML must be present in the snapshot metadata")); + goto cleanup; + } + + for (i = 0; i < snap->def->ndisks; i++) { + virDomainDiskDefPtr vmdisk = config->disks[i]; + virDomainSnapshotDiskDefPtr snapdisk = &(snap->def->disks[i]); + char *src = NULL; + char *type = NULL; + + if (snapdisk->snapshot == VIR_DOMAIN_DISK_SNAPSHOT_NO) + continue; + + if (!(src = strdup(snapdisk->file)) || + !(type = strdup(snapdisk->driverType))) { + virReportOOMError(); + VIR_FREE(src); + VIR_FREE(type); + goto cleanup; + } + + VIR_FREE(vmdisk->src); + vmdisk->src = src; + VIR_FREE(vmdisk->driverType); + vmdisk->driverType = type; + } + + virDomainObjAssignDef(vm, config, false); + ret = 0; +cleanup: + return ret; +} + static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags) { @@ -11265,12 +11324,6 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, "to revert to inactive snapshot")); goto cleanup; } - if (snap->def->state == VIR_DOMAIN_DISK_SNAPSHOT) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("revert to external disk snapshot not supported " - "yet")); - goto cleanup; - } if (!(flags & VIR_DOMAIN_SNAPSHOT_REVERT_FORCE)) { if (!snap->def->dom) { virReportError(VIR_ERR_SNAPSHOT_REVERT_RISKY, @@ -11289,7 +11342,6 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } } - if (vm->current_snapshot) { vm->current_snapshot->def->current = false; if (qemuDomainSnapshotWriteMetadata(vm, vm->current_snapshot, @@ -11325,6 +11377,11 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + if (snap->def->state == VIR_DOMAIN_DISK_SNAPSHOT) { + ret = qemuDomainRevertToSnapshotDisk(snap, vm, config, flags); + goto endjob; + } + if (snap->def->state == VIR_DOMAIN_RUNNING || snap->def->state == VIR_DOMAIN_PAUSED) { /* Transitions 2, 3, 5, 6, 8, 9 */ @@ -11522,7 +11579,6 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } ret = 0; - endjob: if (vm && qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; -- 1.7.11.2

2 1

[libvirt] [PATCH 1/3] virsh.c: Fix compiler warning
by Cole Robinson 14 Aug '12

14 Aug '12

For some reason I only get this after applying subsequent upcoming patches that touch virsh, but don't seem to actually cause the warning. virsh.c: In function ‘vshCommandParse’: virsh.c:2014:46: error: ‘opt_index’ may be used uninitialized in this function [-Werror=maybe-uninitialized] cc1: all warnings being treated as errors --- tools/virsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index b95a008..64e2e18 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1975,7 +1975,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser) } else if (tkdata[0] == '-' && tkdata[1] == '-' && c_isalnum(tkdata[2])) { char *optstr = strchr(tkdata + 2, '='); - int opt_index; + int opt_index = 0; if (optstr) { *optstr = '\0'; /* convert the '=' to '\0' */ -- 1.7.11.2

3 8

[libvirt] [PATCH] build: Distribute check-symfile.pl
by Cole Robinson 13 Aug '12

13 Aug '12

Otherwise distcheck can fail with: GEN check-symfile Can't open perl script "../../src/check-symfile.pl": No such file or directory make[4]: *** [check-symfile] Error 2 --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 79b4e59..8a93a32 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -331,7 +331,7 @@ else !WITH_REMOTE # re-generated when configured --without-remote. check-protocol: endif -EXTRA_DIST += $(PROTOCOL_STRUCTS) +EXTRA_DIST += $(PROTOCOL_STRUCTS) check-symfile.pl check-local: check-protocol check-symfile .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) -- 1.7.11.2

2 2

[libvirt] [PATCH v9 0/7] file descriptor passing using fd sets
by Corey Bryant 13 Aug '12

13 Aug '12

libvirt's sVirt security driver provides SELinux MAC isolation for Qemu guest processes and their corresponding image files. In other words, sVirt uses SELinux to prevent a QEMU process from opening files that do not belong to it. sVirt provides this support by labeling guests and resources with security labels that are stored in file system extended attributes. Some file systems, such as NFS, do not support the extended attribute security namespace, and therefore cannot support sVirt isolation. A solution to this problem is to provide fd passing support, where libvirt opens files and passes file descriptors to QEMU. This, along with SELinux policy to prevent QEMU from opening files, can provide image file isolation for NFS files stored on the same NFS mount. This patch series adds the add-fd, remove-fd, and query-fdsets QMP monitor commands, which allow file descriptors to be passed via SCM_RIGHTS, and assigned to specified fd sets. This allows fd sets to be created per file with fds having, for example, different access rights. When QEMU needs to reopen a file with different access rights, it can search for a matching fd in the fd set. Fd sets also allow for easy tracking of fds per file, helping to prevent fd leaks. Support is also added to the block layer to allow QEMU to dup an fd from an fdset when the filename is of the /dev/fdset/nnn format, where nnn is the fd set ID. No new SELinux policy is required to prevent open of NFS files (files with type nfs_t). The virt_use_nfs boolean type simply needs to be set to false, and open will be prevented (and dup will be allowed). For example: # setsebool virt_use_nfs 0 # getsebool virt_use_nfs virt_use_nfs --> off Corey Bryant (7): qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg qapi: Introduce add-fd, remove-fd, query-fdsets block: Prevent detection of /dev/fdset/ as floppy block: Convert open calls to qemu_open block: Convert close calls to qemu_close block: Enable qemu_open/close to work with fd sets monitor: Clean up fd sets on monitor disconnect block/raw-posix.c | 46 +++++---- block/raw-win32.c | 6 +- block/vdi.c | 5 +- block/vmdk.c | 25 ++--- block/vpc.c | 4 +- block/vvfat.c | 16 +-- cutils.c | 5 + monitor.c | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++ monitor.h | 5 + osdep.c | 113 +++++++++++++++++++++ qapi-schema.json | 98 ++++++++++++++++++ qemu-char.c | 12 ++- qemu-common.h | 2 + qemu-tool.c | 20 ++++ qmp-commands.hx | 122 +++++++++++++++++++++++ savevm.c | 4 +- 16 files changed, 715 insertions(+), 55 deletions(-) -- 1.7.10.4

3 18

[libvirt] ANNOUNCE: Release of libvirt-sandbox version 0.1.0
by Daniel P. Berrange 13 Aug '12

13 Aug '12

I pleased to announce the a new public release of libvirt-sandbox, version 0.1.0, is now available for download ftp://libvirt.org/libvirt/sandbox/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) The libvirt-sandbox package provides an API layer on top of libvirt-gobject which facilitates the cration of application sandboxes using virtualization technology. An application sandbox is a virtual machine or container that runs a single application binary, directly from the host OS filesystem. In other words there is no separate guest operating system install to build or manager. At this point in time libvirt-sandbox can create sandboxes using either LXC or KVM, and should in theory be extendable to any libvirt driver. The first release is able to run simple command line based programs. This release has focused on improving the virt-sandbox-service tool, to facilitate creation and management of system services within sandboxes. For example, to allow a single host to easily run 100's of isolated apache instances. Changed in this release: - ABI+API incompatible with previous library, so new soname - Some changes to CLI args for virt-sandbox command - Many fixes to virt-sandbox-service - Use /run/libvirt-sandbox instead of /root/.cache/libvirt when run as root - Fix typo setting RUNDIR - Re-add /kernel suffix to kmod search dir - Add APIs to select kernel version - Fix SEGV when attaching consoles to NULL stdin - Add logrotate script for virt-sandbox-service - Turn GVirSandboxConsole into an abstract class - Configurable keysequence for breaking out of console (defaults to Ctrl+]) - Fix handling of strace debugging - Add APIs to select kmod directory prefix - Require glib >= 2.32 - Refactor APIs for configuring sandbox mounts - Maintain a single sorted list of mounts - Add support for RAM filesystems - Setup tmpfs for /run and /tmp in sandbox services - Remove need to provide executable for sandbox services, just rely on systemd unit filename - Enable admin customization of systemd services in sandbox services - Rewrite part of virt-sandbox-service in C to reduce long term memory overhead - Create custom systemd startup sequence Thanks to everyone who has contributed towards this release. 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] Release only specific sanlock resource
by Frido Roose 13 Aug '12

13 Aug '12

This is a patch for bug 826704 All sanlock resources get released when hot-dettaching a disk from the domain because virLockManagerSanlockRelease uses the wrong function parameters/flags. With the patch only the resources that should be released are cleaned up. Signed-off-by: Frido Roose <frido.roose(a)gmail.com> --- src/locking/lock_driver_sanlock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 7c71af3..0625d09 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -814,7 +814,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, unsigned int flags) { virLockManagerSanlockPrivatePtr priv = lock->privateData; - int res_count; + int res_count=priv->res_count; int rv; virCheckFlags(0, -1); @@ -834,7 +834,7 @@ static int virLockManagerSanlockRelease(virLockManagerPtr lock, VIR_FREE(*state); } - if ((rv = sanlock_release(-1, priv->vm_pid, SANLK_REL_ALL, 0, NULL)) < 0) { + if ((rv = sanlock_release(-1, priv->vm_pid, 0, res_count, priv->res_args)) < 0) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to release lock: error %d"), rv); -- 1.7.1

3 4