- Devel - libvirt List Archives

[libvirt] [PATCH v2 0/3] Miscellaneous cleanups
by Martin Kletzander 30 Jan '13

30 Jan '13

This is basically v2 of long lost [1] with fixes for what Osier found out and with one one-liner patch added. [1] http://www.redhat.com/archives/libvir-list/2012-December/msg01043.html Martin Kletzander (3): conf: Don't format cputune element when not needed docs: aesthetical cleanups Ignore '.trs' files .gitignore | 1 + HACKING | 10 +++++----- docs/firewall.html.in | 2 +- docs/formatdomain.html.in | 4 ++-- docs/hacking.html.in | 10 +++++----- src/conf/domain_conf.c | 12 ++++++------ src/locking/lock_driver.h | 6 +++--- 7 files changed, 23 insertions(+), 22 deletions(-) -- 1.8.1.2

2 5

[libvirt] [PATCH] docs: fix missed documentation for virterror functions
by Claudio Bley 30 Jan '13

30 Jan '13

Commit f24404a3244b50c1d6d3a735445b02450ac40981 renamed virterror.c to virerror.c but forgot to change the reference in this file. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- docs/apibuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 9a29c42..91dabf8 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -24,7 +24,7 @@ included_files = { "libvirt.h": "header with general libvirt API definitions", "virterror.h": "header with error specific API definitions", "libvirt.c": "Main interfaces for the libvirt library", - "virterror.c": "implements error handling and reporting code for libvirt", + "virerror.c": "implements error handling and reporting code for libvirt", "virevent.c": "event loop for monitoring file handles", "virtypedparam.c": "virTypedParameters APIs", } -- 1.7.9.5

2 2

[libvirt] [PATCH v2] LXC: create directory /dev/shm automatically
by Gao feng 30 Jan '13

30 Jan '13

