- Devel - libvirt List Archives

[libvirt] [PATCH v2 1/2] LXC: umount the temporary filesystem created by libvirt
by Gao feng 11 Sep '13

11 Sep '13

The devpts, dev and fuse filesystems are mounted temporarily. there is no need to export them to container if container shares the root directory with host. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9c04d06..0ab4ab7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1486,6 +1486,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, int ret = -1; char *sec_mount_options; char *stateDir = NULL; + char *tmp = NULL; VIR_DEBUG("Setup pivot root"); @@ -1522,6 +1523,26 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; #endif + /* These filesystems are created by libvirt temporarily, they + * shouldn't appear in container. */ + if (STREQ(root->src, "/")) { + if (virAsprintf(&tmp, "%s/%s.dev", stateDir, vmDef->name) < 0 || + lxcContainerUnmountSubtree(tmp, false) < 0) + goto cleanup; + + VIR_FREE(tmp); + if (virAsprintf(&tmp, "%s/%s.devpts", stateDir, vmDef->name) < 0 || + lxcContainerUnmountSubtree(tmp, false) < 0) + goto cleanup; + +#if WITH_FUSE + VIR_FREE(tmp); + if (virAsprintf(&tmp, "%s/%s.fuse", stateDir, vmDef->name) < 0 || + lxcContainerUnmountSubtree(tmp, false) < 0) + goto cleanup; +#endif + } + /* If we have the root source being '/', then we need to * get rid of any existing stuff under /proc, /sys & /tmp. * We need new namespace aware versions of those. We must @@ -1571,6 +1592,7 @@ cleanup: VIR_FREE(stateDir); virCgroupFree(&cgroup); VIR_FREE(sec_mount_options); + VIR_FREE(tmp); return ret; } -- 1.8.3.1

2 2

[libvirt] [PATCH] Add test for the nodemask double free crash
by Ján Tomko 11 Sep '13

11 Sep '13

Commit ef5d51d fixed a crash for numatune with auto placement and nodeset specified: <numatune> <memory mode='preferred' placement='auto' nodeset='0'/> </numatune> --- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 4 +++ .../qemuxml2argv-numatune-auto-nodeset-invalid.xml | 31 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 36 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args new file mode 100644 index 0000000..1b440d9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml new file mode 100644 index 0000000..d2315b4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <numatune> + <memory mode='preferred' placement='auto' nodeset="0-5,^4"/> + </numatune> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 15d3095..fdf1d31 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -910,6 +910,7 @@ mymain(void) DO_TEST("blkiotune-device", QEMU_CAPS_NAME); DO_TEST("cputune", QEMU_CAPS_NAME); DO_TEST("numatune-memory", NONE); + DO_TEST("numatune-auto-nodeset-invalid", NONE); DO_TEST("numad", NONE); DO_TEST("numad-auto-vcpu-static-numatune", NONE); DO_TEST("numad-auto-memory-vcpu-cpuset", NONE); -- 1.8.1.5

2 2

[libvirt] Help needed in simulating libvirt
by Arun Viswanath 11 Sep '13

11 Sep '13

