- Devel - libvirt List Archives

[libvirt] libvirt and qemu
by mattias 06 Jul '12

06 Jul '12

when i do virsh connect qemu:///system i can connect but virsh list dosent show anything my qemu vms are not created with virt-manager

3 2

[libvirt] [PATCH] [libvirt-java] Fix Array IndexOutOfBoundsException for unknown error codes
by Claudio Bley 06 Jul '12

06 Jul '12

Hi. I'm using libvirt-java 0.4.7 and libvirt 0.9.8. When libvirt returns an error code which is not mapped in enum ErrorNumber, an IndexOutOfBoundsException is thrown. I realize that the freshly released libvirt-java 0.4.8 supports all error codes up to libvirt 0.9.12. But that doesn't fix the problem. Would it be feasible to add a special UNKNOWN enum value? --- diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index 0946030..72bc698 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -151,9 +151,12 @@ public class Error implements Serializable { } public Error(virError vError) { - code = ErrorNumber.values()[vError.code]; - domain = ErrorDomain.values()[vError.domain]; - level = ErrorLevel.values()[vError.level]; + if (ErrorNumber.values().length > vError.code) + code = ErrorNumber.values()[vError.code]; + if (ErrorDomain.values().length > vError.domain) + domain = ErrorDomain.values()[vError.domain]; + if (ErrorLevel.values().length > vError.level) + level = ErrorLevel.values()[vError.level]; message = vError.message; str1 = vError.str1; str2 = vError.str2; --- Best regards, Claudio. -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] [PATCH 00/12] Fine grained access control for libvirt APIs
by Daniel P. Berrange 05 Jul '12

05 Jul '12

This is a repost of https://www.redhat.com/archives/libvir-list/2012-January/msg00907.html which got no comments last time out. This series of patch is the minimal required to get a working proof of concept implementation of fine grained access control in libvirt. This demonstrates - Obtaining a client identity from a socket - Ensuring RPC calls are executed with the correct identity sset - A policykit access driver that checks based on access vector alone - A SELinux access driver that checks based on access vector + object - A set of hooks in the QEMU driver to protect virDomainObjPtr access Things that are not done - APIs for changing the real/effective identity post-connect - A simple RBAC access driver for doing (Access vector, object) checks - SELinux policy for the SELinux driver - Access control hooks on all other QEMU driver methods - Access control hooks in LXC, UML, other libvirtd side drivers - Access control hooks in storage, network, interface, etc drivers - Document WTF todo to propagate SELinux contexts across TCP sockets using IPSec. Any hints welcome... - Lots more I can't think of right now I should note that the policykit driver is mostly useless because it is unable to let you do checks on anything other than permission name and UNIX process ID at this time. So what I've implemented with the polkit driver is really little more than a slightly more fine grained version of the VIR_CONNECT_RO flag. In theory it is supposed to be extendable to allow other types of identity information besides the process ID, and to include some kind of object identiers in the permission check, but no one seems to be attacking this. So I expect the simple RBAC driver to be the most used one in the common case usage of libvirt, and of course the SELinux driver.

4 34

[libvirt] [PATCH] Only ummount /proc, /sys, /dev if the root source is '/'
by Daniel P. Berrange 05 Jul '12

05 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Previous commits added code to unmount the existing /proc, /sys and /dev hierarchies on the root filesystem of the container. This should only have been done if the container's root filesystem was the same as the host's root. ie if the root source is '/'. As it is, this causes LXC containersr to fail to start if their root source is not '/' Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4f8703c..145accb 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1416,12 +1416,14 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root) < 0) goto cleanup; - /* Gets rid of any existing stuff under /proc, /sys & /tmp + /* 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 * do /proc last otherwise we won't find /proc/mounts :-) */ - if (lxcContainerUnmountSubtree("/sys", false) < 0 || - lxcContainerUnmountSubtree("/dev", false) < 0 || - lxcContainerUnmountSubtree("/proc", false) < 0) + if (STREQ(root->src, "/") && + (lxcContainerUnmountSubtree("/sys", false) < 0 || + lxcContainerUnmountSubtree("/dev", false) < 0 || + lxcContainerUnmountSubtree("/proc", false) < 0)) goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ -- 1.7.10.4

2 1

[libvirt] [PATCH libvirt-java 1/2] Return a byte[] array with secretGetValue
by Wido den Hollander 05 Jul '12

05 Jul '12

We break the API with this, but Java does not support multiple method signatures with different return types. The old method returned a String, but since a secret can be binary data this type is not suited. Users who now that their secret is in fact a String, can use cast with: Secret secret = conn.secretLookupByUUIDString("uuuuuuuid"); String value = new String(secret.getValue()); Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/main/java/org/libvirt/Secret.java | 13 ++++++++++--- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index 48f7895..39d9122 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -5,6 +5,9 @@ import org.libvirt.jna.SecretPointer; import com.sun.jna.Native; import com.sun.jna.NativeLong; +import com.sun.jna.ptr.LongByReference; +import com.sun.jna.Pointer; +import java.nio.ByteBuffer; /** * A secret defined by libvirt @@ -106,12 +109,16 @@ public class Secret { /** * Fetches the value of the secret - * + * * @return the value of the secret, or null on failure. */ - public String getValue() throws LibvirtException { - String returnValue = libvirt.virSecretGetValue(VSP, new NativeLong(), 0); + public byte[] getValue() throws LibvirtException { + LongByReference value_size = new LongByReference(); + Pointer value = libvirt.virSecretGetValue(VSP, value_size, 0); processError(); + ByteBuffer bb = value.getByteBuffer(0, value_size.getValue()); + byte[] returnValue = new byte[bb.remaining()]; + bb.get(returnValue); return returnValue; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index b1e53a2..f53199d 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -330,7 +330,7 @@ public interface Libvirt extends Library { public int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); public int virSecretGetUUIDString(SecretPointer virSecretPtr, byte[] uuidString); public String virSecretGetUsageID(SecretPointer virSecretPtr); - public String virSecretGetValue(SecretPointer virSecretPtr, NativeLong value_size, int flags); + public Pointer virSecretGetValue(SecretPointer virSecretPtr, LongByReference value_size, int flags); public String virSecretGetXMLDesc(SecretPointer virSecretPtr, int flags); public SecretPointer virSecretLookupByUsage(ConnectionPointer virConnectPtr, int usageType, String usageID); public SecretPointer virSecretLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); -- 1.7.9.5

2 6

[libvirt] [PATCH] Wire up <loader> to set the QEMU BIOS path
by Daniel P. Berrange 05 Jul '12

05 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> * src/qemu/qemu_command.c: Wire up -bios with <loader> * tests/qemuxml2argvdata/qemuxml2argv-bios.args, tests/qemuxml2argvdata/qemuxml2argv-bios.xml: Expand existing BIOS test case to cover <loader> --- src/qemu/qemu_command.c | 9 +++++++++ tests/qemuxml2argvdata/qemuxml2argv-bios.args | 3 ++- tests/qemuxml2argvdata/qemuxml2argv-bios.xml | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ea9431f..c82f5bc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4052,6 +4052,11 @@ qemuBuildCommandLine(virConnectPtr conn, if (enableKVM) virCommandAddArg(cmd, "-enable-kvm"); + if (def->os.loader) { + virCommandAddArg(cmd, "-bios"); + virCommandAddArg(cmd, def->os.loader); + } + /* Set '-m MB' based on maxmem, because the lower 'memory' limit * is set post-startup using the balloon driver. If balloon driver * is not supported, then they're out of luck anyway. Update the @@ -7581,6 +7586,10 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, WANT_VALUE(); if (!(def->os.kernel = strdup(val))) goto no_memory; + } else if (STREQ(arg, "-bios")) { + WANT_VALUE(); + if (!(def->os.loader = strdup(val))) + goto no_memory; } else if (STREQ(arg, "-initrd")) { WANT_VALUE(); if (!(def->os.initrd = strdup(val))) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.args b/tests/qemuxml2argvdata/qemuxml2argv-bios.args index f9727c4..ac98000 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.args @@ -1,5 +1,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -/usr/bin/qemu -S -M pc -m 1024 -smp 1 -nodefaults -device sga \ +/usr/bin/qemu -S -M pc -bios /usr/share/seabios/bios.bin \ +-m 1024 -smp 1 -nodefaults -device sga \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -hda /dev/HostVG/QEMUGuest1 -serial pty \ -usb -device usb-tablet,id=input0 -vnc 127.0.0.1:0 \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml index cfc5587..ac15d45 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml @@ -6,6 +6,7 @@ <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> + <loader>/usr/share/seabios/bios.bin</loader> <boot dev='hd'/> <bootmenu enable='yes'/> <bios useserial='yes'/> -- 1.7.7.6

3 3

[libvirt] [PATCH] qemu: Always set auth_supported for Ceph disks.
by Wido den Hollander 05 Jul '12

05 Jul '12

Recently the Ceph project defaulted auth_supported from 'none' to 'cephx'. When no auth information was set for Ceph disks this would lead to librados defaulting to 'cephx', but there would be no additional authorization information. We now explicitly set auth_supported to none when passing down arguments to Qemu. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/qemu/qemu_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6549f57..1c59695 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1782,6 +1782,8 @@ qemuBuildRBDString(virConnectPtr conn, disk->auth.username); goto error; } + } else { + virBufferAddLit(opt, ":auth_supported=none"); } if (disk->nhosts > 0) { -- 1.7.9.5

2 2

[libvirt] Tracking VM installations
by Zeeshan Ali (Khattak) 05 Jul '12

05 Jul '12

Hi, We have a requirement in Boxes for showing progress bars on VMs under installation: https://github.com/gnome-design-team/gnome-mockups/raw/master/boxes/boxes-i… https://bugzilla.gnome.org/show_bug.cgi?id=679107 However, we are bit clueless on how that could be achieved. The only idea I have is to know the number of passes (reboots) and typical disk usage in each pass for "every" (we only do this for express installs so we don't need this for all) OS and estimate the progress based on that knowledge. If that idea is worth looking into, we'll need this information in libosinfo and hence me cross-posting this to virt-tools-list. Other ideas welcome! Keep in mind that we don't need to be very accurate, just accurate enough to not annoy the user. -- Regards, Zeeshan Ali (Khattak) FSF member#5124

3 5

[libvirt] [RFC] Allowing promiscuous mode for domains network interfaces
by Jean-Baptiste Rouault 05 Jul '12

05 Jul '12

Hi all, By default, OpenVZ and VirtualBox (> 4.0.x) filter network packets by MAC addresses : only broadcast, multicast and packets directly targeted to VMs are transmitted. This behaviour prevents from using promiscuous mode inside domains. I'd like to write some patches to disable these filters from libvirt. Would it be ok to modify OpenVZ and VirtualBox drivers so that they disable the filters by default ? If this is not acceptable, what about making it configurable through domains' XML ? Regards, Jean-Baptiste -- Jean-Baptiste ROUAULT Ingénieur R&D - diateam : Architectes de l'information Phone : +33 (0)2 98 050 050 Fax : +33 (0)2 98 050 051

2 2

[libvirt] [PATCH v7 0/8] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 05 Jul '12

05 Jul '12

Parallels Cloud Server is a virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. More information can be found here: http://www.parallels.com/products/pcs/ Also beta version of Parallels Cloud Server can be downloaded there. Dmitry Guryanov (8): parallels: add driver skeleton parallels: add functions to list domains and get info parallels: implement functions for domain life cycle management parallels: get info about serial ports parallels: add support of VNC remote display parallels: implement virDomainDefineXML operation for existing domains parallels: add storage driver parallels: implement VM creation cfg.mk | 1 + configure.ac | 23 + docs/drvparallels.html.in | 28 + include/libvirt/virterror.h | 2 +- libvirt.spec.in | 9 +- mingw32-libvirt.spec.in | 6 + po/POTFILES.in | 4 + src/Makefile.am | 15 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 9 + src/parallels/parallels_driver.c | 1309 +++++++++++++++++++++++++++++++++ src/parallels/parallels_driver.h | 75 ++ src/parallels/parallels_storage.c | 1456 +++++++++++++++++++++++++++++++++++++ src/parallels/parallels_utils.c | 131 ++++ src/util/virterror.c | 3 +- 17 files changed, 3072 insertions(+), 4 deletions(-) create mode 100644 docs/drvparallels.html.in create mode 100644 src/parallels/parallels_driver.c create mode 100644 src/parallels/parallels_driver.h create mode 100644 src/parallels/parallels_storage.c create mode 100644 src/parallels/parallels_utils.c

3 16

[libvirt] can't receive keepalive message during migration
by Hu Tao 05 Jul '12

05 Jul '12

Hi, When testing migration, I found a problem that the server can't receive keepalive reply from client when doing migration. The log shows that virsh did send the keepalive reply, but server didn't reveive it. The strange part is it's OK to migrate from host A to Host B, but always fails to migrate from host B to host A. When disable keepalive, migration will success. Any ideas? -- Thanks, Hu Tao

2 2

[libvirt] [PATCH] virsh: Avoid division by 0 in vshCalloc
by Peter Krempa 04 Jul '12

04 Jul '12

vshCalloc function uses xalloc_oversized macro that can't take 0 as it's second argument. If vshCalloc is called with size 0, virsh ends with a floating point exception. This patch changes vshCalloc to return NULL if no memory is requested. --- tools/virsh.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 53d1825..d3d5c6a 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -460,6 +460,9 @@ _vshCalloc(vshControl *ctl, size_t nmemb, size_t size, const char *filename, int { char *x; + if (!size) + return NULL; + if (!xalloc_oversized(nmemb, size) && VIR_ALLOC_N(x, nmemb * size) == 0) return x; -- 1.7.8.6

3 5

[libvirt] [PATCH] Only enforce check for YAJL when starting a VM
by Daniel P. Berrange 04 Jul '12

04 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous check for YAJL would have many undesirable consequences, the most important being that it caused the capabilities XML to loose all <guest> elements. There is no user visible feedback as to what is wrong in this respect, merely a syslog message. The empty capabilities causes libvirtd to then throw away all guest XML configs that are stored. This changes the code so that the check for YAJL is only performed at the time we attempt to spawn a QEMU process error: Failed to start domain vm-vnc error: unsupported configuration: this qemu binary requires libvirt to be compiled with yajl Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 13 +++++++++---- src/qemu/qemu_capabilities.h | 4 +++- src/qemu/qemu_command.c | 1 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_process.c | 3 +++ 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1e12a39..1d6ab2d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -691,7 +691,8 @@ qemuCapsInitGuest(virCapsPtr caps, return 0; /* Ignore binary if extracting version info fails */ - if (qemuCapsExtractVersionInfo(binary, info->arch, NULL, &qemuCaps) < 0) { + if (qemuCapsExtractVersionInfo(binary, info->arch, + false, NULL, &qemuCaps) < 0) { ret = 0; goto cleanup; } @@ -1472,7 +1473,9 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) return 0; } -int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, +int qemuCapsExtractVersionInfo(const char *qemu, + const char *arch, + bool check_yajl, unsigned int *retversion, virBitmapPtr *retflags) { @@ -1505,7 +1508,8 @@ int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, if (!(flags = qemuCapsNew()) || qemuCapsParseHelpStr(qemu, help, flags, - &version, &is_kvm, &kvm_version, true) == -1) + &version, &is_kvm, &kvm_version, + check_yajl) == -1) goto cleanup; /* Currently only x86_64 and i686 support PCI-multibus. */ @@ -1583,7 +1587,8 @@ int qemuCapsExtractVersion(virCapsPtr caps, return -1; } - if (qemuCapsExtractVersionInfo(binary, ut.machine, version, NULL) < 0) { + if (qemuCapsExtractVersionInfo(binary, ut.machine, false, + version, NULL) < 0) { return -1; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 83c135b..c14d53a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -167,7 +167,9 @@ int qemuCapsProbeCPUModels(const char *qemu, int qemuCapsExtractVersion(virCapsPtr caps, unsigned int *version); -int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, +int qemuCapsExtractVersionInfo(const char *qemu, + const char *arch, + bool check_yajl, unsigned int *version, virBitmapPtr *qemuCaps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 528b189..5959352 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -949,6 +949,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def) qemuDomainPCIAddressSetPtr addrs = NULL; if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + false, NULL, &qemuCaps) < 0) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..eb2ed0e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4757,6 +4757,7 @@ static char *qemuDomainXMLToNative(virConnectPtr conn, } if (qemuCapsExtractVersionInfo(def->emulator, def->os.arch, + false, NULL, &qemuCaps) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c5140c3..fd4c9c9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3073,6 +3073,7 @@ qemuProcessReconnect(void *opaque) */ if (!priv->qemuCaps && qemuCapsExtractVersionInfo(obj->def->emulator, obj->def->os.arch, + false, NULL, &priv->qemuCaps) < 0) goto error; @@ -3478,6 +3479,7 @@ int qemuProcessStart(virConnectPtr conn, qemuCapsFree(priv->qemuCaps); priv->qemuCaps = NULL; if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, + true, NULL, &priv->qemuCaps) < 0) goto cleanup; @@ -4237,6 +4239,7 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, priv->qemuCaps = NULL; if (qemuCapsExtractVersionInfo(vm->def->emulator, vm->def->os.arch, + false, NULL, &priv->qemuCaps) < 0) goto cleanup; -- 1.7.10.4

2 1

[libvirt] [PATCH] virsh: Fix ordering of arguments when calling vshCalloc.
by Peter Krempa 04 Jul '12

04 Jul '12

In vshSnapshotListCollect() vshCalloc was called with swapped nmemb and size argument. This caused division by zero in xalloc_oversized as the macro doesn't expect size to be zero. --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 53d1825..25ed177 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -17200,8 +17200,8 @@ vshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, if (count >= 0) { /* When mixing --from and --tree, we also want a copy of from * in the list, but with no parent for that one entry. */ - snaplist->snaps = vshCalloc(ctl, sizeof(*snaplist->snaps), - count + (tree && from)); + snaplist->snaps = vshCalloc(ctl, pcount + (tree && from), + sizeof(*snaplist->snaps)); snaplist->nsnaps = count; for (i = 0; i < count; i++) snaplist->snaps[i].snap = snaps[i]; -- 1.7.8.6

2 3

[libvirt] [PATCH] qemu: Mark domains as having managed state image only on managed save
by Peter Krempa 04 Jul '12

04 Jul '12

QEmu domains were marked as having managed save image even if they were saved using the regular save. With this patch, domains are marked so only when using managed save API. --- src/qemu/qemu_driver.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2f93404..3410535 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2739,7 +2739,6 @@ qemuDomainSaveInternal(struct qemud_driver *driver, virDomainPtr dom, } ret = 0; - vm->hasManagedSave = true; /* Shut it down */ qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, 0); @@ -2916,8 +2915,10 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags) VIR_INFO("Saving state to %s", name); compressed = QEMUD_SAVE_FORMAT_RAW; - ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, - NULL, flags); + if ((ret = qemuDomainSaveInternal(driver, dom, vm, name, compressed, + NULL, flags)) == 0) + vm->hasManagedSave = true; + vm = NULL; cleanup: -- 1.7.8.6

3 3

[libvirt] question about save/restore domain
by Jovanka Gulicoska 04 Jul '12

04 Jul '12

Hi, my name is Jovanka Gulicoska and I'm SoC student. I'm working on implementing save/load of VM in Gnome-Boxes. Something confused me about snapshots. In the documentation about life cycle, in section about Save/Restore is said that domain saved with virDomainSave/virDomainSaveFlags can be restored only once. But in the documentation about Snapshot XML format there is no information about this in VM state snapshots. So is it better just to use virDomainSnapshotCreateXML instead of virDomainSave/virDomainSaveFlags? I've created bindings for this functions in libvirt-glib but I wanted to be sure before I send them for review. Thanks, Jovanka (gulic)

5 8

[libvirt] libvirt can't get capablities
by Li Zhang 04 Jul '12

04 Jul '12

Hi, I have suffered several times on both x86 machine and power machine. When we want to use libvirt to create on VMs, it reports "unknown OS type hvm". We can't get <guest> capabilities. The log is as the following(log_level=1): 2003-01-02 01:21:39.895+0000: 12214: error : virDomainDefParseXML:8491 : unknown OS type hvm 2003-01-02 01:21:39.896+0000: 12214: error : virDomainDefParseXML:8491 : unknown OS type hvm 2003-01-02 01:22:00.135+0000: 12207: error : qemuCapsComputeCmdFlags:1218 : unsupported configuration: this qemu binary requires libvirt to be compiled with yajl 2003-01-02 01:22:13.342+0000: 12207: error : qemuCapsComputeCmdFlags:1218 : unsupported configuration: this qemu binary requires libvirt to be compiled with yajl 2003-01-02 01:22:13.347+0000: 12204: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.351+0000: 12205: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.355+0000: 12207: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.355+0000: 12208: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 2003-01-02 01:22:13.357+0000: 12206: error : qemuCapsExtractVersion:1576 : internal error Cannot find suitable emulator for ppc64 I search online and find one similar issue from Redhat bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=509337 Is there any solution to avoid this problem? Any idea? -- Best Regards Li IBM LTC, China System&Technology Lab, Beijing

4 10

[libvirt] [Patch v2] vmware: detect when a domain was shut down from the inside
by Jean-Baptiste Rouault 04 Jul '12

04 Jul '12

This patch adds an internal function vmwareUpdateVMStatus to update the real state of the domain. This function is used in various places in the driver, in particular to detect when the domain has been shut down by the user with the "halt" command. --- v2: - Replace internal function vmwareGetVMStatus by vmwareUpdateVMStatus - Improve vmrun list output parsing - variable initialization and coding-style fixes src/vmware/vmware_driver.c | 95 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 8f9d922..53e28e7 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -28,6 +28,7 @@ #include "datatypes.h" #include "virfile.h" #include "memory.h" +#include "util.h" #include "uuid.h" #include "command.h" #include "vmx.h" @@ -181,6 +182,64 @@ vmwareGetVersion(virConnectPtr conn, unsigned long *version) } static int +vmwareUpdateVMStatus(struct vmware_driver *driver, virDomainObjPtr vm) +{ + virCommandPtr cmd; + char *outbuf = NULL; + char *vmxAbsolutePath = NULL; + char *parsedVmxPath = NULL; + char *str; + char *saveptr = NULL; + bool found = false; + int oldState = virDomainObjGetState(vm, NULL); + int newState; + int ret = -1; + + cmd = virCommandNewArgList(VMRUN, "-T", vmw_types[driver->type], + "list", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + if (virFileResolveAllLinks(((vmwareDomainPtr) vm->privateData)->vmxPath, + &vmxAbsolutePath) < 0) + goto cleanup; + + for(str = outbuf ; (parsedVmxPath = strtok_r(str, "\n", &saveptr)) != NULL; + str = NULL) { + + if (parsedVmxPath[0] != '/') + continue; + + if (STREQ(parsedVmxPath, vmxAbsolutePath)) { + found = true; + /* If the vmx path is in the output, the domain is running or + * is paused but we have no way to detect if it is paused or not. */ + if (oldState == VIR_DOMAIN_PAUSED) + newState = oldState; + else + newState = VIR_DOMAIN_RUNNING; + break; + } + } + + if (!found) { + vm->def->id = -1; + newState = VIR_DOMAIN_SHUTOFF; + } + + virDomainObjSetState(vm, newState, 0); + + ret = 0; + +cleanup: + virCommandFree(cmd); + VIR_FREE(outbuf); + VIR_FREE(vmxAbsolutePath); + return ret; +} + +static int vmwareStopVM(struct vmware_driver *driver, virDomainObjPtr vm, virDomainShutoffReason reason) @@ -331,6 +390,9 @@ vmwareDomainShutdownFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { vmwareError(VIR_ERR_INTERNAL_ERROR, "%s", _("domain is not in running state")); @@ -485,6 +547,8 @@ vmwareDomainReboot(virDomainPtr dom, unsigned int flags) vmwareSetSentinal(cmd, vmw_types[driver->type]); vmwareSetSentinal(cmd, vmxPath); + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { vmwareError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -596,6 +660,9 @@ vmwareDomainCreateWithFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjIsActive(vm)) { vmwareError(VIR_ERR_OPERATION_INVALID, "%s", _("Domain is already running")); @@ -645,6 +712,9 @@ vmwareDomainUndefineFlags(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + if (virDomainObjIsActive(vm)) { vm->persistent = 0; } else { @@ -874,6 +944,21 @@ vmwareDomainXMLFromNative(virConnectPtr conn, const char *nativeFormat, return xml; } +static void vmwareDomainObjListUpdateDomain(void *payload, const void *name ATTRIBUTE_UNUSED, void *data) +{ + struct vmware_driver *driver = data; + virDomainObjPtr vm = payload; + virDomainObjLock(vm); + vmwareUpdateVMStatus(driver, vm); + virDomainObjUnlock(vm); +} + +static void +vmwareDomainObjListUpdateAll(virDomainObjListPtr doms, struct vmware_driver *driver) +{ + virHashForEach(doms->objs, vmwareDomainObjListUpdateDomain, driver); +} + static int vmwareNumDefinedDomains(virConnectPtr conn) { @@ -881,6 +966,7 @@ vmwareNumDefinedDomains(virConnectPtr conn) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListNumOfDomains(&driver->domains, 0); vmwareDriverUnlock(driver); @@ -894,6 +980,7 @@ vmwareNumDomains(virConnectPtr conn) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListNumOfDomains(&driver->domains, 1); vmwareDriverUnlock(driver); @@ -908,6 +995,7 @@ vmwareListDomains(virConnectPtr conn, int *ids, int nids) int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids); vmwareDriverUnlock(driver); @@ -922,6 +1010,7 @@ vmwareListDefinedDomains(virConnectPtr conn, int n; vmwareDriverLock(driver); + vmwareDomainObjListUpdateAll(&driver->domains, driver); n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames); vmwareDriverUnlock(driver); return n; @@ -944,6 +1033,9 @@ vmwareDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + info->state = virDomainObjGetState(vm, NULL); info->cpuTime = 0; info->maxMem = vm->def->mem.max_balloon; @@ -979,6 +1071,9 @@ vmwareDomainGetState(virDomainPtr dom, goto cleanup; } + if (vmwareUpdateVMStatus(driver, vm) < 0) + goto cleanup; + *state = virDomainObjGetState(vm, reason); ret = 0; -- 1.7.9.1

2 2

[libvirt] [PATCH] remote: Fill remote parameters in remoteDomainListAllSnapshots()
by Peter Krempa 04 Jul '12

04 Jul '12