Now we mount /dev as tmpfs and haven't created directory /dev/shm,so the glibc api such as shm_open/sem_open will create files under dir /dev.(since /dev is mounted as tmpfs) Through these api still useable in container,but this cause directory /dev looks a little chaos. We already have filesystem type "ram",if user want to limit the memory usage of /dev/shm,he should configure the XML,so we only need to create directroy /dev/shm.If user configure the filesystem type on /dev/shm, we will mount it on /dev/shm then. This patch create directory /dev/shm automatically,the files created by shm_open/sem_open will stay in this directroy. This patch also enlarge the size of directroy /dev to the half of container's memory,64k may be too small to contain POSIX shared memory and named semphore. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 497539c..eba3e68 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -504,7 +504,8 @@ err: static int lxcContainerMountBasicFS(bool pivotRoot, - char *sec_mount_options) + char *sec_mount_options, + virDomainDefPtr vmDef) { const struct { const char *src; @@ -567,12 +568,22 @@ static int lxcContainerMountBasicFS(bool pivotRoot, if (pivotRoot) { /* - * tmpfs is limited to 64kb, since we only have device nodes in there - * and don't want to DOS the entire OS RAM usage + * tmpfs is limited to half of container's memory, + * since we not only have device nodes in there,we + * may have POSIX shared memory object and named + * semphore in there too. */ - ignore_value(virAsprintf(&opts, - "mode=755,size=65536%s", sec_mount_options)); + if (vmDef->mem.max_balloon != VIR_DOMAIN_MEMORY_PARAM_UNLIMITED) { + unsigned long long size = 0; + size = vmDef->mem.max_balloon << 9; + ignore_value(virAsprintf(&opts, + "mode=755,size=%llu%s", size, sec_mount_options)); + } else { + ignore_value(virAsprintf(&opts, + "mode=755,%s", sec_mount_options)); + } + if (!opts) { virReportOOMError(); goto cleanup; @@ -586,6 +597,13 @@ static int lxcContainerMountBasicFS(bool pivotRoot, "devfs", "/dev", "tmpfs", opts); goto cleanup; } + + VIR_DEBUG("create directory /dev/shm for POSIX shared memory and named semphore"); + if (virFileMakePath("/dev/shm") < 0) { + virReportSystemError(errno, "%s", + _("Failed to mkdir /dev/shm")); + goto cleanup; + } } rc = 0; @@ -1947,7 +1965,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS(true, sec_mount_options) < 0) + if (lxcContainerMountBasicFS(true, sec_mount_options, vmDef) < 0) goto cleanup; /* Mounts /proc/meminfo etc sysinfo */ @@ -2055,7 +2073,7 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS(false, sec_mount_options) < 0) + if (lxcContainerMountBasicFS(false, sec_mount_options, vmDef) < 0) goto cleanup; /* Mounts /proc/meminfo etc sysinfo */ -- 1.7.11.7

1 0

[libvirt] [PATCH 0/9] Address Coverity false positives
by John Ferlan 29 Jan '13

29 Jan '13

As the Coverity work winds down, I've bundled together a series of patches that only add a comment tag to the offending line of code that Coverity believes the error to be on. Each submit has a commit message indicating the reason for the tag. John Ferlan (9): xend: Address some Coverity false positives lxc: Add coverity[dead_error_begin] tag in switch stmts nodeinfo: Add coverity[dead_error_begin] and [returned_null] tags xen: Add coverity[ptr_arith] and [sign_extension] tags rpc: Add coverity[dead_error_begin] tag qemu: Add coverity[negative_returns] tag remote: Avoid coverity[leaked_storage] message. network: Add coverity[leaked_handle] to ignore error storage: Add coverity[dead_error_condition] to avoid error src/lxc/lxc_driver.c | 3 +++ src/network/bridge_driver.c | 1 + src/nodeinfo.c | 3 +++ src/qemu/qemu_hotplug.c | 1 + src/remote/remote_driver.c | 1 + src/rpc/virnetclient.c | 1 + src/storage/parthelper.c | 2 ++ src/xen/xen_hypervisor.c | 5 ++++- src/xen/xend_internal.c | 4 ++++ 9 files changed, 20 insertions(+), 1 deletion(-) -- 1.7.11.7

3 22

[libvirt] Add support for QEMU file descriptor sets
by Stefan Berger 29 Jan '13

29 Jan '13

Add two API calls to virCommand for generating the parameters necessary for passing to the QEMU -add-fd option, for example "set=10,fd=20", and the file descriptor set for the path= option, such as for example "/dev/fdset/10" Regards, Stefan --- src/libvirt_private.syms | 2 + src/util/vircommand.c | 65 +++++++++++++++++++++++++++++++++++++++++++---- src/util/vircommand.h | 6 ++++ 3 files changed, 68 insertions(+), 5 deletions(-) Index: libvirt/src/libvirt_private.syms =================================================================== --- libvirt.orig/src/libvirt_private.syms +++ libvirt/src/libvirt_private.syms @@ -165,6 +165,8 @@ virCommandSetPreExecHook; virCommandSetWorkingDirectory; virCommandToString; virCommandTransferFD; +virCommandTransferFDGetDevSet; +virCommandTransferFDGetFDSet; virCommandWait; virCommandWriteArgLog; virFork; Index: libvirt/src/util/vircommand.c =================================================================== --- libvirt.orig/src/util/vircommand.c +++ libvirt/src/util/vircommand.c @@ -109,7 +109,7 @@ struct _virCommand { * Returns true if @set contains @fd, * false otherwise. */ -static bool +static int virCommandFDIsSet(int fd, const int *set, int set_size) @@ -118,9 +118,9 @@ virCommandFDIsSet(int fd, while (i < set_size) if (set[i++] == fd) - return true; + return i--; - return false; + return -1; } /* @@ -145,7 +145,7 @@ virCommandFDSet(int fd, if (fd < 0 || !set || !set_size) return -1; - if (virCommandFDIsSet(fd, *set, *set_size)) + if (virCommandFDIsSet(fd, *set, *set_size) >= 0) return 0; if (VIR_REALLOC_N(*set, *set_size + 1) < 0) { @@ -523,7 +523,7 @@ virExecWithHook(const char *const*argv, for (i = 3; i < openmax; i++) { if (i == infd || i == childout || i == childerr) continue; - if (!keepfd || !virCommandFDIsSet(i, keepfd, keepfd_size)) { + if (!keepfd || virCommandFDIsSet(i, keepfd, keepfd_size) < 0) { tmpfd = i; VIR_MASS_CLOSE(tmpfd); } else if (virSetInherit(i, true) < 0) { @@ -896,6 +896,61 @@ virCommandTransferFD(virCommandPtr cmd, VIR_FORCE_CLOSE(fd); } +/** + * virCommandTransferFDGetFDSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the the QEMU -add-fd command line option + * for the given file descriptor. The file descriptor must previously + * have been 'transferred' in a virCommandTransfer() call. + * This function for example returns "set=10,fd=20" for file descriptor 20. + */ +char * +virCommandTransferFDGetFDSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandFDIsSet(fd, cmd->transfer, cmd->transfer_size); + + if (idx >= 0) { + if (virAsprintf(&result, "set=%d,fd=%d", idx, fd) < 0) { + virReportOOMError(); + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + + return result; +} + +/** + * virCommandTransferFDGetDevSet: + * @cmd: the command to modify + * @fd: fd to reassign to the child + * + * Get the parameters for the the QEMU path= parameter where a file + * descriptor is accessed via a file descriptor set, for example + * /dev/fdset/10. The file descriptor must previously have been + * 'transferred' in a virCommandTransfer() call. + */ +char * +virCommandTransferFDGetDevSet(virCommandPtr cmd, int fd) +{ + char *result = NULL; + int idx = virCommandFDIsSet(fd, cmd->transfer, cmd->transfer_size); + + if (idx >= 0) { + if (virAsprintf(&result, "/dev/fdset/%d", idx) < 0) { + virReportOOMError(); + } + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("file descriptor %d has not been transferred"), fd); + } + return result; +} + /** * virCommandSetPidFile: Index: libvirt/src/util/vircommand.h =================================================================== --- libvirt.orig/src/util/vircommand.h +++ libvirt/src/util/vircommand.h @@ -58,6 +58,12 @@ void virCommandPreserveFD(virCommandPtr void virCommandTransferFD(virCommandPtr cmd, int fd); +char *virCommandTransferFDGetFDSet(virCommandPtr cmd, + int fd); + +char *virCommandTransferFDGetDevSet(virCommandPtr cmd, + int fd); + void virCommandSetPidFile(virCommandPtr cmd, const char *pidfile) ATTRIBUTE_NONNULL(2);

3 8

[libvirt] [PATCH v2 0/7] Introduce virCommandDoAsyncIO
by Michal Privoznik 29 Jan '13

29 Jan '13

Currently, if we want to use IO with asynchronous command we have to copy code from virFileWrapperFd to misuse our event loop for reading and writing to the command. However, we can extend our virCommand implementation to automatically set things up. All patches but the first has been ACKed already. diff to v1: -drop usleep(100) while waiting for the event loop to process our string IOs and do it ourselves instead. Michal Privoznik (7): virCommand: Introduce virCommandDoAsyncIO Introduce event loop to commandtest tests: Create test for virCommandDoAsyncIO virFileWrapperFd: Switch to new virCommandDoAsyncIO qemu: Catch stderr of image decompression binary qemu: Catch stderr of image compression binary qemu: Destroy domain on decompression binary error src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_migration.c | 9 +- src/util/vircommand.c | 279 ++++++++++++++++++++++++++++++++++++++++++-- src/util/vircommand.h | 1 + src/util/virfile.c | 82 +------------ tests/commanddata/test3.log | 2 +- tests/commandtest.c | 136 +++++++++++++++++++++ 8 files changed, 430 insertions(+), 89 deletions(-) -- 1.8.0.2

2 10

[libvirt] [Libvirt][QEMU][HLFS]How to test HLFS driver for Libvirt
by harryxiyou 29 Jan '13

29 Jan '13

Hi Morita and other developers, I have programed HLFS(HDFS based Log-structured FileSystem) driver for Libvirt according to Morita's patch(commit 036ad5052b43fe9f0d197e89fd16715950408e1d) for Libvirt, which my patch is not for Libvirt latest version but the version of Morita's patch time.I have called back my git tree to commit 036ad5052b43fe9f0d197e89fd16715950408e1d, then i develop this patch. My patch is now available at http://cloudxy.googlecode.com/svn/branches/hlfs/person/harry/hlfs/hlfs_driv… Therefore, i am not clear about how to test it. How could i know whether it works well for libvirt&QEMU? Could Morita (Or other developers) give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 10

[libvirt] [PATCH] build: Regenerate man pages on version bump
by Jiri Denemark 29 Jan '13

29 Jan '13

Whenever libvirt version changes in configure.ac, we need to regenerate man pages so that they contain correct version info. --- daemon/Makefile.am | 2 +- tools/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 72c6190..4d5c2fd 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -395,7 +395,7 @@ endif # WITH_LIBVIRTD POD2MAN = pod2man -c "Virtualization Support" \ -r "$(PACKAGE)-$(VERSION)" -s 8 -$(srcdir)/libvirtd.8.in: libvirtd.pod.in +$(srcdir)/libvirtd.8.in: libvirtd.pod.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name LIBVIRTD $< $@ \ && if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi diff --git a/tools/Makefile.am b/tools/Makefile.am index 8a0429c..0010c39 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -61,7 +61,7 @@ virt-xml-validate: virt-xml-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ -virt-xml-validate.1: virt-xml-validate.in +virt-xml-validate.1: virt-xml-validate.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-XML-VALIDATE $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi @@ -70,12 +70,12 @@ virt-pki-validate: virt-pki-validate.in Makefile $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ -virt-pki-validate.1: virt-pki-validate.in +virt-pki-validate.1: virt-pki-validate.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-PKI-VALIDATE $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi -virt-host-validate.1: virt-host-validate.c +virt-host-validate.1: virt-host-validate.c $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-HOST-VALIDATE $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi @@ -85,7 +85,7 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ -virt-sanlock-cleanup.8: virt-sanlock-cleanup.in +virt-sanlock-cleanup.8: virt-sanlock-cleanup.in $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) --name VIRT-SANLOCK-CLEANUP $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi @@ -171,7 +171,7 @@ virsh_win_icon.$(OBJEXT): virsh_win_icon.rc --output-format coff --output $@ endif -virsh.1: virsh.pod +virsh.1: virsh.pod $(top_srcdir)/configure.ac $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \ rm $(srcdir)/$@; exit 1; fi -- 1.8.1.1

2 2

[libvirt] [PATCH 0/2] conf: fix some memory leaks
by Ján Tomko 29 Jan '13

29 Jan '13

Ján Tomko (2): conf: Fix cpumask leak in virDomainDefFree conf: Fix leaks in virNetworkObjUpdateParseFile src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) -- 1.7.8.6

3 7

[libvirt] [libvirt-sandbox][PATCH] Don't redefine _FORTIFY_SOURCE macro
by Michal Privoznik 29 Jan '13

29 Jan '13

If the _FORTIFY_SOURCE has been already defined, we unconditionally redefine it, leaving us with warning/error thrown at compilation time. --- m4/virt-compile-warnings.m4 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index cdcbad9..894ab59 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -84,8 +84,13 @@ AC_DEFUN([LIBVIRT_SANDBOX_COMPILE_WARNINGS],[ gl_WARN_ADD([-Wframe-larger-than=4096]) # Use improved glibc headers - AC_DEFINE([_FORTIFY_SOURCE], [2], - [enable compile-time and run-time bounds-checking, and some warnings]) + AH_VERBATIM([FORTIFY_SOURCE], + [/* Enable compile-time and run-time bounds-checking, and some warnings, + without upsetting newer glibc. */ + #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__ + # define _FORTIFY_SOURCE 2 + #endif + ]) # Extra special flags dnl -fstack-protector stuff passes gl_WARN_ADD with gcc -- 1.8.0.2

2 2