Hi All, I'm need to simulate libvirt API's say to mock the libvirt API responses. (Actually I need to simulate qemu API's response). Because of my project needs I need to write this simulated libvirt server in Java. I believe the simulated libvirt can be written as java RPC which should capable to receive the client RPC request calls and by dispatcher we can dispatch to the simulated java functions. I searched for .x file to be used for generating server stubs but unfortunately .x files like "remote_protocol.x", "virnetprotocol.x", "qemu_protocol.x" and "lxc_monitor_protocol.x" are not containing any procedure for libvirt API's that exposed. Please let me know which files will have these exposed procedures and how can I use it in java, Also I'm not sure how to implement the ssl layer support for the libvirt server in java. I need to write a java server in such a way that python client should capable to create a connection with uri "qemu+tls://systemip:port?no_tty=1". Also with the created connection object it should able to call the libvirt API's like getCapabilities, etc. Any help and ideas on this will be really helpful. Thanks in Advance, Arun V

3 6

[libvirt] [PATCH libvirt-python 00/17] RFC: Split the python binding out
by Daniel P. Berrange 11 Sep '13

11 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This patch series demonstrates the minimum possible changes required to split the python binding out into a separate GIT repository. These patches do not apply to current GIT. Instead you have to first create a new git repo, initializing based on the history of the python/ subdirectory. Assuming your current checkout of libvirt is in a directory 'libvirt', then $ git clone libvirt libvirt-python $ cd libvirt-python $ git filter-branch --subdirectory-filter python --tag-name-filter cat -- --all $ git for-each-ref --format="%(refname)" refs/original/ | xargs -n 1 git update-ref -d $ git reflog expire --expire=now --all $ git gc --prune=now You should now have a repo that's a couple of MB in size, showing only the files from python/ dir, in the root. The tags have been re-written to show content from the python/ directory. One problem I've not yet solved is tag signatures. Many of the original vN.N.N tags are signed by Daniel Veillard, and the CVE-XXXXXXX ones signed by Eric Blake. Obviously when re-writing the tags those signatures are now invalid. I can't find a way to get 'git filter-branch' to prompt me to sign the new tags it is creating, and AFAIK, you can't sign an existing tag without deleting and re-creating it ? Anyway, with the repo as above, you can now apply the 17 patches from this series onto that The build system uses python distutils instead of autoconf/automake. It still uses the code generator as before though, pulling the XML files from /usr/share/libvirt/api (or whever you installed libvirt, as indicated by pkg-config) I created a simple autobuild.sh to do an end-to-end build, including the RPM generation. Or you can just do python setup.py build ('make' equiv) python setup.py test ('make check' equiv) python setup.py rpm ('make rpm' equiv) python setup.py clean ('make clean' equiv) Historically libvirt python only worked with the exact matching libvirt binary. Before releasing this, I think we need to make it possible to compile libvirt-python against any recent-ish libvirt version. This shouldn't actually be too hard - the generator will take care of most of it. All we need do is fix up the -override.c files to make use of version checks to hide APIs not present in older libvirt. The RPM is designed to be drop in compatible/identical to/with the existing libvirt-python RPM, so users should notice no difference in any way when upgrading. If you don't want to try the filter-branch steps yourself, you can clone this complete series + repo from http://fedorapeople.org/cgit/berrange/public_git/libvirt-python-split.git/ Notice how the history is intact right back to the first commit of the python bindings. Daniel P. Berrange (17): Update generator for new code layout Remove <config.h> from source files Remove obsolete Makefile.am Remote compiler annotation attributes Fix potential use of uninitialized value in virDomainGetVcpuPinInfo Remove use of VIR_FREE from code Remove use of VIR_ALLOC_N Import STREQ macro from libvirt Add decl of MIN macro Update header file includes Import gnulib's xalloc_oversized macro Import gnulib's ignore_value macro Remove use of virStrcpyStatic Remove use of VIR_FORCE_CLOSE Add build/ to python module path for sanitytest.py Add execute permission for sanitytest.py Setup distutils buld system .gitignore | 4 + AUTHORS.in | 12 + COPYING | 339 ++++++++++++++++++++++++ COPYING.LESSER | 502 ++++++++++++++++++++++++++++++++++++ MANIFEST.in | 25 ++ Makefile.am | 172 ------------- NEWS | 9 + autobuild.sh | 25 ++ generator.py | 69 ++--- libvirt-lxc-override.c | 14 +- libvirt-override.c | 664 +++++++++++++++++++++++++----------------------- libvirt-python.spec.in | 34 +++ libvirt-qemu-override.c | 11 +- sanitytest.py | 4 + setup.py | 294 +++++++++++++++++++++ typewrappers.c | 8 +- 16 files changed, 1629 insertions(+), 557 deletions(-) create mode 100644 .gitignore create mode 100644 AUTHORS.in create mode 100644 COPYING create mode 100644 COPYING.LESSER create mode 100644 MANIFEST.in delete mode 100644 Makefile.am create mode 100644 NEWS create mode 100755 autobuild.sh create mode 100644 libvirt-python.spec.in mode change 100644 => 100755 sanitytest.py create mode 100644 setup.py -- 1.8.3.1

3 31

[libvirt] [PATCH v2 0/5] add new API virConnectGetCPUModelNames
by Giuseppe Scrivano 11 Sep '13

11 Sep '13

This series adds a new API "virConnectGetCPUModelNames" that allows to retrieve the list of CPU models known by the hypervisor for a specific architecture. This new function is mainly needed by virt-manager to not read directly the cpu_map.xml file (it could also be different when accessing a remote daemon). *v2 main changes - set a hard limit for the number of CPU models that is possible to fetch from a remote server. - Use VIR_EXPAND_N instead of VIR_REALLOC_N. - s|1.1.2|1.1.3| Giuseppe Scrivano (5): cpu_models: add new public API cpu_models: implement the remote protocol cpu_models: add the support for qemu cpu_models: add the support for the test protocol cpu_models: add Python bindings daemon/remote.c | 47 ++++++++++++++++++++++++++++++ include/libvirt/libvirt.h.in | 18 ++++++++++++ python/generator.py | 1 + python/libvirt-override-api.xml | 7 +++++ python/libvirt-override.c | 56 ++++++++++++++++++++++++++++++++++++ python/libvirt-override.py | 11 +++++++ src/cpu/cpu.c | 64 +++++++++++++++++++++++++++++++++++++++++ src/cpu/cpu.h | 3 ++ src/driver.h | 7 +++++ src/libvirt.c | 47 ++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 ++++ src/qemu/qemu_driver.c | 14 +++++++++ src/remote/remote_driver.c | 59 +++++++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 20 ++++++++++++- src/remote_protocol-structs | 11 +++++++ src/test/test_driver.c | 16 +++++++++++ tools/virsh-host.c | 48 +++++++++++++++++++++++++++++++ tools/virsh.pod | 5 ++++ 19 files changed, 439 insertions(+), 1 deletion(-) -- 1.8.3.1

3 15

[libvirt] [PATCH 1/2] LXC: umount the temporary filesystem
by Gao feng 11 Sep '13

11 Sep '13

The devpts, dev and fuse filesystems are mounted temporarily. there is no need to export them to container. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9c04d06..0ab4ab7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1486,6 +1486,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, int ret = -1; char *sec_mount_options; char *stateDir = NULL; + char *tmp = NULL; VIR_DEBUG("Setup pivot root"); @@ -1522,6 +1523,26 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; #endif + /* These filesystems are created by libvirt temporarily, they + * shouldn't appear in container. */ + if (STREQ(root->src, "/")) { + if (virAsprintf(&tmp, "%s/%s.dev", stateDir, vmDef->name) < 0 || + lxcContainerUnmountSubtree(tmp, false) < 0) + goto cleanup; + + VIR_FREE(tmp); + if (virAsprintf(&tmp, "%s/%s.devpts", stateDir, vmDef->name) < 0 || + lxcContainerUnmountSubtree(tmp, false) < 0) + goto cleanup; + +#if WITH_FUSE + VIR_FREE(tmp); + if (virAsprintf(&tmp, "%s/%s.fuse", stateDir, vmDef->name) < 0 || + lxcContainerUnmountSubtree(tmp, false) < 0) + goto cleanup; +#endif + } + /* If we have the root source being '/', then we need to * get rid of any existing stuff under /proc, /sys & /tmp. * We need new namespace aware versions of those. We must @@ -1571,6 +1592,7 @@ cleanup: VIR_FREE(stateDir); virCgroupFree(&cgroup); VIR_FREE(sec_mount_options); + VIR_FREE(tmp); return ret; } -- 1.8.3.1

1 2

[libvirt] [PATCH] virBitmapFree: Change the function to a macro
by Liuji (Jeremy) 11 Sep '13

11 Sep '13

The parameter of virBitmapFree function is just a pointer, not a pointer of pointer. The second VIR_FREE on virBitmapFree only assign NULL to the formal parameter. After calling the virBitmapFree function, the actual parameter are still not NULL. There are many code segment don't assign NULL to the formal parameter after calling the virBitmapFree function. This will bring potential risks. A problem scenario: 1) The XML of VM contain the below segment: <numatune> <memory mode='preferred' placement='auto' nodeset='0'/> </numatune> 2)virsh create the VM 3)In the virDomainDefParseXML funtion: /* Ignore 'nodeset' if 'placement' is 'auto' finally */ if (placement_mode == VIR_NUMA_TUNE_MEM_PLACEMENT_MODE_AUTO) { virBitmapFree(def->numatune.memory.nodemask); def->numatune.memory.nodemask = NULL; } 4)Then, virsh destroy the VM. In the virDomainDefFree funtion, it also call the virBitmapFree function to free the nodemask: virBitmapFree(def->numatune.memory.nodemask); But after this call, the value of def->numatune.memory.nodemask is still not NULL. This will generate an exception. >From d2b69b130bca89df85005d395c6d45d8df0b74f1 Mon Sep 17 00:00:00 2001 From: "Liuji (Jeremy)" <jeremy.liu(a)huawei.com> Date: Fri, 6 Sep 2013 04:49:30 -0400 Subject: [PATCH] virBitmapFree: Change the function to a macro The parameter of virBitmapFree function is just a pointer, not a pointer of pointer. The second VIR_FREE on virBitmapFree only assign NULL to the formal parameter. After calling the virBitmapFree function, the actual parameter are still not NULL. There are many code segment don't assign NULL to the formal parameter after calling the virBitmapFree function. This will bring potential risks. Signed-off-by: Liuji (Jeremy) <jeremy.liu(a)huawei.com> --- src/util/virbitmap.c | 21 --------------------- src/util/virbitmap.h | 21 ++++++++++++++++----- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 7e1cd02..cde502f 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -40,13 +40,6 @@ #define VIR_FROM_THIS VIR_FROM_NONE -struct _virBitmap { - size_t max_bit; - size_t map_len; - unsigned long *map; -}; - - #define VIR_BITMAP_BITS_PER_UNIT ((int) sizeof(unsigned long) * CHAR_BIT) #define VIR_BITMAP_UNIT_OFFSET(b) ((b) / VIR_BITMAP_BITS_PER_UNIT) #define VIR_BITMAP_BIT_OFFSET(b) ((b) % VIR_BITMAP_BITS_PER_UNIT) @@ -88,20 +81,6 @@ virBitmapPtr virBitmapNew(size_t size) return bitmap; } -/** - * virBitmapFree: - * @bitmap: previously allocated bitmap - * - * Free @bitmap previously allocated by virBitmapNew. - */ -void virBitmapFree(virBitmapPtr bitmap) -{ - if (bitmap) { - VIR_FREE(bitmap->map); - VIR_FREE(bitmap); - } -} - int virBitmapCopy(virBitmapPtr dst, virBitmapPtr src) { diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index b682523..9b93b88 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -28,6 +28,22 @@ # include <sys/types.h> +struct _virBitmap { + size_t max_bit; + size_t map_len; + unsigned long *map; +}; + +/* + * Free previously allocated bitmap + */ +#define virBitmapFree(bitmap) \ + do { \ + if (bitmap) { \ + VIR_FREE((bitmap)->map); \ + VIR_FREE(bitmap); \ + } \ + } while (0); typedef struct _virBitmap virBitmap; typedef virBitmap *virBitmapPtr; @@ -38,11 +54,6 @@ typedef virBitmap *virBitmapPtr; virBitmapPtr virBitmapNew(size_t size) ATTRIBUTE_RETURN_CHECK; /* - * Free previously allocated bitmap - */ -void virBitmapFree(virBitmapPtr bitmap); - -/* * Copy all bits from @src to @dst. The bitmap sizes * must be the same */ -- 1.8.1.4

5 15

[libvirt] [PATCH] Update docs about user namespace for LXC
by Daniel P. Berrange 11 Sep '13

11 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Mention that user namespace can be enabled using the UID/GID mapping schema. Fix typo in link anchor for container args in domain XML docs. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/drvlxc.html.in | 14 +++++--------- docs/formatdomain.html.in | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 640968f..1e6aa1d 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -40,15 +40,11 @@ primary "host" OS environment, the libvirt LXC driver requires that certain kernel namespaces are compiled in. Libvirt currently requires the 'mount', 'ipc', 'pid', and 'uts' namespaces to be available. If separate network interfaces are desired, then the 'net' namespace is -required. In the near future, the 'user' namespace will optionally be -supported. -</p> - -<p> -<strong>NOTE: In the absence of support for the 'user' namespace, -processes inside containers cannot be securely isolated from host -process without the use of a mandatory access control technology -such as SELinux or AppArmor.</strong> +required. If the guest configuration declares a +<a href="formatdomain.html#elementsOSContainer">UID or GID mapping</a>, +the 'user' namespace will be enabled to apply these. <strong>A suitably +configured UID/GID mapping is a pre-requisite to making containers +secure, in the absence of sVirt confinement.</strong> </p> <h2><a name="init">Default container setup</a></h2> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8bfe0b..971b059 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -263,7 +263,7 @@ <span class="since">Since 1.0.4</span></dd> </dl> - <h4><a name="eleemntsOSContainer">Container boot</a></h4> + <h4><a name="elementsOSContainer">Container boot</a></h4> <p> When booting a domain using container based virtualization, instead -- 1.8.3.1

3 2

[libvirt] [PATCH] Add some notes about security considerations when using LXC
by Daniel P. Berrange 11 Sep '13

11 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Describe some of the issues to be aware of when configuring LXC guests with security isolation as a goal. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/drvlxc.html.in | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 1e6aa1d..dd2e93c 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -168,6 +168,99 @@ Further block or character devices will be made available to containers depending on their configuration. </p> +<h2><a name="security">Security considerations</a></h2> + +<p> +The libvirt LXC driver is fairly flexible in how it can be configured, +and as such does not enforce a requirement for strict security +separation between a container and the host. This allows it to be used +in scenarios where only resource control capabilities are important, +and resource sharing is desired. Applications wishing to ensure secure +isolation between a container and the host must ensure that they are +writing a suitable configuration +</p> + +<h3><a name="securenetworking">Network isolation</a></h3> + +<p> +If the guest configuration does not list any network interfaces, +the <code>network</code> namespace will not be activated, and thus +the container will see all the host's network interfaces. This will +allow apps in the container to bind to/connect from TCP/UDP addresses +and ports from the host OS. It also allows applications to access +UNIX domain sockets associated with the host OS. +</p> + +<p> +It should be noted that <code>systemd</code> has a UNIX domain socket +hich is used for communication by <code>systemctl</code>. Thus, with a +container that shares the host's network namespace, it will be possible +for a user in the container to invoke operations on <code>systemd</code> +in the same way it could if outside the container. In particular this +would allow <code>root</code> in the container to do anything including +shutting down the host OS. If this is not desired, then applications +should either specify the UID/GID mapping in the configuration to enable +user namespaces, or should set the <code><privnet/></code> flag +in the <code><features>....</features></code> element. +</p> + + +<h3><a name="securefs">Filesystem isolation</a></h3> + +<p> +If the guest confuguration does not list any filesystems, then +the container will be setup with a root filesystem that matches +the host's root filesystem. As noted earlier, only a few locations +such as <code>/dev</code>, <code>/proc</code> and <code>/sys</code> +will be altered. This means that, in the absence of restrictions +from sVirt, a process running as user/group N:M inside the container +will be able to access alnmost exactly the same files as a process +running as user/group N:M in the host. +</p> + +<p> +There are multiple options for restricting this. It is possible to +simply map the existing root filesystem through to the container in +read-only mode. Alternatively a completely separate root filesystem +can be configured for the guest. In both cases, further sub-mounts +can be applied to customize the content that is made visible. Note +that in the absence of sVirt controls, it is still possible for the +root user in a container to unmount any sub-mounts applied. The user +namespace feature can also be used to restrict access to files based +on the UID/GID mappings. +</p> + +<h3><a name="secureusers">User and group isolation</a></h3> + +<p> +If the guest configuration does not list any ID mapping, then the +user and group IDs used inside the container will match those used +outside the container. In addition, the capabilities associated with +a process in the container will infer the same privileges they would +for a process in the host. This has obvious implications for security, +since a root user inside the container will be able to access any +file owned by root that is visible to the container, and perform more +or less any privileged kernel operation. In the absence of additional +protection from sVirt, this means that the root user inside a container +is effectively as powerful as the root user in the host. There is no +security isolation of the root user. +</p> + +<p> +The ID mapping facility was introduced to allow for stricter control +over the privileges of users inside the container. It allows apps to +define rules such as "user ID 0 in the container maps to user ID 1000 +in the host". In addition the privileges associated with capabilities +are somewhat reduced so that they can not be used to escape from the +container environment. A full description of user namespaces is outside +the scope of this document, however LWN has +<a href="https://lwn.net/Articles/532593/">a good writeup on the topic</a>. +From the libvirt POV, the key thing to remember is that defining an +ID mapping for users and groups in the container XML configuration +causes libvirt to activate the user namespace feature. +</p> + + <h2><a name="activation">Systemd Socket Activation Integration</a></h2> <p> -- 1.8.3.1

4 3

[libvirt] [PATCH] docs, comments: minor typo fixes
by Oskari Saarenmaa 11 Sep '13

11 Sep '13

Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- 84 files changed, 97 insertions(+), 97 deletions(-) diff --git a/ChangeLog-old b/ChangeLog-old index b5d44d5..e07b11c 100644 --- a/ChangeLog-old +++ b/ChangeLog-old @@ -5504,7 +5504,7 @@ Tue Nov 11 15:51:42 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> Mon Nov 10 12:05:42 GMT 2008 Daniel P. Berrange <berrange(a)redhat.com> - * src/openvz_conf.c: Read filesytem template name from config + * src/openvz_conf.c: Read filesystem template name from config files. Increase buffer size when parsing vzctl version number Thu Nov 6 20:45:42 CET 2008 Jim Meyering <meyering(a)redhat.com> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index f8bfe0b..d656836 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -254,7 +254,7 @@ to the (optional) ramdisk image in the host OS.</dd> <dt><code>cmdline</code></dt> <dd>The contents of this element specify arguments to be passed to - the kernel (or installer) at boottime. This is often used to + the kernel (or installer) at boot time. This is often used to specify an alternate primary console (eg serial port), or the installation media source / kickstart file</dd> <dt><code>dtb</code></dt> @@ -426,7 +426,7 @@ process and virtual CPUs can be specified separately by <code>cputune</code>. If attribute <code>emulatorpin</code> of <code>cputune</code> is specified, <code>cpuset</code> - specified by <code>vcpu</code> here will be ingored; Similarly, + specified by <code>vcpu</code> here will be ignored; Similarly, For virtual CPUs which has <code>vcpupin</code> specified, <code>cpuset</code> specified by <code>cpuset</code> here will be ignored; For virtual CPUs which doesn't have @@ -1235,7 +1235,7 @@ </tr> <tr> <td>relaxed</td> - <td>Relax contstraints on timers</td> + <td>Relax constraints on timers</td> <td> on, off</td> <td><span class="since">1.0.0 (QEMU only)</span></td> </tr> @@ -1358,7 +1358,7 @@ <dd> <p> The <code>tickpolicy</code> attribute determines what - happens whens QEMU misses a deadline for injecting a + happens when QEMU misses a deadline for injecting a tick to the guest: </p> <dl> @@ -2268,7 +2268,7 @@ <dt><code>readonly</code></dt> <dd> - Enables exporting filesytem as a readonly mount for guest, by + Enables exporting filesystem as a readonly mount for guest, by default read-write access is given (currently only works for QEMU/KVM driver). </dd> @@ -2385,7 +2385,7 @@ <h4><a name="elementsControllers">Controllers</a></h4> <p> - Depending on the guest architecture, some device busses can + Depending on the guest architecture, some device buses can appear more than once, with a group of virtual devices tied to a virtual controller. Normally, libvirt can automatically infer such controllers without requiring explicit XML markup, but sometimes @@ -3773,7 +3773,7 @@ qemu-kvm -net nic,model=? /dev/null <span class="since">Since 1.1.0.</span> This uses the optional <code>nativeMode</code> attribute on the <code><tag></code> element: <code>nativeMode</code> may be set to 'tagged' or - 'untagged'. The id atribute of the element sets the native vlan. + 'untagged'. The id attribute of the element sets the native vlan. </p> <h5><a name="elementLink">Modifying virtual link state</a></h5> @@ -4134,7 +4134,7 @@ qemu-kvm -net nic,model=? /dev/null "9216", and <code>heads</code> with value "1". By default, the first video device in domain xml is the primary one, but the optional attribute <code>primary</code> (<span class="since">since 1.0.2</span>) - with value 'yes' can be used to mark the primary in cases of mutiple + with value 'yes' can be used to mark the primary in cases of multiple video device. The non-primary must be type of "qxl". The optional attribute <code>ram</code> (<span class="since">since 1.0.2</span>) is allowed for "qxl" type only and specifies diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 36c381a..63600b3 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -478,7 +478,7 @@ <span class="since">Since 1.1.0</span>. This uses the optional <code>nativeMode</code> attribute on the <code><tag></code> element: <code>nativeMode</code> may be set to 'tagged' or - 'untagged'. The id atribute of the element sets the native vlan. + 'untagged'. The id attribute of the element sets the native vlan. </p> <p> <code><vlan></code> elements can also be specified in @@ -591,7 +591,7 @@ This particular route would *not* be preferred if there was another existing rout on the system with the same address and prefix but with a lower value for the metric. If there is a - route in the host system configuration that should be overriden + route in the host system configuration that should be overridden by a route in a virtual network whenever the virtual network is running, the configuration for the system-defined route should be modified to have a higher metric, and the route on the diff --git a/docs/news.html.in b/docs/news.html.in index 6a07eb0..8a6d5bd 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -13327,7 +13327,7 @@ and check the <a href="http://libvirt.org/git/?p=libvirt.git;a=log">GIT log</a> <h3>0.1.5: Sep 5 2006</h3> <ul> <li>Support for new hypercalls change in Xen changeset 86d26e6ec89b</li> - <li>bug fixes: virParseUUID() was wrong, netwoking for paravirt guestsi + <li>bug fixes: virParseUUID() was wrong, networking for paravirt guestsi (Daniel Berrange), virsh on non-existent domains (Daniel Berrange), string cast bug when handling error in python (Pete Vetere), HTTP 500 xend error code handling (Pete Vetere and Daniel Berrange)</li> diff --git a/po/af.po b/po/af.po index 84878d6..746bc0e 100644 --- a/po/af.po +++ b/po/af.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/am.po b/po/am.po index be63bff..499bff6 100644 --- a/po/am.po +++ b/po/am.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ar.po b/po/ar.po index 0de95c9..f7e75ba 100644 --- a/po/ar.po +++ b/po/ar.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/as.po b/po/as.po index fc7944a..66fdd51 100644 --- a/po/as.po +++ b/po/as.po @@ -21030,7 +21030,7 @@ msgstr "মেটাডাতাৰ দৈৰ্ঘ্য সীমাৰ বা #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ত মিটাডাটা অসম্পূৰ্ণ" #: src/test/test_driver.c:2064 diff --git a/po/be.po b/po/be.po index 681acf7..3f2b73b 100644 --- a/po/be.po +++ b/po/be.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bg.po b/po/bg.po index a3ad765..279be33 100644 --- a/po/bg.po +++ b/po/bg.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bn.po b/po/bn.po index 88a67ac..60ac095 100644 --- a/po/bn.po +++ b/po/bn.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bn_IN.po b/po/bn_IN.po index 5172b20..e718f0b 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -20783,7 +20783,7 @@ msgstr "মিটা-ডাটার দৈর্ঘ্য সীমা বহ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'-র মধ্যে উপস্থিত মিটাডাটা অসম্পূর্ণ" #: src/test/test_driver.c:2064 diff --git a/po/bo.po b/po/bo.po index 32e6ac4..abcf64b 100644 --- a/po/bo.po +++ b/po/bo.po @@ -20592,7 +20592,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/bs.po b/po/bs.po index b7397dd..1390462 100644 --- a/po/bs.po +++ b/po/bs.po @@ -20620,7 +20620,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ca.po b/po/ca.po index f7e771d..a6bc3ab 100644 --- a/po/ca.po +++ b/po/ca.po @@ -20675,7 +20675,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/cs.po b/po/cs.po index d8b1159..af9d566 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20714,7 +20714,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/cy.po b/po/cy.po index db7d71b..fa07a81 100644 --- a/po/cy.po +++ b/po/cy.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/da.po b/po/da.po index 993411b..48c555e 100644 --- a/po/da.po +++ b/po/da.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/de.po b/po/de.po index 2433aef..c0e9d17 100644 --- a/po/de.po +++ b/po/de.po @@ -16933,7 +16933,7 @@ msgstr "getunnelte Offline-Migration ist nicht sinnvoll" #: src/qemu/qemu_migration.c:2109 src/qemu/qemu_migration.c:2407 msgid "domain disappeared" -msgstr "Doamin ist verschwunden" +msgstr "Domain ist verschwunden" #: src/qemu/qemu_migration.c:2321 src/qemu/qemu_migration.c:3400 msgid "cannot create pipe for tunnelled migration" @@ -21623,7 +21623,7 @@ msgstr "Metadaten-Länge außerhalb des Bereichs" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "Unvollständige Metadaten in '%s'" #: src/test/test_driver.c:2064 diff --git a/po/el.po b/po/el.po index 1e1803d..71ec4ca 100644 --- a/po/el.po +++ b/po/el.po @@ -20709,7 +20709,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/en_GB.po b/po/en_GB.po index 2e4d418..3c66182 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/es.po b/po/es.po index f189277..f9972c8 100644 --- a/po/es.po +++ b/po/es.po @@ -21694,7 +21694,7 @@ msgstr "la longitud de los metadatos está fuera de rango" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "metadatos incompletos en '%s'" #: src/test/test_driver.c:2064 diff --git a/po/et.po b/po/et.po index 5f9c18c..39e766e 100644 --- a/po/et.po +++ b/po/et.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/eu_ES.po b/po/eu_ES.po index 703bfed..ecbfc45 100644 --- a/po/eu_ES.po +++ b/po/eu_ES.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/fa.po b/po/fa.po index 1d56043..c8d24d2 100644 --- a/po/fa.po +++ b/po/fa.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/fi.po b/po/fi.po index b81d916..1db6ccd 100644 --- a/po/fi.po +++ b/po/fi.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/fr.po b/po/fr.po index f164fd1..ad9d22b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -20672,7 +20672,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/gl.po b/po/gl.po index 4cc8c36..7d09fab 100644 --- a/po/gl.po +++ b/po/gl.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/gu.po b/po/gu.po index 1304ee9..4332c8a 100644 --- a/po/gu.po +++ b/po/gu.po @@ -20945,7 +20945,7 @@ msgstr "સીમા ની બહાર મેટાડેટા ની લં #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' માં અપૂરતુ મેટાડેટા" #: src/test/test_driver.c:2064 diff --git a/po/he.po b/po/he.po index 1bcc34b..1614684 100644 --- a/po/he.po +++ b/po/he.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/hi.po b/po/hi.po index d966d2b..2e952bd 100644 --- a/po/hi.po +++ b/po/hi.po @@ -20902,7 +20902,7 @@ msgstr "मेटाडेटा की लंबाई परिसर से #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' में अपूर्ण मेटाडेटा" #: src/test/test_driver.c:2064 diff --git a/po/hr.po b/po/hr.po index e74c8e1..46b83bb 100644 --- a/po/hr.po +++ b/po/hr.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/hu.po b/po/hu.po index bfba878..02289d3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/hy.po b/po/hy.po index 79d4dd9..ab2e2b3 100644 --- a/po/hy.po +++ b/po/hy.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/id.po b/po/id.po index 6f1854a..b7948b2 100644 --- a/po/id.po +++ b/po/id.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/is.po b/po/is.po index baef4c6..8bbcec3 100644 --- a/po/is.po +++ b/po/is.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/it.po b/po/it.po index d2469c4..271da4e 100644 --- a/po/it.po +++ b/po/it.po @@ -20819,7 +20819,7 @@ msgstr "lunghezza dei metadata fuori dalla gamma" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "metadata incompleti in '%s'" #: src/test/test_driver.c:2064 diff --git a/po/ja.po b/po/ja.po index 7457281..9cd07af 100644 --- a/po/ja.po +++ b/po/ja.po @@ -21449,7 +21449,7 @@ msgstr "メタデータの長さは範囲外です" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' にあるメタ情報が不完全です" #: src/test/test_driver.c:2064 diff --git a/po/ka.po b/po/ka.po index 0c04465..ecfbbf4 100644 --- a/po/ka.po +++ b/po/ka.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/kn.po b/po/kn.po index ae343b0..1b5c86a 100644 --- a/po/kn.po +++ b/po/kn.po @@ -20910,7 +20910,7 @@ msgstr "ಮೆಟಾಡಾಟಾದ ಗಾತ್ರವು ವ್ಯಾಪ್ತ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ನಲ್ಲಿ ಅಪೂರ್ಣವಾದ ಮೆಟಾಡಾಟಾ" #: src/test/test_driver.c:2064 diff --git a/po/ko.po b/po/ko.po index 8de0d48..583c149 100644 --- a/po/ko.po +++ b/po/ko.po @@ -20701,7 +20701,7 @@ msgstr "메타데이터 길이가 범위를 벗어남" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'안에 완전하지 않은 메타데이터" #: src/test/test_driver.c:2064 diff --git a/po/ku.po b/po/ku.po index 422ff15..0bf4cc3 100644 --- a/po/ku.po +++ b/po/ku.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/libvirt.pot b/po/libvirt.pot index 8c81c40..b900df6 100644 --- a/po/libvirt.pot +++ b/po/libvirt.pot @@ -20592,7 +20592,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/lo.po b/po/lo.po index 93f5e42..1e04889 100644 --- a/po/lo.po +++ b/po/lo.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/lt.po b/po/lt.po index a9902d5..24d9f83 100644 --- a/po/lt.po +++ b/po/lt.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/lv.po b/po/lv.po index e83d44c..2a68e75 100644 --- a/po/lv.po +++ b/po/lv.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/mk.po b/po/mk.po index 3273217..166fa24 100644 --- a/po/mk.po +++ b/po/mk.po @@ -20623,7 +20623,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ml.po b/po/ml.po index 8fd9d70..d337f5a 100644 --- a/po/ml.po +++ b/po/ml.po @@ -21159,7 +21159,7 @@ msgstr "മെറ്റാഡേറ്റായുടെ വ്യാപ്ത #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'-ല്‍ പൂര്‍ത്തിയാകാത്ത മെറ്റഡേറ്റാ" #: src/test/test_driver.c:2064 diff --git a/po/mr.po b/po/mr.po index 0b2eae6..d1775a5 100644 --- a/po/mr.po +++ b/po/mr.po @@ -20873,7 +20873,7 @@ msgstr "मेटाडेटा" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' अंतर्गत अपूर्ण मेटाडेटा आढळले" #: src/test/test_driver.c:2064 diff --git a/po/ms.po b/po/ms.po index d8b067e..2df16a7 100644 --- a/po/ms.po +++ b/po/ms.po @@ -20605,7 +20605,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/my.po b/po/my.po index a4545ba..0abf143 100644 --- a/po/my.po +++ b/po/my.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/nb.po b/po/nb.po index 60e7c41..109fc30 100644 --- a/po/nb.po +++ b/po/nb.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/nl.po b/po/nl.po index c230958..4c6dc81 100644 --- a/po/nl.po +++ b/po/nl.po @@ -20860,7 +20860,7 @@ msgstr "lengte van metadata buiten de reeks" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "onvolledige metadata in '%s'" #: src/test/test_driver.c:2064 diff --git a/po/nn.po b/po/nn.po index 8989f9b..fa5fc97 100644 --- a/po/nn.po +++ b/po/nn.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/nso.po b/po/nso.po index 16246fe..229d76f 100644 --- a/po/nso.po +++ b/po/nso.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/or.po b/po/or.po index 934c21e..a8c95f2 100644 --- a/po/or.po +++ b/po/or.po @@ -20663,7 +20663,7 @@ msgstr "ଅଧିତଥ୍ୟ ଲମ୍ବର ସୀମା ବାହାରେ" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ରେ ଅସମ୍ପୂର୍ଣ୍ଣ ଅଧିତଥ୍ୟ" #: src/test/test_driver.c:2064 diff --git a/po/pa.po b/po/pa.po index 6345a0f..3eb002b 100644 --- a/po/pa.po +++ b/po/pa.po @@ -20706,7 +20706,7 @@ msgstr "ਮੈਟਾਡਾਟਾ ਦੀ ਲੰਬਾਈ ਰੇਂਜ ਤੋਂ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' ਅਧੂਰਾ ਮੈਟਾਡਾਟਾ" #: src/test/test_driver.c:2064 diff --git a/po/pl.po b/po/pl.po index 65ad1f0..72f2e50 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21042,7 +21042,7 @@ msgstr "długość metadanych jest spoza zakresu" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "niepełne metadane w \"%s\"" #: src/test/test_driver.c:2064 diff --git a/po/pt.po b/po/pt.po index 4d22356..3bf93b7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20622,7 +20622,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/pt_BR.po b/po/pt_BR.po index 6b5448e..32c7d06 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21529,7 +21529,7 @@ msgstr "comprimento dos meta dados fora do intervalo" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "meta dados incompletos em \"%s\"" #: src/test/test_driver.c:2064 diff --git a/po/ro.po b/po/ro.po index c3f5a77..14e1f07 100644 --- a/po/ro.po +++ b/po/ro.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ru.po b/po/ru.po index d757aad..88f5ec7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20835,7 +20835,7 @@ msgstr "длина метаданных выходит за пределы ди #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "незавершенные метаданные в «%s»" #: src/test/test_driver.c:2064 diff --git a/po/si.po b/po/si.po index e216364..078e059 100644 --- a/po/si.po +++ b/po/si.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sk.po b/po/sk.po index 98ac256..cb126fd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sl.po b/po/sl.po index d4a9325..ea0877d 100644 --- a/po/sl.po +++ b/po/sl.po @@ -20619,7 +20619,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sq.po b/po/sq.po index b1f6a04..e661560 100644 --- a/po/sq.po +++ b/po/sq.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sr.po b/po/sr.po index a26576c..8d50483 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20682,7 +20682,7 @@ msgstr "дужина мета податка је ван опсега" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po index 3cfaacb..d2904b8 100644 --- a/po/sr(a)latin.po +++ b/po/sr(a)latin.po @@ -20683,7 +20683,7 @@ msgstr "dužina meta podatka je van opsega" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/sv.po b/po/sv.po index f239425..55ff394 100644 --- a/po/sv.po +++ b/po/sv.po @@ -20772,7 +20772,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/ta.po b/po/ta.po index 5f6ae0e..ca41fe8 100644 --- a/po/ta.po +++ b/po/ta.po @@ -21240,7 +21240,7 @@ msgstr "மெட்டா தரவின் எண்ணிக்கை அத #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'ல் முடியாத மெட்டாதரவு" #: src/test/test_driver.c:2064 diff --git a/po/te.po b/po/te.po index 4c87855..7b05c7f 100644 --- a/po/te.po +++ b/po/te.po @@ -20818,7 +20818,7 @@ msgstr "మెటాడాటా యొక్క పొడవు స్థాయ #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s'నందు అంసపూర్తి మెటాడాటా" #: src/test/test_driver.c:2064 diff --git a/po/th.po b/po/th.po index fb56621..c3a1e90 100644 --- a/po/th.po +++ b/po/th.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/tr.po b/po/tr.po index 154278f..122da0e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/uk.po b/po/uk.po index 5ea7984..c97d740 100644 --- a/po/uk.po +++ b/po/uk.po @@ -21894,7 +21894,7 @@ msgstr "довжина метаданих не належить діапазон #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "неповні метадані у «%s»" #: src/test/test_driver.c:2064 diff --git a/po/ur.po b/po/ur.po index 403bcee..5390817 100644 --- a/po/ur.po +++ b/po/ur.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/vi.po b/po/vi.po index ef6a165..01b94da 100644 --- a/po/vi.po +++ b/po/vi.po @@ -20833,7 +20833,7 @@ msgstr "độ dài dữ liệu meta vượt miền" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "dữ liệu meta không hoàn thiện trong '%s'" #: src/test/test_driver.c:2064 diff --git a/po/vi_VN.po b/po/vi_VN.po index 66f5946..d2e69a0 100644 --- a/po/vi_VN.po +++ b/po/vi_VN.po @@ -20834,7 +20834,7 @@ msgstr "độ dài dữ liệu meta vượt miền" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "dữ liệu meta không hoàn thiện trong '%s'" #: src/test/test_driver.c:2064 diff --git a/po/zh_CN.po b/po/zh_CN.po index 28d1411..22c2d6d 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20697,7 +20697,7 @@ msgstr "元数据长度超出范围" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "'%s' 中不完整的元数据" #: src/test/test_driver.c:2064 @@ -24508,7 +24508,7 @@ msgstr "指定未知驱动程序路径 '%s' (尝试：vbox:///session)" #: src/vbox/vbox_driver.c:182 src/vbox/vbox_tmpl.c:1034 #, c-format msgid "unknown driver path '%s' specified (try vbox:///system)" -msgstr "指定未知驱动程序路径 '%s' (尝试：vbox:///systme)" +msgstr "指定未知驱动程序路径 '%s' (尝试：vbox:///system)" #: src/vbox/vbox_driver.c:188 msgid "unable to initialize VirtualBox driver API" diff --git a/po/zh_TW.po b/po/zh_TW.po index 0edb5b8..d9099b2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -20625,7 +20625,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/po/zu.po b/po/zu.po index 3266988..2b0f598 100644 --- a/po/zu.po +++ b/po/zu.po @@ -20618,7 +20618,7 @@ msgstr "" #: src/test/test_driver.c:1992 #, c-format -msgid "incomplete metdata in '%s'" +msgid "incomplete metadata in '%s'" msgstr "" #: src/test/test_driver.c:2064 diff --git a/python/generator.py b/python/generator.py index fb321c6..a91dde8 100755 --- a/python/generator.py +++ b/python/generator.py @@ -510,11 +510,11 @@ skip_function = ( 'virStreamRecv', # overridden in libvirt-override-virStream.py 'virStreamSend', # overridden in libvirt-override-virStream.py - 'virConnectUnregisterCloseCallback', # overriden in virConnect.py - 'virConnectRegisterCloseCallback', # overriden in virConnect.py + 'virConnectUnregisterCloseCallback', # overridden in virConnect.py + 'virConnectRegisterCloseCallback', # overridden in virConnect.py - 'virDomainCreateXMLWithFiles', # overriden in virConnect.py - 'virDomainCreateWithFiles', # overriden in virDomain.py + 'virDomainCreateXMLWithFiles', # overridden in virConnect.py + 'virDomainCreateWithFiles', # overridden in virDomain.py # 'Ref' functions have no use for bindings users. "virConnectRef", diff --git a/src/libvirt.c b/src/libvirt.c index 07a3fd5..665b30b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9058,7 +9058,7 @@ error: * Define a domain, but does not start it. * This definition is persistent, until explicitly undefined with * virDomainUndefine(). A previous definition for this domain would be - * overriden if it already exists. + * overridden if it already exists. * * Some hypervisors may prevent this operation if there is a current * block copy operation on a transient domain with the same id as the diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c225618..f9eee44 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1989,7 +1989,7 @@ testDomainRestoreFlags(virConnectPtr conn, goto cleanup; if (saferead(fd, xml, len) != len) { virReportSystemError(errno, - _("incomplete metdata in '%s'"), path); + _("incomplete metadata in '%s'"), path); goto cleanup; } xml[len] = '\0'; diff --git a/src/util/virpci.c b/src/util/virpci.c index be50b4f..92927aa 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -670,7 +670,7 @@ virPCIDeviceIsParent(virPCIDevicePtr dev, virPCIDevicePtr check, void *data) goto cleanup; } - /* otherwise, SRIOV allows VFs to be on different busses then their PFs. + /* otherwise, SRIOV allows VFs to be on different buses than their PFs. * In this case, what we need to do is look for the "best" match; i.e. * the most restrictive match that still satisfies all of the conditions. */ -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] fix configure to require yajl if qemu is new enough
by Eric Blake 11 Sep '13

11 Sep '13

After yet another debug session on IRC about failure to use qemu because yajl-devel wasn't installed, I came up with these patches. The first is just preparation (no change to generated code); and with the second, I validated that uninstalling yajl-devel and then trying to configure once again gives me the desired: checking for yajl_tree_parse in -lyajl... no configure: error: You must install the libyajl library & headers to compile libvirt [I can't claim build-breaker or trivial rule for either of these patches, but as I am also the autoconf guru around here, I won't be surprised if the extent of other's reviews is "yep, I installed it and it did what you said"...] And yes, I tested on RHEL 5 that it still works with autoconf 2.59. Eric Blake (2): build: avoid obsolete AC_HELP_STRING build: fix regression in requiring yajl for new enough qemu configure.ac | 221 +++++++++++++++++++++++++++++++++++----------------- m4/virt-apparmor.m4 | 4 +- m4/virt-lib.m4 | 12 +-- m4/virt-selinux.m4 | 3 +- 4 files changed, 158 insertions(+), 82 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH] Fix cgroups when all are mounted on /sys/fs/cgroup
by Daniel P. Berrange 11 Sep '13