This patch fills the domain argument that is sent to the remote side. This caused a client segfault as the argument was NULL. --- src/remote/remote_driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 6f53264..eac50e6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -4888,6 +4888,7 @@ remoteDomainListAllSnapshots(virDomainPtr dom, remoteDriverLock(priv); + make_nonnull_domain(&args.dom, dom); args.need_results = !!snapshots; args.flags = flags; -- 1.7.8.6

2 2

[libvirt] Release of libvirt-0.9.13
by Daniel Veillard 03 Jul '12

03 Jul '12

Okay the new release is out and available as uauls at ftp://libvirt.org/libvirt/ along with rpms generated on Fedora16, the git tree is tagged too. As suggested earlier it seems that the rate of commits is slowing down a bit, for example it took one month an a half to accumulate the 300+ commits of this release, considering that there is uauslly a slowdown during the summer months I plan to push the next release at the end of August, well unless there is a lot of activities or something urgent to push in the meantime. This release is rather rich, quite a few features and a lot of improvements: Features: - S390: support for s390(x) (Thang Pham and Viktor Mihajlovski) - snapshot: implement new APIs for esx and vbox (Eric Blake) - list: add virDomainListAllSnapshots API (Eric Blake) - snapshot: new query APIs (Eric Blake) - virsh: Allow users to reedit rejected XML (Michal Privoznik) - nwfilter: add DHCP snooping (Stefan Berger) - Enable driver modules in libvirt RPM (Daniel P. Berrange) - Default to enable driver modules for libvirtd (Daniel P. Berrange) - storage backend: Add RBD (RADOS Block Device) support (Wido den Hollander) - sVirt support for LXC domains (Daniel P. Berrange) Documentation: - virsh: Cleanup virsh -V output (Doug Goldstein) - configure: show correct default argument in help (Marc-André Lureau) - fix typo in virDomainDestroy API doc (Christophe Fergeau) - virsh: fix few typos on desc command (Martin Kletzander) - virsh: Update vol-create-as manpage (Michal Privoznik) - virsh: Tweak attach-* documentation (Michal Privoznik) - small typo in formatdomain.html (Laine Stump) - client rpc: Improve debug messages in virNetClientIO (Jiri Denemark) - minor fixes to domain interface documentation (Laine Stump) - link to FLOSS Weekly podcast, virt blogs (Eric Blake) - examples: add consolecallback example python script (Dave Allan) - Fix typo in comment start (Daniel P. Berrange) - typo in acceleration element (Martin Kletzander) - Improve docs about compiling libvirt from GIT (Daniel P. Berrange) Portability: - Fix compilation on older sanlock (Daniel Veillard) - Fix unused parameters / functions in virsh on Win32 (Daniel P. Berrange) - Update to latest GNULIB to fix compat with Mingw64 toolchain (Daniel P. Berrange) - winsock2.h must always be included before windows.h (Daniel P. Berrange) - Switch automated builds to use Mingw64 toolchain instead of Mingw32 (Daniel P. Berrange) - openvz: Fix wordsize on 64 bit architectures (Guido Günther) - Fixes for check and rpm builds without sanlock (and qemu) (Martin Kletzander) - Fix Win32 build by linking to ole32 (Daniel P. Berrange) - Add impl of APIs to get user directories on Win32 (Daniel P. Berrange) - fix building error on non fedora system (Wen Congyang) - Add stub impl of virNetlinkEventServiceLocalPid for Win32 (Daniel P. Berrange) - Fix build when configuring with polkit0 (Jim Fehlig) - build: fix virnetlink on glibc 2.11 (Eric Blake) - Fix build compat with older libselinux for LXC (Daniel P. Berrange) - build: really silence the 32-bit warning (Eric Blake) Bug Fixes: - build: use correct limit for unsigned long long (Eric Blake) - nwfilter: Fix memory leak (Stefan Berger) - network_conf: Don't free uninitialized pointers while parsing DNS SRV (Peter Krempa) - storage: Error out if the target is already mounted for netfs pool (Osier Yang) - events: Don't fail on registering events for two different domains (Michal Privoznik) - Don't install systemd service files executable (Guido Günther) - fix a bug of ref count in virnetserver.c (Hu Tao) - Fix deadlock on libvirtd shutdown (Jim Fehlig) - openvz: check pointer size instead of int (Guido Günther) - domain_conf: fix possible memory leak (Martin Kletzander) - error: Fix typos in argument checking macros (Peter Krempa) - LXC: fix incorrect DEBUG info (Gao feng) - LXC: fix memory leak in lxcContainerSetupExtraMounts (Gao feng) - LXC: fix memory leak in lxcContainerGetSubtree (Gao feng) - LXC: fix memory leak in lxcContainerMountFSBlockHelper (Gao feng) - qemu_agent: Wait for events instead of agent response (Michal Privoznik) - Fix launch of libvirtd when DHCP snooping support is not available. (Daniel P. Berrange) - qemu: fix potential dead lock (Wen Congyang) - virsh: Null terminated the string memcpy from buffer explicitly (Osier Yang) - qemu: Fix off-by-one error while unescaping monitor strings (Peter Krempa) - virsh: Don't generate invalid XML in attach-disk command (Peter Krempa) - client rpc: Fix error checking after poll() (Daniel P. Berrange) - client rpc: Send keepalive requests from IO event loop (Jiri Denemark) - Fix typo in RPM specfile (Daniel P. Berrange) - python: fix snapshot listing bugs (Eric Blake) - qemu: Don't overwrite security labels (Michal Privoznik) - rpc: Fix memleak in virNetMessageEncodeHeader (Michal Privoznik) - Fix privileges on /var/run/libvirt directory (Daniel P. Berrange) - Only migrate profile in non-privileged libvirtd instance (Daniel P. Berrange) - snapshot: avoid virsh crash with older servers (Eric Blake) - LXC: fix memory leak in lxcContainerMountFSBlockAuto (Gao feng) - LXC: fix incorrect parameter of mount in lxcContainerMountFSBind (Gao feng) - util: Fix deadlock in virLogReset (Jiri Denemark) - Assign correct address type to spapr-vlan and spapr-vty. (Li Zhang) - command: avoid potential deadlock on handshake (Eric Blake) - qemu: better detection of crashed domains (Martin Kletzander) - command: avoid deadlock on EPIPE situation (Eric Blake) - Fix sync issue in virNetClientStreamEventRemoveCallback (Radu Caragea) - qemu: avoid closing fd more than once (Wen Congyang) - command: check for fork error before closing fd (Wen Congyang) - fdstream: avoid double close bug (Eric Blake) - command: avoid double close bugs (Eric Blake) - avoid fd leak (Wen Congyang) - avoid closing uninitialized fd (Wen Congyang) - lxc: return correct number of CPUs (Martin Kletzander) - leak_fix.diff (Stefan Berger) - Fix typos in RPM dependencies (Daniel P. Berrange) - Remove more bogus systemd service dependencies (Daniel P. Berrange) - qemu_hotplug: Don't free the PCI device structure after hot-unplug (Peter Krempa) - Fix potential events deadlock when unref'ing virConnectPtr (Daniel P. Berrange) - qemu: Don't delete USB device on failed qemuPrepareHostdevUSBDevices (Michal Privoznik) - nodeinfo: Get the correct CPU number on AMD Magny Cours platform (Osier Yang) - nodeinfo: avoid probing host filesystem during test (Eric Blake) Improvements: - Remove sub-mounts under /dev when starting an LXC container (Daniel P. Berrange) - Fix vm's outbound traffic control problem (Eiichi Tsukata) - conf: Don't shadow error from virGetDomain() (Peter Krempa) - maint: include ignore-value in internal.h (Peter Krempa) - vbox: Add support for virConnectListAllDomains() (Peter Krempa) - virsh: Add domdisplay cmd for VNC, SPICE and RDP (Doug Goldstein) - AUTHORS: Update (Michal Privoznik) - S390: Added sysinfo for host on s390(x). (Thang Pham) - S390: Fixed core identification for s390 (Viktor Mihajlovski) - S390: Fixed Parser for /proc/cpuinfo needs to be adapted for your architecture (Thang Pham) - S390: Override QEMU_CAPS_NO_ACPI for s390x (Viktor Mihajlovski) - storage backend rbd: Do not prefix rbd: on volume names. (Wido den Hollander) - qemu: Improve error if setmem fails for lacking of balloon support (Osier Yang) - Include the default listen address in the live guest XML (Daniel P. Berrange) - storage: Introduce --inactive for pool-dumpxml (Michal Privoznik) - storage: Switch to new def on pool-destroy (Michal Privoznik) - Support bind mounting host files, as well as directories in LXC (Daniel J Walsh) - Allow NOCONFIGURE=1 to make autogen.sh skip ./configure (Daniel P. Berrange) - virsh: Use virXPath wrappers for vncdisplay cmd (Doug Goldstein) - Add support for shared sanlock leases (Daniel P. Berrange) - Add support for guest bind mounts with LXC (Daniel P. Berrange) - Add support for RAM filesystems for LXC (Daniel P. Berrange) - virsh: Improve error when trying to change vm's cpu count 0 (Peter Krempa) - qemu: Add xhci support (Gerd Hoffmann) - virsh: add support for virConnectListAllDomains and clean up cmdList (Peter Krempa) - virsh: Rename namesorter to vshNameSorter and clean up indentation (Peter Krempa) - Initialize random generator in lxc controller (Jim Fehlig) - storage: Set the perms if the pool target already exists for fs pools (Osier Yang) - snapshot: require existence before returning success (Eric Blake) - drivers: Implement virListAllDomains for drivers using virDomainObj (Peter Krempa) - Fix default USB controller for ppc64 (Dipankar Sarma) - list: add qemu snapshot list support (Eric Blake) - list: new helper function to collect snapshots (Eric Blake) - list: provide RPC call for snapshots (Eric Blake) - list: provide python bindings for snapshots (Eric Blake) - list: use the new snapshot API in virsh when possible (Eric Blake) - snapshot: expose new flags in virsh (Eric Blake) - snapshot: add additional filters when getting lists (Eric Blake) - virsh: make domiftune interface help string consistent (Martin Kletzander) - snapshot: merge count and name collection (Eric Blake) - snapshot: merge domain and snapshot computation (Eric Blake) - snapshot: use metaroot node to simplify management (Eric Blake) - conf: Add helper for listing domains on drivers supporting virDomainObj (Peter Krempa) - conf: Store managed save image existence in virDomainObj (Peter Krempa) - remote: implement remote protocol for virConnectListAllDomains() (Peter Krempa) - python: add API exports for virConnectListAllDomains() (Peter Krempa) - lib: Add public api to enable atomic listing of guest (Peter Krempa) - Add a custom 404 error page for the website (Daniel P. Berrange) - qemu_agent: Add some more debug prints (Michal Privoznik) - snapshot: use new virsh function for snapshot-list (Eric Blake) - snapshot: new virsh function factored from snapshot-list (Eric Blake) - autogen: Always abide --system (Cole Robinson) - Check for errors when parsing bridge interface XML (Jim Fehlig) - Add more debug logging for libvirtd startup (Daniel P. Berrange) - schema: Update domain XML schema (Osier Yang) - virsh: allow the user to specify vmcore's format (Wen Congyang) - qemu: allow the client to choose the vmcore's format (Wen Congyang) - qemu: implement qemu's dump-guest-memory (Wen Congyang) - Always pivot_root event if the new root source is '/' (Daniel P. Berrange) - Improve error message diagnosing incorrect XML CPU mode (Daniel P. Berrange) - qemu: Enable disconnecting SPICE clients without changing password (Peter Krempa) - virsh: Report name from edited object (Michal Privoznik) - virsh: Honor reedit opts printing to a function (Michal Privoznik) - network: fully support/use VIR_NETWORK_XML_INACTIVE flag (Laine Stump) - Add some missing hook functions (Daniel P. Berrange) - server rpc: Remove APIs for manipulating filters on locked client (Jiri Denemark) - rpc: Remove unused parameter in virKeepAliveStopInternal (Jiri Denemark) - rpc: Do not use timer for sending keepalive responses (Jiri Denemark) - client rpc: Separate call creation from running IO loop (Jiri Denemark) - rpc: Add APIs for direct triggering of keepalive timer (Jiri Denemark) - rpc: Refactor keepalive timer code (Jiri Denemark) - client rpc: Drop unused return value of virNetClientSendNonBlock (Jiri Denemark) - client rpc: Just queue non-blocking call if another thread has the buck (Jiri Denemark) - client rpc: Don't drop non-blocking calls (Jiri Denemark) - client rpc: Use event loop for writing (Jiri Denemark) - build: fix 'make dist' on virgin checkout (Eric Blake) - build: silence gettext warning (Eric Blake) - openvz: wire up domainUpdateDeviceFlags (Guido Günther) - openvz: add persist parameter to openvzSetDiskQuota (Guido Günther) - Introduce virDomainFSIndexByName (Guido Günther) - python: use simpler methods (Eric Blake) - qemuProcessStop: Switch to flags (Michal Privoznik) - snapshot: implement new APIs for qemu (Eric Blake) - snapshot: RPC for new query APIs (Eric Blake) - snapshot: add 'virsh snapshot-info' (Eric Blake) - Two RPM conditional fixes for RHEL-7 (Daniel P. Berrange) - snapshot: virsh indentation cleanup (Eric Blake) - virsh: make tree listing more flexible (Eric Blake) - virsh: remove limits on tree listing (Eric Blake) - buf: support peeking at string contents (Eric Blake) - Update AUTHORS (Osier Yang) - LXC: Delete unused variable src in lxcContainerMountBasicFS (Gao feng) - msg_buf_size is unsigned long not size_t (Guido Günther) - Only check for cluster fs if we're using a filesystem (Guido Günther) - snapshot: add virDomainSnapshotRef API (Eric Blake) - Fix missing ) in 2 strings (Cole Robinson) - maint: make it easier to copy FORTIFY_SOURCE snippet (Eric Blake) - build: fix build without i18n (Eric Blake) - spec: Build against systemd for udev (Cole Robinson) - build: fix build of fresh checkout (Eric Blake) - build: ensure storage driver is used (Eric Blake) - rpc: Size up RPC limits (Michal Privoznik) - rpc: Switch to dynamically allocated message buffer (Michal Privoznik) - build: fix 'make distcheck' issues (Eric Blake) - tests: Refresh qemu-1.1.0 data (Jiri Denemark) - virsh: Back out if the argument for vol-create-as is malformed (Osier Yang) - virsh: Accept UUID as an argument for net-info and net-start (Osier Yang) - virsh: Accept UUID as an argument for storage commands (Osier Yang) - Fix for parallel port passthrough for QEMU (Beat Jörg) - util: fix "make rpm" when viratomic.h is used (Laine Stump) - build: allow building with newer glibc-headers and -O0 (Eric Blake) - fix make syntax-check failed (Wen Congyang) - build: fix sc_prohibit_readlink (Eric Blake) - file: Log closing filedescriptors (Jiri Denemark) - command: Fix debug message during handshake (Jiri Denemark) - virsh: Switch from generated cmd*Edit commands to nongenerated (Michal Privoznik) - nwfilter: Add multiple IP address support to DHCP snooping (Stefan Berger) - nwfilter: move code for IP address map into separate file (Stefan Berger) - qemu: move -name arg to be 1st in "ps x" output (Marti Raudsepp) - qemu: fix netdev alias name assignment wrt type='hostdev' (Laine Stump) - tools: make virt-pki-validate work with acls and xattrs (Martin Kletzander) - build: include augeas-gentest.pl into dist file (Wen Congyang) - build: use same perl binary throughout build (Eric Blake) - build: fix testing of augeas files in VPATH builds (Eric Blake) - build: silence warning from autoconf (Eric Blake) - virCommand: Extend debug message for handshake (Michal Privoznik) - build: Fixed generating of libvirt_qemu_probes.h (Martin Kletzander) - build: don't lose probes.o files (Eric Blake) - build: fix missing dependencies for libvirt-qemu.so (Eric Blake) - build: don't clean a file that belongs in the tarball (Eric Blake) - virsh: avoid strncpy (Eric Blake) - build: update to latest gnulib (Eric Blake) - Introduce virMacAddr typedef (Stefan Berger) - Santize the reporting of VIR_ERR_INVALID_ERROR (Daniel P. Berrange) - build: silence libtool during tests (Eric Blake) - Fix linking to DTrace probes file (Daniel P. Berrange) - Autogenerate augeas test case from default config files (Daniel P. Berrange) - Re-order config options in qemu driver augeas lens (Daniel P. Berrange) - Fix mistakes in augeas lens (Daniel P. Berrange) - Standardize whitespace used in example config files (Daniel P. Berrange) - Remove uid param from directory lookup APIs (Daniel P. Berrange) - Fix check for socket existance / daemon spawn (Daniel P. Berrange) - Remove last usage of PATH_MAX and ban its future use (Daniel P. Berrange) - maint: avoid new automake warning about AM_PROG_CC_STDC (Jim Meyering) - build: silence libtool warning on probes.o (Eric Blake) - tests: run valgrind on real executables, not libtool wrappers (Eric Blake) - qemu augeas: Add spice_tls/spice_tls_x509_cert_dir (Douglas Schilling Landgraf) - tests: back to short test names (Eric Blake) - maint: ignore more files from version control (Eric Blake) - Add sentinel for virErrorDomain enum (Daniel P. Berrange) - Add parsing for VIR_ENUM_IMPL & VIR_ENUM_DECL in apibuild.py (Daniel P. Berrange) - security: Switch to C99-style struct initialization (Michal Privoznik) - Add test case for loading driver modules (Daniel P. Berrange) - Override default driver dir when running from GIT (Daniel P. Berrange) - Split QEMU dtrace probes into separate file (Daniel P. Berrange) - Replace RTLD_LOCAL with RTLD_GLOBAL (Daniel P. Berrange) - Ensure LXC driver links against libblkid explicitly. (Daniel P. Berrange) - Remove libvirt_test.la library (Daniel P. Berrange) - Fix broken linkage of libvirt_driver_nodedev.la (Daniel P. Berrange) - Only build server side drivers as modules (Daniel P. Berrange) - Fix dep from libvirt-lock-sanlock RPM (Daniel P. Berrange) - openvz: add quota argument when creating container (Guido Günther) - openvz: support file system quota reporting (Guido Günther) - Introduce filesystem limits to virDomainFSDef (Guido Günther) - Introduce virDomainParseScaledValue (Guido Günther) - util: export virBufferTrim (Laine Stump) - virBuffer: add way to trim back extra text (Eric Blake) - build: fix unused variable after last patch (Eric Blake) - nwfilter: Add support for ipset (Stefan Berger) - Adds support to param 'vcpu_time' in qemu_driver. (Hu Tao) - Add a new param 'vcpu_time' to virDomainGetCPUStats (Hu Tao) - tests: add ich6 codec type test to qemuxml2argv-sound-device (Marc-André Lureau) - qemu: honour sound <codec> sub-elements (Marc-André Lureau) - domain: add <codec> sound sub-element (Marc-André Lureau) - qemu: test CAPS_HDA_MICRO (Marc-André Lureau) - nodeinfo: test more details (Eric Blake) - Add a virLogMessage alternative taking va_list args (Daniel P. Berrange) - build: fix recent syntax-check breakage (Eric Blake) - qemu: Rollback on used USB devices (Michal Privoznik) - Reject any non-option command line arguments (Daniel P. Berrange) - Remount cgroups controllers after setting up new /sys in LXC (Daniel P. Berrange) - Trim /proc & /sys subtrees before mounting new instances (Daniel P. Berrange) - Avoid LXC pivot root in the root source is still / (Daniel P. Berrange) - Mount fresh instance of sysfs/selinux in LXC (Daniel P. Berrange) - Convert the LXC driver to use the security driver API for mount options (Daniel Walsh) - Add security driver APIs for getting mount options (Daniel Walsh) - Add support for LXC specific SELinux configuration (Daniel Walsh) - Use private data struct in SELinux driver (Daniel Walsh) - Don't enable the AppArmour security driver with LXC (Daniel Walsh) - Pass the virt driver name into security drivers (Daniel Walsh) - Remove bogus udev.target dep from libvirtd unit (Daniel P. Berrange) - qemu: Add support for -no-user-config (Jiri Denemark) - Set a sensible default master start port for ehci companion controllers (Daniel P. Berrange) - Fix logic for assigning PCI addresses to USB2 companion controllers (Daniel P. Berrange) - Fix virDomainDeviceInfoIsSet() to check all struct fields (Daniel P. Berrange) - Remove redundant trailing slash in user dir paths (Daniel P. Berrange) - Allow stack traces to be included with log messages (Daniel P. Berrange) - Move user libvirtd socket out of abstract namespace (Daniel P. Berrange) - Add openvz_util.c to POTFILES (Daniel P. Berrange) - Add bundled(gnulib) to RPM specfile (Daniel P. Berrange) - openvz: determine kb/pages only once (Guido Günther) - libvirt-guests: Remove LISTFILE if it's empty when stopping service (Osier Yang) - qemu: Set memory policy using cgroup if placement is auto (Osier Yang) - qemu: Use the CPU index in capabilities to map NUMA node to cpu list. (Osier Yang) - Assign spapr-vio bus address to ibmvscsi controller (Li Zhang) - sanlock: fix locking for readonly devices (David Weber) - nodeinfo: add some more tests (Eric Blake) - nodeinfo: drop static variable (Eric Blake) - maint: fix AUTHORS (Eric Blake) - Use XDG Base Directories instead of storing in home directory (William Jon McCann) Cleanups: - Remove accidentally added Patch: lines from mingw-libvirt.spec.in (Daniel P. Berrange) - Add /tools/libvirt-guests.service to .gitignore (Guido Günther) - sanlock: Properly indent (Michal Privoznik) - Remove stray debug fprintf in XML parser (Daniel P. Berrange) - util: Fix the indention (Osier Yang) - LXC: avoid useless duplicate memory free (Gao feng) - driver: Clean up driver header to space indentation (Peter Krempa) - build: fix whitespace damage (Eric Blake) - build: hoist qemu dependence on yajl to configure (Eric Blake) - maint: command.c whitespace cleanups (Eric Blake) - Revert "rpc: Discard non-blocking calls only when necessary" (Jiri Denemark) thanks everybody for the contributions, be it bug reports, documentation fixes, patches, etc. ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH] Added the attribute vendor_id to the cpu model
by Hendrik Schwartke 03 Jul '12

03 Jul '12

Introducing the attribute vendor_id to force the CPUID instruction in a kvm guest to return the specified vendor. --- docs/schemas/domaincommon.rng | 7 +++++ src/conf/cpu_conf.c | 61 ++++++++++++++++++++++++++++++++--------- src/conf/cpu_conf.h | 3 ++ src/qemu/qemu_command.c | 6 +++- tests/testutilsqemu.c | 1 + 5 files changed, 64 insertions(+), 14 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 46e539d..a246e8b 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2820,6 +2820,13 @@ </choice> </attribute> </optional> + <optional> + <attribute name="vendor_id"> + <data type="string"> + <param name='pattern'>.{12}</param> + </data> + </attribute> + </optional> <choice> <text/> <empty/> diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index b520f7c..b8ca7a5 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -22,6 +22,7 @@ */ #include <config.h> +#include <ctype.h> #include "virterror_internal.h" #include "memory.h" @@ -68,6 +69,7 @@ virCPUDefFreeModel(virCPUDefPtr def) VIR_FREE(def->model); VIR_FREE(def->vendor); + VIR_FREE(def->vendor_id); for (i = 0; i < def->nfeatures; i++) VIR_FREE(def->features[i].name); @@ -104,6 +106,7 @@ virCPUDefCopyModel(virCPUDefPtr dst, if ((src->model && !(dst->model = strdup(src->model))) || (src->vendor && !(dst->vendor = strdup(src->vendor))) + || (src->vendor_id && !(dst->vendor_id = strdup(src->vendor_id))) || VIR_ALLOC_N(dst->features, src->nfeatures) < 0) goto no_memory; dst->nfeatures_max = dst->nfeatures = src->nfeatures; @@ -288,19 +291,42 @@ virCPUDefParseXML(const xmlNodePtr node, } if (def->type == VIR_CPU_TYPE_GUEST && - def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH && - virXPathBoolean("boolean(./model[1]/@fallback)", ctxt)) { - const char *fallback; - - fallback = virXPathString("string(./model[1]/@fallback)", ctxt); - if (fallback) { - def->fallback = virCPUFallbackTypeFromString(fallback); - VIR_FREE(fallback); - if (def->fallback < 0) { - virCPUReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid fallback attribute")); - goto error; - } + def->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) { + + if(virXPathBoolean("boolean(./model[1]/@fallback)", ctxt)) { + const char *fallback; + + fallback = virXPathString("string(./model[1]/@fallback)", ctxt); + if (fallback) { + def->fallback = virCPUFallbackTypeFromString(fallback); + VIR_FREE(fallback); + if (def->fallback < 0) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid fallback attribute")); + goto error; + } + } + + if(virXPathBoolean("boolean(./model[1]/@vendor_id)", ctxt)) { + char *vendor_id; + + vendor_id = virXPathString("string(./model[1]/@vendor_id)", ctxt); + if(!vendor_id || strlen(vendor_id)!=VIR_CPU_VENDOR_ID_LENGTH) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("vendor id must be 12 characters long")); + VIR_FREE(vendor_id); + goto error; + } + for(i=0; i<strlen(vendor_id); i++) { + if(!isprint(vendor_id[i]) || isspace(vendor_id[i])) { + virCPUReportError(VIR_ERR_XML_ERROR, "%s", + _("vendor id is invalid")); + VIR_FREE(vendor_id); + goto error; + } + } + def->vendor_id = vendor_id; + } } } @@ -588,6 +614,8 @@ virCPUDefFormatBuf(virBufferPtr buf, return -1; } virBufferAsprintf(buf, " fallback='%s'", fallback); + if(def->vendor_id) + virBufferAsprintf(buf, " vendor_id='%s'", def->vendor_id); } if (formatModel && def->model) { virBufferAsprintf(buf, ">%s</model>\n", def->model); @@ -738,6 +766,13 @@ virCPUDefIsEqual(virCPUDefPtr src, goto cleanup; } + if (STRNEQ_NULLABLE(src->vendor_id, dst->vendor_id)) { + virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target CPU model %s does not match source %s"), + NULLSTR(dst->vendor_id), NULLSTR(src->vendor_id)); + goto cleanup; + } + if (src->sockets != dst->sockets) { virCPUReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target CPU sockets %d does not match source %d"), diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index f8b7bf9..3daadbd 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -28,6 +28,8 @@ # include "buf.h" # include "xml.h" +#define VIR_CPU_VENDOR_ID_LENGTH 12 + enum virCPUType { VIR_CPU_TYPE_HOST, VIR_CPU_TYPE_GUEST, @@ -103,6 +105,7 @@ struct _virCPUDef { int match; /* enum virCPUMatch */ char *arch; char *model; + char *vendor_id; /* vendor id returned by CPUID in the guest */ int fallback; /* enum virCPUFallback */ char *vendor; unsigned int sockets; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bd4f96a..56ecefb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3910,7 +3910,9 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, } virBufferAddLit(&buf, "host"); } else { - if (VIR_ALLOC(guest) < 0 || !(guest->arch = strdup(host->arch))) + if (VIR_ALLOC(guest) < 0 + || !(guest->arch = strdup(host->arch)) + || (cpu->vendor_id && !(guest->vendor_id = strdup(cpu->vendor_id)))) goto no_memory; if (cpu->match == VIR_CPU_MATCH_MINIMUM) @@ -3924,6 +3926,8 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, goto cleanup; virBufferAdd(&buf, guest->model, -1); + if(guest->vendor_id) + virBufferAsprintf(&buf, ",vendor=%s", guest->vendor_id); for (i = 0; i < guest->nfeatures; i++) { char sign; if (guest->features[i].policy == VIR_CPU_FEATURE_DISABLE) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8d5a3bf..8b7cb33 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -116,6 +116,7 @@ virCapsPtr testQemuCapsInit(void) { 0, /* match */ (char *) "x86_64", /* arch */ (char *) "core2duo", /* model */ + NULL, /* vendor_id */ 0, /* fallback */ (char *) "Intel", /* vendor */ 1, /* sockets */ -- 1.7.9.5

3 9

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 0.9.13
by Daniel P. Berrange 03 Jul '12

03 Jul '12

I am pleased to announce that release 0.9.13 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-0.9.13.tar.gz Changed in this release: - Add all new APIs and constants in libvirt 0.9.13 Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] qemu: add rbd to whitelist of migration-safe formats
by Josh Durgin 03 Jul '12

03 Jul '12

QEMU (and librbd) flush the cache on the source before the destination starts, and the destination does not read any changeable data before that, so live migration with rbd caching is safe. This makes 'virsh migrate' work with rbd and caching without the --unsafe flag. Reported-by: Vladimir Bashkirtsev <vladimir(a)bashkirtsev.com> Signed-off-by: Josh Durgin <josh.durgin(a)inktank.com> --- src/qemu/qemu_migration.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 48369d6..f51c99a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -847,6 +847,9 @@ qemuMigrationIsSafe(virDomainDefPtr def) continue; else if (cfs < 0) return false; + } else if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { + continue; } qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s", -- 1.7.9.5

2 3

[libvirt] [libvirt-php PATCH] Add ability to managed save libvirt domains
by Y＠billing.fastvps.ru 02 Jul '12

02 Jul '12

From: Pavel Odintsov <pavel.odintsov(a)gmail.com> --- src/libvirt-php.c | 22 ++++++++++++++++++++++ src/libvirt-php.h | 1 + 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 20e5d27..9cdfd0e 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -99,6 +99,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_core_dump, NULL) PHP_FE(libvirt_domain_shutdown, NULL) PHP_FE(libvirt_domain_suspend, NULL) + PHP_FE(libvirt_domain_managedsave, NULL) PHP_FE(libvirt_domain_undefine, NULL) PHP_FE(libvirt_domain_reboot, NULL) PHP_FE(libvirt_domain_define_xml, NULL) @@ -4470,6 +4471,27 @@ PHP_FUNCTION(libvirt_domain_shutdown) } /* + Function name: libvirt_domain_managedsave + Since version: 0.4.1(-1) + Description: Function is used to managed save the domain (domain was unloaded from memory and it state saved to disk) identified by it's resource + Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + Returns: TRUE for success, FALSE on error +*/ + +PHP_FUNCTION(libvirt_domain_managedsave) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + int retval; + + GET_DOMAIN_FROM_ARGS("r",&zdomain); + retval=virDomainManagedSave(domain->domain, 0); + DPRINTF("%s: virDomainManagedSave(%p) returned %d\n", PHPFUNC, domain->domain, retval); + if (retval != 0) RETURN_FALSE; + RETURN_TRUE; +} + +/* Function name: libvirt_domain_suspend Since version: 0.4.1(-1) Description: Function is used to suspend the domain identified by it's resource diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 3c7f254..b06836c 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -307,6 +307,7 @@ PHP_FUNCTION(libvirt_domain_resume); PHP_FUNCTION(libvirt_domain_core_dump); PHP_FUNCTION(libvirt_domain_shutdown); PHP_FUNCTION(libvirt_domain_suspend); +PHP_FUNCTION(libvirt_domain_managedsave); PHP_FUNCTION(libvirt_domain_undefine); PHP_FUNCTION(libvirt_domain_reboot); PHP_FUNCTION(libvirt_domain_define_xml); -- 1.7.2.5

3 2

[libvirt] [PATCH] fix key error for qemuMonitorGetBlockStatsInfo
by lvroyce＠linux.vnet.ibm.com 02 Jul '12

02 Jul '12

From: lvroyce <lvroyce(a)linux.vnet.ibm.com> virDomainBlockStatsFlags can't collect total_time_ns for read/write/flush because of key typo when retriveing from qemu cmd result Signed-off-by: lvroyce <lvroyce(a)linux.vnet.ibm.com> --- src/qemu/qemu_monitor_json.c | 24 ++++++++++++------------ src/qemu/qemu_monitor_text.c | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7d2da21..7eb9529 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1710,12 +1710,12 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, goto cleanup; } if (rd_total_times && - virJSONValueObjectHasKey(stats, "rd_total_times_ns") && - (virJSONValueObjectGetNumberLong(stats, "rd_total_times_ns", + virJSONValueObjectHasKey(stats, "rd_total_time_ns") && + (virJSONValueObjectGetNumberLong(stats, "rd_total_time_ns", rd_total_times) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot read %s statistic"), - "rd_total_times_ns"); + "rd_total_time_ns"); goto cleanup; } if (virJSONValueObjectGetNumberLong(stats, "wr_bytes", wr_bytes) < 0) { @@ -1731,12 +1731,12 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, goto cleanup; } if (wr_total_times && - virJSONValueObjectHasKey(stats, "wr_total_times_ns") && - (virJSONValueObjectGetNumberLong(stats, "wr_total_times_ns", + virJSONValueObjectHasKey(stats, "wr_total_time_ns") && + (virJSONValueObjectGetNumberLong(stats, "wr_total_time_ns", wr_total_times) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot read %s statistic"), - "wr_total_times_ns"); + "wr_total_time_ns"); goto cleanup; } if (flush_req && @@ -1749,12 +1749,12 @@ int qemuMonitorJSONGetBlockStatsInfo(qemuMonitorPtr mon, goto cleanup; } if (flush_total_times && - virJSONValueObjectHasKey(stats, "flush_total_times_ns") && - (virJSONValueObjectGetNumberLong(stats, "flush_total_times_ns", + virJSONValueObjectHasKey(stats, "flush_total_time_ns") && + (virJSONValueObjectGetNumberLong(stats, "flush_total_time_ns", flush_total_times) < 0)) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("cannot read %s statistic"), - "flush_total_times_ns"); + "flush_total_time_ns"); goto cleanup; } } @@ -1822,12 +1822,12 @@ int qemuMonitorJSONGetBlockStatsParamsNumber(qemuMonitorPtr mon, if (STREQ(key, "rd_bytes") || STREQ(key, "rd_operations") || - STREQ(key, "rd_total_times_ns") || + STREQ(key, "rd_total_time_ns") || STREQ(key, "wr_bytes") || STREQ(key, "wr_operations") || - STREQ(key, "wr_total_times_ns") || + STREQ(key, "wr_total_time_ns") || STREQ(key, "flush_operations") || - STREQ(key, "flush_total_times_ns")) { + STREQ(key, "flush_total_time_ns")) { num++; } else { /* wr_highest_offset is parsed by qemuMonitorJSONGetBlockExtent. */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index edb5dfd..086b06b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -977,13 +977,13 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, if (virStrToLong_ll (p, &dummy, 10, wr_req) == -1) VIR_DEBUG ("error reading wr_req: %s", p); } else if (rd_total_times && - STRPREFIX (p, "rd_total_times_ns=")) { - p += strlen("rd_total_times_ns="); + STRPREFIX (p, "rd_total_time_ns=")) { + p += strlen("rd_total_time_ns="); if (virStrToLong_ll (p, &dummy, 10, rd_total_times) == -1) VIR_DEBUG ("error reading rd_total_times: %s", p); } else if (wr_total_times && - STRPREFIX (p, "wr_total_times_ns=")) { - p += strlen("wr_total_times_ns="); + STRPREFIX (p, "wr_total_time_ns=")) { + p += strlen("wr_total_time_ns="); if (virStrToLong_ll (p, &dummy, 10, wr_total_times) == -1) VIR_DEBUG ("error reading wr_total_times: %s", p); } else if (flush_req && @@ -992,8 +992,8 @@ int qemuMonitorTextGetBlockStatsInfo(qemuMonitorPtr mon, if (virStrToLong_ll (p, &dummy, 10, flush_req) == -1) VIR_DEBUG ("error reading flush_req: %s", p); } else if (flush_total_times && - STRPREFIX (p, "flush_total_times_ns=")) { - p += strlen("flush_total_times_ns="); + STRPREFIX (p, "flush_total_time_ns=")) { + p += strlen("flush_total_time_ns="); if (virStrToLong_ll (p, &dummy, 10, flush_total_times) == -1) VIR_DEBUG ("error reading flush_total_times: %s", p); } else { @@ -1071,10 +1071,10 @@ int qemuMonitorTextGetBlockStatsParamsNumber(qemuMonitorPtr mon, STRPREFIX (p, " wr_bytes=") || STRPREFIX (p, " rd_operations=") || STRPREFIX (p, " wr_operations=") || - STRPREFIX (p, " rd_total_times_ns=") || - STRPREFIX (p, " wr_total_times_ns=") || + STRPREFIX (p, " rd_total_time_ns=") || + STRPREFIX (p, " wr_total_time_ns=") || STRPREFIX (p, " flush_operations=") || - STRPREFIX (p, " flush_total_times_ns=")) { + STRPREFIX (p, " flush_total_time_ns=")) { num++; } else { VIR_DEBUG ("unknown block stat near %s", p); -- 1.7.7.6

2 2

[libvirt] sanlock on F17
by Dave Allan 02 Jul '12

02 Jul '12

I just tried to set up sanlock on F17 using the instructions at http://libvirt.org/locking.html, but libvirtd refuses to start with the sanlock error in the logs: Jun 29 19:56:20 nienna sanlock[8423]: 19846 open error -13 /var/lib/libvirt/sanlock/__LIBVIRT__DISKS__ I confirmed that user sanlock can create, read and write files in /var/lib/libvirt/sanlock The only thing I can think of that's slightly odd about my setup is that I'm only concerned with the local machine, so that directory is not an NFS mount. Anybody have any thoughts on what's going wrong here? TIA, Dave

3 3

[libvirt] compile option: --without-gnutls
by Chris Van Heuveln 02 Jul '12

02 Jul '12

Hi libvirt-list, Full disclosure: this is the first open source project I've tried to contribute to and I'm still learning the process and tools. In any case, Mikhail Gusarov started a thread on this a while back and I've tried to take it to conclusion. I needed to remove tls for 0.8.4 so I coded up a --without-gnutls configure option using Mikhail's partial code as a template. Then I pulled down 0.9.12 and came up with a patch that I'd like to push out to the commununity. I'm not adding any "new" functionality other than the configure option. The tls calls/structs are just #ifdef'd for the most part. In a couple of places I had to flip the logic for "if (!tls_struct) else", and also had to modify a few function calls to pass void * instead of tls pointers. I built --with-gnutls, --without-gnutls, and no option specified (defaults to --with-gnutls). make check is clean except for: TEST: libvirtdconftest .....!!!!!!...!!!!!!!!!!!!!!!!!!!!!!!!! 39 FAIL ...which consists mostly of this sasl failure: 39) Test corruption ... libvir: Config File error : unsupported configuration: remoteReadConfigFile: /home/ubu/git/libvirt/tests/../daemon/libvirtd.conf: auth_tcp: unsupported auth sasl FAILED ...so I'm trying to track that down, and also need to run syntax-check and valgrind tests. Once I get the tests passing what's my next step? Are you okay with this approach? Do you want a preview of my diffs? Do I need to write additional tests for this new option or update any documentation? Thanks, Chris Van Heuveln

2 1

[libvirt] Entering freeze for libvirt-0.9.13
by Daniel Veillard 02 Jul '12

02 Jul '12

I just tagged the git tree and I pushed the tarball for rc1: ftp://libvirt.org/libvirt/libvirt-0.9.13-rc1.tar.gz the rpms I build are coming along soon. Please give it a try, the basic seems okay to me (kvm driver seems to need the qemu one now but otherwise, no surprize so far) Give it a try too, and let's find if there are portability issues too ! I think i would make an rc2 release on wed or thursday, and then if everything is fine the release next week-end or on Monday. thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

8 13

[libvirt] Intend to add fuse filesystem support for libvirt lxc
by Gao feng 02 Jul '12

02 Jul '12

Hi Everyone, Now I'm working on making the container's system info(such as /proc/meminfo,cpuinfo..) isolate from the host. I made a patch which implement showing the /proc/meminfo base on container's memcg, and sent it to the community.(http://marc.info/?l=linux-mm&m=133826035821338&w=2) but I found it's difficult to be accepted, because this way is ugly, and somebody gave me some suggestions. the first way is making another kernel file(just like memory.limit_in_bytes),and mount it to the container. I don't like this way,because there will be many redundance information between this new kernel file and the existing kernel file,some files such as memory.stat already contains memcg information. the other way is adding fuse filesystem support for libvirt lxc. with this way, we can simply collect information from cgroup in fuse_operations.read function, and mount this file to the container. we can impletment isolate meminfo in userspace without changing kernel codes. I have impletment fuse support for libvrit now, and ready to impletement the meminfo isolated. I want to know if you have any comment or another ideas? please let me know. thanks.

2 2

[libvirt] (no subject)
by Daniele Milani 02 Jul '12

02 Jul '12

http://tidydeck.com/pokpre.html?nq=qaklnkik

1 0

[libvirt] [PATCH] build: define WITH_INTERFACE for the driver
by Eric Blake 02 Jul '12

02 Jul '12

Our code was mistakenly relying on an undefined macro, WITH_INTERFACE, for determining whether to load the interface driver which wraps the netcf library. Clean this situation up by having only one automake conditional for the driver, and having both WITH_NETCF (library detected) and WITH_INTERFACE (driver enabled) in C code, in case a future patch ever adds a network management via means other than the netcf library. While at it, output more information at the conclusion of configure about the various drivers we enabled. * configure.ac: Enhance with_netcf, and add with_interface. Improve output to list final decisions. Replace WITH_NETCF with WITH_INTERFACE. * src/interface/netcf_driver.c: Rename... * src/interface/interface_driver.c: ...to this. * src/interface/interface_driver.h: Likewise. * daemon/Makefile.am (libvirtd_LDADD): Reflect better naming. * src/Makefile.am (libvirt_driver_interface_la_*): Likewise. (INTERFACE_DRIVER_SOURCES): Reflect file moves. * daemon/libvirtd.c (daemonInitialize): Likewise. * tools/virsh.c (vshShowVersion): Show both driver and library decisions. * libvirt.spec.in (with_interface): Tweak to deal with new usage as a real switch. --- I think this addresses the point that Osier raised here: https://www.redhat.com/archives/libvir-list/2012-June/msg01266.html but it is complex enough that I'd appreciate a careful review. configure.ac | 44 ++++++++++++++++---- daemon/Makefile.am | 2 +- daemon/libvirtd.c | 6 +-- libvirt.spec.in | 10 +++-- src/Makefile.am | 4 +- .../{netcf_driver.c => interface_driver.c} | 4 +- .../{netcf_driver.h => interface_driver.h} | 0 tools/virsh.c | 11 +++-- 8 files changed, 59 insertions(+), 22 deletions(-) rename src/interface/{netcf_driver.c => interface_driver.c} (99%) rename src/interface/{netcf_driver.h => interface_driver.h} (100%) diff --git a/configure.ac b/configure.ac index 6436885..a29b3b2 100644 --- a/configure.ac +++ b/configure.ac @@ -1755,6 +1755,7 @@ if test "$with_network" = "yes" ; then fi AM_CONDITIONAL([WITH_NETWORK], [test "$with_network" = "yes"]) +dnl check whether helper code is needed for above selections with_bridge=no if test "$with_qemu:$with_lxc:$with_network" != "no:no:no"; then with_bridge=yes @@ -1762,16 +1763,31 @@ if test "$with_qemu:$with_lxc:$with_network" != "no:no:no"; then fi AM_CONDITIONAL([WITH_BRIDGE], [test "$with_bridge" = "yes"]) -dnl netcf library +dnl check if the interface driver should be compiled + +AC_ARG_WITH([interface], + AC_HELP_STRING([--with-interface], + [with host interface driver @<:@default=check@:>@]),[], + [with_interface=check]) + +dnl there's no use compiling the interface driver without the libvirt daemon +if test "$with_libvirtd" = "no"; then + with_interface=no +fi + +dnl The interface driver depends on the netcf library AC_ARG_WITH([netcf], AC_HELP_STRING([--with-netcf], [libnetcf support to configure physical host network interfaces @<:@default=check@:>@]), [], [with_netcf=check]) NETCF_CFLAGS= NETCF_LIBS= -if test "$with_libvirtd" = "no" ; then +if test "$with_libvirtd" = "no" || test "$with_interface" = "no"; then with_netcf=no fi +if test "$with_interface:$with_netcf" = "yes:check"; then + with_netcf=yes +fi if test "$with_netcf" = "yes" || test "$with_netcf" = "check"; then PKG_CHECK_MODULES(NETCF, netcf >= $NETCF_REQUIRED, [with_netcf=yes], [ @@ -1792,11 +1808,21 @@ if test "$with_netcf" = "yes" || test "$with_netcf" = "check"; then fi fi fi -AM_CONDITIONAL([WITH_NETCF], [test "$with_netcf" = "yes"]) AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) +dnl Final decision on the interface driver +if test "$with_interface" = "check"; then + with_interface=$with_netcf +fi + +if test "$with_interface" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], + [whether interface driver is enabled]) +fi +AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"]) +dnl Check whether the Secrets driver is needed AC_ARG_WITH([secrets], AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) @@ -2807,11 +2833,12 @@ AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ Hyper-V: $with_hyperv]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) -AC_MSG_NOTICE([ Network: $with_network]) AC_MSG_NOTICE([Libvirtd: $with_libvirtd]) -AC_MSG_NOTICE([ netcf: $with_netcf]) -AC_MSG_NOTICE([ macvtap: $with_macvtap]) -AC_MSG_NOTICE([virtport: $with_virtualport]) +AC_MSG_NOTICE([ Network: $with_network]) +AC_MSG_NOTICE([ Iface: $with_interface]) +AC_MSG_NOTICE([ Secrets: $with_secrets]) +AC_MSG_NOTICE([ NodeDev: $with_nodedev]) +AC_MSG_NOTICE([NWfilter: $with_nwfilter]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) @@ -2977,6 +3004,9 @@ AC_MSG_NOTICE([ Readline: $lv_use_readline]) AC_MSG_NOTICE([ Python: $with_python]) AC_MSG_NOTICE([ DTrace: $with_dtrace]) AC_MSG_NOTICE([ numad: $with_numad]) +AC_MSG_NOTICE([ bridge: $with_bridge]) +AC_MSG_NOTICE([ macvtap: $with_macvtap]) +AC_MSG_NOTICE([ virtport: $with_virtualport]) AC_MSG_NOTICE([ XML Catalog: $XML_CATALOG_FILE]) AC_MSG_NOTICE([ Init script: $with_init_script]) AC_MSG_NOTICE([Console locks: $with_console_lock_files]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 71e91cd..f0e422e 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -148,7 +148,7 @@ if WITH_NETWORK libvirtd_LDADD += ../src/libvirt_driver_network.la endif -if WITH_NETCF +if WITH_INTERFACE libvirtd_LDADD += ../src/libvirt_driver_interface.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 9c06344..a4f98cf 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -74,8 +74,8 @@ # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif -# ifdef WITH_NETCF -# include "interface/netcf_driver.h" +# ifdef WITH_INTERFACE +# include "interface/interface_driver.h" # endif # ifdef WITH_STORAGE # include "storage/storage_driver.h" @@ -400,7 +400,7 @@ static void daemonInitialize(void) # ifdef WITH_NETWORK networkRegister(); # endif -# ifdef WITH_NETCF +# ifdef WITH_INTERFACE interfaceRegister(); # endif # ifdef WITH_STORAGE diff --git a/libvirt.spec.in b/libvirt.spec.in index 896ef51..26ea2d9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -70,6 +70,7 @@ # Then the secondary host drivers, which run inside libvirtd %define with_network 0%{!?_without_network:%{server_drivers}} +%define with_interface 0%{!?_without_interface:%{server_drivers}} %define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}} %define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}} %define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} @@ -214,6 +215,7 @@ # The logic is the same as in configure.ac %if ! %{with_libvirtd} %define with_network 0 +%define with_interface 0 %define with_qemu 0 %define with_lxc 0 %define with_uml 0 @@ -267,9 +269,7 @@ %define with_nodedev 0 %endif -%if %{with_netcf} -%define with_interface 1 -%else +%if !%{with_netcf} %define with_interface 0 %endif @@ -1056,6 +1056,9 @@ of recent versions of Linux (and other OSes). %define _without_network --without-network %endif +%if ! %{with_interface} +%define _without_interface --without-interface +%endif %if ! %{with_storage_fs} %define _without_storage_fs --without-storage-fs %endif @@ -1171,6 +1174,7 @@ autoreconf -if %{?_without_hyperv} \ %{?_without_vmware} \ %{?_without_network} \ + %{?_without_interface} \ %{?_with_rhel5_api} \ %{?_without_storage_fs} \ %{?_without_storage_lvm} \ diff --git a/src/Makefile.am b/src/Makefile.am index 2309984..3cfaf01 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -483,7 +483,7 @@ NETWORK_DRIVER_SOURCES = \ network/bridge_driver.h network/bridge_driver.c INTERFACE_DRIVER_SOURCES = \ - interface/netcf_driver.h interface/netcf_driver.c + interface/interface_driver.h interface/interface_driver.c SECRET_DRIVER_SOURCES = \ secret/secret_driver.h secret/secret_driver.c @@ -924,7 +924,7 @@ EXTRA_DIST += network/default.xml -if WITH_NETCF +if WITH_INTERFACE if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_interface.la else diff --git a/src/interface/netcf_driver.c b/src/interface/interface_driver.c similarity index 99% rename from src/interface/netcf_driver.c rename to src/interface/interface_driver.c index 45e6442..4959c72 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/interface_driver.c @@ -2,7 +2,7 @@ * interface_driver.c: backend driver methods to handle physical * interface configuration using the netcf library. * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,7 @@ #include "virterror_internal.h" #include "datatypes.h" -#include "netcf_driver.h" +#include "interface_driver.h" #include "interface_conf.h" #include "memory.h" diff --git a/src/interface/netcf_driver.h b/src/interface/interface_driver.h similarity index 100% rename from src/interface/netcf_driver.h rename to src/interface/interface_driver.h diff --git a/tools/virsh.c b/tools/virsh.c index 53d1825..c1e7010 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -20832,15 +20832,18 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_NETWORK vshPrint(ctl, " Network"); #endif -#ifdef WITH_BRIDGE - vshPrint(ctl, " Bridging"); -#endif -#ifdef WITH_NETCF +#ifdef WITH_INTERFACE vshPrint(ctl, " Interface"); #endif #ifdef WITH_NWFILTER vshPrint(ctl, " Nwfilter"); #endif +#ifdef WITH_BRIDGE + vshPrint(ctl, " Bridging"); +#endif +#ifdef WITH_NETCF + vshPrint(ctl, " Netcf"); +#endif #ifdef WITH_VIRTUALPORT vshPrint(ctl, " VirtualPort"); #endif -- 1.7.10.4

3 4

[libvirt] [PATCH] esx_storage_driver: Add API to upload volumes (virStorageVolUpload for ESX storage driver)
by Ata Bohra 01 Jul '12

01 Jul '12

Patch to add API to upload Volume contents using ESX driver. As stream driver is not supported for ESX, I have used libcurl to transfer the volume, second, using flags here to pass file descriptor of the source file. diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 9b64891..0519efc 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -1643,6 +1643,94 @@ esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) return 1; } +/** + * esxStorageVolumeUpload + * + * Upload file contents to a given volume. + * Method uses libcurl to POST the contents to ESX server. + * flags is used to pass file descriptor of the + * source file to be read. + */ +static int +esxStorageVolumeUpload(virStorageVolPtr volume, + virStreamPtr stream, + unsigned long long offset, + unsigned long long length, + unsigned int flags) +{ + esxPrivate *priv = volume->conn->privateData; + int err = -1; + char *escapedDatastoreName = NULL; + char *url = NULL; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + int fd = (int)flags; + + /** + * Use CURL module to transfer the file to ESX. + * Use flags to pass the file handle. + */ + const char *unescapedDatastoreName = virStorageVolGetPoolName(volume); + const char *volumeName = virStorageVolGetName(volume); + + if (!unescapedDatastoreName) { + goto cleanup; + } + + if (volume->conn != stream->conn) { + virReportInvalidArg(conn, + _("conn in %s must match stream connection."), + __FUNCTION__); + goto cleanup; + } + + virBufferAsprintf(&buffer, "%s://%s:%d/folder/", + priv->parsedUri->transport, + volume->conn->uri->server, volume->conn->uri->port); + + escapedDatastoreName = esxUtil_EscapeDatastoreItem(unescapedDatastoreName); + + if (escapedDatastoreName == NULL) { + goto cleanup; + } + + /* Prepare URL to upload file */ + virBufferAdd(&buffer, volumeName, strlen(volumeName)); + virBufferAddLit(&buffer, "?dcPath="); + virBufferURIEncodeString(&buffer, priv->primary->datacenterPath); + virBufferAddLit(&buffer, "&dsName="); + virBufferURIEncodeString(&buffer, escapedDatastoreName); + + if (virBufferError(&buffer)) { + virReportOOMError(); + goto cleanup; + } + + url = virBufferContentAndReset(&buffer); + + if (esxVI_EnsureSession(priv->primary) < 0) { + return -1; + } + + /* Upload file */ + if (esxVI_CURL_UploadFile(priv->primary->curl, url, + fd, offset, length) < 0) { + goto cleanup; + } + + err = 0; + + cleanup: + + if (url == NULL) { + virBufferFreeAndReset(&buffer); + } + + VIR_FREE(escapedDatastoreName); + VIR_FREE(url); + + return err; + +} static virStorageDriver esxStorageDriver = { @@ -1673,6 +1761,7 @@ static virStorageDriver esxStorageDriver = { .volGetInfo = esxStorageVolumeGetInfo, /* 0.8.4 */ .volGetXMLDesc = esxStorageVolumeGetXMLDesc, /* 0.8.4 */ .volGetPath = esxStorageVolumeGetPath, /* 0.8.4 */ + .volUpload = esxStorageVolumeUpload, /* 0.9.x */ .poolIsActive = esxStoragePoolIsActive, /* 0.8.2 */ .poolIsPersistent = esxStoragePoolIsPersistent, /* 0.8.2 */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 5b5ab69..831ae36 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -425,7 +425,67 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) return 0; } +static size_t +esxVI_CURL_read_callback(void *ptr, size_t size, size_t nmemb, void *stream) +{ + size_t retcode = read((int) stream, ptr, size*nmemb); + + VIR_DEBUG("Read bytes: %d", retcode); + + return retcode; +} + +int +esxVI_CURL_UploadFile(esxVI_CURL *curl, + const char *url, + int fd, + unsigned long long offset, + unsigned long long length) +{ + int error = -1; + int responseCode = 0; + + if (fd < 0) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "Invalid file descriptor: %d", + fd); + goto cleanup; + } + + if (lseek(fd, (off_t) offset, SEEK_SET) < 0) { + virReportSystemError(errno, "%s", + _("Cannot seek file descriptor ")); + goto cleanup; + } + + virMutexLock(&curl->lock); + + /* set CURL headers */ + curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1L); + curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_READDATA, fd); + curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE_LARGE, + (curl_off_t) length); + curl_easy_setopt(curl->handle, CURLOPT_READFUNCTION, + esxVI_CURL_read_callback); + responseCode = esxVI_CURL_Perform(curl, url); + + virMutexUnlock(&curl->lock); + + if (responseCode < 0) { + goto cleanup; + } else if (responseCode != 200) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("HTTP response code %d for upload to '%s'"), + responseCode, url); + goto cleanup; + } + error = 0; + + cleanup: + + return error; +} /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * SharedCURL diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 78d3986..f95ad1d 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -92,7 +92,6 @@ typedef struct _esxVI_EnumerationValue esxVI_EnumerationValue; typedef struct _esxVI_List esxVI_List; - enum _esxVI_APIVersion { esxVI_APIVersion_Undefined = 0, esxVI_APIVersion_Unknown, @@ -167,6 +166,9 @@ void esxVI_CURL_Free(esxVI_CURL **curl); int esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri); int esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content); int esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content); +int esxVI_CURL_UploadFile(esxVI_CURL *curl, const char *url, int fd, + unsigned long long offset, + unsigned long long length); diff --git a/src/libvirt.c b/src/libvirt.c index 0aa50cb..508593b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12537,6 +12537,28 @@ error: return NULL; } +/** + * virStorageVolGetPoolName: + * @vol: pointer to storage volume + * + * Fetch the storage volume pool name. + * + * Returns the pool name, or NULL on error + */ +const char* +virStorageVolGetPoolName(virStorageVolPtr vol) +{ + VIR_DEBUG("vol=%p", vol); + + virResetLastError(); + + if (!VIR_IS_STORAGE_VOL(vol)) { + virLibStorageVolError(VIR_ERR_INVALID_STORAGE_VOL, __FUNCTION__); + virDispatchError(NULL); + return NULL; + } + return vol->pool; +} /** * virStorageVolGetName: diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 2913a81..cdfbf15 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -542,6 +542,7 @@ LIBVIRT_0.9.13 { virDomainSnapshotIsCurrent; virDomainSnapshotListAllChildren; virDomainSnapshotRef; + virStorageVolGetPoolName; } LIBVIRT_0.9.11; # .... define new API here using predicted next version number .... Thanks! Ata Attachment: 1. StorageVolUpload.diff

2 1

[libvirt] Fwd: Re: Intend to add OVA installation API
by Bob Cochran 01 Jul '12

01 Jul '12

Ooops, I should have sent this to the list. I want to support Doug's suggestion, thanks. Bob Cochran -------- Original Message -------- Subject: Re: [libvirt] Intend to add OVA installation API Date: Sun, 24 Jun 2012 22:45:15 -0400 From: Bob Cochran <bcochran13(a)verizon.net> To: Doug Goldstein <cardoe(a)cardoe.com> On 6/24/12 6:27 PM, Doug Goldstein wrote: > On Sun, Jun 24, 2012 at 5:05 PM, Ata Bohra<ata.husain(a)hotmail.com> wrote: >> Thanks Doug for your suggestions. >> >> I believe you are correct about the relation between OVA and OVF. But I am >> not 100 % possitive about your suggestion: "defining an appropriate domain >> in libvirt". To understand better I am sharing more details about my plans: >> >> 1. Enhance libvirt interface code (libvirt.c) to provide a >> domain-independent routine: virDomainCreateOVA, an alternate API to create >> domain. >> To make client code real simple, this routine can take ova path as input >> and internally strip the OVA to extract required details. (planning to >> define a struct to hold all essential >> information). >> 2. Second, to enhance ESX driver to perform ESX specfic calls. >> >> Given OVA is a tar file, the parsing is just another file open/read >> operation; it would be simple to perform it inside domain_conf.c (infact I >> have written a parser to strip information off OVA already). >> >> Hope to get some comments/suggestions on above steps. >> >> Thanks! >> Ata > Right. I'm suggesting you don't go that route and approach the problem > from another angle. I did a little Googling since my last e-mail to at > least make sure I understood the basics. So an OVF looks like the > following: > > virtualappliance/package.ovf > virtualappliance/disk1.vmdk > virtualappliance/disk2.vmdk > virtualappliance/cdrom.iso > virtualappliance/en-US-resources.xml > > An OVA would simply be a tar of the above and named > virtualappliance.ova package.ovf is an XML file containing the > description of the hardware of the virtual machine, much like the XML > that libvirt stores about domains. While en-US-resources.xml would be > the US English descriptions of the machine and its hardware. > > I'm suggesting you write an application that transforms package.ovf > into libvirt's own domain XML format and simply call > virDomainDefineXML() rather than adding API to libvirt itself. You > could then further extend the application to allow you to take a > libvirt domain and export it as a OVA. > > Looking at VMWare and Xen, they both treat OVA/OVF as a foreign format > and require a converter application to import them to their native > internals so it wouldn't be much different than their approach. > > Just my 2 cents. I really like what Doug suggests here. Bob Cochran

3 3

[libvirt] nwfilter: Fix memory leak
by Stefan Berger 29 Jun '12

29 Jun '12

Below patch fixes this coverity report: /libvirt/src/conf/nwfilter_conf.c:382: leaked_storage: Variable "varAccess" going out of scope leaks the storage it points to. --- src/conf/nwfilter_conf.c | 1 + 1 file changed, 1 insertion(+) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -379,6 +379,7 @@ virNWFilterRuleDefAddVar(virNWFilterRule if (VIR_EXPAND_N(nwf->varAccess, nwf->nVarAccess, 1) < 0) { virReportOOMError(); + virNWFilterVarAccessFree(varAccess); return -1; }

2 2

[libvirt] [PATCH] Remove sub-mounts under /dev when starting an LXC container
by Daniel P. Berrange 29 Jun '12

29 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Since we are mounting a new /dev in the container, we must remove any sub-mounts like /dev/shm, /dev/mqueue, etc, otherwise they'll be recorded in /proc/mounts, but not be accessible to applications. --- src/lxc/lxc_container.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 071d8d1..910e82b 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1416,10 +1416,11 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (lxcContainerPivotRoot(root) < 0) goto cleanup; - /* Gets rid of any existing stuff under /proc, since we need new - * namespace aware versions of those. We must do /proc second - * otherwise we won't find /proc/mounts :-) */ + /* Gets rid of any existing stuff under /proc, /sys & /tmp + * We need new namespace aware versions of those. We must + * do /proc last otherwise we won't find /proc/mounts :-) */ if (lxcContainerUnmountSubtree("/sys", false) < 0 || + lxcContainerUnmountSubtree("/dev", false) < 0 || lxcContainerUnmountSubtree("/proc", false) < 0) goto cleanup; -- 1.7.10.4

2 1

[libvirt] [PATCH] Fix vm's outbound traffic control problem
by Eiichi Tsukata 29 Jun '12

29 Jun '12