11 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some users in Ubuntu/Debian seem to have a setup where all the cgroup controllers are mounted on /sys/fs/cgroup rather than any /sys/fs/cgroup/<controller> name. In the loop which detects which controllers are present for a mount point we were modifying 'mnt_dir' field in the 'struct mntent' var, but not always restoring the original value. This caused detection to break in the all-in-one mount setup. Fix that logic bug and add test case coverage for this mount setup. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/vircgroup.c | 3 ++- tests/vircgroupmock.c | 42 ++++++++++++++++++++++++++++++++++++--- tests/vircgrouptest.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 4 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 16458a3..a260356 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -342,10 +342,11 @@ virCgroupDetectMounts(virCgroupPtr group) entry.mnt_dir); goto error; } - *tmp2 = '\0'; + /* If it is a co-mount it has a filename like "cpu,cpuacct" * and we must identify the symlink path */ if (strchr(tmp2 + 1, ',')) { + *tmp2 = '\0'; if (virAsprintf(&linksrc, "%s/%s", entry.mnt_dir, typestr) < 0) goto error; diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index f1a5700..bf52843 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -103,6 +103,27 @@ const char *proccgroups = "blkio 8 4 1\n"; +const char *procmountsallinone = + "rootfs / rootfs rw 0 0\n" + "sysfs /sys sysfs rw,nosuid,nodev,noexec,relatime 0 0\n" + "proc /proc proc rw,nosuid,nodev,noexec,relatime 0 0\n" + "udev /dev devtmpfs rw,relatime,size=16458560k,nr_inodes=4114640,mode=755 0 0\n" + "devpts /dev/pts devpts rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 0 0\n" + "nfsd /proc/fs/nfsd nfsd rw,relatime 0 0\n" + "cgroup /not/really/sys/fs/cgroup cgroup rw,relatime,blkio,devices,memory,cpuacct,cpu,cpuset 0 0\n"; + +const char *procselfcgroupsallinone = + "6:blkio,devices,memory,cpuacct,cpu,cpuset:/"; + +const char *proccgroupsallinone = + "#subsys_name hierarchy num_cgroups enabled\n" + "cpuset 6 1 1\n" + "cpu 6 1 1\n" + "cpuacct 6 1 1\n" + "memory 6 1 1\n" + "devices 6 1 1\n" + "blkio 6 1 1\n"; + static int make_file(const char *path, const char *name, const char *value) @@ -378,11 +399,20 @@ static void init_sysfs(void) FILE *fopen(const char *path, const char *mode) { + const char *mock; + bool allinone = false; init_syms(); + mock = getenv("VIR_CGROUP_MOCK_MODE"); + if (mock && STREQ(mock, "allinone")) + allinone = true; + if (STREQ(path, "/proc/mounts")) { if (STREQ(mode, "r")) { - return fmemopen((void *)procmounts, strlen(procmounts), mode); + if (allinone) + return fmemopen((void *)procmountsallinone, strlen(procmountsallinone), mode); + else + return fmemopen((void *)procmounts, strlen(procmounts), mode); } else { errno = EACCES; return NULL; @@ -390,7 +420,10 @@ FILE *fopen(const char *path, const char *mode) } if (STREQ(path, "/proc/cgroups")) { if (STREQ(mode, "r")) { - return fmemopen((void *)proccgroups, strlen(proccgroups), mode); + if (allinone) + return fmemopen((void *)proccgroupsallinone, strlen(proccgroupsallinone), mode); + else + return fmemopen((void *)proccgroups, strlen(proccgroups), mode); } else { errno = EACCES; return NULL; @@ -398,7 +431,10 @@ FILE *fopen(const char *path, const char *mode) } if (STREQ(path, "/proc/self/cgroup")) { if (STREQ(mode, "r")) { - return fmemopen((void *)procselfcgroups, strlen(procselfcgroups), mode); + if (allinone) + return fmemopen((void *)procselfcgroupsallinone, strlen(procselfcgroupsallinone), mode); + else + return fmemopen((void *)procselfcgroups, strlen(procselfcgroups), mode); } else { errno = EACCES; return NULL; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 4bdd4c9..f12587c 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -99,6 +99,16 @@ const char *mountsFull[VIR_CGROUP_CONTROLLER_LAST] = { [VIR_CGROUP_CONTROLLER_BLKIO] = "/not/really/sys/fs/cgroup/blkio", [VIR_CGROUP_CONTROLLER_SYSTEMD] = "/not/really/sys/fs/cgroup/systemd", }; +const char *mountsAllInOne[VIR_CGROUP_CONTROLLER_LAST] = { + [VIR_CGROUP_CONTROLLER_CPU] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_CPUACCT] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_CPUSET] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_MEMORY] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_DEVICES] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, + [VIR_CGROUP_CONTROLLER_BLKIO] = "/not/really/sys/fs/cgroup", + [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL, +}; const char *links[VIR_CGROUP_CONTROLLER_LAST] = { [VIR_CGROUP_CONTROLLER_CPU] = "/not/really/sys/fs/cgroup/cpu", @@ -108,6 +118,18 @@ const char *links[VIR_CGROUP_CONTROLLER_LAST] = { [VIR_CGROUP_CONTROLLER_DEVICES] = NULL, [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, [VIR_CGROUP_CONTROLLER_BLKIO] = NULL, + [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL, +}; + +const char *linksAllInOne[VIR_CGROUP_CONTROLLER_LAST] = { + [VIR_CGROUP_CONTROLLER_CPU] = NULL, + [VIR_CGROUP_CONTROLLER_CPUACCT] = NULL, + [VIR_CGROUP_CONTROLLER_CPUSET] = NULL, + [VIR_CGROUP_CONTROLLER_MEMORY] = NULL, + [VIR_CGROUP_CONTROLLER_DEVICES] = NULL, + [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, + [VIR_CGROUP_CONTROLLER_BLKIO] = NULL, + [VIR_CGROUP_CONTROLLER_SYSTEMD] = NULL, }; @@ -417,6 +439,34 @@ cleanup: return ret; } +static int testCgroupNewForSelfAllInOne(const void *args ATTRIBUTE_UNUSED) +{ + virCgroupPtr cgroup = NULL; + int ret = -1; + const char *placement[VIR_CGROUP_CONTROLLER_LAST] = { + [VIR_CGROUP_CONTROLLER_CPU] = "/", + [VIR_CGROUP_CONTROLLER_CPUACCT] = "/", + [VIR_CGROUP_CONTROLLER_CPUSET] = "/", + [VIR_CGROUP_CONTROLLER_MEMORY] = "/", + [VIR_CGROUP_CONTROLLER_DEVICES] = "/", + [VIR_CGROUP_CONTROLLER_FREEZER] = NULL, + [VIR_CGROUP_CONTROLLER_BLKIO] = "/", + }; + + if (virCgroupNewSelf(&cgroup) < 0) { + fprintf(stderr, "Cannot create cgroup for self\n"); + goto cleanup; + } + + ret = validateCgroup(cgroup, "", mountsAllInOne, linksAllInOne, placement); + +cleanup: + virCgroupFree(&cgroup); + return ret; +} + + + # define FAKESYSFSDIRTEMPLATE abs_builddir "/fakesysfsdir-XXXXXX" static int @@ -455,6 +505,11 @@ mymain(void) if (virtTestRun("New cgroup for domain partition escaped", 1, testCgroupNewForPartitionDomainEscaped, NULL) < 0) ret = -1; + setenv("VIR_CGROUP_MOCK_MODE", "allinone", 1); + if (virtTestRun("New cgroup for self (allinone)", 1, testCgroupNewForSelfAllInOne, NULL) < 0) + ret = -1; + unsetenv("VIR_CGROUP_MOCK_MODE"); + if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakesysfsdir); -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: endjob returns a bool
by Eric Blake 11 Sep '13

11 Sep '13

Osier Yang pointed out that ever since commit 31cb030, the signature of qemuDomainObjEndJob was changed to return a bool. While comparison against 0 or > 0 still gives the right results, it looks fishy; we also had one place that was comparing < 0 which is effectively dead code. * src/qemu/qemu_migration.c (qemuMigrationPrepareAny): Fix dead code bug. (qemuMigrationBegin): Use more canonical form of bool check. * src/qemu/qemu_driver.c (qemuAutostartDomain) (qemuDomainCreateXML, qemuDomainSuspend, qemuDomainResume) (qemuDomainShutdownFlags, qemuDomainReboot, qemuDomainReset) (qemuDomainDestroyFlags, qemuDomainSetMemoryFlags) (qemuDomainSetMemoryStatsPeriod, qemuDomainInjectNMI) (qemuDomainSendKey, qemuDomainGetInfo, qemuDomainScreenshot) (qemuDomainSetVcpusFlags, qemuDomainGetVcpusFlags) (qemuDomainRestoreFlags, qemuDomainGetXMLDesc) (qemuDomainCreateWithFlags, qemuDomainAttachDeviceFlags) (qemuDomainUpdateDeviceFlags, qemuDomainDetachDeviceFlags) (qemuDomainBlockResize, qemuDomainBlockStats) (qemuDomainBlockStatsFlags, qemuDomainMemoryStats) (qemuDomainMemoryPeek, qemuDomainGetBlockInfo) (qemuDomainAbortJob, qemuDomainMigrateSetMaxDowntime) (qemuDomainMigrateGetCompressionCache) (qemuDomainMigrateSetCompressionCache) (qemuDomainMigrateSetMaxSpeed) (qemuDomainSnapshotCreateActiveInternal) (qemuDomainRevertToSnapshot, qemuDomainSnapshotDelete) (qemuDomainQemuMonitorCommand, qemuDomainQemuAttach) (qemuDomainBlockJobImpl, qemuDomainBlockCopy) (qemuDomainBlockCommit, qemuDomainOpenGraphics) (qemuDomainGetBlockIoTune, qemuDomainGetDiskErrors) (qemuDomainPMSuspendForDuration, qemuDomainPMWakeup) (qemuDomainQemuAgentCommand, qemuDomainFSTrim): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Most of this is mechanical, but the change to qemuMigrationPrepareAny requires special care to ensure that checking for 0 instead of negative isn't introducing a bug on failure to start incoming migration. src/qemu/qemu_driver.c | 115 +++++++++++++++++++++------------------------- src/qemu/qemu_migration.c | 4 +- 2 files changed, 55 insertions(+), 64 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b5d126..bbf2d23 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -293,7 +293,7 @@ qemuAutostartDomain(virDomainObjPtr vm, err ? err->message : _("unknown error")); } - if (qemuDomainObjEndJob(data->driver, vm) == 0) + if (!qemuDomainObjEndJob(data->driver, vm)) vm = NULL; } @@ -1612,7 +1612,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags) < 0) { virDomainAuditStart(vm, "booted", false); - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; goto cleanup; @@ -1637,7 +1637,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, if (dom) dom->id = vm->def->id; - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1722,7 +1722,7 @@ static int qemuDomainSuspend(virDomainPtr dom) { ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1787,7 +1787,7 @@ static int qemuDomainResume(virDomainPtr dom) { ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1882,7 +1882,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -1992,7 +1992,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2035,7 +2035,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) priv->fakeReboot = false; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2121,15 +2121,14 @@ qemuDomainDestroyFlags(virDomainPtr dom, virDomainAuditStop(vm, "destroyed"); if (!vm->persistent) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; } ret = 0; endjob: - if (vm && - qemuDomainObjEndJob(driver, vm) == 0) + if (vm && !qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2274,7 +2273,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2348,7 +2347,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2396,10 +2395,8 @@ static int qemuDomainInjectNMI(virDomainPtr domain, unsigned int flags) qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: if (vm) @@ -2462,7 +2459,7 @@ static int qemuDomainSendKey(virDomainPtr domain, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -2518,7 +2515,7 @@ static int qemuDomainGetInfo(virDomainPtr dom, err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(driver, vm); } - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; } @@ -3670,7 +3667,7 @@ endjob: unlink(tmp); VIR_FREE(tmp); - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -4225,7 +4222,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -4919,7 +4916,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) qemuDomainObjExitAgent(vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; if (ncpuinfo < 0) @@ -5446,7 +5443,7 @@ qemuDomainRestoreFlags(virConnectPtr conn, if (virFileWrapperFdClose(wrapperFd) < 0) VIR_WARN("Failed to close %s", path); - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; else if (ret < 0 && !vm->persistent) { qemuDomainRemoveInactive(driver, vm); @@ -5666,7 +5663,7 @@ static char *qemuDomainGetXMLDesc(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; } @@ -6065,7 +6062,7 @@ qemuDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -6937,7 +6934,7 @@ static int qemuDomainAttachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -7081,7 +7078,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -7219,7 +7216,7 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -8917,7 +8914,7 @@ qemuDomainBlockResize(virDomainPtr dom, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -8993,7 +8990,7 @@ qemuDomainBlockStats(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9161,7 +9158,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, *nparams = tmp; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9556,7 +9553,7 @@ qemuDomainMemoryStats(virDomainPtr dom, } } - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9699,7 +9696,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -9848,7 +9845,7 @@ static int qemuDomainGetBlockInfo(virDomainPtr dom, ret = 0; } - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; } else { ret = 0; @@ -11145,7 +11142,7 @@ static int qemuDomainAbortJob(virDomainPtr dom) { qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11196,7 +11193,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11251,7 +11248,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11307,7 +11304,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -11355,7 +11352,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, priv->migMaxBandwidth = bandwidth; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; } else { priv->migMaxBandwidth = bandwidth; @@ -11708,7 +11705,7 @@ cleanup: } endjob: - if (vm && qemuDomainObjEndJob(driver, vm) == 0) { + if (vm && !qemuDomainObjEndJob(driver, vm)) { /* Only possible if a transient vm quit while our locks were down, * in which case we don't want to save snapshot metadata. */ *vmptr = NULL; @@ -13290,7 +13287,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (qemuDomainSnapshotRevertInactive(driver, vm, snap) < 0) { if (!vm->persistent) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; goto cleanup; @@ -13317,7 +13314,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virDomainAuditStart(vm, "from-snapshot", rc >= 0); if (rc < 0) { if (!vm->persistent) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; goto cleanup; @@ -13340,7 +13337,7 @@ static int qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, ret = 0; endjob: - if (vm && qemuDomainObjEndJob(driver, vm) == 0) + if (vm && !qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -13506,7 +13503,7 @@ static int qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -13559,7 +13556,7 @@ static int qemuDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; } @@ -13641,7 +13638,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (qemuProcessAttach(conn, driver, vm, pid, pidfile, monConfig, monJSON) < 0) { - if (qemuDomainObjEndJob(driver, vm) > 0) + if (qemuDomainObjEndJob(driver, vm)) qemuDomainRemoveInactive(driver, vm); vm = NULL; monConfig = NULL; @@ -13654,7 +13651,7 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, if (dom) dom->id = vm->def->id; - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -14149,7 +14146,7 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, } endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) { vm = NULL; goto cleanup; } @@ -14380,10 +14377,8 @@ endjob: if (ret < 0) disk->mirrorFormat = VIR_STORAGE_FILE_NONE; VIR_FREE(mirror); - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: VIR_FREE(device); @@ -14572,10 +14567,8 @@ endjob: top_parent, VIR_DISK_CHAIN_READ_ONLY); } - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: VIR_FREE(device); @@ -14641,10 +14634,8 @@ qemuDomainOpenGraphics(virDomainPtr dom, ret = qemuMonitorOpenGraphics(priv->mon, protocol, fd, "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH) != 0); qemuDomainObjExitMonitor(driver, vm); - if (qemuDomainObjEndJob(driver, vm) == 0) { + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; - goto cleanup; - } cleanup: if (vm) @@ -14956,7 +14947,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, ret = 0; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15030,7 +15021,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, ret = n; endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15561,7 +15552,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, qemuDomainObjExitAgent(vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15610,7 +15601,7 @@ qemuDomainPMWakeup(virDomainPtr dom, qemuDomainObjExitMonitor(driver, vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15696,7 +15687,7 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, VIR_FREE(result); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: @@ -15766,7 +15757,7 @@ qemuDomainFSTrim(virDomainPtr dom, qemuDomainObjExitAgent(vm); endjob: - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; cleanup: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 3177756..69a9013 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2125,7 +2125,7 @@ endjob: if (qemuMigrationJobFinish(driver, vm) == 0) vm = NULL; } else { - if (qemuDomainObjEndJob(driver, vm) == 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; } goto cleanup; @@ -2334,7 +2334,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, VIR_QEMU_PROCESS_START_PAUSED | VIR_QEMU_PROCESS_START_AUTODESTROY) < 0) { virDomainAuditStart(vm, "migrated", false); - if (qemuDomainObjEndJob(driver, vm) < 0) + if (!qemuDomainObjEndJob(driver, vm)) vm = NULL; goto endjob; } -- 1.8.3.1

2 2

[libvirt] [libvirt-php] bug in libvirt_domain_change_vcpus()
by Olivier Doucet 11 Sep '13

11 Sep '13

Hello everyone, I think there is a bug in the current implementation of function libvirt_domain_change_vcpu(). When using this function (with second parameter = 2), I have the following error : Error setting maxvcpus=2: (domain_definition):8: Specification mandate value for attribute curre <vcpu>2</vcpu> --^ If I'm right, the equivalent with 'virsh' binary is 'setvcpus', and this is working. If I look into source code (http://libvirt.org/git/?p=libvirt-php.git;a=blob;f=src/libvirt-php.c;h=7ce2…) it seems this operation is done by rewriting the whole XML. I think we should use instead C function virDomainSetVcpus http://libvirt.org/html/libvirt-libvirt.html#virDomainSetVcpus What do you think ? Olivier

3 5

[libvirt] [PATCH] qemu: Fix connectGetType() API
by Michal Novotny 10 Sep '13

10 Sep '13

This patch fixes qemuConnectGetType() API function to return KVM if appropriate, i.e. when /dev/kvm exists as the KVM module is loaded. No further check is being done so it's merely showing the possibility that KVM virtualization is available on the host however we don't have any guest information (as it's connection-only related) so we cannot sure we can use KVM. This can be useful to identify we have KVM (Virt Support) available on the host if host and guest archs are the same. Testing: Done using a simple application with C source code below. [before patch applied]$ ./test Hypervisor type: QEMU [after patch applied]$ ./test Hypervisor type: KVM $ Testing C code: int main() { virConnectPtr conn = NULL; conn = virConnectOpen("qemu:///system"); if (!conn) return 1; printf("Hypervisor type: %s\n", virConnectGetType(conn)); virConnectClose(conn); return 0; } Compiled on F-17 x86_64 host using: gcc -o test test.c -lvirt Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- src/qemu/qemu_driver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 9b5d126..b770967 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1132,6 +1132,16 @@ static const char *qemuConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { if (virConnectGetTypeEnsureACL(conn) < 0) return NULL; + /* + * If KVM is available for the host architecture then report KVM support. + * This approach merely shows it is possible to have KVM support as module is + * loaded however if you select different architecture, e.g. ARM on x86_64 host, + * the KVM option will not be available as there is no KVM virtualization + * support for ARM architecture that could be running on top of x86_64 host. + */ + if (access("/dev/kvm", F_OK) == 0) + return "KVM"; + return "QEMU"; } -- 1.7.11.7

3 3

[libvirt] [PATCH] systemd: add debug message when virDBusCallMethod failed
by Gao feng 10 Sep '13

10 Sep '13

Generate debug message when systemd doesn't support interface org.freedesktop.machine1.Manager. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/util/virsystemd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3e69ef6..c631557 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -233,6 +233,7 @@ int virSystemdCreateMachine(const char *name, if (err->code == VIR_ERR_DBUS_SERVICE && STREQ(err->str2, "org.freedesktop.DBus.Error.ServiceUnknown")) { virResetLastError(); + VIR_DEBUG("systemd doesn't support interface org.freedesktop.machine1.Manager"); ret = -2; } goto cleanup; -- 1.8.3.1

3 5

[libvirt] link fow downloading libvirt-0.10.2-19.el6
by arun abhinay 10 Sep '13

10 Sep '13

Hi, In reference to comment28 in below link https://bugzilla.redhat.com/show_bug.cgi?id=911609#c28 The issue was fixed in libvirt-0.10.2-19.el6 version. I am facing similar crash and want to check with libvirt-0.10.2-19.el6 version. But i couldnt find this version from opensource. We could only find below version of libvirt from http://libvirt.org/sources/ *libvirt-0.10.2-1.fc17.src.rpm 24-Sep-2012 07:32 21M libvirt-0.10.2-1.fc17.x86_64.rpm 24-Sep-2012 07:32 21K libvirt-0.10.2.tar.gz 24-Sep-2012 07:53 21M** * *Can any one please provide me a link from where i can download libvirt-0.10.2-19.el6 version.* I am pasting my BT of my core ffor reference below #0 0x00007f068e9f951b in remoteClientCloseFunc (client=<value optimized out>, reason=1, opaque=0x2100110) at remote/remote_driver.c:340 #1 0x00007f068ea1a152 in virNetClientIOHandleOutput (client=0x2100110) at rpc/virnetclient.c:1200 #2 0x0000000000000009 in ?? () #3 0x0000000002100a50 in ?? () #4 0x0000000000000002 in ?? () #5 0x00007f0684000988 in ?? () #6 0x00007f068ea1caa1 in virNetClientIOEventLoop (client=0x2100890, thiscall=0xc02179369c522bee) at rpc/virnetclient.c:1525 #7 0x0000000000000000 in ?? () Thanks Abhinay

5 8

[libvirt] [PATCH 0/4] build: use subdir-objects
by Eric Blake 10 Sep '13

10 Sep '13

Automake 1.14 is annoyingly loud about warning that the future automake 2.0 will turn on subdir-objects by default. Since automake 1.9 also supports subdir-objects, the best course of action is to enable the feature. But we have to fix some problems before doing so. Also, I noticed some issues with .x files while searching for places that needed fixing. Eric Blake (4): build: avoid $(srcdir) in *_SOURCES build: use library rather than cross-directory compilation tests: check remaining .x files build: use automake subdir-objects .gitignore | 1 + cfg.mk | 3 +- configure.ac | 2 +- daemon/Makefile.am | 55 +++++++++++----- src/Makefile.am | 139 +++++++++++++++++++++++---------------- src/lock_protocol-structs | 55 ++++++++++++++++ src/lxc_monitor_protocol-structs | 16 +++++ tests/Makefile.am | 4 +- 8 files changed, 198 insertions(+), 77 deletions(-) create mode 100644 src/lock_protocol-structs create mode 100644 src/lxc_monitor_protocol-structs -- 1.8.3.1

2 7

[libvirt] [PATCH]LXC doc: Add warns if net namespace not enabled
by Chen Hanxiao 10 Sep '13

10 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we don't enable network namespace, we could shutdown host by executing command 'shutdown' inside container. This patch will add some warnings in LXC docs and give some advice to readers. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/drvlxc.html.in | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 640968f..8f3a36a 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -50,6 +50,13 @@ processes inside containers cannot be securely isolated from host process without the use of a mandatory access control technology such as SELinux or AppArmor.</strong> </p> +<p> +<strong>WARNING: If 'net' namespace <i>not</i> enabled for container, +host OS could be <i>shutdown</i> by executing command like 'reboot' +inside container.<br/>So make sure 'net' namespace was available and +set the <privnet/> feature in the XML, or configure virtual NICs. +Then this issue could be circumvented.</strong> +</p> <h2><a name="init">Default container setup</a></h2> -- 1.7.1

3 5

[libvirt] [PATCH] Ensure root filesystem is recursively mounted readonly
by Daniel P. Berrange 10 Sep '13

10 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> If the guest is configured with <filesystem type='mount'> <source dir='/'/> <target dir='/'/> <readonly/> </filesystem> Then any submounts under / should also end up readonly. eg if the user has /home on a separate volume, they'd expect /home to be readonly. Users can selectively make sub-mounts read-write again by simply listing them as new mounts without the <readonly> flag set <filesystem type='mount'> <source dir='/home'/> <target dir='/home'/> </filesystem> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9c04d06..ae672c8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -532,7 +532,6 @@ static int lxcContainerGetSubtree(const char *prefix, } while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { - VIR_DEBUG("Got %s", mntent.mnt_dir); if (!STRPREFIX(mntent.mnt_dir, prefix)) continue; @@ -541,7 +540,6 @@ static int lxcContainerGetSubtree(const char *prefix, if (VIR_STRDUP(mounts[nmounts], mntent.mnt_dir) < 0) goto cleanup; nmounts++; - VIR_DEBUG("Grabbed %s", mntent.mnt_dir); } if (mounts) @@ -750,6 +748,61 @@ err: } +static int lxcContainerSetReadOnly(virDomainFSDefPtr root) +{ + FILE *procmnt; + struct mntent mntent; + char mntbuf[1024]; + int ret = -1; + char **mounts = NULL; + size_t nmounts = 0; + size_t i; + + VIR_DEBUG("root=%s", root->src); + + if (!(procmnt = setmntent("/proc/mounts", "r"))) { + virReportSystemError(errno, "%s", + _("Failed to read /proc/mounts")); + return -1; + } + + while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { + if (STREQ(mntent.mnt_dir, "/") || + STRPREFIX(mntent.mnt_dir, "/.oldroot")) + continue; + + if (VIR_REALLOC_N(mounts, nmounts+1) < 0) + goto cleanup; + if (VIR_STRDUP(mounts[nmounts], mntent.mnt_dir) < 0) + goto cleanup; + nmounts++; + } + + if (mounts) + qsort(mounts, nmounts, sizeof(mounts[0]), + lxcContainerChildMountSort); + + for (i = 0 ; i < nmounts ; i++) { + VIR_DEBUG("Bind readonly %s", mounts[i]); + if (mount(mounts[i], mounts[i], NULL, MS_BIND|MS_REC|MS_RDONLY|MS_REMOUNT, NULL) < 0) { + virReportSystemError(errno, + _("Failed to make mount %s readonly"), + mounts[i]); + goto cleanup; + } + } + + ret = 0; +cleanup: + for (i = 0; i < nmounts; i++) + VIR_FREE(mounts[i]); + VIR_FREE(mounts); + endmntent(procmnt); + return ret; + +} + + static int lxcContainerMountBasicFS(bool userns_enabled) { const struct { @@ -1001,6 +1054,8 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, int ret = -1; struct stat st; + VIR_DEBUG("src=%s dst=%s", fs->src, fs->dst); + if (virAsprintf(&src, "%s%s", srcprefix, fs->src) < 0) goto cleanup; @@ -1057,6 +1112,13 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, _("Failed to make directory %s readonly"), fs->dst); } + } else { + VIR_DEBUG("Binding %s readwrite", fs->dst); + if (mount(src, fs->dst, NULL, MS_BIND|MS_REMOUNT, NULL) < 0) { + virReportSystemError(errno, + _("Failed to make directory %s readwrite"), + fs->dst); + } } ret = 0; @@ -1330,6 +1392,8 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, char *src = NULL; int ret = -1; + VIR_DEBUG("src=%s dst=%s", fs->src, fs->dst); + if (virAsprintf(&src, "%s%s", srcprefix, fs->src) < 0) goto cleanup; @@ -1349,6 +1413,8 @@ static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs, int ret = -1; char *data = NULL; + VIR_DEBUG("usage=%lld sec=%s", fs->usage, sec_mount_options); + if (virAsprintf(&data, "size=%lldk%s", fs->usage, sec_mount_options) < 0) goto cleanup; @@ -1536,6 +1602,11 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) goto cleanup; + /* Ensure entire root filesystem (except /.oldroot) is readonly */ + if (root->readonly && + lxcContainerSetReadOnly(root) < 0) + goto cleanup; + /* Mounts /proc/meminfo etc sysinfo */ if (lxcContainerMountProcFuse(vmDef, stateDir) < 0) goto cleanup; -- 1.8.3.1

3 4

[libvirt] [PATCH libvirt-sandbox] include <locale.h> where needed.
by Ian Main 10 Sep '13

10 Sep '13

For some reason this does not build out of the box for me as I get errors about 'setlocale()' being used without declaration. This patch adds the appropriate header to the appropriate files. Signed-off-by: Ian Main <imain(a)redhat.com> --- bin/virt-sandbox-service-util.c | 1 + bin/virt-sandbox.c | 1 + libvirt-sandbox/libvirt-sandbox-init-common.c | 1 + 3 files changed, 3 insertions(+) diff --git a/bin/virt-sandbox-service-util.c b/bin/virt-sandbox-service-util.c index 83ff17c..c7757fd 100644 --- a/bin/virt-sandbox-service-util.c +++ b/bin/virt-sandbox-service-util.c @@ -25,6 +25,7 @@ #include <libvirt-sandbox/libvirt-sandbox.h> #include <glib/gi18n.h> +#include <locale.h> #define STREQ(x,y) (strcmp(x,y) == 0) diff --git a/bin/virt-sandbox.c b/bin/virt-sandbox.c index b16217b..b9d6825 100644 --- a/bin/virt-sandbox.c +++ b/bin/virt-sandbox.c @@ -24,6 +24,7 @@ #include <libvirt-sandbox/libvirt-sandbox.h> #include <glib/gi18n.h> +#include <locale.h> static gboolean do_close(GVirSandboxConsole *con G_GNUC_UNUSED, gboolean error G_GNUC_UNUSED, diff --git a/libvirt-sandbox/libvirt-sandbox-init-common.c b/libvirt-sandbox/libvirt-sandbox-init-common.c index 262f4e1..d3c21c2 100644 --- a/libvirt-sandbox/libvirt-sandbox-init-common.c +++ b/libvirt-sandbox/libvirt-sandbox-init-common.c @@ -44,6 +44,7 @@ #include <unistd.h> #include <limits.h> #include <grp.h> +#include <locale.h> #include "libvirt-sandbox-rpcpacket.h" -- 1.8.1.4

1 0

[libvirt] [PATCH V3] Use loop-control to allocate loop device.
by Ian Main 10 Sep '13

10 Sep '13

This patch changes virFileLoopDeviceOpen() to use the new loop-control device to allocate a new loop device. If this behavior is unsupported we fall back to the previous method of searching /dev for a free device. With this patch you can start as many image based LXC domains as you like (well almost). Fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=995543 V2: - Modified to use a dedicated error return for loop-control allocation function. - Only do fallback if /dev/loop-control does not exist, otherwise return error. V3: - Remove warning about falling back to search technique. Signed-off-by: Ian Main <imain(a)redhat.com> --- configure.ac | 12 ++++++++++ src/util/virfile.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ac8cfa1..10cd872 100644 --- a/configure.ac +++ b/configure.ac @@ -913,6 +913,18 @@ if test "$with_lxc" = "yes" || test "$with_lxc" = "check"; then AC_MSG_ERROR([Required kernel features for LXC were not found]) fi ]) + AC_LINK_IFELSE([AC_LANG_PROGRAM( + [[ + #include <sched.h> + #include <linux/loop.h> + #include <sys/epoll.h> + ]], [[ + unshare(!(LOOP_CTL_GET_FREE)); + ]])], [ + AC_DEFINE([HAVE_DECL_LOOP_CTL_GET_FREE], [1], + [Define to 1 if you have the declaration of `LOOP_CTL_GET_FREE', + and to 0 if you don't.]) + ]) fi if test "$with_lxc" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_LXC], 1, [whether LXC driver is enabled]) diff --git a/src/util/virfile.c b/src/util/virfile.c index 2b07ac9..9d42380 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -528,7 +528,56 @@ int virFileUpdatePerm(const char *path, #if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR -static int virFileLoopDeviceOpen(char **dev_name) + +#if HAVE_DECL_LOOP_CTL_GET_FREE + +/* virFileLoopDeviceOpenLoopCtl() returns -1 when a real failure has occured + * while in the process of allocating or opening the loop device. On success + * we return 0 and modify the fd to the appropriate file descriptor. + * If /dev/loop-control does not exist, we return 0 and do not set fd. */ + +static int virFileLoopDeviceOpenLoopCtl(char **dev_name, int *fd) +{ + int devnr; + int ctl_fd; + char *looppath = NULL; + + VIR_DEBUG("Opening loop-control device"); + if ((ctl_fd = open("/dev/loop-control", O_RDWR)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to open /dev/loop-control")); + if (errno == ENOENT) { + return 0; + } + return -1; + } + + if ((devnr = ioctl(ctl_fd, LOOP_CTL_GET_FREE)) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get free loop device via ioctl")); + close(ctl_fd); + return -1; + } + close(ctl_fd); + + VIR_DEBUG("Found free loop device number %i", devnr); + + if (virAsprintf(&looppath, "/dev/loop%i", devnr) < 0) + return -1; + + if ((*fd = open(looppath, O_RDWR)) < 0) { + virReportSystemError(errno, + _("Unable to open %s"), looppath); + VIR_FREE(looppath); + return -1; + } + + *dev_name = looppath; + return 0; +} +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + +static int virFileLoopDeviceOpenSearch(char **dev_name) { int fd = -1; DIR *dh = NULL; @@ -601,6 +650,25 @@ cleanup: return fd; } +static int virFileLoopDeviceOpen(char **dev_name) +{ + int loop_fd = -1; + +#ifdef HAVE_DECL_LOOP_CTL_GET_FREE + if (virFileLoopDeviceOpenLoopCtl(dev_name, &loop_fd) < 0) + return -1; + + VIR_DEBUG("Return from loop-control got fd %d\n", loop_fd); + + if (loop_fd >= 0) + return loop_fd; +#endif /* HAVE_DECL_LOOP_CTL_GET_FREE */ + + /* Without the loop control device we just use the old technique. */ + loop_fd = virFileLoopDeviceOpenSearch(dev_name); + + return loop_fd; +} int virFileLoopDeviceAssociate(const char *file, char **dev) -- 1.8.1.4

2 2

[libvirt] [PATCH 1/1] cpu: Cleanup ppcCompute to avoid memory leak
by Li Zhang 10 Sep '13

10 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patch is to Cleanup ppcCompute to avoid memory leak to make the code better. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/cpu/cpu_powerpc.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index a47ee38..4e90672 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -345,16 +345,16 @@ ppcMakeCPUData(virArch arch, struct cpuPPCData *data) static virCPUCompareResult ppcCompute(virCPUDefPtr host, - const virCPUDefPtr cpu, - virCPUDataPtr *guestData, - char **message) + const virCPUDefPtr cpu, + virCPUDataPtr *guestData, + char **message) { struct ppc_map *map = NULL; struct ppc_model *host_model = NULL; struct ppc_model *guest_model = NULL; - int ret = 0; + virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR; virArch arch; size_t i; @@ -375,8 +375,10 @@ ppcCompute(virCPUDefPtr host, virAsprintf(message, _("CPU arch %s does not match host arch"), virArchToString(cpu->arch)) < 0) - goto error; - return VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; + + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; } arch = cpu->arch; } else { @@ -392,14 +394,16 @@ ppcCompute(virCPUDefPtr host, _("host CPU vendor does not match required " "CPU vendor %s"), cpu->vendor) < 0) - goto error; - return VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; + + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; } if (!(map = ppcLoadMap()) || !(host_model = ppcModelFromCPU(host, map)) || !(guest_model = ppcModelFromCPU(cpu, map))) - goto error; + goto cleanup; if (guestData != NULL) { if (cpu->type == VIR_CPU_TYPE_GUEST && @@ -412,25 +416,23 @@ ppcCompute(virCPUDefPtr host, _("host CPU model does not match required " "CPU model %s"), guest_model->name) < 0) - goto error; - return VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; + + ret = VIR_CPU_COMPARE_INCOMPATIBLE; + goto cleanup; } if (!(*guestData = ppcMakeCPUData(arch, &guest_model->data))) - goto error; + goto cleanup; } ret = VIR_CPU_COMPARE_IDENTICAL; -out: +cleanup: ppcMapFree(map); ppcModelFree(host_model); ppcModelFree(guest_model); return ret; - -error: - ret = VIR_CPU_COMPARE_ERROR; - goto out; } static virCPUCompareResult -- 1.8.1.4

2 1

[libvirt] [PATCH] build: shut up automake warnings
by Eric Blake 09 Sep '13

09 Sep '13

I'm tired of seeing screenfuls of messages like these when using automake 1.13 (Fedora 19): configure.ac:2121: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged. configure.ac:2121: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead, configure.ac:2121: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files. daemon/Makefile.am:19: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') seeing as how we MUST use those constructs for the benefit of automake 1.9 (RHEL 5). Conversely, RHEL 5 automake complained: aclocal:configure.ac:36: warning: macro `AM_SILENT_RULES' not found in library Obviously, I tested this patch on both Fedora 19 and RHEL 5. * configure.ac (AM_INIT_AUTOMAKE): Avoid obsoletion warnings. (AM_SILENT_RULES): Avoid unknown macro warning. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- configure.ac | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index f853e03..925afcd 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,9 @@ AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -dnl Make automake keep quiet about wildcards & other GNUmake-isms -AM_INIT_AUTOMAKE([-Wno-portability tar-ustar]) +dnl Make automake keep quiet about wildcards & other GNUmake-isms; also keep +dnl quiet about the fact that we intentionally cater to automake 1.9 +AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-ustar]) AM_MAINTAINER_MODE([enable]) # Maintainer note - comment this line out if you plan to rerun @@ -30,9 +31,11 @@ AM_MAINTAINER_MODE([enable]) # Leave it uncommented for normal releases, for faster ./configure. gl_ASSERT_NO_GNULIB_POSIXCHECK -# Use the silent-rules feature when possible. -m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) -AM_SILENT_RULES([yes]) +# Default to using the silent-rules feature when possible. Formatting +# chosen to bypass 'grep' checks that cause older automake to warn. +# Users (include rpm) can still change the default at configure time. +m4_ifndef([AM_SILENT_RULES], + [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes]) AC_CANONICAL_HOST -- 1.8.3.1

2 4

[libvirt] [PATCHv2] qemu: don't leak vm on failure
by Eric Blake 09 Sep '13

09 Sep '13

Failure to attach to a domain during 'virsh qemu-attach' left the list of domains in an odd state: $ virsh qemu-attach 4176 error: An error occurred, but the cause is unknown $ virsh list --all Id Name State ---------------------------------------------------- 2 foo shut off $ virsh qemu-attach 4176 error: Requested operation is not valid: domain is already active as 'foo' $ virsh undefine foo error: Failed to undefine domain foo error: Requested operation is not valid: cannot undefine transient domain $ virsh shutdown foo error: Failed to shutdown domain foo error: invalid argument: monitor must not be NULL It all stems from leaving the list of domains unmodified on the initial failure; we should follow the lead of createXML which removes vm on failure (the actual initial failure still needs to be fixed in a later patch, but at least this patch gets us to the point where we aren't getting stuck with an unremovable "shut off" transient domain). While investigating, I also found a leak in qemuDomainCreateXML; the two functions should behave similarly. Note that there are still two unusual paths: if dom is not allocated, the user will see an OOM error even though the vm remains registered (but oom errors already indicate tricky cleanup); and if the vm starts and then quits again all before the job ends, it is possible to return a non-NULL dom even though the dom will no longer be useful for anything (but this at least lets the user know their short-lived vm ran). * src/qemu/qemu_driver.c (qemuDomainCreateXML): Don't leak vm on failure to obtain job. (qemuDomainQemuAttach): Match cleanup of qemuDomainCreateXML. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v1 was discussed here: https://www.redhat.com/archives/libvir-list/2013-September/msg00362.html changes since then: plug another leak of vm, and clean up some style. Expand the commit message to explain unusual paths. src/qemu/qemu_driver.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e37fe33..6dafa2b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1602,8 +1602,11 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, def = NULL; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; /* XXXX free the 'vm' we created ? */ + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) { + qemuDomainRemoveInactive(driver, vm); + vm = NULL; + goto cleanup; + } if (qemuProcessStart(conn, driver, vm, NULL, -1, NULL, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, @@ -1631,10 +1634,10 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn, virDomainAuditStart(vm, "booted", true); dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) dom->id = vm->def->id; + if (dom) + dom->id = vm->def->id; - if (vm && - qemuDomainObjEndJob(driver, vm) == 0) + if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; cleanup: @@ -13630,34 +13633,38 @@ static virDomainPtr qemuDomainQemuAttach(virConnectPtr conn, def = NULL; - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) { + qemuDomainRemoveInactive(driver, vm); + vm = NULL; goto cleanup; + } if (qemuProcessAttach(conn, driver, vm, pid, pidfile, monConfig, monJSON) < 0) { + if (qemuDomainObjEndJob(driver, vm) > 0) + qemuDomainRemoveInactive(driver, vm); + vm = NULL; monConfig = NULL; - goto endjob; + goto cleanup; } monConfig = NULL; dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) dom->id = vm->def->id; + if (dom) + dom->id = vm->def->id; -endjob: if (qemuDomainObjEndJob(driver, vm) == 0) { vm = NULL; - goto cleanup; - } cleanup: virDomainDefFree(def); - virObjectUnref(qemuCaps); virDomainChrSourceDefFree(monConfig); if (vm) virObjectUnlock(vm); VIR_FREE(pidfile); virObjectUnref(caps); + virObjectUnref(qemuCaps); return dom; } -- 1.8.3.1

2 3

[libvirt] [PATCHv2 RESEND 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 09 Sep '13

09 Sep '13

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The serie of patches is rather big, and adds among other things some utility functions unrelated to VirtualBox in patches 1 & 2. The code review could be done in several parts: e.g. patches 1 & 2 separately to validate the utility functions. This 2nd version brings a different function for string replacement, because of the license problem with the first one. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling uuid and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only for Virtualbox 4.2 Regards, Manuel VIVES Manuel VIVES (5): viruuid.h/c: Util method for finding uuid patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots src/conf/domain_conf.c | 20 +- src/libvirt_private.syms | 2 + src/util/virstring.c | 48 ++ src/util/virstring.h | 2 + src/util/viruuid.c | 79 ++ src/util/viruuid.h | 1 + src/vbox/vbox_tmpl.c | 1846 +++++++++++++++++++++++++++++++++++++++++++--- 7 files changed, 1878 insertions(+), 120 deletions(-) -- 1.7.10.4

3 7

[libvirt] [PATCH v3 0/8] Support qemu-system-arm vexpress-a9
by Cole Robinson 09 Sep '13

09 Sep '13

This series adds the bits needed to kick of a qemu-system-arm -machine vexpress-a9 guest. vexpress-a15 likely works as well but is untested. Patches 1-2 are related bugfixes/improvements. Patch 6 adds disk bus=sd, which is often the only way to specify storage for ARM boards. Patch 8 adds virtio-mmio address support, which enables virtio for ARM vexpress machine types. The rest are mostly about fixing CLI generations. Unfortunately qemu ARM boards don't quite work like x86 where we can mix and match devices, so -device is out of the picture (for non-virtio), meaning we have to fall back to CLI infrastrucure like -net nic and -serial. v3: Rebased series Add qemu.conf nographics_allow_host_audio for patch #1 Drop domain_conf.c default memballoon handling in patch #2, not #3 Cole Robinson (8): qemu: Set QEMU_AUDIO_DRV=none with -nographic domain_conf: Add default memballoon in PostParse callbacks qemu: Don't add default memballoon device on ARM qemu: Fix specifying char devs for ARM qemu: Don't try to allocate PCI addresses for ARM domain_conf: Add disk bus=sd, wire it up for qemu qemu: Fix networking for ARM guests qemu: Support virtio-mmio transport for virtio on ARM docs/formatdomain.html.in | 3 +- docs/schemas/domaincommon.rng | 20 ++++ src/conf/domain_conf.c | 29 +++-- src/conf/domain_conf.h | 2 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 9 ++ src/qemu/qemu_capabilities.c | 23 ++++ src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 127 +++++++++++++++++---- src/qemu/qemu_conf.c | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 32 +++++- src/qemu/qemu_process.c | 37 +++--- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/xen/xen_driver.c | 9 ++ .../qemuxml2argv-arm-vexpressa9-basic.args | 8 ++ .../qemuxml2argv-arm-vexpressa9-basic.xml | 34 ++++++ .../qemuxml2argv-arm-vexpressa9-nodevs.args | 5 + .../qemuxml2argv-arm-vexpressa9-nodevs.xml | 26 +++++ .../qemuxml2argv-arm-vexpressa9-virtio.args | 14 +++ .../qemuxml2argv-arm-vexpressa9-virtio.xml | 45 ++++++++ .../qemuxml2argv-balloon-device-auto.args | 3 +- .../qemuxml2argv-balloon-device-period.args | 3 +- .../qemuxml2argv-balloon-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-blkdeviotune.args | 3 +- .../qemuxml2argv-blkiotune-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 3 +- .../qemuxml2argv-boot-complex-bootindex.args | 2 +- .../qemuxml2argv-boot-complex.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 3 +- ...xml2argv-boot-menu-disable-drive-bootindex.args | 3 +- .../qemuxml2argv-boot-menu-disable-drive.args | 3 +- .../qemuxml2argv-boot-menu-disable.args | 3 +- .../qemuxml2argv-boot-menu-enable.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 3 +- .../qemuxml2argv-boot-network.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-boot-order.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-bootloader.args | 3 +- .../qemuxml2argv-channel-guestfwd.args | 3 +- .../qemuxml2argv-channel-virtio-auto.args | 3 +- .../qemuxml2argv-channel-virtio.args | 3 +- .../qemuxml2argv-clock-france.args | 4 +- .../qemuxml2argv-clock-localtime.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 3 +- .../qemuxml2argv-clock-variable.args | 3 +- .../qemuxml2argv-console-compat-auto.args | 3 +- .../qemuxml2argv-console-compat-chardev.args | 3 +- .../qemuxml2argv-console-compat.args | 3 +- .../qemuxml2argv-console-sclp.args | 3 +- .../qemuxml2argv-console-virtio-ccw.args | 3 +- .../qemuxml2argv-console-virtio-many.args | 3 +- .../qemuxml2argv-console-virtio-s390.args | 3 +- .../qemuxml2argv-console-virtio.args | 3 +- .../qemuxml2argv-cpu-eoi-disabled.args | 3 +- .../qemuxml2argv-cpu-eoi-enabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 3 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 3 +- .../qemuxml2argv-cpu-fallback.args | 2 +- .../qemuxml2argv-cpu-host-kvmclock.args | 3 +- .../qemuxml2argv-cpu-host-model-fallback.args | 2 +- .../qemuxml2argv-cpu-host-model.args | 2 +- .../qemuxml2argv-cpu-host-passthrough.args | 2 +- .../qemuxml2argv-cpu-kvmclock.args | 3 +- .../qemuxml2argv-cpu-minimum1.args | 3 +- .../qemuxml2argv-cpu-minimum2.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 3 +- .../qemuxml2argv-cpu-topology1.args | 3 +- .../qemuxml2argv-cpu-topology2.args | 3 +- .../qemuxml2argv-cpu-topology3.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 3 +- .../qemuxml2argv-disk-blockio.args | 2 +- .../qemuxml2argv-disk-cdrom-empty.args | 3 +- .../qemuxml2argv-disk-cdrom-network-ftp.args | 3 +- .../qemuxml2argv-disk-cdrom-network-http.args | 3 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 3 +- .../qemuxml2argv-disk-cdrom-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 3 +- .../qemuxml2argv-disk-copy_on_read.args | 2 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 3 +- .../qemuxml2argv-disk-drive-boot-disk.args | 3 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 3 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-none.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-wb.args | 3 +- .../qemuxml2argv-disk-drive-cache-v1-wt.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 3 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 3 +- .../qemuxml2argv-disk-drive-discard.args | 2 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 3 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 3 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 3 +- .../qemuxml2argv-disk-drive-fat.args | 3 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 3 +- .../qemuxml2argv-disk-drive-network-gluster.args | 3 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 3 +- .../qemuxml2argv-disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 3 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 3 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 3 +- .../qemuxml2argv-disk-drive-network-nbd.args | 3 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 2 +- ...muxml2argv-disk-drive-network-rbd-ceph-env.args | 4 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 2 +- .../qemuxml2argv-disk-drive-network-rbd.args | 2 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 3 +- .../qemuxml2argv-disk-drive-no-boot.args | 2 +- .../qemuxml2argv-disk-drive-readonly-disk.args | 3 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 3 +- .../qemuxml2argv-disk-drive-shared.args | 3 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 3 +- .../qemuxml2argv-disk-floppy-tray.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 3 +- .../qemuxml2argv-disk-geometry.args | 3 +- .../qemuxml2argv-disk-ide-drive-split.args | 2 +- .../qemuxml2argv-disk-ide-wwn.args | 2 +- .../qemuxml2argv-disk-ioeventfd.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-disk-order.args | 3 +- .../qemuxml2argv-disk-sata-device.args | 3 +- .../qemuxml2argv-disk-scsi-device-auto.args | 3 +- .../qemuxml2argv-disk-scsi-device.args | 3 +- .../qemuxml2argv-disk-scsi-disk-split.args | 2 +- .../qemuxml2argv-disk-scsi-disk-vpd.args | 2 +- .../qemuxml2argv-disk-scsi-disk-wwn.args | 2 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 3 +- .../qemuxml2argv-disk-scsi-megasas.args | 3 +- .../qemuxml2argv-disk-scsi-virtio-scsi.args | 3 +- .../qemuxml2argv-disk-scsi-vscsi.args | 3 +- .../qemuxml2argv-disk-snapshot.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-disk-usb.args | 3 +- .../qemuxml2argv-disk-virtio-ccw-many.args | 3 +- .../qemuxml2argv-disk-virtio-ccw.args | 3 +- .../qemuxml2argv-disk-virtio-s390.args | 3 +- .../qemuxml2argv-disk-virtio-scsi-ccw.args | 3 +- .../qemuxml2argv-disk-virtio-scsi-num_queues.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 3 +- .../qemuxml2argv-eoi-disabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-event_idx.args | 2 +- .../qemuxml2argv-floppy-drive-fat.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.args | 3 +- .../qemuxml2argv-graphics-vnc-sasl.args | 3 +- .../qemuxml2argv-graphics-vnc-tls.args | 3 +- .../qemuxml2argv-graphics-vnc-websocket.args | 3 +- .../qemuxml2argv-hostdev-pci-address-device.args | 3 +- .../qemuxml2argv-hostdev-pci-address.args | 3 +- .../qemuxml2argv-hostdev-scsi-boot.args | 3 +- .../qemuxml2argv-hostdev-scsi-lsi.args | 3 +- .../qemuxml2argv-hostdev-scsi-readonly.args | 3 +- .../qemuxml2argv-hostdev-scsi-virtio-scsi.args | 3 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 3 +- .../qemuxml2argv-hostdev-usb-address-device.args | 3 +- .../qemuxml2argv-hostdev-usb-address.args | 3 +- .../qemuxml2argv-hostdev-vfio.args | 3 +- .../qemuxml2argv-hotplug-base.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 3 +- .../qemuxml2argv-input-usbmouse-addr.args | 3 +- .../qemuxml2argv-input-usbmouse.args | 3 +- .../qemuxml2argv-input-usbtablet.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 2 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-lease.args | 3 +- .../qemuxml2argv-machine-aliases1.args | 2 +- .../qemuxml2argv-machine-aliases2.args | 3 +- .../qemuxml2argv-machine-core-off.args | 3 +- .../qemuxml2argv-machine-core-on.args | 3 +- .../qemuxml2argv-machine-usb-opt.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 3 +- .../qemuxml2argv-minimal-s390.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 3 +- .../qemuxml2argv-misc-disable-s3.args | 3 +- .../qemuxml2argv-misc-disable-suspends.args | 3 +- .../qemuxml2argv-misc-enable-s4.args | 3 +- .../qemuxml2argv-misc-no-reboot.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 2 +- .../qemuxml2argv-mlock-unsupported.args | 2 +- .../qemuxml2argv-monitor-json.args | 3 +- .../qemuxml2argv-multifunction-pci-device.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 3 +- .../qemuxml2argv-net-eth-ifname.args | 3 +- .../qemuxml2argv-net-eth-names.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 3 +- .../qemuxml2argv-net-hostdev-vfio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-hostdev.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 3 +- .../qemuxml2argv-net-virtio-ccw.args | 3 +- .../qemuxml2argv-net-virtio-device.args | 3 +- .../qemuxml2argv-net-virtio-netdev.args | 3 +- .../qemuxml2argv-net-virtio-s390.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-no-shutdown.args | 2 +- .../qemuxml2argv-nographics-vga.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 3 +- .../qemuxml2argv-nosharepages.args | 3 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 3 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 3 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 3 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 3 +- .../qemuxml2argv-numatune-memory.args | 3 +- .../qemuxml2argv-parallel-parport-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp-chardev.args | 3 +- .../qemuxml2argv-parallel-tcp.args | 3 +- .../qemuxml2argv-pci-autoadd-addr.args | 2 +- .../qemuxml2argv-pci-autoadd-idx.args | 2 +- .../qemuxml2argv-pci-bridge-many-disks.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +- .../qemuxml2argv-pcihole64-none.args | 2 +- .../qemuxml2argv-pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 2 +- .../qemuxml2argv-pseries-basic.args | 2 +- .../qemuxml2argv-pseries-nvram.args | 3 +- .../qemuxml2argv-pseries-usb-default.args | 2 +- .../qemuxml2argv-pseries-usb-multi.args | 2 +- .../qemuxml2argv-pseries-vio-user-assigned.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-vio.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 2 +- .../qemuxml2argv-qemu-ns-no-env.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 4 +- .../qemuxml2argv-reboot-timeout-disabled.args | 3 +- .../qemuxml2argv-reboot-timeout-enabled.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-restore-v1.args | 3 +- .../qemuxml2argv-restore-v2-fd.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 3 +- .../qemuxml2argv-s390-piix-controllers.args | 2 +- .../qemuxml2argv-s390-usb-none.args | 2 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 3 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 3 +- .../qemuxml2argv-seclabel-dynamic-override.args | 3 +- .../qemuxml2argv-seclabel-dynamic.args | 3 +- .../qemuxml2argv-seclabel-none.args | 3 +- .../qemuxml2argv-seclabel-static-labelskip.args | 3 +- .../qemuxml2argv-seclabel-static-relabel.args | 3 +- .../qemuxml2argv-seclabel-static.args | 3 +- .../qemuxml2argv-serial-dev-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 3 +- .../qemuxml2argv-serial-file-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 3 +- .../qemuxml2argv-serial-many-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 3 +- .../qemuxml2argv-serial-pty-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 3 +- .../qemuxml2argv-serial-tcp-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet-chardev.args | 3 +- .../qemuxml2argv-serial-tcp-telnet.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 3 +- .../qemuxml2argv-serial-udp-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 3 +- .../qemuxml2argv-serial-unix-chardev.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 3 +- .../qemuxml2argv-serial-vc-chardev.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 3 +- .../qemuxml2argv-smartcard-controller.args | 3 +- .../qemuxml2argv-smartcard-host-certificates.args | 3 +- .../qemuxml2argv-smartcard-host.args | 3 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 3 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 3 +- .../qemuxml2argv-sound-device.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 3 +- .../qemuxml2argv-tpm-passthrough.args | 2 +- .../qemuxml2argv-usb-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args | 3 +- .../qemuxml2argv-usb-ich9-companion.args | 3 +- .../qemuxml2argv-usb-ich9-ehci-addr.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 3 +- .../qemuxml2argv-usb-piix3-controller.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args | 3 +- .../qemuxml2argv-usb-redir-boot.args | 3 +- .../qemuxml2argv-usb-redir-filter.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args | 3 +- .../qemuxml2argvdata/qemuxml2argv-virtio-lun.args | 2 +- .../qemuxml2argv-virtio-rng-ccw.args | 3 +- .../qemuxml2argv-virtio-rng-default.args | 3 +- .../qemuxml2argv-virtio-rng-egd.args | 3 +- .../qemuxml2argv-virtio-rng-random.args | 3 +- .../qemuxml2argv-watchdog-device.args | 3 +- .../qemuxml2argv-watchdog-dump.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 3 +- tests/qemuxml2argvtest.c | 10 ++ .../qemuxmlns-qemu-ns-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-commandline-ns1.args | 2 +- .../qemuxmlns-qemu-ns-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline-ns0.args | 2 +- .../qemuxmlns-qemu-ns-domain-commandline.args | 2 +- .../qemuxmlns-qemu-ns-domain-ns0.args | 2 +- tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.args | 2 +- tests/testutilsqemu.c | 33 ++++++ 314 files changed, 948 insertions(+), 350 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.xml -- 1.8.3.1

4 24

[libvirt] [ libvirt ] [ PATCH ] Added support for ARMv7 Big Endian
by yogesh tillu 09 Sep '13

09 Sep '13

Hi All, Could you please review below patch, I have successfully tested patch on ARM Versatile Express V2P Board. From: Yogesh Tillu <tillu.yogesh(a)gmail.com> Date: Thu, 5 Sep 2013 17:07:55 +0530 Subject: [PATCH] [ PATCH ] Added Support for ARMv7 Big Endian Signed-off-by: Yogesh Tillu <tillu.yogesh(a)gmail.com> --- src/util/virarch.c | 1 + src/util/virarch.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/util/virarch.c b/src/util/virarch.c index 81558e5..b4e06da 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -37,6 +37,7 @@ static const struct virArchData { { "alpha", 64, VIR_ARCH_BIG_ENDIAN }, { "armv6l", 32, VIR_ARCH_LITTLE_ENDIAN }, { "armv7l", 32, VIR_ARCH_LITTLE_ENDIAN }, + { "armv7b", 32, VIR_ARCH_BIG_ENDIAN }, { "cris", 32, VIR_ARCH_LITTLE_ENDIAN }, { "i686", 32, VIR_ARCH_LITTLE_ENDIAN }, diff --git a/src/util/virarch.h b/src/util/virarch.h index 0d8ae25..dd25679 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -29,6 +29,7 @@ typedef enum { VIR_ARCH_ALPHA, /* Alpha 64 BE http://en.wikipedia.org/wiki/DEC_Alpha */ VIR_ARCH_ARMV6L, /* ARMv6 32 LE http://en.wikipedia.org/wiki/ARM_architecture */ VIR_ARCH_ARMV7L, /* ARMv7 32 LE http://en.wikipedia.org/wiki/ARM_architecture */ + VIR_ARCH_ARMV7B, /* ARMv7 32 BE http://en.wikipedia.org/wiki/ARM_architecture */ VIR_ARCH_CRIS, /* ETRAX 32 LE http://en.wikipedia.org/wiki/ETRAX_CRIS */ VIR_ARCH_I686, /* x86 32 LE http://en.wikipedia.org/wiki/X86 */ -- 1.8.1.2 Test Performed: # virsh nodeinfo CPU model: armv7b CPU(s): 1 CPU frequency: 48 MHz CPU socket(s): 1 Core(s) per socket: 5 Thread(s) per core: 1 NUMA cell(s): 1 Memory size: 1029784 KiB Regards, Yogesh Tillu

2 3

[libvirt] [PATCH] LXC: Free variable vroot in lxcDomainDetachDeviceHostdevUSBLive()
by Hongwei Bi 09 Sep '13

09 Sep '13

The variable vroot should be freed in label cleanup. --- src/lxc/lxc_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9cb95ff..b587c22 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3766,7 +3766,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver, virDomainHostdevDefPtr def = NULL; int idx, ret = -1; char *dst = NULL; - char *vroot; + char *vroot = NULL; virUSBDevicePtr usb = NULL; if ((idx = virDomainHostdevFind(vm->def, @@ -3824,6 +3824,7 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver, cleanup: virUSBDeviceFree(usb); VIR_FREE(dst); + VIR_FREE(vroot); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH v2 0/3] Improve PPC CPU driver
by Li Zhang 09 Sep '13

09 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Currently, PPC CPU driver doesn't support to parse guest data. It can't pass CPU parameters to Qemu command line. This patchset is to implement .guestData to support to parse guest CPU configuration and .update to support host-model and host-passthrough. The guest CPU configuration is as the following: <cpu match='exact'> <model>POWER7_v2.3</model> <vendor>IBM</vendor> </cpu> v2 -> v1: * Remove features functions calling for non-x86 platform (Doug Goldstein) * Improve update code. * Merge update code with guestData. Li Zhang (3): Remove CPU features check for non-x86 platform. cpu: Implement guestData and update for PPC cpu: Add cpu test cases for PPC CPU driver. src/cpu/cpu_powerpc.c | 178 ++++++++++++++++++++- src/qemu/qemu_command.c | 16 +- tests/cputest.c | 9 ++ tests/cputestdata/ppc64-baseline-1-result.xml | 3 + .../ppc64-baseline-incompatible-vendors.xml | 14 ++ .../ppc64-baseline-no-vendor-result.xml | 3 + tests/cputestdata/ppc64-baseline-no-vendor.xml | 7 + tests/cputestdata/ppc64-exact.xml | 3 + tests/cputestdata/ppc64-guest-nofallback.xml | 4 + tests/cputestdata/ppc64-guest.xml | 4 + .../ppc64-host+guest,ppc_models-result.xml | 5 + ...st-nofallback,ppc_models,POWER7_v2.1-result.xml | 5 + tests/cputestdata/ppc64-host.xml | 6 + tests/cputestdata/ppc64-strict.xml | 3 + .../qemuxml2argv-pseries-cpu-exact.args | 7 + .../qemuxml2argv-pseries-cpu-exact.xml | 21 +++ tests/qemuxml2argvtest.c | 1 + 17 files changed, 279 insertions(+), 10 deletions(-) create mode 100644 tests/cputestdata/ppc64-baseline-1-result.xml create mode 100644 tests/cputestdata/ppc64-baseline-incompatible-vendors.xml create mode 100644 tests/cputestdata/ppc64-baseline-no-vendor-result.xml create mode 100644 tests/cputestdata/ppc64-baseline-no-vendor.xml create mode 100644 tests/cputestdata/ppc64-exact.xml create mode 100644 tests/cputestdata/ppc64-guest-nofallback.xml create mode 100644 tests/cputestdata/ppc64-guest.xml create mode 100644 tests/cputestdata/ppc64-host+guest,ppc_models-result.xml create mode 100644 tests/cputestdata/ppc64-host+guest-nofallback,ppc_models,POWER7_v2.1-result.xml create mode 100644 tests/cputestdata/ppc64-host.xml create mode 100644 tests/cputestdata/ppc64-strict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.xml -- 1.8.1.4

5 13

[libvirt] [PATCH] Add support for enabling SASL for SPICE guests
by Daniel P. Berrange 08 Sep '13

08 Sep '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> QEMU has support for SASL auth for SPICE guests, but libvirt has no way to enable it. Following the example from VNC where it is globally enabled via qemu.conf Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/libvirtd_qemu.aug | 2 ++ src/qemu/qemu.conf | 16 ++++++++++++++++ src/qemu/qemu_command.c | 10 ++++++++++ src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 2 ++ src/qemu/test_libvirtd_qemu.aug.in | 2 ++ 6 files changed, 35 insertions(+) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index cd13d53..118d4c7 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -38,6 +38,8 @@ module Libvirtd_qemu = | bool_entry "spice_tls" | str_entry "spice_tls_x509_cert_dir" | str_entry "spice_password" + | bool_entry "spice_sasl" + | str_entry "spice_sasl_dir" let nogfx_entry = bool_entry "nographics_allow_host_audio" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 5fd6263..6d4e99e 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -140,6 +140,22 @@ #spice_password = "XYZ12345" +# Enable use of SASL encryption on the SPICE server. This requires +# a SPICE client which supports the SASL protocol extension. +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +#spice_sasl = 1 + +# The default SASL configuration file is located in /etc/sasl2/ +# When running libvirtd unprivileged, it may be desirable to +# override the configs in this location. Set this parameter to +# point to the directory, and create a qemu.conf in that location +# +#spice_sasl_dir = "/some/directory/sasl2" + + # By default, if no graphical front end is configured, libvirt will disable # QEMU audio output since directly talking to alsa/pulseaudio may not work # with various security settings. If you know what you're doing, enable diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 91ca86a..5e4ebc8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7065,6 +7065,16 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, virBufferAsprintf(&opt, "tls-port=%u", tlsPort); } + if (cfg->spiceSASL) { + virBufferAddLit(&opt, ",sasl"); + + if (cfg->spiceSASLdir) + virCommandAddEnvPair(cmd, "SASL_CONF_DIR", + cfg->spiceSASLdir); + + /* TODO: Support ACLs later */ + } + switch (virDomainGraphicsListenGetType(graphics, 0)) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: listenAddr = virDomainGraphicsListenGetAddress(graphics, 0); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 1f57f72..41ca7a3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -266,6 +266,7 @@ static void virQEMUDriverConfigDispose(void *obj) VIR_FREE(cfg->spiceTLSx509certdir); VIR_FREE(cfg->spiceListen); VIR_FREE(cfg->spicePassword); + VIR_FREE(cfg->spiceSASLdir); VIR_FREE(cfg->hugetlbfsMount); VIR_FREE(cfg->hugepagePath); @@ -379,6 +380,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_BOOL("spice_tls", cfg->spiceTLS); GET_VALUE_STR("spice_tls_x509_cert_dir", cfg->spiceTLSx509certdir); + GET_VALUE_BOOL("spice_sasl", cfg->spiceSASL); + GET_VALUE_STR("spice_sasl_dir", cfg->spiceSASLdir); GET_VALUE_STR("spice_listen", cfg->spiceListen); GET_VALUE_STR("spice_password", cfg->spicePassword); diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 206f2c6..cbd7053 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -111,6 +111,8 @@ struct _virQEMUDriverConfig { bool spiceTLS; char *spiceTLSx509certdir; + bool spiceSASL; + char *spiceSASLdir; char *spiceListen; char *spicePassword; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index ea770dc..1a9fb20 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -15,6 +15,8 @@ module Test_libvirtd_qemu = { "spice_tls" = "1" } { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } { "spice_password" = "XYZ12345" } +{ "spice_sasl" = "1" } +{ "spice_sasl_dir" = "/some/directory/sasl2" } { "nographics_allow_host_audio" = "1" } { "remote_display_port_min" = "5900" } { "remote_display_port_max" = "65535" } -- 1.8.3.1

2 1

[libvirt] [PATCHv5 0/5] Introduce API to query IP addresses for given domain
by Nehal J Wani 08 Sep '13

08 Sep '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.redhat.com/archives/libvir-list/2012-February/msg00437.html A patch was submitted, using structs: https://www.redhat.com/archives/libvir-list/2012-June/msg00220.html Another patch was submitted, using XML: https://www.redhat.com/archives/libvir-list/2012-June/msg00904.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: https://www.redhat.com/archives/libvir-list/2013-July/msg00084.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfaceAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) v5: * s/virDomainInterfacesAddresses/virDomainInterfaceAddresses. * Case for IP aliasing handled using virHashTable. * New test cases added, involving multiple and 0 IP addresse(s) per interface. * IP prefix changed from int to unsigned int. * Changes to practice libvirt habits. v4: * Various style nits, indentation errors, memory leaks fixed. * https://www.redhat.com/archives/libvir-list/2013-August/msg01265.html v3: * Upper bounds to number of interfaces and addresses per interface introduced. * Change from array of structs to array of pointers * ifaces_count moved from function argument to return value * Changes in variable names * Test cases added for qemuAgentGetInterfaces. * https://www.redhat.com/archives/libvir-list/2013-August/msg01215.html v2: * Logical errors, memory leaks and few other errors fixed. * https://www.redhat.com/archives/libvir-list/2013-August/msg00631.html v1: * http://www.redhat.com/archives/libvir-list/2013-July/msg01553.html Nehal J Wani (5): domifaddr: Implement the public APIs domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 131 +++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 +++++++++++ include/libvirt/libvirt.h.in | 32 +++++++ python/generator.py | 3 + python/libvirt-override-api.xml | 8 +- python/libvirt-override.c | 111 +++++++++++++++++++++++ src/driver.h | 6 ++ src/libvirt.c | 115 ++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 193 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 3 + src/qemu/qemu_driver.c | 55 ++++++++++++ src/remote/remote_driver.c | 99 +++++++++++++++++++++ src/remote/remote_protocol.x | 40 ++++++++- src/remote_protocol-structs | 24 +++++ tests/qemuagenttest.c | 149 +++++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 119 +++++++++++++++++++++++++ tools/virsh.pod | 11 +++ 20 files changed, 1155 insertions(+), 3 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

4 33

[libvirt] [PATCH 0/n] improvements to native-to-xml parsing
by Eric Blake 07 Sep '13

07 Sep '13

I tried to use 'virsh qemu-attach', and hit different failures with both libvirt.git on Fedora 19, and with an older version of libvirt on RHEL 6. I'm posting patches that I have so far to start reviews, but need to write still more patches as I still haven't succeeded at attaching. I also need to add a patch to the testsuite to cover the command line that I'm trying to attach to. Eric Blake (3): qemu: only parse basename when determining emulator properties qemu: simplify list cleanup qemu: recognize -machine accel=kvm when parsing native src/conf/domain_conf.c | 6 ++++ src/qemu/qemu_command.c | 87 +++++++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 43 deletions(-) -- 1.8.3.1

3 19

[libvirt] [PATCH] LXC:fix typo in lxc_container.c
by Chen Hanxiao 06 Sep '13

06 Sep '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> fix typo in lxc_container.c Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8abaea0..cf096f3 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1145,7 +1145,7 @@ lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED, #endif /* ! WITH_BLKID */ /* - * This functions attempts to do automatic detection of filesystem + * This function attempts to do automatic detection of filesystem * type following the same rules as the util-linux 'mount' binary. * * The main difference is that we don't (currently) try to use @@ -1600,7 +1600,7 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) } /* - * This is running as the 'init' process insid the container. + * This is running as the 'init' process inside the container. * It removes some capabilities that could be dangerous to * host system, since they are not currently "containerized" */ @@ -1750,7 +1750,7 @@ static int lxcContainerChild(void *data) if (lxcContainerSendContinue(argv->handshakefd) < 0) { virReportSystemError(errno, "%s", - _("failed to send continue signal to controller")); + _("Failed to send continue signal to controller")); goto cleanup; } -- 1.8.2.1

2 1

[libvirt] [PATCH 0/3] caps: expose the user and group owner of the HV
by Giuseppe Scrivano 06 Sep '13

06 Sep '13

virt-manager has no way to known the user/group that run the HV process without requiring the user to manually set it trough setup.py or assuming "root" as default value. This series extends the Guest capabilities with "hv_user" and "hv_group", to inform the libvirt user about the user/group (when qemu is used) that run the HV process. Giuseppe Scrivano (3): caps: new internal function "virCapabilitiesSetHvUserAndGroup" qemu: set hv_user/hv_group caps to the user/group which runs qemu caps: add tests and documentation for hv_user and hv_group docs/schemas/capability.rng | 10 +++++++ src/conf/capabilities.c | 46 +++++++++++++++++++++++++++++++ src/conf/capabilities.h | 7 +++++ src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 ++ tests/capabilityschemadata/caps-test2.xml | 4 +++ 6 files changed, 71 insertions(+) -- 1.8.3.1

2 12

[libvirt] [PATCH 0/3] Keep original file label
by Michal Privoznik 06 Sep '13

06 Sep '13

This is just a resurrection of my previous patchset. As of atomicity problem, I just realized there is none. The qemuProcessHook (which is responsible for locking the files) is called prior virSecurityManagerSetAllLabel (responsible for chown()-ing). Anyway, even if there's still one and it's pre-existing, it shouldn't block this set, should it? Michal Privoznik (3): virFile: Add APIs for extended attributes handling virfile: Introduce internal API for managing ACL security_dac: Favour ACLs over chown() configure.ac | 2 + libvirt.spec.in | 1 + m4/virt-acl.m4 | 9 ++ src/Makefile.am | 4 +- src/libvirt_private.syms | 6 + src/security/security_dac.c | 297 ++++++++++++++++++++++++++++++++++++++----- src/util/virfile.c | 301 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 28 +++++ 8 files changed, 617 insertions(+), 31 deletions(-) create mode 100644 m4/virt-acl.m4 -- 1.8.1.5

2 7

[libvirt] [PATCH] qemu: Remove unnecessary variable assignment
by Hongwei Bi 06 Sep '13

06 Sep '13

Remove unnecessary 'addrs = NULL' in qemuDomainAssignS390Addresses() and qemuDomainAssignPCIAddresses() due to the related Free function in label cleanup. --- src/qemu/qemu_command.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 643532f..3cc9c1d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1320,7 +1320,6 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, qemuDomainCCWAddressSetFree(priv->ccwaddrs); priv->persistentAddrs = 1; priv->ccwaddrs = addrs; - addrs = NULL; } else { priv->persistentAddrs = 0; } @@ -1901,7 +1900,6 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, qemuDomainPCIAddressSetFree(priv->pciaddrs); priv->persistentAddrs = 1; priv->pciaddrs = addrs; - addrs = NULL; } else { priv->persistentAddrs = 0; } -- 1.7.1

3 2

[libvirt] [PATCH 1/1] qemu: avoid users specifying CPU features for non-x86 plaftorm.
by Li Zhang 06 Sep '13

06 Sep '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Currently, only X86 provides users CPU features with CPUID instruction. If users specify the features for non-x86, it should tell users to remove them. This patch is to report one error if features are specified by users for non-x86 platform. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 91ca86a..1a158e4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10644,6 +10644,14 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, if (*feature == '\0') goto syntax; + if (dom->os.arch != VIR_ARCH_X86_64 && + dom->os.arch != VIR_ARCH_I686) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s platform doesn't support CPU features'"), + virArchToString(dom->os.arch)); + goto cleanup; + } + if (STREQ(feature, "kvmclock")) { bool present = (policy == VIR_CPU_FEATURE_REQUIRE); size_t j; -- 1.8.1.4

1 0

[libvirt] [PATCH] Docs: fix a typo in virt-login-shell.pod
by Alex Jia 06 Sep '13

06 Sep '13

Signed-off-by: Alex Jia <ajia(a)redhat.com> --- tools/virt-login-shell.pod | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virt-login-shell.pod b/tools/virt-login-shell.pod index e27d500..bcd7855 100644 --- a/tools/virt-login-shell.pod +++ b/tools/virt-login-shell.pod @@ -11,7 +11,7 @@ B<virt-login-shell> The B<virt-login-shell> program is a setuid shell that is used to join an LXC container that matches the user's name. If the container is not running, virt-login-shell will attempt to start the container. -virt-sandbox-shell is not allowed to be run by root. Normal users will get +virt-login-shell is not allowed to be run by root. Normal users will get added to a container that matches their username, if it exists, and they are configured in /etc/libvirt/virt-login-shell.conf. -- 1.7.1

2 2

[libvirt] [PATCH] domain_conf: Delete the USB controller check from the USB Device checklist on virDomainDeviceIsUSB
by Liuji (Jeremy) 06 Sep '13

06 Sep '13

When using "virsh attach-device" to attach a device, the virDomainDefCompatibleDevice function will check the compatibility. If the device is a USB device, but the VM don't have any USB controller, the execution of "virsh attach-device" will fails. It considers the USB controller as a USB device on virDomainDeviceIsUSB, so we can't use "virsh attach-device" to attach a USB controller for a VM which don't have any other USB controller. >From ec3257407a9c4aadcd4554dcaad00d40387cf488 Mon Sep 17 00:00:00 2001 From: Liu Ji <jeremy.liu(a)huawei.com> Date: Thu, 5 Sep 2013 09:56:42 +0800 Subject: [PATCH] domain_conf: Delete the USB controller check from the USB Device checklist on virDomainDeviceIsUSB Delete the USB controller check from the USB Device checklist on virDomainDeviceIsUSB, otherwise we can't use "virsh attach-device" to attach a USB controller for a VM which don't have any other USB controller. Signed-off-by: Liu Ji <jeremy.liu(a)huawei.com> --- src/conf/domain_conf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e3aec69..ffb3254 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16899,8 +16899,6 @@ virDomainDeviceIsUSB(virDomainDeviceDefPtr dev) int t = dev->type; if ((t == VIR_DOMAIN_DEVICE_DISK && dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) || - (t == VIR_DOMAIN_DEVICE_CONTROLLER && - dev->data.controller->type == VIR_DOMAIN_CONTROLLER_TYPE_USB) || (t == VIR_DOMAIN_DEVICE_INPUT && dev->data.input->type == VIR_DOMAIN_INPUT_BUS_USB) || (t == VIR_DOMAIN_DEVICE_HOSTDEV && -- 1.7.11.7

3 3

[libvirt] virsh domstate output when kvm killed vs guest OS panic
by Chris Friesen 06 Sep '13

06 Sep '13

Hi, If I kill a libvirt-managed kvm process with "kill -9", running "virsh domstate --reason <name>" gives shut off (crashed) Looking at the code, that corresponds to VIR_DOMAIN_SHUTOFF/VIR_DOMAIN_SHUTOFF_CRASHED. The comment says that VIR_DOMAIN_SHUTOFF_CRASHED corresponds to "domain crashed". Is this supposed to be a crash of the hypervisor, or of the guest OS? If I trigger a panic in the guest, it sits there in the panicked state doing nothing and "virsh domstate" gives running (booted) So what's the point of VIR_DOMAIN_CRASHED/VIR_DOMAIN_CRASHED_PANICKED? Chris

2 1

[libvirt] [PATCH 0/2] Only free compiled regex when regcomp() succeeds
by Jim Fehlig 06 Sep '13

06 Sep '13

During a recent discussion about calling regfree() when regcomp() fails, we decided it was best to not call regfree() when compilation fails. https://www.redhat.com/archives/libvir-list/2013-September/msg00262.html The first patch fixes existing infractions throughout the code. I split the second patch out since there were other issues beyond simply removing a call to regfree(). Jim Fehlig (2): Don't call regfree() if regcomp() fails libxl: Compile regular expression where it is used src/libxl/libxl_conf.c | 29 +++++++++++++++-------------- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_logical.c | 1 - src/xen/xen_hypervisor.c | 3 --- 4 files changed, 16 insertions(+), 19 deletions(-) -- 1.8.1.4

2 5

[libvirt] [PATCH] storage: new backend: btrfs subvolumes
by Oskari Saarenmaa 05 Sep '13

05 Sep '13

This commit adds a new storage pool driver, btrfs, which can be used to manage btrfs subvolumes on an existing btrfs filesystem. The driver can create new blank subvolumes and snapshots of existing subvolumes as well as delete existing subvolumes. The subvolumes created are automatically made visible on the host side and can be attached to domains using the <filesystem> tags as defined in 'format domain' documentation. Libvirt volumes do not implement quotas at the moment because the current (btrfs-progs-0.20.rc1.20130501git7854c8b-4.fc20.x86_64) support for quota management in btrfs-progs is lacking the necessary features, for example it's not possible to see the quota assigned to a certain subvolume and usage information is only updated on syncfs(2). Quota support will be implemented once the tools gain the necessary features. Signed-off-by: Oskari Saarenmaa <os(a)ohmu.fi> --- configure.ac | 23 +- docs/drivers.html.in | 1 + docs/schemas/storagepool.rng | 11 + docs/storage.html.in | 60 +++++ include/libvirt/libvirt.h.in | 1 + libvirt.spec.in | 2 + src/Makefile.am | 8 + src/conf/storage_conf.c | 12 +- src/conf/storage_conf.h | 1 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_btrfs.c | 284 ++++++++++++++++++++++ src/storage/storage_backend_btrfs.h | 30 +++ tests/storagepoolxml2xmlin/pool-btrfs.xml | 7 + tests/storagepoolxml2xmlout/pool-btrfs.xml | 17 ++ tests/storagepoolxml2xmltest.c | 1 + tests/storagevolxml2xmlin/vol-btrfs-snapshot.xml | 11 + tests/storagevolxml2xmlin/vol-btrfs.xml | 8 + tests/storagevolxml2xmlout/vol-btrfs-snapshot.xml | 26 ++ tests/storagevolxml2xmlout/vol-btrfs.xml | 17 ++ tests/storagevolxml2xmltest.c | 2 + 20 files changed, 525 insertions(+), 3 deletions(-) create mode 100644 src/storage/storage_backend_btrfs.c create mode 100644 src/storage/storage_backend_btrfs.h create mode 100644 tests/storagepoolxml2xmlin/pool-btrfs.xml create mode 100644 tests/storagepoolxml2xmlout/pool-btrfs.xml create mode 100644 tests/storagevolxml2xmlin/vol-btrfs-snapshot.xml create mode 100644 tests/storagevolxml2xmlin/vol-btrfs.xml create mode 100644 tests/storagevolxml2xmlout/vol-btrfs-snapshot.xml create mode 100644 tests/storagevolxml2xmlout/vol-btrfs.xml diff --git a/configure.ac b/configure.ac index f853e03..100c87d 100644 --- a/configure.ac +++ b/configure.ac @@ -1562,6 +1562,8 @@ AC_ARG_WITH([storage-rbd], AC_HELP_STRING([--with-storage-rbd], [with RADOS Block Device backend for the storage driver @<:@default=check@:>@]),[],[with_storage_rbd=check]) AC_ARG_WITH([storage-sheepdog], AC_HELP_STRING([--with-storage-sheepdog], [with Sheepdog backend for the storage driver @<:@default=check@:>@]),[],[with_storage_sheepdog=check]) +AC_ARG_WITH([storage-btrfs], + AC_HELP_STRING([--with-storage-btrfs], [with Btrfs backend for the storage driver @<:@default=check@:>@]),[],[with_storage_btrfs=check]) if test "$with_libvirtd" = "no"; then with_storage_dir=no @@ -1774,6 +1776,24 @@ fi AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG], [test "$with_storage_sheepdog" = "yes"]) +if test "$with_storage_btrfs" = "yes" || test "$with_storage_btrfs" = "check"; then + AC_PATH_PROG([BTRFS], [btrfs], [], [$PATH:/sbin:/usr/sbin]) + + if test "$with_storage_btrfs" = "yes" ; then + if test -z "$BTRFS" ; then AC_MSG_ERROR([We need btrfs -command for btrfs storage driver]) ; fi + else + if test -z "$BTRFS" ; then with_storage_btrfs=no ; fi + if test "$with_storage_btrfs" = "check" ; then with_storage_btrfs=yes ; fi + fi + + if test "$with_storage_btrfs" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_STORAGE_BTRFS], 1, [whether Btrfs backend for storage driver is enabled]) + AC_DEFINE_UNQUOTED([BTRFS],["$BTRFS"],[Location of btrfs program]) + fi +fi +AM_CONDITIONAL([WITH_STORAGE_BTRFS], [test "$with_storage_btrfs" = "yes"]) + + LIBPARTED_CFLAGS= LIBPARTED_LIBS= @@ -1861,7 +1881,7 @@ AC_SUBST([DEVMAPPER_CFLAGS]) AC_SUBST([DEVMAPPER_LIBS]) with_storage=no -for backend in dir fs lvm iscsi scsi mpath rbd disk; do +for backend in dir fs lvm iscsi scsi mpath rbd disk btrfs; do if eval test \$with_storage_$backend = yes; then with_storage=yes break @@ -2573,6 +2593,7 @@ AC_MSG_NOTICE([ mpath: $with_storage_mpath]) AC_MSG_NOTICE([ Disk: $with_storage_disk]) AC_MSG_NOTICE([ RBD: $with_storage_rbd]) AC_MSG_NOTICE([Sheepdog: $with_storage_sheepdog]) +AC_MSG_NOTICE([ Btrfs: $with_storage_btrfs]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Security Drivers]) AC_MSG_NOTICE([]) diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 7aa44f3..d9eb6d7 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -48,6 +48,7 @@ <li><strong><a href="storage.html#StorageBackendMultipath">Multipath backend</a></strong></li> <li><strong><a href="storage.html#StorageBackendRBD">RBD (RADOS Block Device) backend</a></strong></li> <li><strong><a href="storage.html#StorageBackendSheepdog">Sheepdog backend</a></strong></li> + <li><strong><a href="storage.html#StorageBackendBtrfs">Btrfs subvolume backend</a></strong></li> </ul> </body> </html> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index a4ef5af..6435566 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -21,6 +21,7 @@ <ref name='poolmpath'/> <ref name='poolrbd'/> <ref name='poolsheepdog'/> + <ref name='poolbtrfs'/> </choice> </element> </define> @@ -125,6 +126,16 @@ <ref name='sourcesheepdog'/> </define> + <define name='poolbtrfs'> + <attribute name='type'> + <value>btrfs</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcedir'/> + <ref name='target'/> + </define> + <define name='sourceinfovendor'> <optional> <element name='vendor'> diff --git a/docs/storage.html.in b/docs/storage.html.in index 1181444..4d4690c 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -114,6 +114,9 @@ <li> <a href="#StorageBackendSheepdog">Sheepdog backend</a> </li> + <li> + <a href="#StorageBackendBtrfs">Btrfs subvolume backend</a> + </li> </ul> <h2><a name="StorageBackendDir">Directory pool</a></h2> @@ -647,5 +650,62 @@ The Sheepdog pool does not use the volume format type element. </p> + <h2><a name="StorageBackendBtrfs">Btrfs subolume pools</a></h2> + <p> + This provides a pool based on a Btrfs filesystem using subvolumes and + optionally their snapshots. Btrfs subvolume pool can be used to create + subvolumes ans snapshots on the host side and the created volumes can + be attached as filesystems to LXC domains. + + The btrfs filesystem must already be formatted and mounted. Subvolume + quotas are not supported at the moment. + + <span class="since">Since 1.1.3</span> + </p> + + <h3>Example pool input</h3> + <pre> + <pool type="btrfs"> + <name>lxcdomains</name> + <target> + <path>/lxc</path> + </target> + </pool></pre> + + <h3>Example volume output</h3> + <pre> + <volume> + <name>vanilla</name> + <key>/lxc/vanilla</key> + <source> + </source> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>/lxc/vanilla</path> + <permissions> + <mode>00</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> + </volume></pre> + + <h3>Example filesystem attachment</h3> + <p>Btrfs volumes can be attached to LXC guests. Information about + attaching a filesystem to a guest can be found at the + <a href="formatdomain.html#elementsFilesystems">format domain</a> + page.</p> + + <h3>Valid pool format types</h3> + <p> + The Btrfs pool does not use the pool format type element. + </p> + + <h3>Valid volume format types</h3> + <p> + The Btrfs pool does not use the volume format type element. + </p> + </body> </html> diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a47e33c..6106ad5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3028,6 +3028,7 @@ typedef enum { VIR_CONNECT_LIST_STORAGE_POOLS_MPATH = 1 << 13, VIR_CONNECT_LIST_STORAGE_POOLS_RBD = 1 << 14, VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG = 1 << 15, + VIR_CONNECT_LIST_STORAGE_POOLS_BTRFS = 1 << 16, } virConnectListAllStoragePoolsFlags; int virConnectListAllStoragePools(virConnectPtr conn, diff --git a/libvirt.spec.in b/libvirt.spec.in index e94901a..3867b99 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -730,6 +730,8 @@ Requires: device-mapper Requires: device-mapper %endif %if %{with_storage_sheepdog} +# For Btrfs storage +Requires: btrfs-progs # For Sheepdog support Requires: sheepdog %endif diff --git a/src/Makefile.am b/src/Makefile.am index 636bcbc..cdcda36 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -789,6 +789,9 @@ STORAGE_DRIVER_RBD_SOURCES = \ STORAGE_DRIVER_SHEEPDOG_SOURCES = \ storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c +STORAGE_DRIVER_BTRFS_SOURCES = \ + storage/storage_backend_btrfs.h storage/storage_backend_btrfs.c + STORAGE_HELPER_DISK_SOURCES = \ storage/parthelper.c @@ -1402,6 +1405,10 @@ if WITH_STORAGE_SHEEPDOG libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) endif +if WITH_STORAGE_BTRFS +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_BTRFS_SOURCES) +endif + if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals if WITH_DRIVER_MODULES @@ -1594,6 +1601,7 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_DISK_SOURCES) \ $(STORAGE_DRIVER_RBD_SOURCES) \ $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ + $(STORAGE_DRIVER_BTRFS_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 002663f..ce7c999 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -55,7 +55,8 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi", "mpath", "rbd", "sheepdog") + "scsi", "mpath", "rbd", "sheepdog", + "btrfs") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, @@ -261,6 +262,11 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .formatFromString = virStorageVolFormatDiskTypeFromString, .formatToString = virStorageVolFormatDiskTypeToString, }, + }, + {.poolType = VIR_STORAGE_POOL_BTRFS, + .volOptions = { + .formatToString = virStoragePoolFormatDiskTypeToString, + } } }; @@ -2189,7 +2195,9 @@ virStoragePoolMatch(virStoragePoolObjPtr poolobj, (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_RBD) && (poolobj->def->type == VIR_STORAGE_POOL_RBD)) || (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_SHEEPDOG) && - (poolobj->def->type == VIR_STORAGE_POOL_SHEEPDOG)))) + (poolobj->def->type == VIR_STORAGE_POOL_SHEEPDOG)) || + (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_BTRFS) && + (poolobj->def->type == VIR_STORAGE_POOL_BTRFS)))) return false; } diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 62ff1fd..3d02c2a 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -128,6 +128,7 @@ enum virStoragePoolType { VIR_STORAGE_POOL_MPATH, /* Multipath devices */ VIR_STORAGE_POOL_RBD, /* RADOS Block Device */ VIR_STORAGE_POOL_SHEEPDOG, /* Sheepdog device */ + VIR_STORAGE_POOL_BTRFS, /* btrfs subvolumes / snapshots */ VIR_STORAGE_POOL_LAST, }; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 4ebe11b..1518dec 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -80,6 +80,9 @@ #if WITH_STORAGE_SHEEPDOG # include "storage_backend_sheepdog.h" #endif +#if WITH_STORAGE_BTRFS +# include "storage_backend_btrfs.h" +#endif #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -112,6 +115,9 @@ static virStorageBackendPtr backends[] = { #if WITH_STORAGE_SHEEPDOG &virStorageBackendSheepdog, #endif +#if WITH_STORAGE_BTRFS + &virStorageBackendBtrfs, +#endif NULL }; diff --git a/src/storage/storage_backend_btrfs.c b/src/storage/storage_backend_btrfs.c new file mode 100644 index 0000000..f0b7563 --- /dev/null +++ b/src/storage/storage_backend_btrfs.c @@ -0,0 +1,284 @@ +/* + * storage_backend_btrfs.c: btrfs subvolume / snapshot backed storage + * + * Copyright (C) 2007-2012 Red Hat, Inc. + * Copyright (C) 2013 Oskari Saarenmaa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Oskari Saarenmaa <os(a)ohmu.fi> + */ + +#include <config.h> + +#include <sys/statvfs.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> + +#include "storage_backend.h" +#include "viralloc.h" +#include "virfile.h" +#include "virstring.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +static char * +btrfsPoolVolPath(virStoragePoolObjPtr pool, + const char *name) +{ + char *res = NULL; + int rc = -1; + if (STREQLEN(name, pool->def->target.path, + strlen(pool->def->target.path))) { + rc = VIR_STRDUP(res, name); + } else { + rc = virAsprintf(&res, "%s/%s", pool->def->target.path, name); + } + return (rc < 0) ? NULL : res; +} + +static int +btrfsPoolCheck(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + bool *isActive) +{ + *isActive = (access(pool->def->target.path, R_OK | X_OK) == 0); + return 0; +} + +struct btrfsVolS { + int count; + struct { + char *name; + char *uuid; + } *vols; +}; + +static int +btrfsPoolFindVols(virStoragePoolObjPtr pool, + char **const groups, + void *data) +{ + struct btrfsVolS *bvols = data; + virStorageVolDefPtr vol = NULL; + int idx, ret = -1; + + if (VIR_ALLOC(vol) < 0) + goto cleanup; + + if (VIR_STRDUP(vol->name, groups[2]) < 0) + goto cleanup; + + vol->type = VIR_STORAGE_VOL_DIR; + if (virAsprintf(&vol->target.path, "%s/%s", + pool->def->target.path, + vol->name) == -1) + goto cleanup; + + if (VIR_STRDUP(vol->key, vol->target.path) < 0) + goto cleanup; + + /* Store uuid and name in case a snapshot targets this volume */ + if (VIR_REALLOC_N(bvols->vols, bvols->count+1) < 0) + goto cleanup; + idx = bvols->count++; + bvols->vols[idx].name = NULL; + bvols->vols[idx].uuid = NULL; + if (VIR_STRDUP(bvols->vols[idx].name, groups[2]) < 0 || + VIR_STRDUP(bvols->vols[idx].uuid, groups[1]) < 0) + goto cleanup; + + /* Is this a snapshot? */ + if (STRNEQ(groups[0], "-")) { + for (idx = 0; idx < bvols->count; idx++) { + if (STREQ(bvols->vols[idx].uuid, groups[0])) { + vol->backingStore.path = btrfsPoolVolPath(pool, bvols->vols[idx].name); + if (vol->backingStore.path == NULL) + goto cleanup; + break; + } + } + } + + if (VIR_REALLOC_N(pool->volumes.objs, + pool->volumes.count+1) < 0) + goto cleanup; + + pool->volumes.objs[pool->volumes.count++] = vol; + vol = NULL; + ret = 0; + +cleanup: + virStorageVolDefFree(vol); + return ret; +} + +static int +btrfsPoolRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) +{ + struct statvfs sb; + struct btrfsVolS bvols; + int idx, vars[] = {3}; + const char *regexes[] = { + "^ID [0-9]+ gen [0-9]+ top level [0-9]+ " + "parent_uuid ([-a-f0-9]+) uuid ([-a-f0-9]+) path (\\S+)$"}; + virCommandPtr cmd = virCommandNewArgList( + "btrfs", "subvolume", "list", "-uq", pool->def->target.path, NULL); + + bvols.count = 0; + bvols.vols = NULL; + if (virStorageBackendRunProgRegex(pool, cmd, 1, regexes, vars, + btrfsPoolFindVols, &bvols, NULL) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to parse btrfs subvolume list")); + goto cleanup; + } + + if (statvfs(pool->def->target.path, &sb) < 0) { + virReportSystemError(errno, + _("cannot statvfs path '%s'"), + pool->def->target.path); + goto cleanup; + } + pool->def->capacity = ((unsigned long long)sb.f_frsize * + (unsigned long long)sb.f_blocks); + pool->def->available = ((unsigned long long)sb.f_bfree * + (unsigned long long)sb.f_frsize); + pool->def->allocation = pool->def->capacity - pool->def->available; + + return 0; + +cleanup: + virStoragePoolObjClearVols(pool); + for (idx = 0; idx < bvols.count; idx++) { + VIR_FREE(bvols.vols[idx].name); + VIR_FREE(bvols.vols[idx].uuid); + } + VIR_FREE(bvols.vols); + + return -1; +} + +static int +btrfsPoolVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol) +{ + vol->type = VIR_STORAGE_VOL_DIR; + + VIR_FREE(vol->target.path); + vol->target.path = btrfsPoolVolPath(pool, vol->name); + if (vol->target.path == NULL) + return -1; + + if (virFileExists(vol->target.path)) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("volume target path '%s' already exists"), + vol->target.path); + return -1; + } + + VIR_FREE(vol->key); + return VIR_STRDUP(vol->key, vol->target.path); +} + +static int +btrfsPoolVolBuild(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int flags ATTRIBUTE_UNUSED) +{ + int ret = -1; + char *target_volume = NULL, *snapshot_source = NULL; + virCommandPtr cmd = virCommandNew("btrfs"); + struct stat st; + + if (!cmd) + goto cleanup; + + target_volume = btrfsPoolVolPath(pool, vol->target.path); + if (target_volume == NULL) + goto cleanup; + + if (vol->backingStore.path == NULL) { + virCommandAddArgList(cmd, "subvolume", "create", target_volume, NULL); + } else { + int accessRetCode = -1; + snapshot_source = btrfsPoolVolPath(pool, vol->backingStore.path); + if (snapshot_source == NULL) + goto cleanup; + + accessRetCode = access(snapshot_source, R_OK | X_OK); + if (accessRetCode != 0) { + virReportSystemError(errno, + _("inaccessible backing store volume %s"), + vol->backingStore.path); + goto cleanup; + } + + virCommandAddArgList(cmd, "subvolume", "snapshot", snapshot_source, + target_volume, NULL); + } + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + if (stat(target_volume, &st) < 0) { + virReportSystemError(errno, + _("failed to create %s"), vol->target.path); + goto cleanup; + } + ret = 0; + +cleanup: + VIR_FREE(target_volume); + VIR_FREE(snapshot_source); + virCommandFree(cmd); + return ret; +} + +static int +btrfsPoolVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int flags ATTRIBUTE_UNUSED) +{ + int ret = -1; + char *target_volume = btrfsPoolVolPath(pool, vol->target.path); + virCommandPtr cmd = virCommandNewArgList("btrfs", "subvolume", + "delete", target_volume, NULL); + if (target_volume == NULL || cmd == NULL) + goto cleanup; + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + ret = 0; + +cleanup: + VIR_FREE(target_volume); + virCommandFree(cmd); + return ret; +} + +virStorageBackend virStorageBackendBtrfs = { + .type = VIR_STORAGE_POOL_BTRFS, + + .checkPool = btrfsPoolCheck, + .refreshPool = btrfsPoolRefresh, + + .buildVol = btrfsPoolVolBuild, + .createVol = btrfsPoolVolCreate, + .deleteVol = btrfsPoolVolDelete, +}; diff --git a/src/storage/storage_backend_btrfs.h b/src/storage/storage_backend_btrfs.h new file mode 100644 index 0000000..7d65f58 --- /dev/null +++ b/src/storage/storage_backend_btrfs.h @@ -0,0 +1,30 @@ +/* + * storage_backend_btrfs.c: btrfs subvolume / snapshot backed storage + * + * Copyright (C) 2013 Oskari Saarenmaa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Oskari Saarenmaa <os(a)ohmu.fi> + */ + +#ifndef __VIR_STORAGE_BACKEND_BTRFS_H__ +# define __VIR_STORAGE_BACKEND_BTRFS_H__ + +# include "storage_backend.h" + +extern virStorageBackend virStorageBackendBtrfs; + +#endif /* __VIR_STORAGE_BACKEND_BTRFS_H__ */ diff --git a/tests/storagepoolxml2xmlin/pool-btrfs.xml b/tests/storagepoolxml2xmlin/pool-btrfs.xml new file mode 100644 index 0000000..c9e0626 --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-btrfs.xml @@ -0,0 +1,7 @@ +<pool type='btrfs'> + <name>lxc</name> + <uuid>96a73758-5481-4e79-b557-e130b81adf4c</uuid> + <target> + <path>/lxc</path> + </target> +</pool> diff --git a/tests/storagepoolxml2xmlout/pool-btrfs.xml b/tests/storagepoolxml2xmlout/pool-btrfs.xml new file mode 100644 index 0000000..c2cdec9 --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-btrfs.xml @@ -0,0 +1,17 @@ +<pool type='btrfs'> + <name>lxc</name> + <uuid>96a73758-5481-4e79-b557-e130b81adf4c</uuid> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <available unit='bytes'>0</available> + <source> + </source> + <target> + <path>/lxc</path> + <permissions> + <mode>0755</mode> + <owner>-1</owner> + <group>-1</group> + </permissions> + </target> +</pool> diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index d59cff9..cf61d24 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -100,6 +100,7 @@ mymain(void) DO_TEST("pool-iscsi-multiiqn"); DO_TEST("pool-iscsi-vendor-product"); DO_TEST("pool-sheepdog"); + DO_TEST("pool-btrfs"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/storagevolxml2xmlin/vol-btrfs-snapshot.xml b/tests/storagevolxml2xmlin/vol-btrfs-snapshot.xml new file mode 100644 index 0000000..f412e44 --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-btrfs-snapshot.xml @@ -0,0 +1,11 @@ +<volume> + <name>clone</name> + <capacity unit="bytes">0</capacity> + <allocation unit="bytes">0</allocation> + <target> + <path>/lxc/clone</path> + </target> + <backingStore> + <path>/lxc/vanilla</path> + </backingStore> +</volume> diff --git a/tests/storagevolxml2xmlin/vol-btrfs.xml b/tests/storagevolxml2xmlin/vol-btrfs.xml new file mode 100644 index 0000000..9522029 --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-btrfs.xml @@ -0,0 +1,8 @@ +<volume> + <name>vanilla</name> + <capacity unit="bytes">0</capacity> + <allocation unit="bytes">0</allocation> + <target> + <path>/lxc/vanilla</path> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-btrfs-snapshot.xml b/tests/storagevolxml2xmlout/vol-btrfs-snapshot.xml new file mode 100644 index 0000000..b96b5f0 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-btrfs-snapshot.xml @@ -0,0 +1,26 @@ +<volume> + <name>clone</name> + <key>(null)</key> + <source> + </source> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>/lxc/clone</path> + <format type='unknown'/> + <permissions> + <mode>0600</mode> + <owner>4294967295</owner> + <group>4294967295</group> + </permissions> + </target> + <backingStore> + <path>/lxc/vanilla</path> + <format type='unknown'/> + <permissions> + <mode>0600</mode> + <owner>4294967295</owner> + <group>4294967295</group> + </permissions> + </backingStore> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-btrfs.xml b/tests/storagevolxml2xmlout/vol-btrfs.xml new file mode 100644 index 0000000..bef5a1a --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-btrfs.xml @@ -0,0 +1,17 @@ +<volume> + <name>vanilla</name> + <key>(null)</key> + <source> + </source> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>/lxc/vanilla</path> + <format type='unknown'/> + <permissions> + <mode>0600</mode> + <owner>4294967295</owner> + <group>4294967295</group> + </permissions> + </target> +</volume> diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index 5b0a60b..fdfcc55 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -120,6 +120,8 @@ mymain(void) DO_TEST("pool-logical", "vol-logical"); DO_TEST("pool-logical", "vol-logical-backing"); DO_TEST("pool-sheepdog", "vol-sheepdog"); + DO_TEST("pool-btrfs", "vol-btrfs"); + DO_TEST("pool-btrfs", "vol-btrfs-snapshot"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.3.1

2 1

[libvirt] [PATCH 1/n] spec: fix rpm build when lxc disabled
by Eric Blake 05 Sep '13

05 Sep '13

'make rpm' failed if ~/.rpmmacros contains '%_without_lxc 1', which simulates the case of not having lxc available. RPM build errors: File not found: /home/eblake/rpmbuild/BUILDROOT/libvirt-1.1.1-1.fc19.x86_64/etc/libvirt/virt-login-shell.conf File not found by glob: /home/eblake/rpmbuild/BUILDROOT/libvirt-1.1.1-1.fc19.x86_64/usr/share/man/man1/virt-login-shell.1* File not found: /home/eblake/rpmbuild/BUILDROOT/libvirt-1.1.1-1.fc19.x86_64/usr/bin/virt-login-shell make: *** [rpm] Error 1 Reported by Dan Berrange. * libvirt.spec.in: Mark virt-login-shell as conditional on lxc. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm working on a couple more that I spotted while in the area: we still unconditionally build vbox even though we recently moved it into libvirtd for licensing reasons, which means a client_only build will probably fall over on that; but while testing my hypothesis, I discoverd that a client_only build fails even earlier with: TEST: fdstreamtest 1) Stream read blocking ... OK 2) Stream read non-blocking ... Unexpected EOF block 0 want 128 FAILED 3) Stream write blocking ... OK 4) Stream write non-blocking ... Failed to finish stream: internal error: libvirt: error : cannot execute binary /home/eblake/rpmbuild/BUILD/libvirt-1.1.1/tests/../src/libvirt_iohelper: No such file or directory libvirt.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index e94901a..affd2ec 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2014,17 +2014,23 @@ fi %doc AUTHORS ChangeLog.gz NEWS README COPYING COPYING.LESSER TODO %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf +%if %{with_lxc} %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf +%endif %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_mandir}/man1/virt-pki-validate.1* %{_mandir}/man1/virt-host-validate.1* +%if %{with_lxc} %{_mandir}/man1/virt-login-shell.1* +%endif %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate %{_bindir}/virt-host-validate +%if %{with_lxc} %attr(4755, root, root) %{_bindir}/virt-login-shell +%endif %{_libdir}/lib*.so.* %if %{with_dtrace} -- 1.8.3.1

2 18

[libvirt] [PATCH] libxl: Check for regcomp failure
by Jim Fehlig 05 Sep '13

05 Sep '13

Change libxlGetAutoballoonConf() function to return an int for success/failure, and fail if regcomp fails. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index fcb278b..a634476 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1014,21 +1014,28 @@ error: return -1; } -static bool -libxlGetAutoballoonConf(libxlDriverConfigPtr cfg) +static int +libxlGetAutoballoonConf(libxlDriverConfigPtr cfg, bool *autoballoon) { regex_t regex; - int ret; + int res; + + if ((res = regcomp(&regex, + "(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", + REG_NOSUB | REG_EXTENDED)) != 0) { + char error[100]; + regerror(res, &regex, error, sizeof(error)); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to compile regex %s"), + error); - ret = regcomp(&regex, - "(^| )dom0_mem=((|min:|max:)[0-9]+[bBkKmMgG]?,?)+($| )", - REG_NOSUB | REG_EXTENDED); - if (ret) - return true; + return -1; + } - ret = regexec(&regex, cfg->verInfo->commandline, 0, NULL, 0); + res = regexec(&regex, cfg->verInfo->commandline, 0, NULL, 0); regfree(&regex); - return ret == REG_NOMATCH; + *autoballoon = res == REG_NOMATCH; + return 0; } libxlDriverConfigPtr @@ -1098,7 +1105,8 @@ libxlDriverConfigNew(void) } /* setup autoballoon */ - cfg->autoballoon = libxlGetAutoballoonConf(cfg); + if (libxlGetAutoballoonConf(cfg, &cfg->autoballoon) < 0) + goto error; return cfg; -- 1.8.1.4

3 8

[libvirt] [PATCH] Add '<nat>' element to '<forward>' network schemas
by Ján Tomko 05 Sep '13

05 Sep '13

Commits 905629f4 and 1716e7a6 have added support for specifying an IPv4 range and a port range to be used by NAT: <forward mode='nat'> <nat> <address start='10.20.30.40' end='10.20.30.44'/> <port start='60000' end='65432'/> </nat> </forward> https://bugzilla.redhat.com/show_bug.cgi?id=1004364 --- docs/schemas/network.rng | 26 +++++++++++++++++++++ docs/schemas/networkcommon.rng | 7 ++++++ .../nat-network-forward-nat-address.xml | 26 +++++++++++++++++++++ .../nat-network-forward-nat-address.xml | 27 ++++++++++++++++++++++ tests/networkxml2xmltest.c | 1 + 5 files changed, 87 insertions(+) create mode 100644 tests/networkxml2xmlin/nat-network-forward-nat-address.xml create mode 100644 tests/networkxml2xmlout/nat-network-forward-nat-address.xml diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ab183f1..d7edb09 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -160,6 +160,32 @@ <empty/> </element> </optional> + <optional> + <element name='nat'> + <interleave> + <optional> + <element name='address'> + <attribute name='start'> + <ref name='ipv4Addr'/> + </attribute> + <attribute name='end'> + <ref name='ipv4Addr'/> + </attribute> + </element> + </optional> + <optional> + <element name='port'> + <attribute name='start'> + <ref name='port'/> + </attribute> + <attribute name='end'> + <ref name='port'/> + </attribute> + </element> + </optional> + </interleave> + </element> + </optional> </interleave> </element> </optional> diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index e60f1fc..e26b7f3 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -217,4 +217,11 @@ </oneOrMore> </element> </define> + + <define name='port'> + <data type='integer'> + <param name='minInclusive'>1</param> + <param name='maxInclusive'>65535</param> + </data> + </define> </grammar> diff --git a/tests/networkxml2xmlin/nat-network-forward-nat-address.xml b/tests/networkxml2xmlin/nat-network-forward-nat-address.xml new file mode 100644 index 0000000..403d058 --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-forward-nat-address.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <bridge name="virbr0"/> + <forward mode="nat" dev="eth1"> + <nat> + <address start='10.20.30.40' end='10.20.30.44'/> + <port start='60000' end='65432'/> + </nat> + </forward> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254"/> + <host mac="00:16:3e:77:e2:ed" name="a.example.com" ip="192.168.122.10"/> + <host mac="00:16:3e:3e:a9:1a" name="b.example.com" ip="192.168.122.11"/> + </dhcp> + </ip> + <ip family="ipv4" address="192.168.123.1" netmask="255.255.255.0"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fe01::1" prefix="64"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fd01::1" prefix="64"> + </ip> + <ip family="ipv4" address="10.24.10.1"> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-address.xml b/tests/networkxml2xmlout/nat-network-forward-nat-address.xml new file mode 100644 index 0000000..faeba24 --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-forward-nat-address.xml @@ -0,0 +1,27 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <nat> + <address start='10.20.30.40' end='10.20.30.44'/> + <port start='60000' end='65432'/> + </nat> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254'/> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 675a862..d04039d 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -108,6 +108,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record-minimal"); DO_TEST("nat-network-dns-hosts"); DO_TEST("nat-network-dns-forward-plain"); + DO_TEST("nat-network-forward-nat-address"); DO_TEST("8021Qbh-net"); DO_TEST("direct-net"); DO_TEST("host-bridge-net"); -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix a typo in network XML docs
by Ján Tomko 05 Sep '13

05 Sep '13

--- Pushed as trivial. docs/formatnetwork.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e1482db..36c381a 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -155,7 +155,7 @@ </forward> ...</pre> <p> - An singe IPv4 address can be set by setting + A single IPv4 address can be set by setting <code>start</code> and <code>end</code> attributes to the same value. </p> -- 1.8.1.5

1 0

[libvirt] [PATCH] Change 'shortforward' to bool.
by Ján Tomko 05 Sep '13

05 Sep '13

--- Pushed as trivial. src/conf/network_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d54f2aa..654919e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2552,7 +2552,7 @@ virNetworkDefFormatInternal(virBufferPtr buf, unsigned char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; - int shortforward; + bool shortforward; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) { -- 1.8.1.5

1 0

[libvirt] [PATCH] LXC: Don't mount securityfs when user namespace enabled
by Gao feng 05 Sep '13

05 Sep '13

Right now, securityfs is disallowed to be mounted in un init user namespace, we should avoid to mount securityfs in the container which enables user namespace. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8abaea0..c41ab40 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -750,7 +750,7 @@ err: } -static int lxcContainerMountBasicFS(void) +static int lxcContainerMountBasicFS(bool userns_enabled) { const struct { const char *src; @@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void) continue; #endif + if (STREQ(mnts[i].src, "securityfs") && userns_enabled) + continue; + if (virFileMakePath(mnts[i].dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), @@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS() < 0) + if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) goto cleanup; /* Mounts /proc/meminfo etc sysinfo */ -- 1.8.3.1

2 1

[libvirt] [PATCH] [RFC] docs: Add OpenStack into references
by Martin Kletzander 05 Sep '13

05 Sep '13

diff --git a/docs/apps.html.in b/docs/apps.html.in index 46e5dca..9f22df8 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -244,6 +244,15 @@ integrates libvirt for VM monitoring, live migration, and life-cycle management. </dd> + + <dt><a href="http://www.openstack.org">OpenStack</a></dt> + <dd> + OpenStack is a "cloud operating system" usable for both public + and private clouds. Its various parts take care of compute, + storage and networking resources and iterface with the user + using a dashboard. Compute part uses libvirt to manage VM + life-cycle, monitoring and so on. + </dd> </dl> <h2><a name="libraries">Libraries</a></h2> -- 1.8.3.2

4 5