Hello, This is a patch to fix vm's outbound traffic control problem. Currently, vm's outbound traffic control by libvirt doesn't go well. This problem was previously discussed at libvir-list ML, however it seems that there isn't still any answer to the problem. http://www.redhat.com/archives/libvir-list/2011-August/msg00333.html I measured Guest(with virtio-net) to Host TCP throughput with the command "netperf -H". Here are the outbound QoS parameters and the results. outbound average rate[kilobytes/s] : Guest to Host throughput[Mbit/s] ====================================================================== 1024 (8Mbit/s) : 4.56 2048 (16Mbit/s) : 3.29 4096 (32Mbit/s) : 3.35 8192 (64Mbit/s) : 3.95 16384 (128Mbit/s) : 4.08 32768 (256Mbit/s) : 3.94 65536 (512Mbit/s) : 3.23 The outbound traffic goes down unreasonably and is even not controled. The cause of this problem is too large mtu value in "tc filter" command run by libvirt. The command uses burst value to set mtu and the burst is equal to average rate value if it's not set. This value is too large. For example if the average rate is set to 1024 kilobytes/s, the mtu value is set to 1024 kilobytes. That's too large compared to the size of network packets. Here libvirt applies tc ingress filter to Host's vnet(tun) device. Tc ingress filter is implemented with TBF(Token Buckets Filter) algorithm. TBF uses mtu value to calculate the amount of token consumed by each packet. With too large mtu value, the token consumption rate is set too large. This leads to token starvation and deterioration of TCP throughput. Then, should we use the default mtu value 2 kilobytes? The anser is No, because Guest with virtio-net device uses 65536 bytes as mtu to transmit packets to Host, and the tc filter with the default mtu value 2k drops packets whose size is larger than 2k. So, the most packets is droped and again leads to deterioration of TCP throughput. The appropriate mtu value is 65536 bytes which is equal to the maximum value of network interface device defined in <linux/netdevice.h>. The value is not so large that it causes token starvation and not so small that it drops most packets. Therefore this patch set the mtu value to 64kb(== 65535 bytes). Again, here are the outbound QoS parameters and the TCP throughput with the libvirt patched. outbound average rate[kilobytes/s] : Guest to Host throughput[Mbit/s] ====================================================================== 1024 (8Mbit/s) : 8.22 2048 (16Mbit/s) : 16.42 4096 (32Mbit/s) : 32.93 8192 (64Mbit/s) : 66.85 16384 (128Mbit/s) : 133.88 32768 (256Mbit/s) : 271.01 65536 (512Mbit/s) : 547.32 The outbound traffic conforms to the given limit. Thank you, Signed-off-by: Eiichi Tsukata <eiichi.tsukata.xh(a)hitachi.com> --- AUTHORS | 1 + src/util/virnetdevbandwidth.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index b876ee6..375db24 100644 --- a/AUTHORS +++ b/AUTHORS @@ -246,6 +246,7 @@ Patches have also been contributed by: Gerd Hoffmann <kraxel(a)redhat.com> Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> Thang Pham <thang.pham(a)us.ibm.com> + Eiichi Tsukata <eiichi.tsukata.xh(a)hitachi.com> [....send patches to get your name here....] diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b9bd2e3..93df5c1 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -136,7 +136,7 @@ virNetDevBandwidthSet(const char *ifname, virCommandAddArgList(cmd, "filter", "add", "dev", ifname, "parent", "ffff:", "protocol", "ip", "u32", "match", "ip", "src", "0.0.0.0/0", "police", "rate", average, - "burst", burst, "mtu", burst, "drop", "flowid", + "burst", burst, "mtu", "64kb", "drop", "flowid", ":1", NULL); if (virCommandRun(cmd, NULL) < 0) -- 1.7.4.4 -- Eiichi Tsukata Linux Technology Center Hitachi, Ltd., Yokohama Research Laboratory E-mail: eiichi.tsukata.xh(a)hitachi.com

3 2

[libvirt] [PATCH] network_conf: Don't free uninitialized pointers while parsing DNS SRV
by Peter Krempa 29 Jun '12

29 Jun '12

If the user specified invalid protocol type in a network's SRV record the error path ended up in freeing uninitialized pointers causing a daemon crash. *network_conf.c: virNetworkDNSSrvDefParseXML(): initialize local variables --- src/conf/network_conf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 60cd888..515bc36 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -574,10 +574,10 @@ virNetworkDNSSrvDefParseXML(virNetworkDNSDefPtr def, xmlNodePtr cur, xmlXPathContextPtr ctxt) { - char *domain; - char *service; - char *protocol; - char *target; + char *domain = NULL; + char *service = NULL; + char *protocol = NULL; + char *target = NULL; int port; int priority; int weight; -- 1.7.8.6

3 3

[libvirt] [PATCH] virsh: Cleanup virsh -V output
by Doug Goldstein 28 Jun '12

28 Jun '12

Fixed up virsh -V output by removing invalid WITH_PROXY & WITH_ONE checks, adding Hyper-V check and fixing the DTrace check. Signed-off-by: Doug Goldstein <cardoe(a)cardoe.com> --- tools/virsh.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 2b4cb2c..9fccd2d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -20636,8 +20636,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_PHYP vshPrint(ctl, " PHYP"); #endif -#ifdef WITH_ONE - vshPrint(ctl, " ONE"); +#ifdef WITH_HYPERV + vshPrint(ctl, " Hyper-V"); #endif #ifdef WITH_TEST vshPrint(ctl, " Test"); @@ -20648,9 +20648,6 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_REMOTE vshPrint(ctl, " Remote"); #endif -#ifdef WITH_PROXY - vshPrint(ctl, " Proxy"); -#endif #ifdef WITH_LIBVIRTD vshPrint(ctl, " Daemon"); #endif @@ -20711,7 +20708,7 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef ENABLE_DEBUG vshPrint(ctl, " Debug"); #endif -#ifdef WITH_DTRACE +#ifdef WITH_DTRACE_PROBES vshPrint(ctl, " DTrace"); #endif #ifdef USE_READLINE -- 1.7.3.4

3 5

[libvirt] [PATCH] conf: Don't shadow error from virGetDomain()
by Peter Krempa 28 Jun '12

28 Jun '12

virGetDomain() does a good job of reporting errors itself. This patch removes shadowing of that error in virDomainListPopulate(). --- src/conf/virdomainlist.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/conf/virdomainlist.c b/src/conf/virdomainlist.c index f9fbde8..2b0b878 100644 --- a/src/conf/virdomainlist.c +++ b/src/conf/virdomainlist.c @@ -117,8 +117,10 @@ virDomainListPopulate(void *payload, return; } - if (!(dom = virGetDomain(data->conn, vm->def->name, vm->def->uuid))) - goto no_memory; + if (!(dom = virGetDomain(data->conn, vm->def->name, vm->def->uuid))) { + data->error = true; + goto cleanup; + } dom->id = vm->def->id; @@ -127,11 +129,6 @@ virDomainListPopulate(void *payload, cleanup: virDomainObjUnlock(vm); return; - -no_memory: - virReportOOMError(); - data->error = true; - goto cleanup; } #undef MATCH -- 1.7.8.6

2 2

[libvirt] [PATCHv4 0/6] API for atomic listing of guests (rest of the series)
by Peter Krempa 28 Jun '12

28 Jun '12

This is a respin of patches that have not yet been commited. Peter Krempa (6): virsh: Rename namesorter to vshNameSorter and clean up indentation virsh: add support for virConnectListAllDomains and clean up cmdList vbox: Add support for virConnectListAllDomains() hyperv: Add implementation for virConnectListAllDomains() esx: Add implementation for virConnectListAllDomains() maint: include ignore-value in internal.h src/conf/domain_audit.c | 1 - src/conf/domain_conf.c | 1 - src/conf/virdomainlist.c | 1 - src/esx/esx_driver.c | 194 +++++++++++++ src/hyperv/hyperv_driver.c | 136 +++++++++ src/internal.h | 1 + src/network/bridge_driver.c | 1 - src/node_device/node_device_hal.c | 1 - src/openvz/openvz_conf.c | 1 - src/qemu/qemu_domain.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/util/command.c | 1 - src/util/event_poll.c | 1 - src/util/logging.c | 1 - src/util/memory.c | 1 - src/util/threadpool.c | 1 - src/util/virfile.h | 1 - src/util/virnetdevbandwidth.c | 1 - src/vbox/vbox_tmpl.c | 170 +++++++++++ src/xenapi/xenapi_driver.c | 1 - tests/shunloadtest.c | 1 - tools/virsh.c | 575 +++++++++++++++++++++++++------------ tools/virsh.pod | 92 +++++-- 23 files changed, 962 insertions(+), 223 deletions(-) -- 1.7.8.6

3 13

[libvirt] Fwd: In Use tracker for network and pci-passthrough devices
by Shradha Shah 28 Jun '12

28 Jun '12

This is a conversation that I started with Laine Stump for the implementation of the in-use tracker for network and pci devices. I want to make this conversation more public in order to receive everyone's view on the topic. I will also post the responses I got from Laine and Osier Yang. Many Thanks, Regards, Shradha Shah -------- Original Message -------- Subject: In Use tracker for network and pci-passthrough devices Date: Tue, 26 Jun 2012 12:23:52 +0100 From: Shradha Shah <sshah(a)solarflare.com> To: Laine Stump <laine(a)laine.org> Laine, I have submitted my v2 patches for forward mode='hostdev' and am planning to work on the in-use tracker for network and pci-passthrough devices. I am unable to wrap my head around how I should be implementing this functionality. I am unable to decide at what level I should be implementing this (network, domain or qemu). May I ask for your guidance in order to implement this functionality? -- Many Thanks, Regards, Shradha Shah

2 6

[libvirt] adding more element to <interface>
by Rashid Zamani 28 Jun '12

28 Jun '12

Hello people, I am considering adding more elements into <interface> name space in order to support more features of different hypervisors (specificly qemu). I have discuss this<https://www.redhat.com/archives/libvirt-users/2012-June/msg00141.html>in user thread, and I have been told to propose an xml syntax for it. What exactly I have in mind is adding elements like <dns>, <hostname> and etc. to set the these variables from within the <interface> instead of having <qemu:commandline> at the end of the file, in case of using qemu. So the final xml file should look something like below: <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> . . . <interface type='user'> <mac address=/> <model type=/> <bandwidth> </bandwidth> <address=/>* <**hostname=/> <dns=/> * . . . </interface> . . . </domain> I am wondering, firstly if such a thing is plausible. And if so, how I can contribute and where I can start from. Thank you in advance. Zamani

2 1

[libvirt] [libvirt-glib v3 1/2] Make GVirConfigCapabilitiesCpu.get_features virtual
by Zeeshan Ali (Khattak) 28 Jun '12

28 Jun '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Also provide helper function for subclasses that will have the exact same implementation except that they'll return instances of another type (subclasses of GVirConfigDomainCpuFeature rather than GVirConfigDomainCpuFeature itself). --- libvirt-gconfig/Makefile.am | 1 + .../libvirt-gconfig-capabilities-cpu-private.h | 35 ++++++++++++++++ libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c | 42 +++++++++++++++----- libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h | 4 +- libvirt-gconfig/libvirt-gconfig-private.h | 1 + 5 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-capabilities-cpu-private.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 7f0ea3b..52f2d52 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -73,6 +73,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-storage-vol-target.h noinst_HEADERS = \ libvirt-gconfig-private.h \ + libvirt-gconfig-capabilities-cpu-private.h \ libvirt-gconfig-domain-device-private.h \ libvirt-gconfig-helpers-private.h \ libvirt-gconfig-object-private.h \ diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-private.h b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-private.h new file mode 100644 index 0000000..4832656 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu-private.h @@ -0,0 +1,35 @@ +/* + * libvirt-gconfig-capabilities-cpu-private.h: libvirt CPU capabilities + * + * Copyright (C) 2012 Red Hat, Inc. + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + */ +#ifndef __LIBVIRT_GCONFIG_CAPABILITIES_CPU_PRIVATE_H__ +#define __LIBVIRT_GCONFIG_CAPABILITIES_CPU_PRIVATE_H__ + +G_BEGIN_DECLS + +#include <libvirt-gconfig/libvirt-gconfig.h> + +GList * +gvir_config_capabilities_cpu_get_features_with_type(GVirConfigCapabilitiesCpu *cpu, + GType type); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_CAPABILITIES_CPU_PRIVATE_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c index e517a20..5b619b5 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c @@ -37,10 +37,14 @@ struct _GVirConfigCapabilitiesCpuPrivate G_DEFINE_TYPE(GVirConfigCapabilitiesCpu, gvir_config_capabilities_cpu, GVIR_CONFIG_TYPE_OBJECT); +static GList * +_gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu); static void gvir_config_capabilities_cpu_class_init(GVirConfigCapabilitiesCpuClass *klass) { g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesCpuPrivate)); + + klass->get_features = _gvir_config_capabilities_cpu_get_features; } static void gvir_config_capabilities_cpu_init(GVirConfigCapabilitiesCpu *cpu) @@ -75,6 +79,7 @@ struct GetFeatureData { GVirConfigXmlDoc *doc; const gchar *schema; GList *features; + GType type; }; static gboolean add_feature(xmlNodePtr node, gpointer opaque) @@ -86,7 +91,7 @@ static gboolean add_feature(xmlNodePtr node, gpointer opaque) return TRUE; feature = gvir_config_object_new_from_tree - (GVIR_CONFIG_TYPE_CAPABILITIES_CPU_FEATURE, + (data->type, data->doc, data->schema, node); @@ -98,16 +103,9 @@ static gboolean add_feature(xmlNodePtr node, gpointer opaque) return TRUE; } -/** - * gvir_config_capabilities_cpu_get_features: - * - * Gets the features of this CPU. - * - * Returns: (element-type LibvirtGConfig.CapabilitiesCpuFeature) (transfer full): - * a newly allocated #GList of #GVirConfigCapabilitiesCpuFeature. - */ -GList * -gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu) +G_GNUC_INTERNAL GList * +gvir_config_capabilities_cpu_get_features_with_type(GVirConfigCapabilitiesCpu *cpu, + GType type) { struct GetFeatureData data; @@ -117,6 +115,7 @@ gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu) g_object_get(G_OBJECT(cpu), "doc", &data.doc, NULL); g_return_val_if_fail(data.doc != NULL, NULL); data.features = NULL; + data.type = type; gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(cpu), NULL, @@ -127,6 +126,27 @@ gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu) return data.features; } +static GList * +_gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu) +{ + return gvir_config_capabilities_cpu_get_features_with_type( + cpu, GVIR_CONFIG_TYPE_CAPABILITIES_CPU_FEATURE); +} + +/** + * gvir_config_capabilities_cpu_get_features: + * + * Gets the features of this CPU. + * + * Returns: (element-type LibvirtGConfig.CapabilitiesCpuFeature) (transfer full): + * a newly allocated #GList of #GVirConfigCapabilitiesCpuFeature. + */ +GList * +gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu) +{ + return GVIR_CONFIG_CAPABILITIES_CPU_GET_CLASS(cpu)->get_features(cpu); +} + /** * gvir_config_capabilities_cpu_get_topology: * diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h index 67fe607..be6c06f 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h @@ -57,7 +57,9 @@ struct _GVirConfigCapabilitiesCpuClass { GVirConfigObjectClass parent_class; - gpointer padding[20]; + GList *(*get_features)(GVirConfigCapabilitiesCpu *cpu); + + gpointer padding[19]; }; GType gvir_config_capabilities_cpu_get_type(void); diff --git a/libvirt-gconfig/libvirt-gconfig-private.h b/libvirt-gconfig/libvirt-gconfig-private.h index d4df030..ea532ad 100644 --- a/libvirt-gconfig/libvirt-gconfig-private.h +++ b/libvirt-gconfig/libvirt-gconfig-private.h @@ -23,6 +23,7 @@ #ifndef __LIBVIRT_GCONFIG_PRIVATE_H__ #define __LIBVIRT_GCONFIG_PRIVATE_H__ +#include <libvirt-gconfig/libvirt-gconfig-capabilities-cpu-private.h> #include <libvirt-gconfig/libvirt-gconfig-domain-device-private.h> #include <libvirt-gconfig/libvirt-gconfig-helpers-private.h> #include <libvirt-gconfig/libvirt-gconfig-object-private.h> -- 1.7.10.4

2 3

[libvirt] [PATCH] [libvirt-java] Fix JNA passing of scheduler parameters
by Daniel Veillard 28 Jun '12

28 Jun '12

trying to use setSchedulerParameters for the cpu_share was always ending up setting the value to 2. in practice the JNA code was not passing the parameter value, letting it uninitialized to zero and the kernel accepts 2 as the closest value leading to that behaviour. The code was actually telling JNA which type to use from the enum but the JNA refused to take it into account possibly because multiple C types maps to the same Java types and in that case it refuses to accept setType(class) and simply act as if the information had not been given (no warning/no error at runtime) ! The workaround is to actually tell it the field name in the enum, that is accepted and the function works properly once done. diff --git a/src/main/java/org/libvirt/SchedParameter.java b/src/main/java/org/libvirt/SchedParameter.java index ab988e9..1dece56 100644 --- a/src/main/java/org/libvirt/SchedParameter.java +++ b/src/main/java/org/libvirt/SchedParameter.java @@ -52,33 +52,33 @@ public abstract class SchedParameter { switch (param.getType()) { case (1): returnValue.value.i = ((SchedIntParameter) param).value; - returnValue.value.setType(int.class); + returnValue.value.setType("i"); break; case (2): returnValue.value.ui = ((SchedUintParameter) param).value; - returnValue.value.setType(int.class); + returnValue.value.setType("ui"); break; case (3): returnValue.value.l = ((SchedLongParameter) param).value; - returnValue.value.setType(long.class); + returnValue.value.setType("l"); break; case (4): returnValue.value.ul = ((SchedUlongParameter) param).value; - returnValue.value.setType(long.class); + returnValue.value.setType("ul"); break; case (5): returnValue.value.d = ((SchedDoubleParameter) param).value; - returnValue.value.setType(double.class); + returnValue.value.setType("d"); break; case (6): returnValue.value.b = (byte) (((SchedBooleanParameter) param).value ? 1 : 0); - returnValue.value.setType(byte.class); + returnValue.value.setType("b"); break; } return returnValue; } - + public static byte[] copyOf(byte[] original, int length) { byte[] returnValue = new byte[length]; int originalLength = original.length ; -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Coverity automatic detection
by Alex Jia 28 Jun '12

28 Jun '12

This email is automatically generated. The test result is based on the following git commit: cd15303 events: Don't fail on registering events for two different domains Analysis summary report: ------------------------ Files analyzed : 314 Total LoC input to cov-analyze : 371998 Functions analyzed : 9054 Paths analyzed : 1066057 Defect occurrences found : 136 Total 7 ATOMICITY 9 CHECKED_RETURN 6 DEADCODE 9 FORWARD_NULL 13 LOCK 5 NEGATIVE_RETURNS 3 NO_EFFECT 2 NULL_RETURNS 1 OVERRUN_STATIC 15 RESOURCE_LEAK 1 RETURN_LOCAL 14 REVERSE_INULL 3 SECURE_TEMP 1 SIZEOF_MISMATCH 1 STRING_NULL 13 TAINTED_SCALAR 3 TAINTED_STRING 18 TOCTOU 10 UNINIT 2 UNUSED_VALUE Exceeded path limit of 5000 paths in 0.59% of functions (normally up to 5% of functions encounter this limitation) For details, please see attachment. Regards, Alex

1 0

[libvirt] [PATCH] storage: Error out if the target is already mounted for netfs pool
by Osier Yang 28 Jun '12

28 Jun '12

mnt_fsname can not be the same, as we check the duplicate pool sources earlier before, means it can't be the same pool, moreover, a pool can't be started if it's already active anyway. So no reason to act as success. --- src/storage/storage_backend_fs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index bde4528..87d9192 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -424,10 +424,10 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) { /* Short-circuit if already mounted */ if ((ret = virStorageBackendFileSystemIsMounted(pool)) != 0) { - if (ret < 0) - return -1; - else - return 0; + virStorageReportError(VIR_ERR_OPERATION_INVALID, + _("Target '%s' is already mounted"), + pool->def->target.path); + return -1; } if (pool->def->type == VIR_STORAGE_POOL_NETFS) { -- 1.7.7.3

2 2

[libvirt] [PATCH 0/6 v2] Support forward mode='hostdev' and interface pools
by Shradha Shah 28 Jun '12

28 Jun '12

This patch series supports the forward mode='hostdev'. The functionality of this mode is the same as interface type='hostdev' but with the added benefit of using interface pools. The patch series also contains a patch to support use of interface names and PCI device addresses interchangeably in a network xml, and return the appropriate one in actualDevice when networkAllocateActualDevice is called. At the top level managed attribute can be specified with identical results as when it's specified for a hostdev. Currently forward mode='hostdev' does not support USB devices. Shradha Shah (6): Prerequisite Patch. virDomainDevicePCIAddress and respective functions moved to a new file called conf/device_conf.ch Moved the code to create implicit interface pool from PF to a new function RNG updates, new xml parser/formatter code to support forward mode=hostdev Code to return interface name or pci_addr of the VF in actualDevice Forward Mode Hostdev network driver Implementation Forward Mode 'Hostdev' qemu driver implementation docs/formatnetwork.html.in | 62 ++++++ docs/schemas/network.rng | 82 ++++++++- src/Makefile.am | 7 +- src/conf/device_conf.c | 135 +++++++++++++ src/conf/device_conf.h | 65 +++++++ src/conf/domain_conf.c | 114 ++---------- src/conf/domain_conf.h | 25 +--- src/conf/network_conf.c | 126 +++++++++++-- src/conf/network_conf.h | 29 +++- src/libvirt_private.syms | 10 +- src/network/bridge_driver.c | 322 +++++++++++++++++++++++++------- src/qemu/qemu_command.c | 27 ++- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_monitor.c | 14 +- src/qemu/qemu_monitor.h | 17 +- src/qemu/qemu_monitor_json.c | 14 +- src/qemu/qemu_monitor_json.h | 14 +- src/qemu/qemu_monitor_text.c | 16 +- src/qemu/qemu_monitor_text.h | 14 +- src/util/virnetdev.c | 29 ++-- src/util/virnetdev.h | 4 +- src/xen/xend_internal.c | 3 +- tests/networkxml2xmlin/hostdev-pf.xml | 11 + tests/networkxml2xmlin/hostdev.xml | 10 + tests/networkxml2xmlout/hostdev-pf.xml | 7 + tests/networkxml2xmlout/hostdev.xml | 10 + tests/networkxml2xmltest.c | 2 + 27 files changed, 889 insertions(+), 287 deletions(-) create mode 100644 src/conf/device_conf.c create mode 100644 src/conf/device_conf.h create mode 100644 tests/networkxml2xmlin/hostdev-pf.xml create mode 100644 tests/networkxml2xmlin/hostdev.xml create mode 100644 tests/networkxml2xmlout/hostdev-pf.xml create mode 100644 tests/networkxml2xmlout/hostdev.xml -- 1.7.4.4

3 9

[libvirt] [PATCH] events: Don't fail on registering events for two different domains
by Michal Privoznik 27 Jun '12

27 Jun '12

virConnectDomainEventRegisterAny() takes a domain as an argument. So it should be possible to register the same event (be it VIR_DOMAIN_EVENT_ID_LIFECYCLE for example) for two different domains. That is, we need to take domain into account when searching for duplicate event being already registered. --- src/conf/domain_event.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 4ecc413..3cfd940 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -363,7 +363,11 @@ virDomainEventCallbackListAddID(virConnectPtr conn, for (i = 0 ; i < cbList->count ; i++) { if (cbList->callbacks[i]->cb == VIR_DOMAIN_EVENT_CALLBACK(callback) && cbList->callbacks[i]->eventID == eventID && - cbList->callbacks[i]->conn == conn) { + cbList->callbacks[i]->conn == conn && + ((dom && cbList->callbacks[i]->dom && + memcmp(cbList->callbacks[i]->dom->uuid, + dom->uuid, VIR_UUID_BUFLEN) == 0) || + (!dom && !cbList->callbacks[i]->dom))) { eventReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("event callback already tracked")); return -1; -- 1.7.3.4

3 10

[libvirt] [PATCH] virsh: Add domdisplay command for VNC and SPICE
by Doug Goldstein 27 Jun '12

27 Jun '12

Add a new 'domdisplay' command that provides a URI for both VNC and SPICE connections. Presently the 'vncdisplay' command provides you with the port info that QEMU is listening on but there is no counterpart for SPICE. Additionally this provides you with the bind address as specified in the XML, which the existing 'vncdisplay' lacks. Signed-off-by: Doug Goldstein <cardoe(a)cardoe.com> --- tools/virsh.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4d34d49..88d4681 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13624,6 +13624,133 @@ cmdSysinfo (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } /* + * "display" command + */ +static const vshCmdInfo info_domdisplay[] = { + {"help", N_("domain display connection URI")}, + {"desc", N_("Output the IP address and port number for the graphical display.")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_domdisplay[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) +{ + xmlDocPtr xml = NULL; + xmlXPathObjectPtr obj = NULL; + xmlXPathContextPtr ctxt = NULL; + virDomainPtr dom; + bool ret = false; + int port = 0; + char *doc; + char *xpath; + const char *scheme[] = { "vnc", "spice", NULL }; + int iter = 0; + + if (!vshConnectionUsability(ctl, ctl->conn)) + return false; + + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + doc = virDomainGetXMLDesc(dom, 0); + if (!doc) + goto cleanup; + + xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); + VIR_FREE(doc); + if (!xml) + goto cleanup; + + /* Attempt to grab our display info */ + for (iter = 0; scheme[iter] != NULL; iter++) { + /* Create our XPATH lookup for the current display */ + virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" + "/@port)", scheme[iter]); + if (!xpath) { + virReportOOMError(); + goto cleanup; + } + + obj = xmlXPathEval(BAD_CAST xpath, ctxt); + VIR_FREE(xpath); + if (obj == NULL || obj->type != XPATH_STRING || + obj->stringval == NULL) { + if (obj) { + /* Clean up memory */ + xmlXPathFreeObject(obj); + obj = NULL; + } + continue; + } + + /* If there was a port number, then the guest uses the current scheme */ + if (obj->stringval[0] != 0) { + + /* Make sure this is a valid port number */ + if (virStrToLong_i((const char *)obj->stringval, NULL, 10, &port)) { + vshError(ctl, _("Unable to interpret '%s' as a port number."), + obj->stringval); + goto cleanup; + } + + if (port < 0) { + vshError(ctl, _("Invalid port '%d', guest likely not started."), + port); + goto cleanup; + } + + /* Clean up memory */ + xmlXPathFreeObject(obj); + obj = NULL; + + virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" + "/@listen)", scheme[iter]); + if (!xpath) { + virReportOOMError(); + goto cleanup; + } + + obj = xmlXPathEval(BAD_CAST xpath, ctxt); + VIR_FREE(xpath); + + /* VNC protocol handlers take their port number as X - 5900 */ + if (scheme[iter] == "vnc") + port -= 5900; + + if (obj == NULL || obj->type != XPATH_STRING || + obj->stringval == NULL || obj->stringval[0] == 0 || + STREQ((const char *)obj->stringval, "0.0.0.0")) { + vshPrint(ctl, "%s://localhost:%d\n", scheme[iter], port); + } else { + vshPrint(ctl, "%s://%s:%d\n", scheme[iter], + (const char *)obj->stringval, port); + } + + /* Clean up memory */ + xmlXPathFreeObject(obj); + obj = NULL; + + /* We got what we came for so return successfully */ + ret = true; + break; + } + + } + +cleanup: + xmlXPathFreeObject(obj); + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + virDomainFree(dom); + return ret; +} + +/* * "vncdisplay" command */ static const vshCmdInfo info_vncdisplay[] = { @@ -17702,6 +17829,7 @@ static const vshCmdDef domManagementCmds[] = { {"detach-disk", cmdDetachDisk, opts_detach_disk, info_detach_disk, 0}, {"detach-interface", cmdDetachInterface, opts_detach_interface, info_detach_interface, 0}, + {"domdisplay", cmdDomDisplay, opts_domdisplay, info_domdisplay, 0}, {"domid", cmdDomid, opts_domid, info_domid, 0}, {"domif-setlink", cmdDomIfSetLink, opts_domif_setlink, info_domif_setlink, 0}, {"domiftune", cmdDomIftune, opts_domiftune, info_domiftune, 0}, -- 1.7.3.4

5 14

[libvirt] [PATCH 0/2] Fix counting of cores while gathering processor information
by Peter Krempa 27 Jun '12

27 Jun '12

Peter Krempa (2): nodeinfo: Fix code style and some minor bugs. nodeinfo: Fix CPU core counting src/nodeinfo.c | 137 +++++--- .../linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt | 1 + .../linux-nodeinfo-sysfs-test-4-x86.cpuinfo | 400 ++++++++++++++++++++ .../cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../cpu/cpu10/topology/core_id | 1 + .../cpu/cpu10/topology/physical_package_id | 1 + .../cpu/cpu10/topology/thread_siblings | 1 + .../cpu/cpu11/topology/core_id | 1 + .../cpu/cpu11/topology/physical_package_id | 1 + .../cpu/cpu11/topology/thread_siblings | 1 + .../cpu/cpu12/topology/core_id | 1 + .../cpu/cpu12/topology/physical_package_id | 1 + .../cpu/cpu12/topology/thread_siblings | 1 + .../cpu/cpu13/topology/core_id | 1 + .../cpu/cpu13/topology/physical_package_id | 1 + .../cpu/cpu13/topology/thread_siblings | 1 + .../cpu/cpu14/topology/core_id | 1 + .../cpu/cpu14/topology/physical_package_id | 1 + .../cpu/cpu14/topology/thread_siblings | 1 + .../cpu/cpu15/topology/core_id | 1 + .../cpu/cpu15/topology/physical_package_id | 1 + .../cpu/cpu15/topology/thread_siblings | 1 + .../cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../cpu/cpu5/topology/thread_siblings | 1 + .../cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../cpu/cpu7/topology/thread_siblings | 1 + .../cpu/cpu8/topology/core_id | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../cpu/cpu8/topology/thread_siblings | 1 + .../cpu/cpu9/topology/core_id | 1 + .../cpu/cpu9/topology/physical_package_id | 1 + .../cpu/cpu9/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-4/node/node0/meminfo | 29 ++ .../linux-nodeinfo-sysfs-test-4/node/node1/meminfo | 29 ++ .../linux-nodeinfo-sysfs-test-4/node/possible | Bin 0 -> 5 bytes tests/nodeinfotest.c | 1 + 55 files changed, 593 insertions(+), 52 deletions(-) create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-cpu-x86-output.txt create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4-x86.cpuinfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu0/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu1/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu10/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu11/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu12/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu13/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu14/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu15/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu2/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu3/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu4/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu5/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu6/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu7/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu8/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/cpu/cpu9/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node0/meminfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/node1/meminfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-4/node/possible -- 1.7.8.6

2 5

[libvirt] [PATCH] doc: fix typo in virDomainDestroy API doc
by Christophe Fergeau 27 Jun '12

27 Jun '12

--- Pushed under the trivial rule. src/libvirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ef5ac47..db6ba15 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2127,11 +2127,11 @@ error: * Destroy the domain object. The running instance is shutdown if not down * already and all resources used by it are given back to the hypervisor. This * does not free the associated virDomainPtr object. - * This function may require privileged access + * This function may require privileged access. * * virDomainDestroy first requests that a guest terminate * (e.g. SIGTERM), then waits for it to comply. After a reasonable - * timeout, if the guest still exists, virDomainDestory will + * timeout, if the guest still exists, virDomainDestroy will * forcefully terminate the guest (e.g. SIGKILL) if necessary (which * may produce undesirable results, for example unflushed disk cache * in the guest). To avoid this possibility, it's recommended to -- 1.7.10.2

1 0

[libvirt] Accessing VM by only specigied users.
by Pankaj Rawat 27 Jun '12

27 Jun '12

Hi All, I want to access vm via noon-root user. To explain my scenario : Suppose I have following VM VM1,VM2,VM3,VM4 I want User1 access VM1 only User2 access VM2 only User3 access VM3 only User4 access VM4 only By access I mean that he should be able to start and console on Vm. Moreover only he can list the vm by Virsh list command Is that possible, like in VMware? Regards Pankaj Rawat DISCLAIMER: ----------------------------------------------------------------------------------------------------------------------- The contents of this e-mail and any attachment(s) are confidential and intended for the named recipient(s) only. It shall not attach any liability on the originator or NECHCL or its affiliates. Any views or opinions presented in this email are solely those of the author and may not necessarily reflect the opinions of NECHCL or its affiliates. Any form of reproduction, dissemination, copying, disclosure, modification, distribution and / or publication of this message without the prior written consent of the author of this e-mail is strictly prohibited. If you have received this email in error please delete it and notify the sender immediately. . -----------------------------------------------------------------------------------------------------------------------

2 1

[libvirt] qemu -net_user features
by Chet Maghz 27 Jun '12

27 Jun '12

Hi, I am trying to specify the host name, dns address and some other features provided by qemu -net_user. Right now Im adding a new name space at the end of my xml, like the one below: <qemu:commandline> <qemu:arg value='-net'/> <qemu:arg value='user,hostname=blahblah'/> </qemu:commandline> I am wondering if it is possible to set them within the <interface> name space. My concern is I need to set the host name and dns address using SLiRP for other hypervisors (such as XeN) and it seems they only accept standard libvirt xml tags. Would appreciate if you could give a response on this, and a reason if such thing is not possible. Thanks in advance. Chet

1 0

[libvirt] KVM/QEMU -net_user host and dns addr
by Chet Maghz 27 Jun '12

27 Jun '12

Hi, I am using libvirt with kvm/qemu. And Im using -net_user network option of kvm/qemu. In order to send the dns addr and host addr I have to modify the xml by my slef. I am wondering why there is no built in function in libvirt api to access/modify dns addr and host addr from within libvirt under user mode network of kvm/qemu (-net_user). Is there a reason for not having this feature or is it just not been implemented? Chet

1 0

[libvirt] Libvirt on Ohloh
by Guido Günther 27 Jun '12

27 Jun '12

Hi, I just noticed that ohloh tracks both libvirt-glib and libvirt under libvirt: https://www.ohloh.net/p/libvirt/enlistments Any objections to removing libvirt-glib from there (it's a separate project on ohloh as well). Cheers, -- Guido

2 2

[libvirt] pci bus slot in libvirt
by Fong Vang 27 Jun '12

27 Jun '12

What's the best way to configure multiple disks in libvirt? How many slots can you have? This is from the xml dump: In some of my configurations, I have this: <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' io='native'/> <source dev='/dev/sdb1'/> <target dev='vdb' bus='virtio'/> <alias name='virtio-disk1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </disk> while others are created as such: <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/data2/VMs/libvirt/images/win2k8-1.qcow2'/> <target dev='hda' bus='ide'/> <alias name='ide0-0-0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> Which way is better? The top one defines the bus and slot while the bottom defines the controller, bus, target, and unit. BTW, how many slots can we define per bus?

3 4

[libvirt] [PATCHv2 0/5] Basic Enablement of s390
by Viktor Mihajlovski 27 Jun '12

27 Jun '12

Resending as a thread, same content. Please ignore previous submission. The first series of patches aimed to enable libvirt to manage qemu/kvm domains hosted on the System z platform. The patches in this series address s390 specifics of node and hypervisor. Patches 2,3 and 5 are written by Thang Pham <thang.pham(a)us.ibm.com> the others are my doing. Since they all should go together, I am sending in Thang's as well, hoping to facilitate the review a bit this way. Thang Pham (3): S390: CPU support for s390(x) S390: Fixed Parser for /proc/cpuinfo needs to be adapted for your architecture S390: Added sysinfo for host on s390x. Viktor Mihajlovski (2): S390: Override QEMU_CAPS_NO_ACPI for s390x S390: Fixed core identification for s390 src/Makefile.am | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu_s390x.c | 80 ++++++++++++++++++++++ src/cpu/cpu_s390x.h | 31 +++++++++ src/nodeinfo.c | 11 +++ src/qemu/qemu_capabilities.c | 5 ++ src/util/sysinfo.c | 154 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 284 insertions(+), 0 deletions(-) create mode 100644 src/cpu/cpu_s390x.c create mode 100644 src/cpu/cpu_s390x.h

4 24

[libvirt] [PATCH] Add /tools/libvirt-guests.service to .gitignore
by Guido Günther 26 Jun '12

26 Jun '12

since it's an autogenerated file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index cd978d2..e5d5db9 100644 --- a/.gitignore +++ b/.gitignore @@ -160,6 +160,7 @@ /tests/xmconfigtest /tools/*.[18] /tools/libvirt-guests.init +/tools/libvirt-guests.service /tools/virsh /tools/virsh-*-edit.c /tools/virt-*-validate -- 1.7.10.4

2 2

[libvirt] [PATCHv2] Don't install systemd service files executable
by Guido Günther 26 Jun '12

26 Jun '12

since they aren't. Detected by Debian's lintian. --- Changes since last version: use INSTALL_DATA instead of -m0644 daemon/Makefile.am | 2 +- tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index fbb0ae1..71e91cd 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -319,7 +319,7 @@ BUILT_SOURCES += libvirtd.service install-init-systemd: install-sysconfig libvirtd.service $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_SCRIPT) libvirtd.service \ + $(INSTALL_DATA) libvirtd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service uninstall-init-systemd: uninstall-sysconfig diff --git a/tools/Makefile.am b/tools/Makefile.am index 7ca5599..c82a2fb 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -198,7 +198,7 @@ SYSTEMD_UNIT_DIR = /lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: libvirt-guests.service install-initscript install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_SCRIPT) libvirt-guests.service \ + $(INSTALL_DATA) libvirt-guests.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service uninstall-systemd: uninstall-initscript uninstall-sysconfig -- 1.7.10.4

2 2

[libvirt] [libvirt-glib v2 1/8] Setters/adders for GVirConfigCapabilitiesCpu props
by Zeeshan Ali (Khattak) 26 Jun '12

26 Jun '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> - gvir_config_capabilities_cpu_add_feature - gvir_config_capabilities_cpu_set_topology --- libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c | 32 ++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h | 6 ++++ libvirt-gconfig/libvirt-gconfig.sym | 6 ++++ 3 files changed, 44 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c index df77364..e517a20 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c @@ -56,6 +56,21 @@ gvir_config_capabilities_cpu_get_arch(GVirConfigCapabilitiesCpu *cpu) return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(cpu), "arch"); } +/** + * gvir_config_capabilities_cpu_add_feature: + * + * Adds a new feature to CPU. + */ +void gvir_config_capabilities_cpu_add_feature(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuFeature *feature) +{ + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU(cpu)); + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU_FEATURE(feature)); + + gvir_config_object_attach_add(GVIR_CONFIG_OBJECT(cpu), + GVIR_CONFIG_OBJECT(feature)); +} + struct GetFeatureData { GVirConfigXmlDoc *doc; const gchar *schema; @@ -133,3 +148,20 @@ gvir_config_capabilities_cpu_get_topology(GVirConfigCapabilitiesCpu *cpu) return GVIR_CONFIG_CAPABILITIES_CPU_TOPOLOGY(object); } + +/** + * gvir_config_capabilities_cpu_set_topology: + * + * Sets the topology of the cpu. + */ +void +gvir_config_capabilities_cpu_set_topology(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuTopology *topology) +{ + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU(cpu)); + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU_TOPOLOGY(topology)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(cpu), + "topology", + GVIR_CONFIG_OBJECT(topology)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h index 4d896ef..67fe607 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h @@ -29,6 +29,7 @@ #define __LIBVIRT_GCONFIG_CAPABILITIES_CPU_H__ #include "libvirt-gconfig-capabilities-cpu-topology.h" +#include "libvirt-gconfig-capabilities-cpu-feature.h" G_BEGIN_DECLS @@ -63,10 +64,15 @@ GType gvir_config_capabilities_cpu_get_type(void); const gchar * gvir_config_capabilities_cpu_get_arch(GVirConfigCapabilitiesCpu *cpu); +void gvir_config_capabilities_cpu_add_feature(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuFeature *feature); GList * gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu); GVirConfigCapabilitiesCpuTopology * gvir_config_capabilities_cpu_get_topology(GVirConfigCapabilitiesCpu *cpu); +void +gvir_config_capabilities_cpu_set_topology(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuTopology *topology); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 21942b4..1741c51 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -425,4 +425,10 @@ LIBVIRT_GCONFIG_0.0.9 { gvir_config_capabilities_host_get_cpu; } LIBVIRT_GCONFIG_0.0.8; +LIBVIRT_GCONFIG_0.0.10 { + global: + gvir_config_capabilities_cpu_add_feature; + gvir_config_capabilities_cpu_set_topology; +} LIBVIRT_GCONFIG_0.0.9; + # .... define new API here using predicted next version number .... -- 1.7.10.4

2 17

[libvirt] [PATCH 00/02] libvirt-java add domain flags and error constants up to 0.9, 2
by Stefan Majer 26 Jun '12

26 Jun '12

Hi, in order to bring libvirt-java closer to head i will start send a few patches therefore. I start with the domain flags and error constants, as these dont break any older clients, but make it possible to get usefull errorcodes when using it with recent libvirt. Greetings Stefan Majer (2): Added error constants up to libvirt-0.9.12 Added domain flags up to libvirt-0.9.12 src/main/java/org/libvirt/Domain.java | 38 +++++++++++++++++++++++++--- src/main/java/org/libvirt/Error.java | 45 +++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 9 deletions(-) -- 1.7.9.5 -- Stefan Majer

2 2

[libvirt] [PATCH] Don't install systemd service files executable
by Guido Günther 26 Jun '12

26 Jun '12

since they aren't. Detected by Debian's lintian. --- daemon/Makefile.am | 2 +- tools/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index fbb0ae1..473fa98 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -319,7 +319,7 @@ BUILT_SOURCES += libvirtd.service install-init-systemd: install-sysconfig libvirtd.service $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_SCRIPT) libvirtd.service \ + $(INSTALL_SCRIPT) -m0644 libvirtd.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service uninstall-init-systemd: uninstall-sysconfig diff --git a/tools/Makefile.am b/tools/Makefile.am index 7ca5599..79baf19 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -198,7 +198,7 @@ SYSTEMD_UNIT_DIR = /lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: libvirt-guests.service install-initscript install-sysconfig $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR) - $(INSTALL_SCRIPT) libvirt-guests.service \ + $(INSTALL_SCRIPT) -m0644 libvirt-guests.service \ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service uninstall-systemd: uninstall-initscript uninstall-sysconfig -- 1.7.10.4

3 2

[libvirt] [PATCHv2 0/9] support to set cpu bandwidth for hypervisor threads
by Hu Tao 26 Jun '12

26 Jun '12

Currently, we only can set cpu bandwidth for vcpu. If the hypervisor threads consume too much cpu time, it may affect the vcpu. This patchset allows the user to control the cpu bandwidth for hypervisor threads. Changes: v2: - rename qemuSetupCgroupVcpuBW to qemuSetupCgroupCpuBandwidth - limit cpu bandwidth only for vcpus - update doc about hypervisor_period/hypervisor_quota - add virCgroupMoveTask to libvirt_private.syms Hu Tao (3): rename qemuSetupCgroupVcpuBW to qemuSetupCgroupCpuBandwidth limit cpu bandwidth only for vcpus update doc about hypervisor_period/hypervisor_quota Wen Congyang (6): Introduce the function virCgroupForHypervisor introduce the function virCgroupMoveTask() create a new cgroup and move all hypervisor threads to the new cgroup Update XML Schema for new entries qemu: Implement hypervisor's period and quota tunable XML configuration and parsing qemu: Implement hypervisor_period and hypervisor_quota's modification docs/schemas/domaincommon.rng | 10 ++ include/libvirt/libvirt.h.in | 16 ++++ src/conf/domain_conf.c | 25 +++++- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 107 ++++++++++++++++------ src/qemu/qemu_cgroup.h | 8 +- src/qemu/qemu_driver.c | 201 +++++++++++++++++++++++++++-------------- src/qemu/qemu_process.c | 4 + src/util/cgroup.c | 96 ++++++++++++++++++++ src/util/cgroup.h | 6 ++ tools/virsh.pod | 11 ++- 12 files changed, 381 insertions(+), 107 deletions(-) -- 1.7.4.4

1 9

[libvirt] [PATCH v2] storage backend: Add sheepdog support
by Sebastian Wiedenroth 26 Jun '12

26 Jun '12

This patch brings support to manage sheepdog pools and volumes to libvirt. It uses the "collie" command-line utility that comes with sheepdog for that. A sheepdog pool in libvirt maps to a sheepdog cluster. It needs a host and port to connect to, which in most cases is just going to be the default of localhost on port 7000. A sheepdog volume in libvirt maps to a sheepdog vdi. To create one specify the pool, a name and the capacity. Volumes can also be resized later. In the volume XML the vdi name is prefixed with "sheepdog:" and put into the <target><path>. To use the volume as a disk source for virtual machines specify the vdi name as "name" attribute of the <source>. The host and port information from the pool are specified inside the host tag. <disk type='network'> ... <source protocol="sheepdog" name="vdi_name"> <host name="localhost" port="7000"/> </source> </disk> To work right this patch parses the output of collie, so it relies on the raw output option. There recently was a bug which caused size information to be reported wrong. This is fixed upstream already and will be in the next release. Signed-off-by: Sebastian Wiedenroth <wiedi(a)frubar.net> --- configure.ac | 23 ++ docs/drivers.html.in | 1 + docs/schemas/storagepool.rng | 17 ++ docs/schemas/storagevol.rng | 3 +- docs/storage.html.in | 62 +++++ libvirt.spec.in | 35 ++- po/POTFILES.in | 1 + src/Makefile.am | 8 + src/conf/storage_conf.c | 17 +- src/conf/storage_conf.h | 1 + src/storage/storage_backend.c | 6 + src/storage/storage_backend_sheepdog.c | 311 +++++++++++++++++++++++++ src/storage/storage_backend_sheepdog.h | 39 ++++ tests/Makefile.am | 13 ++ tests/storagebackendsheepdogtest.c | 196 ++++++++++++++++ tests/storagepoolxml2xmlin/pool-sheepdog.xml | 8 + tests/storagepoolxml2xmlout/pool-sheepdog.xml | 11 + tests/storagepoolxml2xmltest.c | 1 + tests/storagevolxml2xmlin/vol-sheepdog.xml | 10 + tests/storagevolxml2xmlout/vol-sheepdog.xml | 17 ++ tests/storagevolxml2xmltest.c | 1 + tools/virsh.c | 3 + 22 files changed, 770 insertions(+), 14 deletions(-) create mode 100644 src/storage/storage_backend_sheepdog.c create mode 100644 src/storage/storage_backend_sheepdog.h create mode 100644 tests/storagebackendsheepdogtest.c create mode 100644 tests/storagepoolxml2xmlin/pool-sheepdog.xml create mode 100644 tests/storagepoolxml2xmlout/pool-sheepdog.xml create mode 100644 tests/storagevolxml2xmlin/vol-sheepdog.xml create mode 100644 tests/storagevolxml2xmlout/vol-sheepdog.xml diff --git a/configure.ac b/configure.ac index dda764d..774a9dd 100644 --- a/configure.ac +++ b/configure.ac @@ -1807,6 +1807,8 @@ AC_ARG_WITH([storage-disk], AC_HELP_STRING([--with-storage-disk], [with GPartd Disk backend for the storage driver @<:@default=check@:>@]),[],[with_storage_disk=check]) 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]) if test "$with_libvirtd" = "no"; then with_storage_dir=no @@ -1817,6 +1819,7 @@ if test "$with_libvirtd" = "no"; then with_storage_mpath=no with_storage_disk=no with_storage_rbd=no + with_storage_sheepdog=no fi if test "$with_storage_dir" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_STORAGE_DIR], 1, [whether directory backend for storage driver is enabled]) @@ -1991,6 +1994,25 @@ fi AM_CONDITIONAL([WITH_STORAGE_RBD], [test "$with_storage_rbd" = "yes"]) AC_SUBST([LIBRBD_LIBS]) +if test "$with_storage_sheepdog" = "yes" || test "$with_storage_sheepdog" = "check"; then + AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin]) + + if test "$with_storage_sheepdog" = "yes" ; then + if test -z "$COLLIE" ; then AC_MSG_ERROR([We need collie for Sheepdog storage driver]) ; fi + else + if test -z "$COLLIE" ; then with_storage_sheepdog=no ; fi + + if test "$with_storage_sheepdog" = "check" ; then with_storage_sheepdog=yes ; fi + fi + + if test "$with_storage_sheepdog" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1, [whether Sheepdog backend for storage driver is enabled]) + AC_DEFINE_UNQUOTED([COLLIE],["$COLLIE"],[Location of collie program]) + fi +fi +AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG], [test "$with_storage_sheepdog" = "yes"]) + + LIBPARTED_CFLAGS= LIBPARTED_LIBS= if test "$with_storage_disk" = "yes" || @@ -2806,6 +2828,7 @@ AC_MSG_NOTICE([ SCSI: $with_storage_scsi]) 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([]) AC_MSG_NOTICE([Security Drivers]) AC_MSG_NOTICE([]) diff --git a/docs/drivers.html.in b/docs/drivers.html.in index 8ad2c33..90b6196 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -43,6 +43,7 @@ <li><strong><a href="storage.html#StorageBackendSCSI">SCSI backend</a></strong></li> <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> </ul> </body> </html> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 75b6b51..039798a 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -20,6 +20,7 @@ <ref name='poolscsi'/> <ref name='poolmpath'/> <ref name='poolrbd'/> + <ref name='poolsheepdog'/> </choice> </element> </define> @@ -115,6 +116,15 @@ <ref name='sourcerbd'/> </define> + <define name='poolsheepdog'> + <attribute name='type'> + <value>sheepdog</value> + </attribute> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcesheepdog'/> + </define> + <define name='sourceinfovendor'> <optional> <element name='vendor'> @@ -496,6 +506,13 @@ </element> </define> + <define name='sourcesheepdog'> + <element name='source'> + <ref name='sourceinfohost'/> + <ref name='sourceinfoname'/> + </element> + </define> + <define name='name'> <data type='string'> <param name="pattern">[a-zA-Z0-9_\+\-]+</param> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 8edb877..83148ca 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -67,7 +67,7 @@ <element name='target'> <optional> <element name='path'> - <ref name='absFilePath'/> + <data type='anyURI'/> </element> </optional> <ref name='format'/> @@ -144,6 +144,7 @@ <define name='formatfile'> <choice> + <value>unknown</value> <value>raw</value> <value>dir</value> <value>bochs</value> diff --git a/docs/storage.html.in b/docs/storage.html.in index b3484e8..e1dbbdf 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -110,6 +110,9 @@ <li> <a href="#StorageBackendRBD">RBD (RADOS Block Device) backend</a> </li> + <li> + <a href="#StorageBackendSheepdog">Sheepdog backend</a> + </li> </ul> <h2><a name="StorageBackendDir">Directory pool</a></h2> @@ -565,5 +568,64 @@ The RBD pool does not use the volume format type element. </p> + <h2><a name="StorageBackendSheepdog">Sheepdog pools</a></h2> + <p> + This provides a pool based on a Sheepdog Cluster. + Sheepdog is a distributed storage system for QEMU/KVM. + It provides highly available block level storage volumes that + can be attached to QEMU/KVM virtual machines. + + The cluster must already be formated. + + <span class="since">Since 0.9.13</span> + </p> + + <h3>Example pool input</h3> + <pre> + <pool type="sheepdog"> + <name>mysheeppool</name> + <source> + <name>mysheeppool</name> + <host name='localhost' port='7000'/> + </source> + </pool></pre> + + <h3>Example volume output</h3> + <pre> + <volume> + <name>myvol</name> + <key>sheep/myvol</key> + <source> + </source> + <capacity unit='bytes'>53687091200</capacity> + <allocation unit='bytes'>53687091200</allocation> + <target> + <path>sheepdog:myvol</path> + <format type='unknown'/> + <permissions> + <mode>00</mode> + <owner>0</owner> + <group>0</group> + </permissions> + </target> + </volume></pre> + + <h3>Example disk attachement</h3> + <p>Sheepdog images can be attached to Qemu guests. + Information about attaching a Sheepdog image to a + guest can be found + at the <a href="formatdomain.html#elementsDisks">format domain</a> + page.</p> + + <h3>Valid pool format types</h3> + <p> + The Sheepdog pool does not use the pool format type element. + </p> + + <h3>Valid volume format types</h3> + <p> + The Sheepdog pool does not use the volume format type element. + </p> + </body> </html> diff --git a/libvirt.spec.in b/libvirt.spec.in index 896ef51..e80259e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -69,19 +69,24 @@ %define with_xenapi 0%{!?_without_xenapi:1} # Then the secondary host drivers, which run inside libvirtd -%define with_network 0%{!?_without_network:%{server_drivers}} -%define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}} -%define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}} -%define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} -%define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} -%define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} +%define with_network 0%{!?_without_network:%{server_drivers}} +%define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}} +%define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}} +%define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} +%define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} +%define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %if 0%{?fedora} >= 16 -%define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} +%define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} %else -%define with_storage_rbd 0 +%define with_storage_rbd 0 %endif -%define with_numactl 0%{!?_without_numactl:%{server_drivers}} -%define with_selinux 0%{!?_without_selinux:%{server_drivers}} +%if 0%{?fedora} >= 17 +%define with_storage_sheepdog 0%{!?_without_storage_sheepdog:%{server_drivers}} +%else +%define with_storage_sheepdog 0 +%endif +%define with_numactl 0%{!?_without_numactl:%{server_drivers}} +%define with_selinux 0%{!?_without_selinux:%{server_drivers}} # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} @@ -224,6 +229,7 @@ %define with_storage_iscsi 0 %define with_storage_mpath 0 %define with_storage_rbd 0 +%define with_storage_sheepdog 0 %define with_storage_disk 0 %endif @@ -603,6 +609,10 @@ Requires: device-mapper # For RBD support Requires: ceph %endif +%if %{with_storage_sheepdog} +# For Sheepdog support +Requires: sheepdog +%endif %if %{with_cgconfig} Requires: libcgroup %endif @@ -1080,6 +1090,10 @@ of recent versions of Linux (and other OSes). %define _without_storage_rbd --without-storage-rbd %endif +%if ! %{with_storage_sheepdog} +%define _without_storage_sheepdog --without-storage-sheepdog +%endif + %if ! %{with_numactl} %define _without_numactl --without-numactl %endif @@ -1178,6 +1192,7 @@ autoreconf -if %{?_without_storage_disk} \ %{?_without_storage_mpath} \ %{?_without_storage_rbd} \ + %{?_without_storage_sheepdog} \ %{?_without_numactl} \ %{?_without_numad} \ %{?_without_capng} \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 31246f7..33a2ace 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -108,6 +108,7 @@ src/storage/storage_backend_logical.c src/storage/storage_backend_mpath.c src/storage/storage_backend_rbd.c src/storage/storage_backend_scsi.c +src/storage/storage_backend_sheepdog.c src/storage/storage_driver.c src/test/test_driver.c src/uml/uml_conf.c diff --git a/src/Makefile.am b/src/Makefile.am index 2bcebcf..a562f4d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -509,6 +509,9 @@ STORAGE_DRIVER_DISK_SOURCES = \ STORAGE_DRIVER_RBD_SOURCES = \ storage/storage_backend_rbd.h storage/storage_backend_rbd.c +STORAGE_DRIVER_SHEEPDOG_SOURCES = \ + storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c + STORAGE_HELPER_DISK_SOURCES = \ storage/parthelper.c @@ -1012,6 +1015,10 @@ libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES) libvirt_driver_storage_la_LIBADD += $(LIBRBD_LIBS) endif +if WITH_STORAGE_SHEEPDOG +libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +endif + if WITH_NODE_DEVICES # Needed to keep automake quiet about conditionals if WITH_DRIVER_MODULES @@ -1110,6 +1117,7 @@ EXTRA_DIST += \ $(STORAGE_DRIVER_MPATH_SOURCES) \ $(STORAGE_DRIVER_DISK_SOURCES) \ $(STORAGE_DRIVER_RBD_SOURCES) \ + $(STORAGE_DRIVER_SHEEPDOG_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 bf4567f..8ca6b1e 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -52,7 +52,7 @@ VIR_ENUM_IMPL(virStoragePool, VIR_STORAGE_POOL_LAST, "dir", "fs", "netfs", "logical", "disk", "iscsi", - "scsi", "mpath", "rbd") + "scsi", "mpath", "rbd", "sheepdog") VIR_ENUM_IMPL(virStoragePoolFormatFileSystem, VIR_STORAGE_POOL_FS_LAST, @@ -206,6 +206,17 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { .formatToString = virStoragePoolFormatDiskTypeToString, } }, + { .poolType = VIR_STORAGE_POOL_SHEEPDOG, + .poolOptions = { + .flags = (VIR_STORAGE_POOL_SOURCE_HOST | + VIR_STORAGE_POOL_SOURCE_NETWORK | + VIR_STORAGE_POOL_SOURCE_NAME), + }, + .volOptions = { + .defaultFormat = VIR_STORAGE_FILE_RAW, + .formatToString = virStoragePoolFormatDiskTypeToString, + } + }, { .poolType = VIR_STORAGE_POOL_MPATH, .volOptions = { .formatToString = virStoragePoolFormatDiskTypeToString, @@ -1011,9 +1022,9 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { if (virStoragePoolSourceFormat(&buf, options, &def->source) < 0) goto cleanup; - /* RBD devices are not local block devs nor files, so it doesn't + /* RBD and Sheepdog devices are not local block devs nor files, so it doesn't * have a target */ - if (def->type != VIR_STORAGE_POOL_RBD) { + if (def->type != VIR_STORAGE_POOL_RBD && def->type != VIR_STORAGE_POOL_SHEEPDOG) { virBufferAddLit(&buf," <target>\n"); if (def->target.path) diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 5733b57..dcf976f 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -121,6 +121,7 @@ enum virStoragePoolType { VIR_STORAGE_POOL_SCSI, /* SCSI HBA */ VIR_STORAGE_POOL_MPATH, /* Multipath devices */ VIR_STORAGE_POOL_RBD, /* RADOS Block Device */ + VIR_STORAGE_POOL_SHEEPDOG, /* Sheepdog device */ VIR_STORAGE_POOL_LAST, }; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e2e9b51..93964d6 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -80,6 +80,9 @@ #if WITH_STORAGE_RBD # include "storage_backend_rbd.h" #endif +#if WITH_STORAGE_SHEEPDOG +# include "storage_backend_sheepdog.h" +#endif #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -109,6 +112,9 @@ static virStorageBackendPtr backends[] = { #if WITH_STORAGE_RBD &virStorageBackendRBD, #endif +#if WITH_STORAGE_SHEEPDOG + &virStorageBackendSheepdog, +#endif NULL }; diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c new file mode 100644 index 0000000..d324613 --- /dev/null +++ b/src/storage/storage_backend_sheepdog.c @@ -0,0 +1,311 @@ +/* + * storage_backend_sheepdog.c: storage backend for Sheepdog handling + * + * Copyright (C) 2012 Wido den Hollander + * Copyright (C) 2012 Frank Spijkerman + * Copyright (C) 2012 Sebastian Wiedenroth + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wido den Hollander <wido(a)widodh.nl> + * Frank Spijkerman <frank.spijkerman(a)avira.com> + * Sebastian Wiedenroth <sebastian.wiedenroth(a)skylime.net> + */ + +#include <config.h> + +#include "virterror_internal.h" +#include "storage_backend_sheepdog.h" +#include "storage_conf.h" +#include "util/command.h" +#include "util.h" +#include "memory.h" +#include "logging.h" + +#define VIR_FROM_THIS VIR_FROM_STORAGE + +static int virStorageBackendSheepdogRefreshVol(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol); + +void virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, + virStoragePoolObjPtr pool); + +int +virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, + char *output) +{ + /* example output: + * 0 15245667872 117571104 0% + * Total 15245667872 117571104 0% 20972341 + */ + + const char *p, *next; + + pool->allocation = pool->capacity = pool->available = 0; + + p = output; + do { + char *end; + + if ((next = strchr(p, '\n'))) + ++next; + else + return -1; + + if (!STRPREFIX(p, "Total ")) + continue; + + p = p + 6; + + if (virStrToLong_ull(p, &end, 10, &pool->capacity) < 0) + return -1; + + if ((p = end + 1) > next) + return -1; + + if (virStrToLong_ull(p, &end, 10, &pool->allocation) < 0) + return -1; + + pool->available = pool->capacity - pool->allocation; + return 0; + + } while ((p = next)); + + return -1; +} + +void virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, virStoragePoolObjPtr pool) +{ + const char *address = "localhost"; + int port = 7000; + if (pool->def->source.nhost > 0) { + if (pool->def->source.hosts[0].name != NULL) { + address = pool->def->source.hosts[0].name; + } + if (pool->def->source.hosts[0].port) { + port = pool->def->source.hosts[0].port; + } + } + virCommandAddArg(cmd, "-a"); + virCommandAddArgFormat(cmd, "%s", address); + virCommandAddArg(cmd, "-p"); + virCommandAddArgFormat(cmd, "%d", port); +} + + +static int +virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) +{ + int ret; + char *output = NULL; + virCommandPtr cmd; + + cmd = virCommandNew(COLLIE); + virCommandAddArgList(cmd, "node", "info", "-r", NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + virCommandSetOutputBuffer(cmd, &output); + ret = virCommandRun(cmd, NULL); + if (ret == 0) + ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + + virCommandFree(cmd); + VIR_FREE(output); + return ret; +} + + +static int +virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int flags) +{ + + virCheckFlags(0, -1); + + virCommandPtr cmd = virCommandNew(COLLIE); + + virCommandAddArgList(cmd, "vdi", "delete", vol->name, NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + int ret = virCommandRun(cmd, NULL); + + virCommandFree(cmd); + return ret; +} + + +static int +virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol) +{ + + int ret; + + if (vol->target.encryption != NULL) { + virStorageReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Sheepdog does not support encrypted volumes")); + return -1; + } + + virCommandPtr cmd = virCommandNew(COLLIE); + + virCommandAddArgList(cmd, "vdi", "create", vol->name, NULL); + virCommandAddArgFormat(cmd, "%llu", vol->capacity); + virStorageBackendSheepdogAddHostArg(cmd, pool); + ret = virCommandRun(cmd, NULL); + + virStorageBackendSheepdogRefreshVol(conn, pool, vol); + + virCommandFree(cmd); + return ret; +} + + +int +virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, + char *output) +{ + /* example output: + * s test 1 10 0 0 1336556634 7c2b25 + * s test 2 10 0 0 1336557203 7c2b26 + * = test 3 10 0 0 1336557216 7c2b27 + */ + + int id; + const char *p, *next; + + vol->allocation = vol->capacity = 0; + + p = output; + do { + char *end; + + if ((next = strchr(p, '\n'))) + ++next; + + /* ignore snapshots */ + if (*p != '=') + continue; + + /* skip space */ + if (p + 2 < next) { + p += 2; + } else { + return -1; + } + + /* skip name */ + while (*p != '\0' + && (*p != ' ' || (*p == ' ' && (*(p - 1) == '\\')))) + ++p; + + if (virStrToLong_i(p, &end, 10, &id) < 0) + return -1; + + p = end + 1; + + if (virStrToLong_ull(p, &end, 10, &vol->capacity) < 0) + return -1; + + p = end + 1; + + if (virStrToLong_ull(p, &end, 10, &vol->allocation) < 0) + return -1; + + return 0; + } while ((p = next)); + + return -1; +} + +static int +virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol) +{ + int ret; + char *output = NULL; + virCommandPtr cmd; + + cmd = virCommandNew(COLLIE); + virCommandAddArgList(cmd, "vdi", "list", vol->name, "-r", NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + virCommandSetOutputBuffer(cmd, &output); + ret = virCommandRun(cmd, NULL); + + if (ret < 0) + goto cleanup; + + if ((ret = virStorageBackendSheepdogParseVdiList(vol, output)) < 0) + goto cleanup; + + vol->type = VIR_STORAGE_VOL_NETWORK; + + VIR_FREE(vol->key); + if (virAsprintf(&vol->key, "%s/%s", + pool->def->source.name, vol->name) == -1) { + virReportOOMError(); + goto cleanup; + } + + VIR_FREE(vol->target.path); + if (virAsprintf(&vol->target.path, "sheepdog:%s", vol->name) == -1) { + virReportOOMError(); + goto cleanup; + } + + + +cleanup: + virCommandFree(cmd); + return ret; +} + + +static int +virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned long long capacity, + unsigned int flags) +{ + + virCheckFlags(0, -1); + + virCommandPtr cmd = virCommandNew(COLLIE); + virCommandAddArgList(cmd, "vdi", "resize", vol->name, NULL); + virCommandAddArgFormat(cmd, "%llu", capacity); + virStorageBackendSheepdogAddHostArg(cmd, pool); + int ret = virCommandRun(cmd, NULL); + + virCommandFree(cmd); + return ret; + +} + + + +virStorageBackend virStorageBackendSheepdog = { + .type = VIR_STORAGE_POOL_SHEEPDOG, + + .refreshPool = virStorageBackendSheepdogRefreshPool, + .createVol = virStorageBackendSheepdogCreateVol, + .refreshVol = virStorageBackendSheepdogRefreshVol, + .deleteVol = virStorageBackendSheepdogDeleteVol, + .resizeVol = virStorageBackendSheepdogResizeVol, +}; diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h new file mode 100644 index 0000000..51ef7a4 --- /dev/null +++ b/src/storage/storage_backend_sheepdog.h @@ -0,0 +1,39 @@ +/* + * storage_backend_sheepog.h: storage backend for Sheepdog handling + * + * Copyright (C) 2012 Wido den Hollander + * Copyright (C) 2012 Frank Spijkerman + * Copyright (C) 2012 Sebastian Wiedenroth + * + * 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Wido den Hollander <wido(a)widodh.nl> + * Frank Spijkerman <frank.spijkerman(a)avira.com> + * Sebastian Wiedenroth <sebastian.wiedenroth(a)skylime.net> + */ + +#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_H__ +# define __VIR_STORAGE_BACKEND_SHEEPDOG_H__ + +# include "storage_backend.h" + +int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, + char *output); +int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, + char *output); + +extern virStorageBackend virStorageBackendSheepdog; + +#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index e3bd6d1..a466480 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -141,6 +141,10 @@ if WITH_NETWORK test_programs += networkxml2argvtest endif +if WITH_STORAGE_SHEEPDOG +test_programs += storagebackendsheepdogtest +endif + test_programs += nwfilterxml2xmltest test_programs += storagevolxml2xmltest storagepoolxml2xmltest @@ -398,6 +402,15 @@ else EXTRA_DIST += networkxml2argvtest.c endif +if WITH_STORAGE_SHEEPDOG +storagebackendsheepdogtest_SOURCES = \ + storagebackendsheepdogtest.c \ + testutils.c testutils.h +storagebackendsheepdogtest_LDADD = ../src/libvirt_driver_storage.la $(LDADDS) +else +EXTRA_DIST += storagebackendsheepdogtest.c +endif + nwfilterxml2xmltest_SOURCES = \ nwfilterxml2xmltest.c \ testutils.c testutils.h diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c new file mode 100644 index 0000000..a8f62a4 --- /dev/null +++ b/tests/storagebackendsheepdogtest.c @@ -0,0 +1,196 @@ +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <stdint.h> +#include <string.h> + +#include <sys/types.h> +#include <fcntl.h> + +#include "internal.h" +#include "testutils.h" +#include "storage/storage_backend_sheepdog.h" + + +typedef struct { + const char *output; + int expected_return; + uint64_t expected_capacity; + uint64_t expected_allocation; +} collie_test; + + +static int +test_node_info_parser(collie_test test, char *poolxml) +{ + int ret = -1; + char *output = NULL; + char *poolXmlData = NULL; + virStoragePoolDefPtr pool = NULL; + + if (virtTestLoadFile(poolxml, &poolXmlData) < 0) + goto cleanup; + + if (!(pool = virStoragePoolDefParseString(poolXmlData))) + goto cleanup; + + output = strdup(test.output); + if(!output) { + goto cleanup; + } + + ret = virStorageBackendSheepdogParseNodeInfo(pool, output); + + if (ret != test.expected_return) + goto cleanup; + + if (ret != 0) { + ret = 0; + goto cleanup; + } + + if (pool->capacity == test.expected_capacity + && pool->allocation == test.expected_allocation) + ret = 0; + + cleanup: + VIR_FREE(output); + VIR_FREE(poolXmlData); + virStoragePoolDefFree(pool); + return ret; +} + +static int +test_vdi_list_parser(collie_test test, char *poolxml, char *volxml) +{ + int ret = -1; + char *poolXmlData = NULL; + char *volXmlData = NULL; + char *output = NULL; + virStoragePoolDefPtr pool = NULL; + virStorageVolDefPtr vol = NULL; + + if (virtTestLoadFile(poolxml, &poolXmlData) < 0) + goto cleanup; + if (virtTestLoadFile(volxml, &volXmlData) < 0) + goto cleanup; + + if (!(pool = virStoragePoolDefParseString(poolXmlData))) + goto cleanup; + + if (!(vol = virStorageVolDefParseString(pool, volXmlData))) + goto cleanup; + + output = strdup(test.output); + if(!output) { + goto cleanup; + } + + ret = virStorageBackendSheepdogParseVdiList(vol, output); + + + if (ret != test.expected_return) + goto cleanup; + + if (ret != 0) { + ret = 0; + goto cleanup; + } + + if (vol->capacity == test.expected_capacity + && vol->allocation == test.expected_allocation) + ret = 0; + + cleanup: + VIR_FREE(output); + VIR_FREE(poolXmlData); + VIR_FREE(volXmlData); + virStoragePoolDefFree(pool); + virStorageVolDefFree(vol); + return ret; +} + + +static int +mymain(void) +{ + int ret = -1; + char *poolxml = NULL; + char *volxml = NULL; + + collie_test node_info_tests[] = { + {"", -1, 0, 0}, + {"Total 15245667872 117571104 0% 20972341\n", 0, 15245667872, 117571104}, + {"To", -1, 0, 0}, + {"asdf\nasdf", -1, 0, 0}, + {"Total ", -1, 0, 0}, + {"Total 1", -1, 0, 0}, + {"Total 1\n", -1, 0, 0}, + {"Total 1 ", -1, 0, 0}, + {"Total 1 2", -1, 0, 0}, + {"Total 1 2 ", -1, 0, 0}, + {"Total 1 2\n", 0, 1, 2}, + {"Total 1 2 \n", 0, 1, 2}, + {"Total a 2 \n", -1, 0, 0}, + {"Total 1 b \n", -1, 0, 0}, + {"Total a b \n", -1, 0, 0}, + {"stuff\nTotal 1 2 \n", 0, 1, 2}, + {"0 1 2 3\nTotal 1 2 \n", 0, 1, 2}, + {NULL, 0, 0, 0} + }; + + collie_test vdi_list_tests[] = { + {"", -1, 0, 0}, + {"= test 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, + {"= test\\ with\\ spaces 3 10 20 0 1336557216 7c2b27\n", 0, 10, 20}, + {"s test 1 10 20 0 1336556634 7c2b25\n= test 3 50 60 0 1336557216 7c2b27\n", 0, 50, 60}, + {"=", -1, 0, 0}, + {"= test", -1, 0, 0}, + {"= test ", -1, 0, 0}, + {"= test 1", -1, 0, 0}, + {"= test 1 ", -1, 0, 0}, + {"= test 1 2", -1, 0, 0}, + {"= test 1 2 ", -1, 0, 0}, + {"= test 1 2 3", -1, 0, 0}, + {NULL, 0, 0, 0} + }; + + collie_test *test = node_info_tests; + + if (virAsprintf(&poolxml, "%s/storagepoolxml2xmlin/pool-sheepdog.xml", + abs_srcdir) < 0) + goto cleanup; + + if (virAsprintf(&volxml, "%s/storagevolxml2xmlin/vol-sheepdog.xml", + abs_srcdir) < 0) + goto cleanup; + + while (test->output != NULL) { + ret = test_node_info_parser(*test, poolxml); + virtTestResult("node_info_parser", ret, NULL); + ++test; + if (ret < 0) + return EXIT_FAILURE; + } + + test = vdi_list_tests; + + while (test->output != NULL) { + ret = test_vdi_list_parser(*test, poolxml, volxml); + virtTestResult("vdi_list_parser", ret, NULL); + ++test; + if (ret < 0) + return EXIT_FAILURE; + } + + ret = 0; + + cleanup: + VIR_FREE(poolxml); + VIR_FREE(volxml); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) diff --git a/tests/storagepoolxml2xmlin/pool-sheepdog.xml b/tests/storagepoolxml2xmlin/pool-sheepdog.xml new file mode 100644 index 0000000..1287047 --- /dev/null +++ b/tests/storagepoolxml2xmlin/pool-sheepdog.xml @@ -0,0 +1,8 @@ +<pool type='sheepdog'> + <name>sheepdog</name> + <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid> + <source> + <host name='localhost' port='7000'/> + <name>sheepdog</name> + </source> +</pool> diff --git a/tests/storagepoolxml2xmlout/pool-sheepdog.xml b/tests/storagepoolxml2xmlout/pool-sheepdog.xml new file mode 100644 index 0000000..000c068 --- /dev/null +++ b/tests/storagepoolxml2xmlout/pool-sheepdog.xml @@ -0,0 +1,11 @@ +<pool type='sheepdog'> + <name>sheepdog</name> + <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <available unit='bytes'>0</available> + <source> + <host name='localhost' port='7000'/> + <name>sheepdog</name> + </source> +</pool> diff --git a/tests/storagepoolxml2xmltest.c b/tests/storagepoolxml2xmltest.c index d73fc8a..8cac978 100644 --- a/tests/storagepoolxml2xmltest.c +++ b/tests/storagepoolxml2xmltest.c @@ -93,6 +93,7 @@ mymain(void) DO_TEST("pool-mpath"); DO_TEST("pool-iscsi-multiiqn"); DO_TEST("pool-iscsi-vendor-product"); + DO_TEST("pool-sheepdog"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/storagevolxml2xmlin/vol-sheepdog.xml b/tests/storagevolxml2xmlin/vol-sheepdog.xml new file mode 100644 index 0000000..49e221c --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-sheepdog.xml @@ -0,0 +1,10 @@ +<volume> + <name>test2</name> + <source> + </source> + <capacity unit='bytes'>1024</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>sheepdog:test2</path> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-sheepdog.xml b/tests/storagevolxml2xmlout/vol-sheepdog.xml new file mode 100644 index 0000000..2f19af8 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-sheepdog.xml @@ -0,0 +1,17 @@ +<volume> + <name>test2</name> + <key>(null)</key> + <source> + </source> + <capacity unit='bytes'>1024</capacity> + <allocation unit='bytes'>0</allocation> + <target> + <path>sheepdog:test2</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 37c92cd..ee85988 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -112,6 +112,7 @@ mymain(void) DO_TEST("pool-disk", "vol-partition"); DO_TEST("pool-logical", "vol-logical"); DO_TEST("pool-logical", "vol-logical-backing"); + DO_TEST("pool-sheepdog", "vol-sheepdog"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tools/virsh.c b/tools/virsh.c index 98305c0..0dbc9d9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -20245,6 +20245,9 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) #ifdef WITH_STORAGE_RBD vshPrint(ctl, " RBD"); #endif +#ifdef WITH_STORAGE_SHEEPDOG + vshPrint(ctl, " Sheepdog"); +#endif vshPrint(ctl, "\n"); vshPrint(ctl, "%s", _(" Miscellaneous:")); -- 1.7.9.4

3 5

[libvirt] [PATCH] Allow byte[] arrays to be set as a secretValue
by Wido den Hollander 26 Jun '12

26 Jun '12

Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/main/java/org/libvirt/Secret.java | 11 +++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 1 + 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index e536cf4..48f7895 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -146,6 +146,17 @@ public class Secret { } /** + * Sets the value of the secret + * + * @return 0 on success, -1 on failure. + */ + public int setValue(byte[] value) throws LibvirtException { + int returnValue = libvirt.virSecretSetValue(VSP, value, new NativeLong(value.length), 0); + processError(); + return returnValue; + } + + /** * Undefines, but does not free, the Secret. * * @return 0 on success, -1 on failure. diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 2c8c03d..b1e53a2 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -336,6 +336,7 @@ public interface Libvirt extends Library { public SecretPointer virSecretLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); public SecretPointer virSecretLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); public int virSecretSetValue(SecretPointer virSecretPtr, String value, NativeLong value_size, int flags); + public int virSecretSetValue(SecretPointer virSecretPtr, byte[] value, NativeLong value_size, int flags); public int virSecretUndefine(SecretPointer virSecretPtr); //Stream Methods -- 1.7.5.4

3 5

[libvirt] Potential deadlock in libvirt lxc driver
by Thomas Hunger 25 Jun '12

25 Jun '12

Hi, I'm running version 0.9.10 on debian [1]. When starting and stopping containers I see deadlocks every so often. I attached a full backtrace (see at the end of the log). This seems to happen in conditions similar to the segfault I wrote about recently. I.e. usually when destroying domains. I'm unsure why but it seems to me that lxcMonitorEvent gets called after a vm has been freed. This happens despite lxcVmCleanup calling "virEventRemoveHandle(priv->monitorWatch);" to remove the handle. best, Tom [1] Linux zap 3.1.0-1-amd64 #1 SMP Tue Jan 10 05:01:58 UTC 2012 x86_64 GNU/Linux

2 5

[libvirt] [ANNOUNCE] libvirt-glib 0.0.9 release
by Daniel P. Berrange 25 Jun '12

25 Jun '12

I am pleased to announce that a new release of the libvirt-glib package, version 0.0.8 is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Full API docs for libvirt-glib library - Add API for getting domain OS config - Add API for getting domain OS boot devices - Add APIs for querying host capabilities - Add missing domain OS type enum values - Add API for getting domain virt type - Add comprehensive API arg checking - Add API for getting domain arch - Allow zero timeouts in timer - Fix build with newer glibc-headers and -O0 - Fix generation of filesystem source element - Port to use Mingw64 toolchain for automated builds - Add async API for starting domains - Fix thread safety of event loop timeouts/watches - Add support for filesystem type=bind|ram libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list redhat com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] storage backend rbd: Do not prefix rbd: on volume names.
by Wido den Hollander 25 Jun '12

25 Jun '12

We used to prefix 'rbd:' to volume names, this is not necessary. Qemu takes RBD devices in this way, like: qemu -drive rbd:pool/image When attaching a network disk like RBD to a guest we however do not use this prefix. Currently you can't map a RBD volume name directly to a domain without removing the prefix. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/storage/storage_backend_rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 3e7464c..7615dcc 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -237,7 +237,7 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, vol->type = VIR_STORAGE_VOL_NETWORK; VIR_FREE(vol->target.path); - if (virAsprintf(&vol->target.path, "rbd:%s/%s", + if (virAsprintf(&vol->target.path, "%s/%s", pool->def->source.name, vol->name) == -1) { virReportOOMError(); -- 1.7.9.5

3 2

[libvirt] [PATCH 1/2] storage: Switch to new def on pool-destroy
by Michal Privoznik 25 Jun '12

25 Jun '12

Currently, we share the idea of old & new def with domains. Users can *-edit an object (domain, pool) which spawns a new internal representation for them. This is referenced via {domainObj,poolObj}->newDef [compared to ->def]. However, for pool we were never overwriting def with newDef. This must be done on pool-destroy (like we do analogically in domain detroy). --- src/storage/storage_driver.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 88f3809..3b95c70 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -794,6 +794,10 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (pool->configFile == NULL) { virStoragePoolObjRemove(&driver->pools, pool); pool = NULL; + } else if (pool->newDef) { + virStoragePoolDefFree(pool->def); + pool->def = pool->newDef; + pool->newDef = NULL; } ret = 0; @@ -804,7 +808,6 @@ cleanup: return ret; } - static int storagePoolDelete(virStoragePoolPtr obj, unsigned int flags) { -- 1.7.8.5

3 7

[libvirt] [PATCH] qemu: Improve error if setmem fails for lacking of balloon support
by Osier Yang 25 Jun '12

25 Jun '12

"cannot set memory of an active domain" is misleading, it sounds like setting memory of active domain is not supported. --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5713650..bb33fd5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2037,7 +2037,8 @@ static int qemudDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, /* Lack of balloon support is a fatal error */ if (r == 0) { qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot set memory of an active domain")); + _("Lacks of balloon support, perhaps" + " the balloon device is disabled")); goto endjob; } } -- 1.7.7.3

2 2

[libvirt] This patch creates a mount point for libvirt-lxc containers to mount on the destination system if it does not exist.
by Daniel J Walsh 25 Jun '12

25 Jun '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Currently libvirt-lxc checks to see if the destination exists and is a directory. If it is not a directory then the mount fails. Since libvirt-lxc can bind mount files on an inode, this patch is needed to allow us to bind mount files on files. Currently we want to bind mount on top of /etc/machine-id, and /etc/adjtime If the destination of the mount point does not exists, it checks if the src is a directory and then attempts to create a directory, otherwise it creates an empty file for the destination. The code will then bind mount over the destination. Current code blows up if the destination was not a directory. We want to be able to bind mount files on files. Sorry if you are seeing this patch for the second time, since I sent it to the wrong list. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/kel4ACgkQrlYvE4MpobP7uwCfXUPMJP4bNZiBGTwnJ70dezVf KPwAnjt3MYSlHxkcwZCe5H1X4C0P4ky/ =1te/ -----END PGP SIGNATURE-----

2 2

[libvirt] [PATCH libvirt-gconfig] Add support for domain filesystems with type=bind|ram
by Daniel P. Berrange 25 Jun '12

25 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> This adds support for filesystems with type=bind or type=ram, eg <filesystem type='bind'> <source dir="/some/guest/file"/> <target dir=/other/guest/file"/> </filesystem> And <filesystem type='ram'> <source usage='102400'/> <target dir='/run'/> </filesystem> Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 19 +++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain-filesys.h | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index c9c7aa8..54f124a 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -146,6 +146,7 @@ void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, switch (filesys->priv->type) { case GVIR_CONFIG_DOMAIN_FILESYS_MOUNT: + case GVIR_CONFIG_DOMAIN_FILESYS_BIND: attribute_name = "dir"; break; case GVIR_CONFIG_DOMAIN_FILESYS_FILE: @@ -157,6 +158,9 @@ void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, case GVIR_CONFIG_DOMAIN_FILESYS_TEMPLATE: attribute_name = "name"; break; + case GVIR_CONFIG_DOMAIN_FILESYS_RAM: + g_return_if_reached(); + default: g_return_if_reached(); } @@ -166,6 +170,21 @@ void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, attribute_name, source); } +void gvir_config_domain_filesys_set_ram_usage(GVirConfigDomainFilesys *filesys, + guint64 bytes) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); + GVirConfigObject *src; + + src = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), + "source"); + + gvir_config_object_set_attribute_with_type(src, + "usage", G_TYPE_UINT64, bytes, + "units", G_TYPE_STRING, "bytes", + NULL); + +} void gvir_config_domain_filesys_set_target(GVirConfigDomainFilesys *filesys, const char *path) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.h b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h index 2ceb2a8..e4b7c20 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h @@ -61,6 +61,8 @@ typedef enum { GVIR_CONFIG_DOMAIN_FILESYS_BLOCK, GVIR_CONFIG_DOMAIN_FILESYS_FILE, GVIR_CONFIG_DOMAIN_FILESYS_TEMPLATE, + GVIR_CONFIG_DOMAIN_FILESYS_RAM, + GVIR_CONFIG_DOMAIN_FILESYS_BIND, } GVirConfigDomainFilesysType; typedef enum { @@ -89,6 +91,8 @@ void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys GVirConfigDomainFilesysDriverType type); void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, const char *source); +void gvir_config_domain_filesys_set_ram_usage(GVirConfigDomainFilesys *filesys, + guint64 bytes); void gvir_config_domain_filesys_set_target(GVirConfigDomainFilesys *filesys, const char *target); void gvir_config_domain_filesys_set_readonly(GVirConfigDomainFilesys *filesys, -- 1.7.10.2

2 1

[libvirt] [PATCH] conf: Fill listenAddr from driver if none set
by Michal Privoznik 25 Jun '12

25 Jun '12

Currently, if domain's graphic has no listenAddr set we provide the one from qemu.conf. However, we must make this transient to not overwrite future changes to the config file. Moreover, we have to store this into domain state XML so we remain consistent on eventual config file edits. --- Since users will never see new 'driverListenAddress' attribute I don't think update of RNG schema is necessary. src/conf/domain_conf.c | 14 ++++++++++++++ src/conf/domain_conf.h | 6 ++++++ src/qemu/qemu_command.c | 18 ++++++++++++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4651765..29fa215 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -909,6 +909,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) for (ii = 0; ii < def->nListens; ii++) virDomainGraphicsListenDefClear(&def->listens[ii]); VIR_FREE(def->listens); + VIR_FREE(def->driverListenAddress); VIR_FREE(def); } @@ -5976,6 +5977,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int nListens; xmlNodePtr *listenNodes = NULL; char *listenAddr = NULL; + char *driverListenAddress = NULL; xmlNodePtr save = ctxt->node; if (VIR_ALLOC(def) < 0) { @@ -5999,6 +6001,12 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, goto error; } + if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS) { + driverListenAddress = virXMLPropString(node, "driverListenAddress"); + if (driverListenAddress) + def->driverListenAddress = driverListenAddress; + } + if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC || def->type == VIR_DOMAIN_GRAPHICS_TYPE_RDP || def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { @@ -12323,9 +12331,15 @@ virDomainGraphicsDefFormat(virBufferPtr buf, break; } } + if (!listenAddr && !(flags & VIR_DOMAIN_XML_INACTIVE)) + listenAddr = def->driverListenAddress; virBufferAsprintf(buf, " <graphics type='%s'", type); + if (flags & VIR_DOMAIN_XML_INTERNAL_STATUS && def->driverListenAddress) + virBufferAsprintf(buf, " driverListenAddress='%s'", + def->driverListenAddress); + switch (def->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: if (def->data.vnc.socket) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3712785..6ad48fd 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1273,6 +1273,12 @@ struct _virDomainGraphicsDef { * simplify parsing code.*/ size_t nListens; virDomainGraphicsListenDefPtr listens; + + /* In qemu driver if none of 'listens' contain usable listen address, + * the one from qemu.conf file is taken. However, we cannot store it + * into inactive XML as it would discard all future changes made to + * the config file. */ + char * driverListenAddress; }; enum virDomainRedirdevBus { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6549f57..9878a66 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5496,8 +5496,15 @@ qemuBuildCommandLine(virConnectPtr conn, break; } - if (!listenAddr) + if (!listenAddr) { listenAddr = driver->vncListen; + if (listenAddr && + !(def->graphics[0]->driverListenAddress = + strdup(listenAddr))) { + virReportOOMError(); + goto error; + } + } escapeAddr = strchr(listenAddr, ':') != NULL; if (escapeAddr) @@ -5647,8 +5654,15 @@ qemuBuildCommandLine(virConnectPtr conn, break; } - if (!listenAddr) + if (!listenAddr) { listenAddr = driver->spiceListen; + if (listenAddr && + !(def->graphics[0]->driverListenAddress = + strdup(listenAddr))) { + virReportOOMError(); + goto error; + } + } if (listenAddr) virBufferAsprintf(&opt, ",addr=%s", listenAddr); -- 1.7.8.5

2 5

[libvirt] [libvirt-glib] mainloop integration fixes
by Christophe Fergeau 25 Jun '12

25 Jun '12

Hey, While testing Boxes, I've noticed that if I started a VM and then let it in the background for a while, it usually crashed after a while. When this happens, the backtrace is: Program received signal SIGSEGV, Segmentation fault. 0x00007ffff6671898 in gvir_event_handle_dispatch (source=0x7fffdc001f60, condition=G_IO_IN, opaque=0x7fffdc0021a0) at libvirt-glib-event.c:135 135 (data->cb)(data->watch, data->fd, events, data->opaque); (gdb) bt #0 0x00007ffff6671898 in gvir_event_handle_dispatch (source=0x7fffdc001f60, condition=G_IO_IN, opaque=0x7fffdc0021a0) at libvirt-glib-event.c:135 #1 0x00007ffff231dcb4 in g_io_unix_dispatch (source=0x40e34a0, callback=0x7ffff66717d8 <gvir_event_handle_dispatch>, user_data=0x7fffdc0021a0) at giounix.c:166 #2 0x00007ffff22cef15 in g_main_dispatch (context=0x7007f0) at gmain.c:2539 #3 0x00007ffff22cfbda in g_main_context_dispatch (context=0x7007f0) at gmain.c:3075 #4 0x00007ffff22cfdbd in g_main_context_iterate (context=0x7007f0, block=1, dispatch=1, self=0x15d3180) at gmain.c:3146 #5 0x00007ffff22cfe81 in g_main_context_iteration (context=0x7007f0, may_block=1) at gmain.c:3207 #6 0x00007ffff2ad7e7c in g_application_run (application=0x70b890, argc=0, argv=0x0) at gapplication.c:1607 #7 0x000000000041df98 in boxes_app_run (self=0x1527010) at app.c:1254 #8 0x0000000000450134 in _vala_main (args=0x7fffffffd708, args_length1=1) at main.c:729 #9 0x000000000045019e in main (argc=1, argv=0x7fffffffd708) at main.c:740 and the corresponding gvir_event_handle structure is corrupted: (gdb) p *data $3 = {watch = 0, fd = 0, events = 1886417008, enabled = 1886417008, channel = 0x7070707070707070, source = 1886417008, cb = 0x7070707070707070, opaque = 0x7070707070707070, ff = 0x7ffff60cfba0 <virNetSocketEventFree>} (gdb) p/x *data $4 = {watch = 0x0, fd = 0x0, events = 0x70707070, enabled = 0x70707070, channel = 0x7070707070707070, source = 0x70707070, cb = 0x7070707070707070, opaque = 0x7070707070707070, ff = 0x7ffff60cfba0} (I'm running with MALLOC_PERTURB_ set so the 0x70707070 pattern indicates uninitialized memory). Right before this happens, the libvirt-glib event debugging log has: (gnome-boxes:29577): Libvirt.GLib-DEBUG: Remove handle 0x7fffdc0021a0 1 27 (gnome-boxes:29577): Libvirt.GLib-DEBUG: Update handle 0x7fffdc0021a0 1 27 1 (gnome-boxes:29577): Libvirt.GLib-DEBUG: Update for missing handle watch 1 (gnome-boxes:29577): Libvirt.GLib-DEBUG: Dispatch handler 0x7fffdc0021a0 0 0 1 0x7070707070707070 that is, libvirt removes a handle watch, and then updates this handle (in other words, it calls virEventPollUpdateHandle after having called virEventPollRemoveHandle on the same handle). I don't know if it's legit for libvirt to do that, but we can make libvirt-glib robust against this situation, which is what patch 5/5 does. The first 3 patches are small cleanups, and 4/5 fixes a potential race which I found while looking at this code. Christophe

2 13

[libvirt] [libvirt-glib 1/8] Setters/adders for GVirConfigCapabilitiesCpu props
by Zeeshan Ali (Khattak) 25 Jun '12

25 Jun '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> - gvir_config_capabilities_cpu_add_feature - gvir_config_capabilities_cpu_set_topology --- libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c | 32 ++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h | 6 ++++ libvirt-gconfig/libvirt-gconfig.sym | 2 ++ 3 files changed, 40 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c index df77364..e517a20 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.c @@ -56,6 +56,21 @@ gvir_config_capabilities_cpu_get_arch(GVirConfigCapabilitiesCpu *cpu) return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(cpu), "arch"); } +/** + * gvir_config_capabilities_cpu_add_feature: + * + * Adds a new feature to CPU. + */ +void gvir_config_capabilities_cpu_add_feature(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuFeature *feature) +{ + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU(cpu)); + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU_FEATURE(feature)); + + gvir_config_object_attach_add(GVIR_CONFIG_OBJECT(cpu), + GVIR_CONFIG_OBJECT(feature)); +} + struct GetFeatureData { GVirConfigXmlDoc *doc; const gchar *schema; @@ -133,3 +148,20 @@ gvir_config_capabilities_cpu_get_topology(GVirConfigCapabilitiesCpu *cpu) return GVIR_CONFIG_CAPABILITIES_CPU_TOPOLOGY(object); } + +/** + * gvir_config_capabilities_cpu_set_topology: + * + * Sets the topology of the cpu. + */ +void +gvir_config_capabilities_cpu_set_topology(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuTopology *topology) +{ + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU(cpu)); + g_return_if_fail(GVIR_CONFIG_IS_CAPABILITIES_CPU_TOPOLOGY(topology)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(cpu), + "topology", + GVIR_CONFIG_OBJECT(topology)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h index 4d896ef..67fe607 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-cpu.h @@ -29,6 +29,7 @@ #define __LIBVIRT_GCONFIG_CAPABILITIES_CPU_H__ #include "libvirt-gconfig-capabilities-cpu-topology.h" +#include "libvirt-gconfig-capabilities-cpu-feature.h" G_BEGIN_DECLS @@ -63,10 +64,15 @@ GType gvir_config_capabilities_cpu_get_type(void); const gchar * gvir_config_capabilities_cpu_get_arch(GVirConfigCapabilitiesCpu *cpu); +void gvir_config_capabilities_cpu_add_feature(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuFeature *feature); GList * gvir_config_capabilities_cpu_get_features(GVirConfigCapabilitiesCpu *cpu); GVirConfigCapabilitiesCpuTopology * gvir_config_capabilities_cpu_get_topology(GVirConfigCapabilitiesCpu *cpu); +void +gvir_config_capabilities_cpu_set_topology(GVirConfigCapabilitiesCpu *cpu, + GVirConfigCapabilitiesCpuTopology *topology); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 5473148..a9e5da5 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -389,9 +389,11 @@ LIBVIRT_GCONFIG_0.0.9 { gvir_config_capabilities_get_guests; gvir_config_capabilities_cpu_get_type; + gvir_config_capabilities_cpu_add_feature; gvir_config_capabilities_cpu_get_arch; gvir_config_capabilities_cpu_get_features; gvir_config_capabilities_cpu_get_topology; + gvir_config_capabilities_cpu_set_topology; gvir_config_capabilities_cpu_feature_get_type; gvir_config_capabilities_cpu_feature_get_name; -- 1.7.10.4

3 13

[libvirt] [PATCH v2] storage: Introduce --inactive for pool-dumpxml
by Michal Privoznik 25 Jun '12

25 Jun '12

Storage is one of the last domains in libvirt where we don't fully utilize inactive and live XML. Okay, it might be because we don't have support for that. So implement such support. However, we need to fallback when talking to old daemon which doesn't support this new flag called VIR_STORAGE_XML_INACTIVE. --- include/libvirt/libvirt.h.in | 4 ++++ src/libvirt.c | 2 +- src/storage/storage_driver.c | 10 ++++++++-- tools/virsh.c | 24 ++++++++++++++++++++++-- tools/virsh.pod | 4 +++- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 024c4ec..6e8d5dd 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2445,6 +2445,10 @@ struct _virStorageVolInfo { typedef virStorageVolInfo *virStorageVolInfoPtr; +typedef enum { + VIR_STORAGE_XML_INACTIVE = (1 << 0), /* dump inactive pool/volume information */ +} virStorageXMLFlags; + /* * Get connection from pool. */ diff --git a/src/libvirt.c b/src/libvirt.c index 0aa50cb..ef5ac47 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12169,7 +12169,7 @@ error: /** * virStoragePoolGetXMLDesc: * @pool: pointer to storage pool - * @flags: bitwise-OR of virDomainXMLFlags + * @flags: bitwise-OR of virStorageXMLFlags * * Fetch an XML document describing all aspects of the * storage pool. This is suitable for later feeding back diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 3b95c70..fbc630d 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -960,9 +960,10 @@ storagePoolGetXMLDesc(virStoragePoolPtr obj, { virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStoragePoolObjPtr pool; + virStoragePoolDefPtr def; char *ret = NULL; - virCheckFlags(0, NULL); + virCheckFlags(VIR_STORAGE_XML_INACTIVE, NULL); storageDriverLock(driver); pool = virStoragePoolObjFindByUUID(&driver->pools, obj->uuid); @@ -974,7 +975,12 @@ storagePoolGetXMLDesc(virStoragePoolPtr obj, goto cleanup; } - ret = virStoragePoolDefFormat(pool->def); + if ((flags & VIR_STORAGE_XML_INACTIVE) && pool->newDef) + def = pool->newDef; + else + def = pool->def; + + ret = virStoragePoolDefFormat(def); cleanup: if (pool) diff --git a/tools/virsh.c b/tools/virsh.c index 567a5f6..2b4cb2c 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10807,6 +10807,7 @@ static const vshCmdInfo info_pool_dumpxml[] = { static const vshCmdOptDef opts_pool_dumpxml[] = { {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, N_("pool name or uuid")}, + {"inactive", VSH_OT_BOOL, 0, N_("show inactive defined XML")}, {NULL, 0, 0, NULL} }; @@ -10815,15 +10816,20 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) { virStoragePoolPtr pool; bool ret = true; + bool inactive = vshCommandOptBool(cmd, "inactive"); + unsigned int flags = 0; char *dump; + if (inactive) + flags |= VIR_STORAGE_XML_INACTIVE; + if (!vshConnectionUsability(ctl, ctl->conn)) return false; if (!(pool = vshCommandOptPool(ctl, cmd, "pool", NULL))) return false; - dump = virStoragePoolGetXMLDesc(pool, 0); + dump = virStoragePoolGetXMLDesc(pool, flags); if (dump != NULL) { vshPrint(ctl, "%s", dump); VIR_FREE(dump); @@ -16127,7 +16133,8 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd) bool ret = false; virStoragePoolPtr pool = NULL; virStoragePoolPtr pool_edited = NULL; - unsigned int flags = 0; + unsigned int flags = VIR_STORAGE_XML_INACTIVE; + char *tmp_desc = NULL; if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; @@ -16136,6 +16143,19 @@ cmdPoolEdit(vshControl *ctl, const vshCmd *cmd) if (pool == NULL) goto cleanup; + /* Some old daemons don't support _INACTIVE flag */ + if (!(tmp_desc = virStoragePoolGetXMLDesc(pool, flags))) { + if (last_error->code == VIR_ERR_INVALID_ARG) { + flags &= ~VIR_STORAGE_XML_INACTIVE; + virFreeError(last_error); + last_error = NULL; + } else { + goto cleanup; + } + } else { + VIR_FREE(tmp_desc); + } + #define EDIT_GET_XML virStoragePoolGetXMLDesc(pool, flags) #define EDIT_NOT_CHANGED \ vshPrint(ctl, _("Pool %s XML configuration not changed.\n"), \ diff --git a/tools/virsh.pod b/tools/virsh.pod index f83a29d..191c9f2 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2112,9 +2112,11 @@ Destroy the resources used by a given I<pool> object. This operation is non-recoverable. The I<pool> object will still exist after this command, ready for the creation of new storage volumes. -=item B<pool-dumpxml> I<pool-or-uuid> +=item B<pool-dumpxml> [I<--inactive>] I<pool-or-uuid> Returns the XML information about the I<pool> object. +I<--inactive> tells virsh to dump pool configuration that will be used +on next start of the pool as opposed to the current pool configuration. =item B<pool-edit> I<pool-or-uuid> -- 1.7.8.5

2 1

[libvirt] [PATCH] sanlock: Properly indent
by Michal Privoznik 25 Jun '12

25 Jun '12

One of latest patches (0fce94fe) didn't properly indented #define making syntax-check fail. --- Pushed under build-breaker rule. src/locking/lock_driver_sanlock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 9668ca9..26bdde8 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -60,7 +60,7 @@ * too old to provide that define, and probably the functionality too */ #ifndef SANLK_RES_SHARED -#define SANLK_RES_SHARED 0x4 +# define SANLK_RES_SHARED 0x4 #endif typedef struct _virLockManagerSanlockDriver virLockManagerSanlockDriver; -- 1.7.8.5

1 0

[libvirt] [PATCH] Fix compilation on older sanlock
by Daniel Veillard 25 Jun '12

25 Jun '12

This is clearly not ideal, but we ought to check the version of sanlock and act accordingly. We may end up with autoconf.ac and libvirt.spec.in change for the real fix. Pushing under the build breaker rule Temporary fix since compilation broke with older version of sanlock following acbd4965c44c4dbc676dfe89aff970052e376073 diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 16941c9..9668ca9 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -55,6 +55,14 @@ #define VIR_LOCK_MANAGER_SANLOCK_AUTO_DISK_LOCKSPACE "__LIBVIRT__DISKS__" +/* + * temporary fix for the case where the sanlock devel package is + * too old to provide that define, and probably the functionality too + */ +#ifndef SANLK_RES_SHARED +#define SANLK_RES_SHARED 0x4 +#endif + typedef struct _virLockManagerSanlockDriver virLockManagerSanlockDriver; typedef virLockManagerSanlockDriver *virLockManagerSanlockDriverPtr; -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] This patch mounts /run and /var/run before running a sandbox container
by Daniel J Walsh 25 Jun '12

25 Jun '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 We do not want to share /run between containers and the host. This patch mounts a tmpfs on /run and then bind mounts /run on /var/run. Reason this is pach 0003 is that this is a part of a previous patch set that was never applied. Sorry to those who are receiving this patch for the second time, as I sent it first to the wrong list. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk/keZcACgkQrlYvE4MpobNnagCgyHc9igEYxPT/Bblf1XVPkwMX EM0Anj9xzzf9k88He1gkoXKBEAija52U =4Uny -----END PGP SIGNATURE-----

2 1

[libvirt] regression ?
by Harsh Bora 25 Jun '12

25 Jun '12

Hi, I was testing an under-development patch on upstream libvirt using domxml-to-native and domxml-from-native and realised that the domxml-from-native fails for a successfully generated qemu cmd line using domxml-to-native. To isolate the issue, I tried generating the qemu cmd line for tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml like this: $virsh domxml-to-native qemu-argv tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml > qemu-args Now, when I try to generate the XML back for the same CLI, it fails: $virsh domxml-from-native qemu-argv qem-args error: internal error missing index/unit/bus parameter in drive 'file=/dev/HostVG/QEMUGuest1,if=none,id=drive-ide0-0-0,format=raw' Does anyone have any idea, what could be causing this ? regards, Harsh

2 1

[libvirt] [PATCH] virsh: Use virXPath wrappers for vncdisplay cmd
by Doug Goldstein 25 Jun '12

25 Jun '12

Update the vncdisplay command to use the virXPath wrappers as well as check if the domain is up rather than using the port set to -1 to mean the domain is not up. Signed-off-by: Doug Goldstein <cardoe(a)cardoe.com> --- tools/virsh.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0354822..a6649f4 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13844,12 +13844,12 @@ static bool cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) { xmlDocPtr xml = NULL; - xmlXPathObjectPtr obj = NULL; xmlXPathContextPtr ctxt = NULL; virDomainPtr dom; bool ret = false; int port = 0; char *doc; + char *listen_addr; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -13857,6 +13857,12 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; + /* Check if the domain is active and don't rely on -1 for this */ + if (!virDomainIsActive(dom)) { + vshError(ctl, _("Domain is not running")); + goto cleanup; + } + doc = virDomainGetXMLDesc(dom, 0); if (!doc) goto cleanup; @@ -13866,29 +13872,23 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) if (!xml) goto cleanup; - obj = xmlXPathEval(BAD_CAST "string(/domain/devices/graphics[@type='vnc']/@port)", ctxt); - if (obj == NULL || obj->type != XPATH_STRING || - obj->stringval == NULL || obj->stringval[0] == 0) { + /* Get the VNC port */ + if (virXPathInt("string(/domain/devices/graphics[@type='vnc']/@port)", + ctxt, &port)) { + vshError(ctl, _("Failed to get VNC port. Is this domain using VNC?")); goto cleanup; } - if (virStrToLong_i((const char *)obj->stringval, NULL, 10, &port) || port < 0) - goto cleanup; - xmlXPathFreeObject(obj); - obj = xmlXPathEval(BAD_CAST "string(/domain/devices/graphics[@type='vnc']/@listen)", ctxt); - if (obj == NULL || obj->type != XPATH_STRING || - obj->stringval == NULL || obj->stringval[0] == 0 || - STREQ((const char*)obj->stringval, "0.0.0.0")) { + listen_addr = virXPathString("string(/domain/devices/graphics" + "[@type='vnc']/@listen)", ctxt); + if (listen_addr == NULL || STREQ((const char *)listen_addr, "0.0.0.0")) { vshPrint(ctl, ":%d\n", port-5900); } else { - vshPrint(ctl, "%s:%d\n", (const char *)obj->stringval, port-5900); + vshPrint(ctl, "%s:%d\n", (const char *)listen_addr, port-5900); } - xmlXPathFreeObject(obj); - obj = NULL; ret = true; cleanup: - xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); virDomainFree(dom); -- 1.7.3.4

2 1

[libvirt] [PATCH] Add support for guest bind mounts with LXC
by Daniel P. Berrange 25 Jun '12

25 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently you can configure LXC to bind a host directory to a guest directory, but not to bind a guest directory to a guest directory. While the guest container init could do this itself, allowing it in the libvirt XML means a stricter SELinux policy can be written --- src/conf/domain_conf.c | 7 +++++-- src/conf/domain_conf.h | 11 ++++++----- src/lxc/lxc_container.c | 7 +++++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a653fe6..8ce122e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -263,7 +263,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "block", "file", "template", - "ram") + "ram", + "bind") VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", @@ -4260,7 +4261,8 @@ virDomainFSDefParseXML(xmlNodePtr node, if (!source && xmlStrEqual(cur->name, BAD_CAST "source")) { - if (def->type == VIR_DOMAIN_FS_TYPE_MOUNT) + if (def->type == VIR_DOMAIN_FS_TYPE_MOUNT || + def->type == VIR_DOMAIN_FS_TYPE_BIND) source = virXMLPropString(cur, "dir"); else if (def->type == VIR_DOMAIN_FS_TYPE_FILE) source = virXMLPropString(cur, "file"); @@ -11335,6 +11337,7 @@ virDomainFSDefFormat(virBufferPtr buf, switch (def->type) { case VIR_DOMAIN_FS_TYPE_MOUNT: + case VIR_DOMAIN_FS_TYPE_BIND: virBufferEscapeString(buf, " <source dir='%s'/>\n", def->src); break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b8d9c87..bdb1f75 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -656,11 +656,12 @@ struct _virDomainControllerDef { /* Two types of disk backends */ enum virDomainFSType { - VIR_DOMAIN_FS_TYPE_MOUNT, /* Better named 'bind' */ - VIR_DOMAIN_FS_TYPE_BLOCK, - VIR_DOMAIN_FS_TYPE_FILE, - VIR_DOMAIN_FS_TYPE_TEMPLATE, - VIR_DOMAIN_FS_TYPE_RAM, + VIR_DOMAIN_FS_TYPE_MOUNT, /* Mounts (binds) a host dir on a guest dir */ + VIR_DOMAIN_FS_TYPE_BLOCK, /* Mounts a host block dev on a guest dir */ + VIR_DOMAIN_FS_TYPE_FILE, /* Loopback mounts a host file on a guest dir */ + VIR_DOMAIN_FS_TYPE_TEMPLATE, /* Expands a OS template to a guest dir */ + VIR_DOMAIN_FS_TYPE_RAM, /* Mount a RAM filesystem on a guest dir */ + VIR_DOMAIN_FS_TYPE_BIND, /* Binds a guest dir to another guest dir */ VIR_DOMAIN_FS_TYPE_LAST }; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index b69255e..bf67ba1 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1025,7 +1025,14 @@ static int lxcContainerMountFS(virDomainFSDefPtr fs, if (lxcContainerMountFSTmpfs(fs) < 0) return -1; break; + case VIR_DOMAIN_FS_TYPE_BIND: + if (lxcContainerMountFSBind(fs, "") < 0) + return -1; + break; case VIR_DOMAIN_FS_TYPE_FILE: + /* We do actually support this, but the lxc controller + * should have associated the file with a loopback + * device and changed this to TYPE_BLOCK for us */ lxcError(VIR_ERR_INTERNAL_ERROR, _("Unexpected filesystem type %s"), virDomainFSTypeToString(fs->type)); -- 1.7.10.2

2 1

[libvirt] [PATCH] qemu: Support attaching controller device persistently
by Osier Yang 25 Jun '12

25 Jun '12

src/conf/domain_conf.*: (Introduce virDomainControllerFind) src/libvirt_private.syms: (Add virDomainControllerFind to private symbol) src/qemu/qemu_driver.c: (Use of virDomainControllerFind) src/qemu/qemu_driver.c: (Support attaching controller device persistently) --- src/conf/domain_conf.c | 17 +++++++++++++++++ src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 17 +++++++++++++++++ src/qemu/qemu_hotplug.c | 14 +++++--------- 5 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4651765..f2e8271 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7520,6 +7520,23 @@ void virDomainControllerInsertPreAlloced(virDomainDefPtr def, def->ncontrollers++; } +bool +virDomainControllerFind(virDomainDefPtr def, + virDomainControllerDefPtr controller) +{ + int i; + bool found = false; + + for (i = 0 ; i < def->ncontrollers ; i++) { + if ((def->controllers[i]->type == controller->type) && + (def->controllers[i]->idx == controller->idx)) { + found = true; + break; + } + } + + return found; +} int virDomainLeaseIndex(virDomainDefPtr def, virDomainLeaseDefPtr lease) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3712785..f7e7dca 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2036,7 +2036,7 @@ int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller); void virDomainControllerInsertPreAlloced(virDomainDefPtr def, virDomainControllerDefPtr controller); - +bool virDomainControllerFind(virDomainDefPtr def, virDomainControllerDefPtr controller); int virDomainLeaseIndex(virDomainDefPtr def, virDomainLeaseDefPtr lease); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2fe5068..a75086b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -263,6 +263,7 @@ virDomainClockOffsetTypeFromString; virDomainClockOffsetTypeToString; virDomainConfigFile; virDomainControllerDefFree; +virDomainControllerFind; virDomainControllerInsert; virDomainControllerInsertPreAlloced; virDomainControllerModelSCSITypeFromString; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2177c30..5713650 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5529,6 +5529,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, virDomainNetDefPtr net; virDomainHostdevDefPtr hostdev; virDomainLeaseDefPtr lease; + virDomainControllerDefPtr controller; switch (dev->type) { case VIR_DOMAIN_DEVICE_DISK: @@ -5600,6 +5601,22 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, dev->data.lease = NULL; break; + case VIR_DOMAIN_DEVICE_CONTROLLER: + controller = dev->data.controller; + if (virDomainControllerFind(vmdef, controller)) { + qemuReportError(VIR_ERR_INVALID_ARG, + _("Target already exists")); + return -1; + } + + if (virDomainControllerInsert(vmdef, controller) < 0) + return -1; + dev->data.controller = NULL; + + if (qemuDomainAssignAddresses(vmdef) < 0) + return -1; + break; + default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("persistent attach of device is not supported")); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c2fa75b..a9d9ff9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -308,21 +308,17 @@ int qemuDomainAttachPciControllerDevice(struct qemud_driver *driver, virDomainObjPtr vm, virDomainControllerDefPtr controller) { - int i; int ret = -1; const char* type = virDomainControllerTypeToString(controller->type); char *devstr = NULL; qemuDomainObjPrivatePtr priv = vm->privateData; bool releaseaddr = false; - for (i = 0 ; i < vm->def->ncontrollers ; i++) { - if ((vm->def->controllers[i]->type == controller->type) && - (vm->def->controllers[i]->idx == controller->idx)) { - qemuReportError(VIR_ERR_OPERATION_FAILED, - _("target %s:%d already exists"), - type, controller->idx); - return -1; - } + if (virDomainControllerFind(vm->def, controller)) { + qemuReportError(VIR_ERR_OPERATION_FAILED, + _("target %s:%d already exists"), + type, controller->idx); + return -1; } if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { -- 1.7.7.3

1 0

[libvirt] [PATCH] Add support for RAM filesystems for LXC
by Daniel P. Berrange 25 Jun '12

25 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Introduce a new syntax for filesystems to allow use of a RAM filesystem <filesystem type='ram'> <source usage='10' units='MiB'/> <target dir='/mnt'/> </filesystem> The usage units default to KiB to limit consumption of host memory. * docs/formatdomain.html.in: Document new syntax * docs/schemas/domaincommon.rng: Add new attributes * src/conf/domain_conf.c: Parsing/formatting of RAM filesystems * src/lxc/lxc_container.c: Mounting of RAM filesystems Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/formatdomain.html.in | 9 ++++++- docs/schemas/domaincommon.rng | 18 +++++++++++++ src/conf/domain_conf.c | 58 +++++++++++++++++++++++++++-------------- src/conf/domain_conf.h | 5 ++++ src/lxc/lxc_container.c | 49 ++++++++++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 21 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1f30772..99ca26e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1630,6 +1630,12 @@ format will be autodetected. Only used by LXC driver <span class="since">(since 0.9.5)</span>. </dd> + <dt><code>type='ram'</code></dt> + <dd> + An in-memory filesystem, using memory from the host OS. + The source element has a single attribute <code>usage</code> + which gives the memory usage limit in kibibytes. + <span class="since"> (since 0.9.13)</span></dd> </dl> The filesystem block has an optional attribute <code>accessmode</code> @@ -1669,7 +1675,8 @@ The resource on the host that is being accessed in the guest. The <code>name</code> attribute must be used with <code>type='template'</code>, and the <code>dir</code> attribute must - be used with <code>type='mount'</code> + be used with <code>type='mount'</code>. The <code>usage</code> attribute + is used with <code>type='ram'</code> to set the memory limit in KB. </dd> <dt><code>target</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 46e539d..4a04a65 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1289,6 +1289,24 @@ </element> </interleave> </group> + <group> + <attribute name="type"> + <value>ram</value> + </attribute> + <interleave> + <element name="source"> + <attribute name="usage"> + <ref name="unsignedLong"/> + </attribute> + <optional> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + </optional> + <empty/> + </element> + </interleave> + </group> </choice> <interleave> <element name="target"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5ea264f..a653fe6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -262,7 +262,8 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "mount", "block", "file", - "template") + "template", + "ram") VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, "default", @@ -4210,6 +4211,7 @@ virDomainFSDefParseXML(xmlNodePtr node, char *target = NULL; char *accessmode = NULL; char *wrpolicy = NULL; + char *usage = NULL; ctxt->node = node; @@ -4297,7 +4299,8 @@ virDomainFSDefParseXML(xmlNodePtr node, def->wrpolicy = VIR_DOMAIN_FS_WRPOLICY_DEFAULT; } - if (source == NULL) { + if (source == NULL && + def->type != VIR_DOMAIN_FS_TYPE_RAM) { virDomainReportError(VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); goto error; @@ -4309,6 +4312,16 @@ virDomainFSDefParseXML(xmlNodePtr node, goto error; } + if (def->type == VIR_DOMAIN_FS_TYPE_RAM) { + def->usage = VIR_DOMAIN_FS_RAM_DEFAULT_USAGE; + if (virDomainParseScaledValue("./source[0]", ctxt, + &def->usage, + 1024, + ULONG_LONG_MAX, + false) < 0) + goto error; + } + def->src = source; source = NULL; def->dst = target; @@ -4325,6 +4338,7 @@ cleanup: VIR_FREE(source); VIR_FREE(accessmode); VIR_FREE(wrpolicy); + VIR_FREE(usage); return def; @@ -11319,27 +11333,31 @@ virDomainFSDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } - if (def->src) { - switch (def->type) { - case VIR_DOMAIN_FS_TYPE_MOUNT: - virBufferEscapeString(buf, " <source dir='%s'/>\n", - def->src); - break; + switch (def->type) { + case VIR_DOMAIN_FS_TYPE_MOUNT: + virBufferEscapeString(buf, " <source dir='%s'/>\n", + def->src); + break; - case VIR_DOMAIN_FS_TYPE_BLOCK: - virBufferEscapeString(buf, " <source dev='%s'/>\n", - def->src); - break; + case VIR_DOMAIN_FS_TYPE_BLOCK: + virBufferEscapeString(buf, " <source dev='%s'/>\n", + def->src); + break; - case VIR_DOMAIN_FS_TYPE_FILE: - virBufferEscapeString(buf, " <source file='%s'/>\n", - def->src); - break; + case VIR_DOMAIN_FS_TYPE_FILE: + virBufferEscapeString(buf, " <source file='%s'/>\n", + def->src); + break; - case VIR_DOMAIN_FS_TYPE_TEMPLATE: - virBufferEscapeString(buf, " <source name='%s'/>\n", - def->src); - } + case VIR_DOMAIN_FS_TYPE_TEMPLATE: + virBufferEscapeString(buf, " <source name='%s'/>\n", + def->src); + break; + + case VIR_DOMAIN_FS_TYPE_RAM: + virBufferAsprintf(buf, " <source usage='%lld' units='KiB'/>\n", + def->usage); + break; } virBufferEscapeString(buf, " <target dir='%s'/>\n", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 86c1e63..b8d9c87 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -660,6 +660,7 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_BLOCK, VIR_DOMAIN_FS_TYPE_FILE, VIR_DOMAIN_FS_TYPE_TEMPLATE, + VIR_DOMAIN_FS_TYPE_RAM, VIR_DOMAIN_FS_TYPE_LAST }; @@ -690,11 +691,15 @@ enum virDomainFSWrpolicy { VIR_DOMAIN_FS_WRPOLICY_LAST }; +/* Allow 2 MB ram usage */ +#define VIR_DOMAIN_FS_RAM_DEFAULT_USAGE (1024 * 2) + struct _virDomainFSDef { int type; int fsdriver; int accessmode; int wrpolicy; /* enum virDomainFSWrpolicy */ + unsigned long long usage; char *src; char *dst; unsigned int readonly : 1; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 24b1017..b69255e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -335,6 +335,8 @@ static int lxcContainerPivotRoot(virDomainFSDefPtr root) ret = -1; + VIR_DEBUG("Pivot via %s", root->src); + /* root->parent must be private, so make / private. */ if (mount("", "/", NULL, MS_PRIVATE|MS_REC, NULL) < 0) { virReportSystemError(errno, "%s", @@ -966,6 +968,47 @@ cleanup: } +static int lxcContainerMountFSTmpfs(virDomainFSDefPtr fs) +{ + int ret = -1; + char *data = NULL; + + if (virAsprintf(&data, "size=%lldk", fs->usage) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (virFileMakePath(fs->dst) < 0) { + virReportSystemError(errno, + _("Failed to create %s"), + fs->dst); + goto cleanup; + } + + if (mount("tmpfs", fs->dst, "tmpfs", MS_NOSUID|MS_NODEV, data) < 0) { + virReportSystemError(errno, + _("Failed to mount directory %s as tmpfs"), + fs->dst); + goto cleanup; + } + + if (fs->readonly) { + VIR_DEBUG("Binding %s readonly", fs->dst); + if (mount(fs->dst, fs->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { + virReportSystemError(errno, + _("Failed to make directory %s readonly"), + fs->dst); + } + } + + ret = 0; + +cleanup: + VIR_FREE(data); + return ret; +} + + static int lxcContainerMountFS(virDomainFSDefPtr fs, const char *srcprefix) { @@ -978,6 +1021,10 @@ static int lxcContainerMountFS(virDomainFSDefPtr fs, if (lxcContainerMountFSBlock(fs, srcprefix) < 0) return -1; break; + case VIR_DOMAIN_FS_TYPE_RAM: + if (lxcContainerMountFSTmpfs(fs) < 0) + return -1; + break; case VIR_DOMAIN_FS_TYPE_FILE: lxcError(VIR_ERR_INTERNAL_ERROR, _("Unexpected filesystem type %s"), @@ -1441,6 +1488,8 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) for (i = 0 ; i < vmDef->nfss ; i++) { virDomainFSDefPtr fs = vmDef->fss[i]; + if (!fs->src) + continue; if (virFileResolveAllLinks(fs->src, &newroot) < 0) return -1; -- 1.7.10.2

2 1

[libvirt] [PATCH] [libvirt-test-API] modify test dir and log dir path in autotest.
by Lin Qing 25 Jun '12

25 Jun '12

In autotest,test dir match test class name,which should be 'libvirt_test_api' for libvirt-test-api test suit.And the default tar extract is 'src'.So we should modify the autotest_testdir as 'tests/libvirt_test_api',and autotetst log dir as 'tests/libvirt_test_api/src/log'.Otherwise,libvirt-test-api can not work in autotest. Signed-off-by: Qing Lin<qinglbj(a)linux.vnet.ibm.com> Signed-off-by: Li Zhang<zhlcindy(a)linux.vnet.ibm.com> --- libvirt-test-api | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-test-api b/libvirt-test-api index cec7679..017343c 100755 --- a/libvirt-test-api +++ b/libvirt-test-api @@ -141,8 +141,8 @@ class Main(object): testid = logname[-3:] log_xml_parser.add_test_xml(testrunid, testid) if os.environ.has_key('AUTODIR'): - autotest_testdir = os.path.join(os.environ['AUTODIR'],'tests/libvirt_test_API') - logfile = os.path.join('%s/libvirt-test-API/log/%s' % (autotest_testdir, testrunid), logname) + autotest_testdir = os.path.join(os.environ['AUTODIR'],'tests/libvirt_test_api') + logfile = os.path.join('%s/src/log/%s' % (autotest_testdir, testrunid), logname) else: logfile = os.path.join('log/%s' % testrunid, logname) procs.append(generator.FuncGen(cases_func_ref_dict, -- 1.7.10.2

2 2

[libvirt] libvirtd deadlock on shutdown
by Jim Fehlig 22 Jun '12

22 Jun '12

I'm looking into a libvirtd deadlock on daemon shutdown. The deadlock occurs when shutting down virNetServer. If the handling of a job is in flight in virNetServerHandleJob(), the virNetServer lock is acquired when freeing job->prog (src/rpc/virnetserver.c:167). But the lock is already held in virNetServerFree(), which is blocked in virThreadPoolFree() waiting for all the workers to finish. No progress can be made. The attached hack fixes the problem, but I'm not convinced this is an appropriate fix. Is it necessary to hold the virNetServer lock when calling virNetServerProgramFree(job->prog)? I notice the lock is not held in the error path of virNetServerHandleJob(). Thanks, Jim

5 11

[libvirt] qemu -numa option and non-contiguous CPU ranges
by Eduardo Habkost 22 Jun '12

22 Jun '12

Hi, I just noticed libvirt tries to use the -numa option in a way that qemu never understood: if a node is configured to have a non-contiguous set of CPUs, it tries to generate a command-line option that looks like: "-numa node,nodeid=...,cpus=0,2,4,mem=..." ^^^^^ But this format was never supported by qemu. This format is even a bit weird, as "," is an option separator, and it is being used as a separator _inside_ an option. My question is: should we support this option format in qemu, or should we change libvirt to use another format (that has yet to be implemented, because currently there's no way to specify a non-contiguous set of CPUs for a NUMA node). Any suggestions? -- Eduardo

3 3

[libvirt] [PATCHv2 0/5] Virtio support for S390
by Viktor Mihajlovski 22 Jun '12

22 Jun '12

Resending as a thread, same content. Please ignore previous submission. This series adds support for the s390 flavor of virtio devices. Since the s390 virtio devices are not implemented as PCI devices it is necessary to refactor some of the device address assignment code. Viktor Mihajlovski (5): S390: Extended qemuDomainAssignAddresses to be callable from everywhere. S390: Change tests to use (modified) qemuDomainAssignAddresses S390: Add support for virtio-s390 devices. S390: Domain Schema for s390-virtio machines. S390: Adding testcases for s390 docs/schemas/domaincommon.rng | 20 +++ src/conf/domain_conf.c | 11 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 7 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 140 ++++++++++++++++++-- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_process.c | 42 +------ .../qemuxml2argv-console-virtio-s390.args | 9 ++ .../qemuxml2argv-console-virtio-s390.xml | 24 ++++ .../qemuxml2argv-disk-virtio-s390.args | 5 + .../qemuxml2argv-disk-virtio-s390.xml | 22 +++ .../qemuxml2argv-minimal-s390.args | 5 + .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 +++ .../qemuxml2argv-net-virtio-s390.args | 5 + .../qemuxml2argv-net-virtio-s390.xml | 22 +++ tests/qemuxml2argvtest.c | 20 ++-- tests/qemuxmlnstest.c | 13 +-- tests/testutilsqemu.c | 31 +++++ 20 files changed, 333 insertions(+), 86 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml

1 5

[libvirt] [PATCH 0/5] Basic Enablement of s390
by Viktor Mihajlovski 22 Jun '12

22 Jun '12

Hi, although there's already some code in libvirt for qemu on s390 it has experienced a certain level of degradation over time. Or, to put it short: it is not compatible with upstream qemu/kvm. This is the first series of patches aimed to enable libvirt to manage qemu/kvm domains hosted on the s390 platform. The patches in this series address s390 specifics of node and hypervisor. Patches 2,3 and 5 are written by Thang Pham <thang.pham(a)us.ibm.com> the others are my doing. Since they all should go together, I am sending in Thang's as well, hoping to facilitate the review a bit this way. Thang Pham (3): S390: CPU support for s390(x) S390: Fixed Parser for /proc/cpuinfo needs to be adapted for your architecture S390: Added sysinfo for host on s390x. Viktor Mihajlovski (2): S390: Override QEMU_CAPS_NO_ACPI for s390x S390: Fixed core identification for s390 src/Makefile.am | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu_s390x.c | 80 ++++++++++++++++++++++ src/cpu/cpu_s390x.h | 31 +++++++++ src/nodeinfo.c | 11 +++ src/qemu/qemu_capabilities.c | 5 ++ src/util/sysinfo.c | 154 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 284 insertions(+), 0 deletions(-) create mode 100644 src/cpu/cpu_s390x.c create mode 100644 src/cpu/cpu_s390x.h -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

2 2

[libvirt] [PATCH][libvirt-sandbox] configure: Require higher version of glib
by Michal Privoznik 22 Jun '12

22 Jun '12

Since commit cfd4460b we must require glib-2.32.0 at least because we are using g_value_set_schar which was introduced in that release. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index f8956c4..8d91440 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AC_CANONICAL_HOST AM_SILENT_RULES([yes]) GIO_UNIX_REQUIRED=2.28.0 -GOBJECT_REQUIRED=2.28.0 +GOBJECT_REQUIRED=2.32.0 LIBVIRT_GLIB_REQUIRED=0.0.4 LIBVIRT_GOBJECT_REQUIRED=0.0.7 GOBJECT_INTROSPECTION_REQUIRED=0.10.8 -- 1.7.8.5

2 4

[libvirt] [PATCH 1/5] S390: Override QEMU_CAPS_NO_ACPI for s390x
by Viktor Mihajlovski 22 Jun '12

22 Jun '12

Starting a KVM guest on s390 fails immediately. This is because "qemu --help" reports -no-acpi even for the s390(x) architecture but -no-acpi isn't supported there. Workaround is to remove QEMU_CAPS_NO_ACPI from the capability set after the version/capability extraction. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4308833..0c01cb0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1511,6 +1511,11 @@ int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIBUS); } + /* S390 and probably other archs do not support no-acpi - + maybe the qemu option parsing should be re-thought. */ + if (STREQLEN(arch, "s390x", 5)) + qemuCapsClear(flags, QEMU_CAPS_NO_ACPI); + /* qemuCapsExtractDeviceStr will only set additional flags if qemu * understands the 0.13.0+ notion of "-device driver,". */ if (qemuCapsGet(flags, QEMU_CAPS_DEVICE) && -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

3 3

[libvirt] [PATCH libvirt-glib] Add async version of gvir_domain_start
by Marc-André Lureau 22 Jun '12

22 Jun '12

--- libvirt-gobject/libvirt-gobject-domain.c | 75 ++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 9 ++++ libvirt-gobject/libvirt-gobject.sym | 3 ++ 3 files changed, 87 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index 59af63f..088cd33 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -345,6 +345,81 @@ gboolean gvir_domain_start(GVirDomain *dom, return TRUE; } +typedef struct { + guint flags; +} DomainStartData; + +static void domain_start_data_free(DomainStartData *data) +{ + g_slice_free(DomainStartData, data); +} + +static void +gvir_domain_start_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable G_GNUC_UNUSED) +{ + GVirDomain *dom = GVIR_DOMAIN(object); + DomainStartData *data; + GError *err = NULL; + + data = g_simple_async_result_get_op_res_gpointer(res); + + if (!gvir_domain_start(dom, data->flags, &err)) + g_simple_async_result_take_error(res, err); +} + +/** + * gvir_domain_start_async: + * @dom: the domain + * @flags: the flags + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + * + * Asynchronous variant of #gvir_domain_start. + */ +void gvir_domain_start_async(GVirDomain *dom, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + DomainStartData *data; + + g_return_if_fail(GVIR_IS_DOMAIN(dom)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + data = g_slice_new0(DomainStartData); + data->flags = flags; + + res = g_simple_async_result_new(G_OBJECT(dom), + callback, + user_data, + gvir_domain_start_async); + g_simple_async_result_set_op_res_gpointer (res, data, (GDestroyNotify)domain_start_data_free); + g_simple_async_result_run_in_thread(res, + gvir_domain_start_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +gboolean gvir_domain_start_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_DOMAIN(dom), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(dom), gvir_domain_start_async), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) + return FALSE; + + return TRUE; +} + /** * gvir_domain_resume: * @dom: the domain diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 677fbe6..87b94f4 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -124,6 +124,15 @@ gint gvir_domain_get_id(GVirDomain *dom, gboolean gvir_domain_start(GVirDomain *dom, guint flags, GError **err); +void gvir_domain_start_async(GVirDomain *dom, + guint flags, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_domain_start_finish(GVirDomain *dom, + GAsyncResult *result, + GError **err); + gboolean gvir_domain_resume(GVirDomain *dom, GError **err); gboolean gvir_domain_stop(GVirDomain *dom, diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 7121794..94e441a 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -165,6 +165,9 @@ LIBVIRT_GOBJECT_0.0.9 { gvir_connection_get_capabilities; gvir_connection_get_capabilities_async; gvir_connection_get_capabilities_finish; + + gvir_domain_start_async; + gvir_domain_start_finish; } LIBVIRT_GOBJECT_0.0.8; # .... define new API here using predicted next version number .... -- 1.7.10.2

2 1

[libvirt] [PATCH] virsh: Improve error when trying to change vm's cpu count 0
by Peter Krempa 22 Jun '12

22 Jun '12

This patch adds a check for the count of processors the user requests for the guest machine so that invalid values produce a more helpful error message. --- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 55cbe2b..2ec84cd 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -5755,7 +5755,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(cmd, "count", &count) < 0) { + if (vshCommandOptInt(cmd, "count", &count) < 0 || count <= 0) { vshError(ctl, "%s", _("Invalid number of virtual CPUs")); goto cleanup; } -- 1.7.8.6

2 2

[libvirt] [PATCH] Add support for shared sanlock leases
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> A sanlock lease can be marked as shared (rather than exclusive) using SANLK_RES_SHARED flag. This adds support for that flag and ensures that in auto disk mode, any shared disks use shared leases. This also makes any read-only disks be completely ignored. These changes remove the need for the option ignore_readonly_and_shared_disks so that is removed Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 38 +++++++++++-------------------- src/locking/sanlock.conf | 7 ------ src/locking/test_libvirt_sanlock.aug.in | 1 - 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 146aefd..16941c9 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -65,7 +65,6 @@ struct _virLockManagerSanlockDriver { bool requireLeaseForDisks; int hostID; bool autoDiskLease; - bool ignoreReadonlyShared; char *autoDiskLeasePath; }; @@ -115,10 +114,6 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) CHECK_TYPE("auto_disk_leases", VIR_CONF_LONG); if (p) driver->autoDiskLease = p->l; - p = virConfGetValue(conf, "ignore_readonly_and_shared_disks"); - CHECK_TYPE("ignore_readonly_and_shared_disks", VIR_CONF_LONG); - if (p) driver->ignoreReadonlyShared = p->l; - p = virConfGetValue(conf, "disk_lease_dir"); CHECK_TYPE("disk_lease_dir", VIR_CONF_STRING); if (p && p->str) { @@ -428,7 +423,8 @@ static int virLockManagerSanlockDiskLeaseName(const char *path, static int virLockManagerSanlockAddLease(virLockManagerPtr lock, const char *name, size_t nparams, - virLockManagerParamPtr params) + virLockManagerParamPtr params, + bool shared) { virLockManagerSanlockPrivatePtr priv = lock->privateData; int ret = -1; @@ -440,6 +436,7 @@ static int virLockManagerSanlockAddLease(virLockManagerPtr lock, goto cleanup; } + res->flags = shared ? SANLK_RES_SHARED : 0; res->num_disks = 1; if (!virStrcpy(res->name, name, SANLK_NAME_LEN)) { virLockError(VIR_ERR_INTERNAL_ERROR, @@ -485,7 +482,8 @@ cleanup: static int virLockManagerSanlockAddDisk(virLockManagerPtr lock, const char *name, size_t nparams, - virLockManagerParamPtr params ATTRIBUTE_UNUSED) + virLockManagerParamPtr params ATTRIBUTE_UNUSED, + bool shared) { virLockManagerSanlockPrivatePtr priv = lock->privateData; int ret = -1; @@ -503,6 +501,7 @@ static int virLockManagerSanlockAddDisk(virLockManagerPtr lock, goto cleanup; } + res->flags = shared ? SANLK_RES_SHARED : 0; res->num_disks = 1; if (virLockManagerSanlockDiskLeaseName(name, res->name, SANLK_NAME_LEN) < 0) goto cleanup; @@ -630,27 +629,15 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock, return -1; } - if ((flags & (VIR_LOCK_MANAGER_RESOURCE_READONLY | - VIR_LOCK_MANAGER_RESOURCE_SHARED)) && - driver->ignoreReadonlyShared) { - return 0; - } - - if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) { - virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Readonly leases are not supported")); - return -1; - } - if (flags & VIR_LOCK_MANAGER_RESOURCE_SHARED) { - virLockError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Shareable leases are not supported")); - return -1; - } + /* Treat R/O resources as a no-op lock request */ + if (flags & VIR_LOCK_MANAGER_RESOURCE_READONLY) + return 0; switch (type) { case VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK: if (driver->autoDiskLease) { - if (virLockManagerSanlockAddDisk(lock, name, nparams, params) < 0) + if (virLockManagerSanlockAddDisk(lock, name, nparams, params, + !!(flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)) < 0) return -1; if (virLockManagerSanlockCreateLease(priv->res_args[priv->res_count-1]) < 0) @@ -664,7 +651,8 @@ static int virLockManagerSanlockAddResource(virLockManagerPtr lock, break; case VIR_LOCK_MANAGER_RESOURCE_TYPE_LEASE: - if (virLockManagerSanlockAddLease(lock, name, nparams, params) < 0) + if (virLockManagerSanlockAddLease(lock, name, nparams, params, + !!(flags & VIR_LOCK_MANAGER_RESOURCE_SHARED)) < 0) return -1; break; diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf index 19ab2b3..efc35ee 100644 --- a/src/locking/sanlock.conf +++ b/src/locking/sanlock.conf @@ -52,10 +52,3 @@ # to enabled, otherwise it defaults to disabled. # #require_lease_for_disks = 1 - -# -# Enable this flag to have sanlock ignore readonly and shared disks. -# If disabled, then this rejects attempts to share resources until -# sanlock gains support for shared locks. -# -#ignore_readonly_and_shared_disks = 1 diff --git a/src/locking/test_libvirt_sanlock.aug.in b/src/locking/test_libvirt_sanlock.aug.in index 1f05558..288f329 100644 --- a/src/locking/test_libvirt_sanlock.aug.in +++ b/src/locking/test_libvirt_sanlock.aug.in @@ -6,4 +6,3 @@ module Test_libvirt_sanlock = { "disk_lease_dir" = "/var/lib/libvirt/sanlock" } { "host_id" = "1" } { "require_lease_for_disks" = "1" } -{ "ignore_readonly_and_shared_disks" = "1" } -- 1.7.10.2

3 3

[libvirt] [PATCH] Allow NOCONFIGURE=1 to make autogen.sh skip ./configure
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Sometimes it is useful to re-bootstrap libvirt without running through a ./configure invocation immediately. eg if you want to run ./configure for Mingw32 rather than native. --- autogen.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/autogen.sh b/autogen.sh index f1591d8..95598e2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -70,6 +70,8 @@ if test -d .git; then fi fi +test -n "$NOCONFIGURE" && exit 0 + cd "$THEDIR" if test "x$OBJ_DIR" != x; then -- 1.7.10.2

2 1

[libvirt] [PATCH] Fix unused parameters / functions in virsh on Win32
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The vshPrintRaw function is not used on Win32, and neither is the 'msg' parameter of vshAskReedit. Change the nesting of #ifdef WIN32 conditionals to address this --- tools/virsh.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1b4f771..b84c4bc 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -655,6 +655,7 @@ vshReconnect(vshControl *ctl) ctl->useSnapshotOld = false; } +#ifndef WIN32 static void vshPrintRaw(vshControl *ctl, ...) { @@ -684,7 +685,6 @@ vshPrintRaw(vshControl *ctl, ...) static int vshAskReedit(vshControl *ctl, const char *msg) { -#ifndef WIN32 int c = -1; struct termios ttyattr; @@ -720,12 +720,16 @@ vshAskReedit(vshControl *ctl, const char *msg) vshPrint(ctl, "\r\n"); return c; +} #else +static int +vshAskReedit(vshControl *ctl, const char *msg ATTRIBUTE_UNUSED) +{ vshDebug(ctl, VSH_ERR_WARNING, "%s", _("This function is not " "supported on WIN32 platform")); return 0; -#endif } +#endif /* --------------- * Commands -- 1.7.10.2

2 1

[libvirt] [PATCH] winsock2.h must always be included before windows.h
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Some GNULIB headers (eg unistd.h) will often need to include winsock2.h for various symbols. There is a rule that winsock2.h must be included before windows.h. This means that any file which does #ifdef WIN32 #include <windows.h> #endif #include <unistd.h> is potentially broken. A simple rule is that /all/ includes of windows.h must be matched with a preceeding include of winsock2.h regardless of whether unistd.h is used currently --- src/util/util.c | 3 +++ src/vbox/vbox_MSCOMGlue.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/util/util.c b/src/util/util.c index 28a4fe7..a71b0d6 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -65,6 +65,9 @@ #endif #ifdef WIN32 +# ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +# endif # include <windows.h> # include <shlobj.h> #endif diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index b07d6a7..68810fb 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -22,6 +22,9 @@ #include <config.h> +#ifdef HAVE_WINSOCK2_H +# include <winsock2.h> +#endif #include <windows.h> #define nsCID CLSID -- 1.7.10.2

2 1

[libvirt] [PATCH] Update to latest GNULIB to fix compat with Mingw64 toolchain
by Daniel P. Berrange 22 Jun '12

22 Jun '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> On both x86_64-w64-mingw32 and i686-w64-mingw32 there were the following warnings/errors: CC fstat.lo ../../../gnulib/lib/fstat.c:27:0: warning: "stat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/fstat.c:25: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:258:0: note: this is the location of the previous definition ../../../gnulib/lib/fstat.c:28:0: warning: "fstat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/fstat.c:25: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:259:0: note: this is the location of the previous definition CC stat.lo ../../../gnulib/lib/stat.c:32:0: warning: "stat" redefined [enabled by default] In file included from ./sys/stat.h:32:0, from ../../../gnulib/lib/stat.c:27: /usr/x86_64-w64-mingw32/sys-root/mingw/include/sys/stat.h:258:0: note: this is the location of the previous definition CC stdio-read.lo ../../../gnulib/lib/stdio-read.c:102:1: error: redefinition of 'vscanf' In file included from ./stdio.h:43:0, from ../../../gnulib/lib/stdio-read.c:21: /usr/x86_64-w64-mingw32/sys-root/mingw/include/stdio.h:397:7: note: previous definition of 'vscanf' was here ../../../gnulib/lib/stdio-read.c:108:1: error: redefinition of 'vfscanf' In file included from ./stdio.h:43:0, from ../../../gnulib/lib/stdio-read.c:21: /usr/x86_64-w64-mingw32/sys-root/mingw/include/stdio.h:384:7: note: previous definition of 'vfscanf' was here make[3]: *** [stdio-read.lo] Error 1 make[3]: Leaving directory `/home/berrange/src/virt/libvirt/build/gnulib/lib' While on x86_64-w64-mingw32 only there was: In file included from ../../../gnulib/lib/regex.c:69:0: ../../../gnulib/lib/regcomp.c: In function 'parse_dup_op': ../../../gnulib/lib/regcomp.c:2624:39: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] ../../../gnulib/lib/regcomp.c: In function 'mark_opt_subexp': ../../../gnulib/lib/regcomp.c:3859:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] --- .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 77cef20..a02ba4b 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 77cef2022004c4066e805da09a83b2c77f17bdd3 +Subproject commit a02ba4bf889fee4622db87f185c3d0af84d74ae7 -- 1.7.10.2

2 1

[libvirt] KVM Forum and oVirt Workshop Europe 2012 Save the Date
by KVM Forum 2012 Program Committee 22 Jun '12

22 Jun '12

KVM is an industry leading open source hypervisor that provides an ideal platform for datacenter virtualization, virtual desktop infrastructure, and cloud computing. Once again, it's time to bring together the community of developers and users that define the KVM ecosystem for our annual technical conference. We will discuss the current state of affairs and plan for the future of KVM, its surrounding infrastructure, and management tools. We are also excited to announce the oVirt Workshop will run in parallel with the KVM Forum, bringing in a community focused on enterprise datacenter virtualization management built on KVM. So mark your calendar and join us in advancing KVM. Once again we are colocated with The Linux Foundation's LinuxCon, Based on feedback from last year, this time it's LinuxCon Europe! Conference: November 7 - 9, 2012 Location: Hotel Fira Palace - Barcelona, Spain Details regarding registration and proposal submission are forthcoming. thanks, your KVM Forum 2012 Program Commitee

1 0

[libvirt] [PATCH 5/5] S390: Adding testcases for s390
by Viktor Mihajlovski 21 Jun '12

21 Jun '12

Add minimal s390-virtio domain testcase and testcases for virtio serial, net, disk for the virtio-s390 bus. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- .../qemuxml2argv-console-virtio-s390.args | 9 ++++++ .../qemuxml2argv-console-virtio-s390.xml | 24 +++++++++++++++ .../qemuxml2argv-disk-virtio-s390.args | 5 +++ .../qemuxml2argv-disk-virtio-s390.xml | 22 ++++++++++++++ .../qemuxml2argv-minimal-s390.args | 5 +++ .../qemuxml2argvdata/qemuxml2argv-minimal-s390.xml | 21 +++++++++++++ .../qemuxml2argv-net-virtio-s390.args | 5 +++ .../qemuxml2argv-net-virtio-s390.xml | 22 ++++++++++++++ tests/qemuxml2argvtest.c | 8 +++++ tests/testutilsqemu.c | 31 ++++++++++++++++++++ 10 files changed, 152 insertions(+), 0 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args new file mode 100644 index 0000000..3388a35 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +s390-virtio -m 214 -smp 1 -nographic -nodefconfig -nodefaults -chardev \ +socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \ +chardev=charmonitor,id=monitor,mode=readline -no-acpi \ +-boot c -device virtio-serial-s390,id=virtio-serial0 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 \ +-chardev pty,id=charconsole0 \ +-device virtconsole,chardev=charconsole0,id=console0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml new file mode 100644 index 0000000..5a4a9d4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <os> + <type arch='s390x' machine='s390-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <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='virtio'/> + </disk> + <console type='pty'> + <target type='virtio'/> + </console> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args new file mode 100644 index 0000000..66bdf1e --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ +-M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml new file mode 100644 index 0000000..9ce6c18 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.xml @@ -0,0 +1,22 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='s390x' machine='s390-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <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='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args new file mode 100644 index 0000000..4e7bf05 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ +-name QEMUGuest1 -S -M s390-virtio -m 214 -smp 1 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi \ +-boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml new file mode 100644 index 0000000..7378bd4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal-s390.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <os> + <type arch='s390x' machine='s390-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <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='virtio'/> + </disk> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args new file mode 100644 index 0000000..700ea84 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S \ +-M s390-virtio -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-net-s390,vlan=0,id=net0,mac=00:11:22:33:44:55 \ +-net user,vlan=0,name=hostnet0 -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml new file mode 100644 index 0000000..f42fadd --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.xml @@ -0,0 +1,22 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219136</memory> + <currentMemory>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='s390x' machine='s390-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <interface type='user'> + <mac address='00:11:22:33:44:55'/> + <model type='virtio'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3b339be..8cd8a91 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -341,6 +341,7 @@ mymain(void) unsetenv("SDL_AUDIODRIVER"); DO_TEST("minimal", false, QEMU_CAPS_NAME); + DO_TEST("minimal-s390", false, QEMU_CAPS_NAME); DO_TEST("machine-aliases1", false, NONE); DO_TEST("machine-aliases2", true, NONE); DO_TEST("boot-cdrom", false, NONE); @@ -393,6 +394,8 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE); DO_TEST("disk-many", false, NONE); DO_TEST("disk-virtio", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DRIVE_BOOT); + DO_TEST("disk-virtio-s390", false, QEMU_CAPS_DRIVE, + QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_S390); DO_TEST("disk-order", false, QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); @@ -552,6 +555,8 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("net-virtio-netdev", false, QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV, QEMU_CAPS_NODEFCONFIG); + DO_TEST("net-virtio-s390", false, + QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_S390); DO_TEST("net-eth", false, NONE); DO_TEST("net-eth-ifname", false, NONE); DO_TEST("net-eth-names", false, QEMU_CAPS_NET_NAME); @@ -609,6 +614,9 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); DO_TEST("console-virtio-many", false, QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG); + DO_TEST("console-virtio-s390", false, + QEMU_CAPS_DEVICE, QEMU_CAPS_CHARDEV, QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_DRIVE, QEMU_CAPS_VIRTIO_S390); DO_TEST("channel-spicevmc", false, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEVMC); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 8d5a3bf..74b9122 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -87,6 +87,34 @@ error: return -1; } +static int testQemuAddS390Guest(virCapsPtr caps) +{ + static const char *s390_machines[] = { "s390-virtio"}; + virCapsGuestMachinePtr *machines = NULL; + virCapsGuestPtr guest; + + machines = virCapabilitiesAllocMachines(s390_machines, + ARRAY_CARDINALITY(s390_machines)); + if (!machines) + goto error; + + guest = virCapabilitiesAddGuest(caps, "hvm", "s390x", 64, + "/usr/bin/qemu-system-s390x", NULL, + ARRAY_CARDINALITY(s390_machines), + machines); + if (!guest) + goto error; + + if (!virCapabilitiesAddGuestDomain(guest, "qemu", NULL, NULL, 0, NULL)) + goto error; + + return 0; + +error: + virCapabilitiesFreeMachines(machines, ARRAY_CARDINALITY(s390_machines)); + return -1; +} + virCapsPtr testQemuCapsInit(void) { virCapsPtr caps; virCapsGuestPtr guest; @@ -208,6 +236,9 @@ virCapsPtr testQemuCapsInit(void) { if (testQemuAddPPC64Guest(caps)) goto cleanup; + if (testQemuAddS390Guest(caps)) + goto cleanup; + if (virTestGetDebug()) { char *caps_str; -- 1.7.0.4 -- Mit freundlichen Grüßen/Kind Regards Viktor Mihajlovski IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Martin Jetter Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

1 0