- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Add support for changing timeout value to open unix monitor socket
by Pavel Fux 08 Jan '14

08 Jan '14

I have fixed all comments except: "We prefer passing the driver as an argument instead". I thought of it at first but I looked at the function call graph and it's not that easy. and you did the same in src/qemu/qemu_process.c:115

4 6

[libvirt] [libvirt-java] [PATCH] Avoid calling processError for functions that cannot fail
by Claudio Bley 08 Jan '14

08 Jan '14

The libvirt functions virNodeDeviceNumOfCaps, virNodeDeviceGetParent and virNodeDeviceListCaps never indicate an error because they do not fail. --- src/main/java/org/libvirt/Device.java | 19 ++++++------------- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index fe49ce9..5492b69 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -98,23 +98,19 @@ public class Device { /** * Returns the number of capabilities which the instance has. * - * @throws LibvirtException + * @throws LibvirtException <em>never</em> */ public int getNumberOfCapabilities() throws LibvirtException { - int num = libvirt.virNodeDeviceNumOfCaps(VDP); - processError(); - return num; + return libvirt.virNodeDeviceNumOfCaps(VDP); } /** * Returns the parent of the device * - * @throws LibvirtException + * @throws LibvirtException <em>never</em> */ public String getParent() throws LibvirtException { - String parent = libvirt.virNodeDeviceGetParent(VDP); - processError(); - return parent; + return libvirt.virNodeDeviceGetParent(VDP); } /** @@ -123,15 +119,13 @@ public class Device { * @throws LibvirtException */ public String getXMLDescription() throws LibvirtException { - String desc = libvirt.virNodeDeviceGetXMLDesc(VDP); - processError(); - return desc; + return processError(libvirt.virNodeDeviceGetXMLDesc(VDP)); } /** * List the capabilities of the device * - * @throws LibvirtException + * @throws LibvirtException <em>never</em> */ public String[] listCapabilities() throws LibvirtException { int maxCaps = getNumberOfCapabilities(); @@ -139,7 +133,6 @@ public class Device { if (maxCaps > 0) { libvirt.virNodeDeviceListCaps(VDP, names, maxCaps); - processError(); } return names; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index b026b04..a2bf42e 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -281,7 +281,7 @@ public interface Libvirt extends Library { String virNodeDeviceGetName(DevicePointer virDevicePointer); String virNodeDeviceGetParent(DevicePointer virDevicePointer); int virNodeDeviceNumOfCaps(DevicePointer virDevicePointer); - int virNodeDeviceListCaps(DevicePointer virDevicePointer, String[] names, int maxNames); + int virNodeDeviceListCaps(DevicePointer virDevicePointer, Pointer[] names, int maxNames); String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer); int virNodeDeviceFree(DevicePointer virDevicePointer); int virNodeDeviceDettach(DevicePointer virDevicePointer); -- 1.8.5.2.msysgit.0

1 2

[libvirt] [libvirt-java] [PATCH] Use virFree in order to release memory acquired from libvirt
by Claudio Bley 08 Jan '14

08 Jan '14

When JNA is linked to a different runtime library than libvirt, using JNA's Native.free will probably lead to crashes as witnessed on Windows: # A fatal error has been detected by the Java Runtime Environment: # # EXCEPTION_ACCESS_VIOLATION (0xc0000005) at pc=0x0000000077363290, pid=10180, tid=9908 # # JRE version: 7.0_25-b16 # Java VM: Java HotSpot(TM) 64-Bit Server VM (23.25-b01 mixed mode windows-amd64 compressed oops) # Problematic frame: # C [ntdll.dll+0x53290] RtlFreeHeap+0xd0 The root cause is that the libvirt DLL uses MSVCRT as its runtime library, whereas the jnidispatch DLL of JNA uses a different one. At runtime, when calling org.sun.com.jna.Native.free() the OS function RtlFreeHeap is called with an invalid Pointer that was actually allocated by MSVCRT's malloc. Basically, we cannot simply mix and match memory allocation functions from different runtime libraries, but have to call virFree for pointers orignating from libvirt itself. So, this patch re-adds and uses the virFree method which had been removed in commit 3220de292990bed71828fba2f3700bc846d440f2. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- src/main/java/org/libvirt/Library.java | 4 ++-- src/main/java/org/libvirt/jna/Libvirt.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 0136095..33d3042 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -4,6 +4,7 @@ import org.libvirt.jna.Libvirt; import com.sun.jna.Native; import com.sun.jna.Pointer; +import com.sun.jna.ptr.PointerByReference; /** * This class represents an instance of the JNA mapped libvirt @@ -38,8 +39,7 @@ final class Library { * Free memory pointed to by ptr. */ static void free(Pointer ptr) { - Native.free(Pointer.nativeValue(ptr)); - Pointer.nativeValue(ptr, 0L); + libvirt.virFree(new PointerByReference(ptr)); } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 813f09b..b026b04 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -7,6 +7,7 @@ import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; +import com.sun.jna.ptr.PointerByReference; /** * The libvirt interface which is exposed via JNA. The complete API is @@ -171,6 +172,7 @@ public interface Libvirt extends Library { int virGetVersion(LongByReference libVer, String type, LongByReference typeVer); int virInitialize(); int virCopyLastError(virError error); + void virFree(PointerByReference ptr); virError virGetLastError(); void virResetLastError(); void virSetErrorFunc(Pointer userData, VirErrorCallback callback); -- 1.8.5.2.msysgit.0

1 0

[libvirt] [PATCH] util: Use new array management macros
by Osier Yang 08 Jan '14

08 Jan '14

Like commit 94a26c7e from Eric Blake, the old fuzzy code should be replaced by the new array management macros now. And the type of scsi->count should be changed into "size_t", and thus virSCSIDeviceListCount should return size_t instead, similar for vir{PCI,USB}DeviceListCount. --- src/util/virpci.c | 2 +- src/util/virpci.h | 2 +- src/util/virscsi.c | 35 ++++++++++------------------------- src/util/virscsi.h | 2 +- src/util/virusb.c | 2 +- src/util/virusb.h | 2 +- 6 files changed, 15 insertions(+), 30 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 8ec642f..ea93771 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1721,7 +1721,7 @@ virPCIDeviceListGet(virPCIDeviceListPtr list, return list->devs[idx]; } -int +size_t virPCIDeviceListCount(virPCIDeviceListPtr list) { return list->count; diff --git a/src/util/virpci.h b/src/util/virpci.h index 0479f0b..08bf4c3 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -86,7 +86,7 @@ int virPCIDeviceListAdd(virPCIDeviceListPtr list, int virPCIDeviceListAddCopy(virPCIDeviceListPtr list, virPCIDevicePtr dev); virPCIDevicePtr virPCIDeviceListGet(virPCIDeviceListPtr list, int idx); -int virPCIDeviceListCount(virPCIDeviceListPtr list); +size_t virPCIDeviceListCount(virPCIDeviceListPtr list); virPCIDevicePtr virPCIDeviceListSteal(virPCIDeviceListPtr list, virPCIDevicePtr dev); virPCIDevicePtr virPCIDeviceListStealIndex(virPCIDeviceListPtr list, diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 7aca9e6..f12a2a5 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -62,7 +62,7 @@ struct _virSCSIDevice { struct _virSCSIDeviceList { virObjectLockable parent; - unsigned int count; + size_t count; virSCSIDevicePtr *devs; }; @@ -356,12 +356,7 @@ virSCSIDeviceListAdd(virSCSIDeviceListPtr list, return -1; } - if (VIR_REALLOC_N(list->devs, list->count + 1) < 0) - return -1; - - list->devs[list->count++] = dev; - - return 0; + return VIR_APPEND_ELEMENT(list->devs, list->count, dev); } virSCSIDevicePtr @@ -373,7 +368,7 @@ virSCSIDeviceListGet(virSCSIDeviceListPtr list, int idx) return list->devs[idx]; } -int +size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list) { return list->count; @@ -387,24 +382,14 @@ virSCSIDeviceListSteal(virSCSIDeviceListPtr list, size_t i; for (i = 0; i < list->count; i++) { - if (list->devs[i]->adapter != dev->adapter || - list->devs[i]->bus != dev->bus || - list->devs[i]->target != dev->target || - list->devs[i]->unit != dev->unit) - continue; - - ret = list->devs[i]; - - if (i != list->count--) - memmove(&list->devs[i], - &list->devs[i+1], - sizeof(*list->devs) * (list->count - i)); - - if (VIR_REALLOC_N(list->devs, list->count) < 0) { - ; /* not fatal */ + if (list->devs[i]->adapter == dev->adapter || + list->devs[i]->bus == dev->bus || + list->devs[i]->target == dev->target || + list->devs[i]->unit == dev->unit) { + ret = list->devs[i]; + VIR_DELETE_ELEMENT(list->devs, i, list->count); + break; } - - break; } return ret; diff --git a/src/util/virscsi.h b/src/util/virscsi.h index cce5df4..4c461f8 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -77,7 +77,7 @@ int virSCSIDeviceListAdd(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); virSCSIDevicePtr virSCSIDeviceListGet(virSCSIDeviceListPtr list, int idx); -int virSCSIDeviceListCount(virSCSIDeviceListPtr list); +size_t virSCSIDeviceListCount(virSCSIDeviceListPtr list); virSCSIDevicePtr virSCSIDeviceListSteal(virSCSIDeviceListPtr list, virSCSIDevicePtr dev); void virSCSIDeviceListDel(virSCSIDeviceListPtr list, diff --git a/src/util/virusb.c b/src/util/virusb.c index 3c82200..bb5980d 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -464,7 +464,7 @@ virUSBDeviceListGet(virUSBDeviceListPtr list, return list->devs[idx]; } -int +size_t virUSBDeviceListCount(virUSBDeviceListPtr list) { return list->count; diff --git a/src/util/virusb.h b/src/util/virusb.h index aa59d12..e0a7c4c 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -86,7 +86,7 @@ int virUSBDeviceListAdd(virUSBDeviceListPtr list, virUSBDevicePtr dev); virUSBDevicePtr virUSBDeviceListGet(virUSBDeviceListPtr list, int idx); -int virUSBDeviceListCount(virUSBDeviceListPtr list); +size_t virUSBDeviceListCount(virUSBDeviceListPtr list); virUSBDevicePtr virUSBDeviceListSteal(virUSBDeviceListPtr list, virUSBDevicePtr dev); void virUSBDeviceListDel(virUSBDeviceListPtr list, -- 1.8.1.4

2 2

[libvirt] [libvirt-java] [PATCH] Fix wrapping of virStreamSend
by Claudio Bley 08 Jan '14

08 Jan '14

The native virStreamSend function is meant to be used to transfer byte data. Wrapping the function to use a Java String as the data depends on the default charset of the JVM and might impose further problems transferring \0 characters. Use a byte Array as the parameter type instead, as for virStreamRecv. Add the Stream.receive(byte[]) method which should be used instead of the legacy Stream.receive(String) method. The old method is kept for backward compatibility, but marked as deprecated. --- src/main/java/org/libvirt/Stream.java | 27 +++++++++++++++++++++++++-- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index bd8e87f..404c9a0 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -142,6 +142,27 @@ public class Stream { } /** + * Write the data of the given string to a stream. + * + * @param data + * the string data to write + * @return the number of bytes written, -1 on error, -2 if the buffer is + * full + * @throws LibvirtException + * + * @deprecated This libvirt API was previously wrapped incorrectly, since + * the native function is meant to transfer bytes, not string + * data.<p> + * Its effect depends on the default Charset on your platform + * which is determined on JVM startup.<p> + * Use the {@link #send(byte[])} method instead. + */ + @Deprecated + public int send(String data) throws LibvirtException { + return send(data.getBytes(java.nio.charset.Charset.defaultCharset())); + } + + /** * Write a series of bytes to the stream. * * @param data @@ -149,9 +170,11 @@ public class Stream { * @return the number of bytes written, -1 on error, -2 if the buffer is * full * @throws LibvirtException + * + * @since 1.5.2 */ - public int send(String data) throws LibvirtException { - int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(data.length())); + public int send(byte[] data) throws LibvirtException { + int returnValue = libvirt.virStreamSend(VSP, data, new NativeLong(data.length)); processError(); return returnValue; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 813f09b..98f2125 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -368,7 +368,7 @@ public interface Libvirt extends Library { int virStreamFinish(StreamPointer virStreamPtr) ; int virStreamFree(StreamPointer virStreamPtr) ; StreamPointer virStreamNew(ConnectionPointer virConnectPtr, int flags) ; - int virStreamSend(StreamPointer virStreamPtr, String data, NativeLong size); + int virStreamSend(StreamPointer virStreamPtr, byte[] data, NativeLong size); int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); int virStreamRecv(StreamPointer virStreamPtr, byte[] data, NativeLong length); int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); -- 1.8.5.2.msysgit.0

1 0

[libvirt] [libvirt-java] [PATCH] Fix javadoc comments
by Claudio Bley 08 Jan '14

08 Jan '14

Correct some typos and paste the right documentation from virInterfaceCreate, virInterfaceDestroy to the Interface.create and Interface.destroy doc comments. --- Pushing under the trivial rule. src/main/java/org/libvirt/Domain.java | 2 +- .../java/org/libvirt/DomainInterfaceStats.java | 2 +- src/main/java/org/libvirt/DomainSnapshot.java | 2 +- src/main/java/org/libvirt/Interface.java | 22 ++++++++++++++++++---- src/main/java/org/libvirt/Stream.java | 4 ++-- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index e4c45f6..2f70bf2 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -370,7 +370,7 @@ public class Domain { } /** - * Provides a boolean value indicating whether the network is configured to + * Provides a boolean value indicating whether the domain is configured to * be automatically started when the host machine boots. * * @return the result diff --git a/src/main/java/org/libvirt/DomainInterfaceStats.java b/src/main/java/org/libvirt/DomainInterfaceStats.java index 0e948d5..eab5c44 100644 --- a/src/main/java/org/libvirt/DomainInterfaceStats.java +++ b/src/main/java/org/libvirt/DomainInterfaceStats.java @@ -3,7 +3,7 @@ package org.libvirt; import org.libvirt.jna.virDomainInterfaceStats; /** - * The Domain.interfaceStats method returns th network counters in this object + * The Domain.interfaceStats method returns the network counters in this object. * * @author stoty * diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index b58fd20..9409fef 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -27,7 +27,7 @@ public class DomainSnapshot { * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotDelete">Libvirt * Documentation</a> * @param flags - * controls teh deletion + * controls the deletion * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. * @throws LibvirtException */ diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 7782fb9..6ea21b6 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -40,8 +40,13 @@ public class Interface { } /** - * Create and start a defined network. If the call succeed the network moves - * from the defined to the running networks pools. + * Activate an interface (i.e. call "ifup"). + * <p> + * If there was an open network config transaction at the time + * this interface was defined (that is, if + * virInterfaceChangeBegin() had been called), the interface will + * be brought back down (and then undefined) if + * virInterfaceChangeRollback() is called. * * @throws LibvirtException */ @@ -52,8 +57,17 @@ public class Interface { } /** - * Destroy the network object. The running instance is shutdown if not down - * already and all resources used by it are given back to the hypervisor. + * Deactivate an interface (i.e. call "ifdown"). + * <p> + * This does not remove the interface from the config, and does + * not free the associated virInterfacePtr object. + * <p> + * If there is an open network config transaction at the time this + * interface is destroyed (that is, if virInterfaceChangeBegin() + * had been called), and if the interface is later undefined and + * then virInterfaceChangeRollback() is called, the restoral of + * the interface definition will also bring the interface back + * up. * * @throws LibvirtException */ diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 84e300c..bd8e87f 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -100,10 +100,10 @@ public class Stream { } /** - * Receieves data from teh stream into the buffer provided. + * Receives data from the stream into the buffer provided. * * @param data - * the put the sata into + * buffer to put the data into * @return the number of bytes read, -1 on error, -2 if the buffer is empty * @throws LibvirtException */ -- 1.8.5.2.msysgit.0

1 0

[libvirt] [libvirt-java] [PATCH] Fix javadoc warning about snapshotCreateXML(int)
by Claudio Bley 08 Jan '14

08 Jan '14

Javadoc complains about: [javadoc] x:\src\libvirt-java1\src\main\java\org\libvirt\Domain.java:1212: warning - Tag @see: can't find snapshotCreateXML(int) in org.libvirt.Domain There is no such method, snapshotCreateXML(String, int) was intended. --- Pushing under the trivial rule. src/main/java/org/libvirt/Domain.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index ee26a95..e4c45f6 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -1189,7 +1189,7 @@ public class Domain { * This is just a convenience method, it has the same effect * as calling {@code snapshotCreateXML(xmlDesc, 0);}. * - * @see #snapshotCreateXML(int) + * @see #snapshotCreateXML(String, int) * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainSnapshotCreateXML">Libvirt * Documentation</a> -- 1.8.5.2.msysgit.0

1 0

[libvirt] [PATCH] conf: trivial typo fix
by Martin Kletzander 08 Jan '14

08 Jan '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as trivial. src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e65f3e3..416d96e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1,7 +1,7 @@ /* * domain_conf.c: domain XML processing * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2692,7 +2692,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, /* This switch statement is here to trigger compiler warning when adding * a new device type. When you are adding a new field to the switch you - * also have to add a iteration statement above. Otherwise the switch + * also have to add an iteration statement above. Otherwise the switch * statement has no real function here and should be optimized out by the * compiler. */ i = VIR_DOMAIN_DEVICE_LAST; -- 1.8.5.2

1 0

[libvirt] Redefining the XML of VM
by kangta123 08 Jan '14

08 Jan '14

Hi, I'm a newbie to Libvirt, i want to know if i can change the vm definition xml dynamically. like change cpu, network value. I found the hook in Libvirt, and i can get the xml from standard input. but i change it and out put to standard output, it no effect. I was try to execute “virsh define” shell command in python script on hook, but it was blocked and unabled to execute another Libvirt command. Is there create vm hook in Libvirt? Any help is appreciated. Regards,

2 1

[libvirt] Redefining the XML of VM
by kangta123 08 Jan '14

08 Jan '14

Hi, I'm a newbie to Libvirt, i want to know if i can change the vm definition xml dynamically. like change cpu, network value. I found the hook in Libvirt, and i can get the xml from standard input. but i change it and out put to standard output, it no effect. I was try to execute “virsh define” shell command in python script on hook, but it was blocked and unabled to execute another Libvirt command. Is there create vm hook in Libvirt? Any help is appreciated. Regards,

3 2

[libvirt] [sandbox PATCH v2] Fix FSF address on bin/virt-sandbox-service
by Cédric Bosdonnat 08 Jan '14

08 Jan '14

--- Use the URLized version bin/virt-sandbox-service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..884acac 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -15,8 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# along with this library. If not, see <http://www.gnu.org/licenses/>. # from gi.repository import LibvirtGObject -- 1.8.5.2

2 1

[libvirt] [PATCH] libxl: Fix devid init in libxlMakeNicList
by Stefan Bader 08 Jan '14

08 Jan '14

This basically reverts commit ba64b97134a6129a48684f22f31be92c3b6eef96 "libxl: Allow libxl to set NIC devid". However assigning devid's before calling libxlMakeNic does not work as that is calling libxl_device_nic_init which sets it back to -1. Right now auto-assignment only works in the hotplug case. But even if that would be fixed at some point (if that is possible at all), this would add a weird dependency between Xen and libvirt versions. The change here should accept any auto-assignment that makes it into libxl_device_nic_init. My understanding is that a caller always is allowed to make the devid choice itself. And assuming libxlMakeNicList is only used on domain creation, a sequential numbering should be ok. Signed-off-by: Stefan Bader <stefan.bader(a)canonical.com> --- src/libxl/libxl_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 04d01af..4cefadf 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -918,6 +918,13 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) for (i = 0; i < nnics; i++) { if (libxlMakeNic(def, l_nics[i], &x_nics[i])) goto error; + /* + * The devid (at least right now) will not get initialized by + * libxl in the setup case but is required for starting the + * device-model. + */ + if (x_nics[i].devid < 0) + x_nics[i].devid = i; } d_config->nics = x_nics; -- 1.7.9.5

2 3

[libvirt] [PATCH 1/1] virsh nodecpustats erroneously returns stats for offline cpus on Linux
by Pradipta Kr. Banerjee 08 Jan '14

08 Jan '14

From: "Pradipta Kr. Banerjee" <bpradip(a)in.ibm.com> virsh nodecpustats erroneously returns stats for offline cpus on Linux To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function performs a minimal match of the input cpuid with the cpuid read from /proc/cpustat. On systems with larger cpus this can result in erroneous data. For eg if /proc/stat has similar data cpu 3645648 485 361475 3691194868 176595 40645 69850 0 1526172 0 cpu0 494045 62 42763 138516619 16107 2339 2431 0 248345 0 cpu4 402646 59 34745 138617562 17738 1413 1196 0 193948 0 cpu8 318662 32 32119 138715131 7903 927 982 0 115429 0 cpu12 247004 33 30465 138791438 5251 759 913 0 51938 0 and cpu 1,2 are offline, then 'virsh nodecpustats 1' displays data for cpu12 whereas virsh nodecpustats 2 correctly throws the following error "error: Unable to get node cpu stats error: Invalid cpuNum in linuxNodeGetCPUStats" This patch fixes the above mentioned problem Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/nodeinfo.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1838547..c9e5ff1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -614,6 +614,8 @@ linuxNodeGetCPUStats(FILE *procstat, unsigned long long usr, ni, sys, idle, iowait; unsigned long long irq, softirq, steal, guest, guest_nice; char cpu_header[3 + INT_BUFSIZE_BOUND(cpuNum)]; + char cpu_header_read[3 + INT_BUFSIZE_BOUND(cpuNum)]; + char cpu_header_fmt[8]; if ((*nparams) == 0) { /* Current number of cpu stats supported by linux */ @@ -631,8 +633,11 @@ linuxNodeGetCPUStats(FILE *procstat, if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { strcpy(cpu_header, "cpu"); + snprintf(cpu_header_fmt, sizeof(cpu_header_fmt), "%%%ds", 3); } else { snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); + snprintf(cpu_header_fmt, sizeof(cpu_header_fmt), "%%%ds", + (int)(3 + INT_BUFSIZE_BOUND(cpuNum))); } while (fgets(line, sizeof(line), procstat) != NULL) { @@ -649,6 +654,14 @@ linuxNodeGetCPUStats(FILE *procstat, continue; } + /* + * Process with stats gathering only if the cpuid from /proc/stat + * matches exactly with the input cpuid + */ + sscanf(buf, cpu_header_fmt, cpu_header_read); + if (STRNEQ(cpu_header, cpu_header_read)) + continue; + for (i = 0; i < *nparams; i++) { virNodeCPUStatsPtr param = &params[i]; -- 1.8.3.1

5 6

[libvirt] [PATCH] docs: add LXC multi console command docs and a example
by Chen Hanxiao 08 Jan '14

08 Jan '14

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/drvlxc.html.in | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index 7494eb3..0f3efb0 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -659,16 +659,25 @@ running, this will turn it into a "transient" guest. <p> The <code>virsh console</code> command can be used to connect -to the text console associated with a container. If the container -has been configured with multiple console devices, then the -<code>--devname</code> argument can be used to choose the -console to connect to +to the text console associated with a container. </p> <pre> # virsh -c lxc:/// console myguest </pre> +<p> +If the container has been configured with multiple console devices, +then the <code>--devname</code> argument can be used to choose the +console to connect to. +In LXC, multiple consoles will be named +as 'console0', 'console1', 'console2', etc. +</p> + +<pre> +# virsh -c lxc:/// console myguest --devname console1 +</pre> + <h3><a name="usageEnter">Running commands in a container</a></h3> <p> -- 1.8.2.1

3 2

[libvirt] [PATCH] LXC: create monitor socket under selinux context of domain
by Gao feng 08 Jan '14

08 Jan '14

the unix socket /var/run/libvirt/lxc/domain.sock is not created under the selinux context which configured by <seclabel>. If we try to connect the domain.sock under the selinux context of domain in virtLXCProcessConnectMonitor,selinux will deny this connect operation. type=AVC msg=audit(1387953696.067:662): avc: denied { connectto } for pid=21206 comm="libvirtd" path="/usr/local/var/run/libvirt/lxc/systemd.sock" scontext=unconfined_u:system_r:svirt_lxc_net_t:s0:c770,c848 tcontext=unconfined_u:system_r:unconfined_t:s0-s0:c0.c1023 tclass=unix_stream_socket fix this problem by creating socket under selinux context of domain. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_controller.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index a2ae599..5ca960f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -745,6 +745,9 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) ctrl))) goto error; + if (virSecurityManagerSetSocketLabel(ctrl->securityManager, ctrl->def) < 0) + goto error; + if (!(svc = virNetServerServiceNewUNIX(sockpath, 0700, 0, @@ -757,6 +760,9 @@ static int virLXCControllerSetupServer(virLXCControllerPtr ctrl) 5))) goto error; + if (virSecurityManagerClearSocketLabel(ctrl->securityManager, ctrl->def) < 0) + goto error; + if (virNetServerAddService(ctrl->server, svc, NULL) < 0) goto error; virObjectUnref(svc); -- 1.8.4.2

2 1

[libvirt] [PATCH 0/2] virsh: Fix mishandling of inactive configuration on device hotplug
by Peter Krempa 08 Jan '14

08 Jan '14

Peter Krempa (2): virsh: Don't use legacy API if --current is used on device hot(un)plug virsh: Use inactive definition when removing disk from config tools/virsh-domain.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) -- 1.8.5.2

2 5

[libvirt] [PATCH] virConnectUnregisterCloseCallback: Unlock @conn prior to error dispatch
by Michal Privoznik 08 Jan '14

08 Jan '14

The function checks for @conn to be valid and locks its mutex. Then, it checks if callee is unregistering the same callback that he registered previously. If this fails an error is reported and the control jumps to 'error' label. Here, if @conn has some errors (and it certainly does - the one that's been just reported) the conn->mutex is locked again - without any previous unlock: Thread 1 (Thread 0x7fb500ef1800 (LWP 18982)): #0 __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007fb4fd99ce56 in _L_lock_918 () from /lib64/libpthread.so.0 #2 0x00007fb4fd99ccaa in __GI___pthread_mutex_lock (mutex=0x7fb50153b670) at pthread_mutex_lock.c:64 #3 0x00007fb5007e574d in virMutexLock (m=m@entry=0x7fb50153b670) at util/virthreadpthread.c:85 #4 0x00007fb5007b198e in virDispatchError (conn=conn@entry=0x7fb50153b5e0) at util/virerror.c:594 #5 0x00007fb5008a3735 in virConnectUnregisterCloseCallback (conn=0x7fb50153b5e0, cb=cb@entry=0x7fb500f588e0 <vshCatchDisconnect>) at libvirt.c:21025 #6 0x00007fb500f5d690 in vshReconnect (ctl=ctl@entry=0x7fffff60e710) at virsh.c:328 #7 0x00007fb500f5dc50 in vshCommandRun (ctl=ctl@entry=0x7fffff60e710, cmd=0x7fb50152ca80) at virsh.c:1755 #8 0x00007fb500f5861b in main (argc=<optimized out>, argv=<optimized out>) at virsh.c:3393 And since the conn's mutex is not recursive, the virDispatchError will never ever lock it successfully. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2f5f023..71c9d8c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -21022,9 +21022,9 @@ virConnectUnregisterCloseCallback(virConnectPtr conn, return 0; error: - virDispatchError(conn); virObjectUnlock(conn->closeCallback); virMutexUnlock(&conn->lock); + virDispatchError(conn); return -1; } -- 1.8.5.1

2 2

[libvirt] [ruby-libvirt] Don't free more entries than we retrieved
by Guido Günther 08 Jan '14

08 Jan '14

The vir*List* functions return the number of fetched entries. We mustn't free more, otherwise we'll crash like #0 0xb779d424 in __kernel_vsyscall () #1 0xb733981f in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 #2 0xb733ccd3 in __GI_abort () at abort.c:90 #3 0xb7376275 in __libc_message (do_abort=do_abort@entry=2, fmt=fmt@entry=0xb74767d0 "*** Error in `%s': %s: 0x%s ***\n") at ../sysdeps/unix/sysv/linux/libc_fatal.c:199 #4 0xb7380e52 in malloc_printerr (action=<optimized out>, str=<optimized out>, ptr=0xb7087000) at malloc.c:4923 #5 0xb7381b90 in _int_free (av=0xb74b7440 <main_arena>, p=0xb7086ff8, have_lock=0) at malloc.c:3779 #6 0xb75c059f in ruby_xfree () from /usr/lib/libruby-1.9.1.so.1.9 #7 0xb7076448 in ruby_libvirt_generate_list () from /usr/lib/ruby/vendor_ruby/1.9.1/i486-linux/_libvirt.so ... since we're trying to free random addresses. --- ext/libvirt/connect.c | 4 ++-- ext/libvirt/domain.c | 2 +- ext/libvirt/nodedevice.c | 2 +- ext/libvirt/storage.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/libvirt/connect.c b/ext/libvirt/connect.c index 36cac20..1af64a1 100644 --- a/ext/libvirt/connect.c +++ b/ext/libvirt/connect.c @@ -67,7 +67,7 @@ names = alloca(sizeof(char *) * num); \ r = virConnectList##objs(ruby_libvirt_connect_get(c), names, num); \ ruby_libvirt_raise_error_if(r < 0, e_RetrieveError, "virConnectList" # objs, ruby_libvirt_connect_get(c)); \ - return ruby_libvirt_generate_list(num, names); \ + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); \ } while(0) static VALUE c_connect; @@ -1508,7 +1508,7 @@ static VALUE libvirt_connect_list_nodedevices(int argc, VALUE *argv, VALUE c) ruby_libvirt_raise_error_if(r < 0, e_RetrieveError, "virNodeListDevices", ruby_libvirt_connect_get(c)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* diff --git a/ext/libvirt/domain.c b/ext/libvirt/domain.c index ddce2d8..bc46753 100644 --- a/ext/libvirt/domain.c +++ b/ext/libvirt/domain.c @@ -1532,7 +1532,7 @@ static VALUE libvirt_domain_list_snapshots(int argc, VALUE *argv, VALUE d) "virDomainSnapshotListNames", ruby_libvirt_connect_get(d)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* diff --git a/ext/libvirt/nodedevice.c b/ext/libvirt/nodedevice.c index 98b3715..041cda2 100644 --- a/ext/libvirt/nodedevice.c +++ b/ext/libvirt/nodedevice.c @@ -124,7 +124,7 @@ static VALUE libvirt_nodedevice_list_caps(VALUE c) "virNodeDeviceListCaps", ruby_libvirt_connect_get(c)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* diff --git a/ext/libvirt/storage.c b/ext/libvirt/storage.c index 4b96d2e..008410a 100644 --- a/ext/libvirt/storage.c +++ b/ext/libvirt/storage.c @@ -340,7 +340,7 @@ static VALUE libvirt_storage_pool_list_volumes(VALUE p) "virStoragePoolListVolumes", ruby_libvirt_connect_get(p)); - return ruby_libvirt_generate_list(num, names); + return ruby_libvirt_generate_list(r < 0 ? 0 : r, names); } /* -- 1.8.5.2

2 6

[libvirt] [PATCH] LXC: don't set socket create selinux context in virLXCProcessConnectMonitor
by Gao feng 08 Jan '14

08 Jan '14

the unix socket /var/run/libvirt/lxc/domain.sock is not created under the selinux context which configured by <seclabel>. If we try to connect the domain.sock under the selinux context of domain in virtLXCProcessConnectMonitor,selinux will deny this connect operation. type=AVC msg=audit(1387953696.067:662): avc: denied { connectto } for pid=21206 comm="libvirtd" path="/usr/local/var/run/libvirt/lxc/systemd.sock" scontext=unconfined_u:system_r:svirt_lxc_net_t:s0:c770,c848 tcontext=unconfined_u:system_r:unconfined_t:s0-s0:c0.c1023 tclass=unix_stream_socket Since there is no harm to access doamin.sock outof domain's context, this patch removes the setsockcreatecon in virLXCProcessConnectMonitor. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_process.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index cc9c1a2..b336ade 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -640,9 +640,6 @@ static virLXCMonitorPtr virLXCProcessConnectMonitor(virLXCDriverPtr driver, virLXCMonitorPtr monitor = NULL; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); - if (virSecurityManagerSetSocketLabel(driver->securityManager, vm->def) < 0) - goto cleanup; - /* Hold an extra reference because we can't allow 'vm' to be * deleted while the monitor is active */ virObjectRef(vm); @@ -652,15 +649,6 @@ static virLXCMonitorPtr virLXCProcessConnectMonitor(virLXCDriverPtr driver, if (monitor == NULL) virObjectUnref(vm); - if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0) { - if (monitor) { - virObjectUnref(monitor); - monitor = NULL; - } - goto cleanup; - } - -cleanup: virObjectUnref(cfg); return monitor; } -- 1.8.4.2

2 2

[libvirt] [ruby-libvirt] Allow to set URI via environment variable
by Guido Günther 08 Jan '14

08 Jan '14

This allows us to run tests with the destdriver like: RUBY_LIBVIRT_TEST_URI=test:///default \ RUBYLIB=lib/:ext/libvirt/ \ ruby tests/test_open.rb --- I've only converted three modules so far since they were simple but these already help to run tests during package build. tests/test_nodedevice.rb | 2 +- tests/test_open.rb | 36 ++++++++++++++++++------------------ tests/test_stream.rb | 2 +- tests/test_utils.rb | 2 ++ 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tests/test_nodedevice.rb b/tests/test_nodedevice.rb index 7da1a5f..50a1304 100644 --- a/tests/test_nodedevice.rb +++ b/tests/test_nodedevice.rb @@ -9,7 +9,7 @@ require 'test_utils.rb' set_test_object("nodedevice") -conn = Libvirt::open("qemu:///system") +conn = Libvirt::open(URI) # TESTGROUP: nodedevice.name testnode = conn.lookup_nodedevice_by_name(conn.list_nodedevices[0]) diff --git a/tests/test_open.rb b/tests/test_open.rb index 17baa93..c67eaab 100644 --- a/tests/test_open.rb +++ b/tests/test_open.rb @@ -21,49 +21,49 @@ expect_success(Libvirt, "nil arg", "version", nil) {|x| x.class == Array and x.l expect_success(Libvirt, "Test arg", "version", "Test") {|x| x.class == Array and x.length == 2} # TESTGROUP: Libvirt::open -expect_too_many_args(Libvirt, "open", "qemu:///system", 1) +expect_too_many_args(Libvirt, "open", URI, 1) expect_connect_error("open", "foo:///system") conn = expect_success(Libvirt, "no args", "open") {|x| x.class == Libvirt::Connect } conn.close -conn = expect_success(Libvirt, "qemu:///system", "open", "qemu:///system") {|x| x.class == Libvirt::Connect } +conn = expect_success(Libvirt, URI, "open", URI) {|x| x.class == Libvirt::Connect } conn.close conn = expect_success(Libvirt, "nil arg", "open", nil) {|x| x.class == Libvirt::Connect } conn.close # TESTGROUP: Libvirt::open_read_only -expect_too_many_args(Libvirt, "open_read_only", "qemu:///system", 1) +expect_too_many_args(Libvirt, "open_read_only", URI, 1) expect_connect_error("open_read_only", "foo:///system") conn = expect_success(Libvirt, "no args", "open_read_only") {|x| x.class == Libvirt::Connect } conn.close -conn = expect_success(Libvirt, "qemu:///system", "open_read_only", "qemu:///system") {|x| x.class == Libvirt::Connect } +conn = expect_success(Libvirt, URI, "open_read_only", URI) {|x| x.class == Libvirt::Connect } conn.close conn = expect_success(Libvirt, "nil arg", "open_read_only", nil) {|x| x.class == Libvirt::Connect } conn.close # TESTGROUP: Libvirt::open_auth -expect_too_many_args(Libvirt, "open_auth", "qemu:///system", [], "hello there", 1, 2) +expect_too_many_args(Libvirt, "open_auth", URI, [], "hello there", 1, 2) expect_connect_error("open_auth", "foo:///system") expect_invalid_arg_type(Libvirt, "open_auth", 1) -expect_invalid_arg_type(Libvirt, "open_auth", "qemu:///system", [], "hello", "foo") +expect_invalid_arg_type(Libvirt, "open_auth", URI, [], "hello", "foo") conn = expect_success(Libvirt, "no args", "open_auth") {|x| x.class == Libvirt::Connect } conn.close -conn = expect_success(Libvirt, "uri arg", "open_auth", "qemu:///system") {|x| x.class == Libvirt::Connect } +conn = expect_success(Libvirt, "uri arg", "open_auth", URI) {|x| x.class == Libvirt::Connect } conn.close -conn = expect_success(Libvirt, "uri and empty cred args", "open_auth", "qemu:///system", []) {|x| x.class == Libvirt::Connect } +conn = expect_success(Libvirt, "uri and empty cred args", "open_auth", URI, []) {|x| x.class == Libvirt::Connect } conn.close -conn = expect_success(Libvirt, "uri and full cred args", "open_auth", "qemu:///system", [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE]) {|x| x.class == Libvirt::Connect } +conn = expect_success(Libvirt, "uri and full cred args", "open_auth", URI, [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE]) {|x| x.class == Libvirt::Connect } conn.close -conn = expect_success(Libvirt, "uri, full cred, and user args", "open_auth", "qemu:///system", [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello") {|x| x.class == Libvirt::Connect } +conn = expect_success(Libvirt, "uri, full cred, and user args", "open_auth", URI, [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello") {|x| x.class == Libvirt::Connect } conn.close # equivalent to expect_invalid_arg_type begin - conn = Libvirt::open_auth("qemu:///system", {}) do |cred| + conn = Libvirt::open_auth(URI, {}) do |cred| end rescue TypeError => e puts_ok "#{$test_object}.open_auth invalid arg type threw #{TypeError.to_s}" @@ -73,7 +73,7 @@ end # equivalent to expect_invalid_arg_type begin - conn = Libvirt::open_auth("qemu:///system", 1) do |cred| + conn = Libvirt::open_auth(URI, 1) do |cred| end rescue TypeError => e puts_ok "#{$test_object}.open_auth invalid arg type threw #{TypeError.to_s}" @@ -83,7 +83,7 @@ end # equivalent to expect_invalid_arg_type begin - conn = Libvirt::open_auth("qemu:///system", 'foo') do |cred| + conn = Libvirt::open_auth(URI, 'foo') do |cred| end rescue TypeError => e puts_ok "#{$test_object}.open_auth invalid arg type threw #{TypeError.to_s}" @@ -93,7 +93,7 @@ end # equivalent to "expect_success" begin - conn = Libvirt::open_auth("qemu:///system", [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello") do |cred| + conn = Libvirt::open_auth(URI, [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello") do |cred| if not cred["userdata"].nil? puts "userdata is #{cred["userdata"]}" end @@ -122,7 +122,7 @@ end # equivalent to "expect_success" begin - conn = Libvirt::open_auth("qemu:///system") do |cred| + conn = Libvirt::open_auth(URI) do |cred| end puts_ok "Libvirt.open_auth uri, succeeded" @@ -135,7 +135,7 @@ end # equivalent to "expect_success" begin - conn = Libvirt::open_auth("qemu:///system", [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello", Libvirt::CONNECT_RO) do |cred| + conn = Libvirt::open_auth(URI, [Libvirt::CRED_AUTHNAME, Libvirt::CRED_PASSPHRASE], "hello", Libvirt::CONNECT_RO) do |cred| if not cred["userdata"].nil? puts "userdata is #{cred["userdata"]}" end @@ -163,7 +163,7 @@ rescue => e end # TESTGROUP: Libvirt::event_invoke_handle_callback -conn = Libvirt::open("qemu:///system") +conn = Libvirt::open(URI) expect_too_many_args(Libvirt, "event_invoke_handle_callback", 1, 2, 3, 4, 5) expect_too_few_args(Libvirt, "event_invoke_handle_callback") @@ -188,7 +188,7 @@ expect_invalid_arg_type(Libvirt, "event_invoke_handle_callback", 1, 1, 1, { "lib conn.close # TESTGROUP: Libvirt::event_invoke_timeout_callback -conn = Libvirt::open("qemu:///system") +conn = Libvirt::open(URI) expect_too_many_args(Libvirt, "event_invoke_timeout_callback", 1, 2, 3) expect_too_few_args(Libvirt, "event_invoke_timeout_callback") diff --git a/tests/test_stream.rb b/tests/test_stream.rb index 07ec222..e272104 100644 --- a/tests/test_stream.rb +++ b/tests/test_stream.rb @@ -9,7 +9,7 @@ require 'test_utils.rb' set_test_object("stream") -conn = Libvirt::open("qemu:///system") +conn = Libvirt::open(URI) # TESTGROUP: stream.send st = conn.stream diff --git a/tests/test_utils.rb b/tests/test_utils.rb index 1bac1cc..519de27 100644 --- a/tests/test_utils.rb +++ b/tests/test_utils.rb @@ -2,6 +2,8 @@ $FAIL = 0 $SUCCESS = 0 $SKIPPED = 0 +URI = ENV['RUBY_LIBVIRT_TEST_URI'] || "qemu:///system" + $GUEST_BASE = '/var/lib/libvirt/images/ruby-libvirt-tester' $GUEST_DISK = $GUEST_BASE + '.qcow2' $GUEST_SAVE = $GUEST_BASE + '.save' -- 1.8.5.2

2 1

[libvirt] [PATCH] Allow to install apparmor profiles
by Guido Günther 07 Jan '14

07 Jan '14

Make it easy to install the shipped examples. The aim is to have reasonably working templates so that distros only need to minimally patch these and can feed things upstream more easily. This was prompted by http://bugs.debian.org/725144 --- configure.ac | 12 +++++++++++- examples/apparmor/Makefile.am | 18 ++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2622dfd..97752f4 100644 --- a/configure.ac +++ b/configure.ac @@ -1418,6 +1418,16 @@ elif test "with_secdriver_apparmor" != "no" ; then fi AM_CONDITIONAL([WITH_SECDRIVER_APPARMOR], [test "$with_secdriver_apparmor" != "no"]) +if test "$with_apparmor" != "no"; then +AC_ARG_WITH([apparmor-profiles], + [AS_HELP_STRING([--with-apparmor-profiles], + [install apparmor profiles @<:@default=no@:>@])], + [with_apparmor_profiles=yes], + [with_apparmor_profiles=no]) +else + with_apparmor_profiles="no" +fi +AM_CONDITIONAL([WITH_APPARMOR_PROFILES], [test "$with_apparmor_profiles" != "no"]) dnl DTrace static probes AC_ARG_WITH([dtrace], @@ -2607,7 +2617,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Security Drivers]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ SELinux: $with_secdriver_selinux ($SELINUX_MOUNT)]) -AC_MSG_NOTICE([AppArmor: $with_secdriver_apparmor]) +AC_MSG_NOTICE([AppArmor: $with_secdriver_apparmor (install profiles: $with_apparmor_profiles)]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Driver Loadable Modules]) AC_MSG_NOTICE([]) diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am index 79cf5c9..6e69440 100644 --- a/examples/apparmor/Makefile.am +++ b/examples/apparmor/Makefile.am @@ -19,3 +19,21 @@ EXTRA_DIST= \ libvirt-qemu \ usr.lib.libvirt.virt-aa-helper \ usr.sbin.libvirtd + +if WITH_APPARMOR_PROFILES +apparmordir = $(sysconfdir)/apparmor.d/ +apparmor_DATA = \ + usr.lib.libvirt.virt-aa-helper \ + usr.sbin.libvirtd \ + $(NULL) + +abstractionsdir = $(apparmordir)/abstractions +abstractions_DATA = \ + libvirt-qemu \ + $(NULL) + +templatesdir = $(apparmordir)/libvirtd +templates_DATA = \ + TEMPLATE \ + $(NULL) +endif WITH_APPARMOR_PROFILES -- 1.8.5.1

2 2

[libvirt] [PATCHv2 00/14] event cleanups
by Eric Blake 07 Jan '14

07 Jan '14

I'm sitting on quite a few event fixes, prior to being able to reach my goal of adding a new api to libvirt-qemu.so for querying arbitrary monitor events. For testing purposes, I split the tests from the code changes, to make it easier (at least for me) to prove what the bugs are, and how the code fixes the bug. Each patch in this series should pass 'make', but those labeled '[squash with next]' will fail 'make check' until you also apply the next patch in the series. Before pushing, I will merge the patches as documented. That is, although there are 14 mails, there are only 9 commits to push when I finally get acks. If you exclude tests/, this series removes more lines than it adds (always a desirable goal when refactoring to fix bugs). Eric Blake (14): event [squash with next]: add test of old-style events event: make deregister return value match docs event [squash with next]: test shared state driver in test:///default event: share state driver between test:///default connections event: rename confusing variable in test, remote drivers event [squash with next]: test that old-style can't clobber new-style event: don't let old-style events clobber per-domain events event: tighten scope of object_event event: properly filter count of remaining events event [squash with next]: test that old-style is distinct from new-style event: don't allow mix of old- and new-style registration event [squash with next]: test per-domain events of offline domain event: don't turn offline domain into global event event: make network events easier to use without casts src/conf/domain_event.c | 185 ++++------------------------- src/conf/network_event.c | 16 +-- src/conf/network_event.h | 3 +- src/conf/object_event.c | 255 +++++++++++++++++++++++++++++----------- src/conf/object_event.h | 5 +- src/conf/object_event_private.h | 63 ++-------- src/libvirt.c | 17 ++- src/libxl/libxl_driver.c | 35 +++--- src/lxc/lxc_driver.c | 30 ++--- src/network/bridge_driver.c | 14 ++- src/remote/remote_driver.c | 86 ++++++-------- src/test/test_driver.c | 135 +++++++++++++-------- src/uml/uml_driver.c | 29 +++-- src/vbox/vbox_tmpl.c | 32 +++-- src/xen/xen_driver.c | 25 ++-- tests/objecteventtest.c | 196 +++++++++++++++++++++++++++--- 16 files changed, 631 insertions(+), 495 deletions(-) -- 1.8.4.2

2 33

[libvirt] vm tunable memory and cgroup
by yue 07 Jan '14

07 Jan '14

hi,all 1. is there any relationship between cgroup and tunable memory ? if i adjust vm's memory, if cgroup has any responding action? <memory unit='KiB'>1048576</memory> <currentMemory unit='KiB'>524288</currentMemory> 2. it seems that the memory.limit_in_bytes of a vm in cgroup is twice over vm's assigned memory? addtional, blkio.sectors does not equal sectors calculated from inner vm. how limit_in_bytes, sectors are calculative? what is the relationship between them? thanks

1 0

[libvirt] [PATCH V2 1/1] Add hw random number generator (/dev/hwrng) to cgroup ACL
by Pradipta Kr. Banerjee 07 Jan '14

07 Jan '14

From: "Pradipta Kr. Banerjee" <bpradip(a)in.ibm.com> Creating a qemu VM with /dev/hwrng as backend RNG device throws the following error - "Could not open '/dev/hwrng': Permission denied" This patch fixes the issue Signed-off-by: Pradipta Kr. Banerjee <bpradip(a)in.ibm.com> --- src/qemu/qemu_cgroup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index f0cacd0..8e2076e 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -533,6 +533,18 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver, goto cleanup; } + if (vm->def->rng && + (vm->def->rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM)) { + VIR_DEBUG("Setting Cgroup ACL for RNG device"); + rv = virCgroupAllowDevicePath(priv->cgroup, vm->def->rng->source.file, + VIR_CGROUP_DEVICE_RW); + virDomainAuditCgroupPath(vm, priv->cgroup, "allow", + vm->def->rng->source.file, "rw", rv == 0); + if (rv < 0 && + !virLastErrorIsSystemErrno(ENOENT)) + goto cleanup; + } + ret = 0; cleanup: virObjectUnref(cfg); -- 1.8.3.1

2 2

[libvirt] [PATCH 0/5] qemu: Fix job usage in several APIs
by Jiri Denemark 07 Jan '14

07 Jan '14

When fixing https://bugzilla.redhat.com/show_bug.cgi?id=1043069 I realized qemuDomainBlockStats is not the only API that does not acquire a job early enough. Generally, every API that is going to begin a job should do that before fetching data from vm->def. The following 5 APIs failed to do so and moreover used the data fetched early from vm->def after starting a job. In some circumstances this can lead to a crash. Jiri Denemark (5): qemu: Do not access stale data in virDomainBlockStats qemu: Avoid using stale data in virDomainGetBlockInfo qemu: Fix job usage in qemuDomainBlockJobImpl qemu: Fix job usage in qemuDomainBlockCopy qemu: Fix job usage in virDomainGetBlockIoTune src/qemu/qemu_driver.c | 92 ++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 48 deletions(-) -- 1.8.5.2

3 15

[libvirt] [PATCH] Read PCI class from sysfs class file instead of config space.
by Thadeu Lima de Souza Cascardo 07 Jan '14

07 Jan '14

When determining if a device is behind a PCI bridge, the PCI device class is checked by reading the config space. However, there are some devices which have the wrong class on the config space, but the class is initialized by Linux correctly as a PCI BRIDGE. This class can be read by the sysfs file '/sys/bus/pci/devices/xxxx:xx:xx.x/class'. One example of such bridge is IBM PCI Bridge 1014:03b9, which is identified as a Host Bridge when reading the config space. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo(a)linux.vnet.ibm.com> --- The new test cases succeed with this patch. The second test fails without the changes to src/util/virpci.c. --- src/util/virpci.c | 41 +++++++++++++++++++++++++++-- tests/virpcimock.c | 33 ++++++++++++++++++++++++ tests/virpcitest.c | 34 ++++++++++++++++++++++++ tests/virpcitestdata/0001:00:00.0.config | Bin 0 -> 4096 bytes tests/virpcitestdata/0001:01:00.0.config | Bin 0 -> 4096 bytes tests/virpcitestdata/0001:01:00.1.config | Bin 0 -> 4096 bytes tests/virpcitestdata/0005:80:00.0.config | Bin 0 -> 4096 bytes tests/virpcitestdata/0005:90:01.0.config | Bin 0 -> 256 bytes tests/virpcitestdata/0005:90:01.1.config | Bin 0 -> 256 bytes tests/virpcitestdata/0005:90:01.2.config | Bin 0 -> 256 bytes 10 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 tests/virpcitestdata/0001:00:00.0.config create mode 100644 tests/virpcitestdata/0001:01:00.0.config create mode 100644 tests/virpcitestdata/0001:01:00.1.config create mode 100644 tests/virpcitestdata/0005:80:00.0.config create mode 100644 tests/virpcitestdata/0005:90:01.0.config create mode 100644 tests/virpcitestdata/0005:90:01.1.config create mode 100644 tests/virpcitestdata/0005:90:01.2.config diff --git a/src/util/virpci.c b/src/util/virpci.c index 8ec642f..8c10a93 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -344,6 +344,37 @@ virPCIDeviceRead32(virPCIDevicePtr dev, int cfgfd, unsigned int pos) } static int +virPCIDeviceReadClass(virPCIDevicePtr dev, uint16_t *device_class) +{ + char *path = NULL; + char *id_str; + int ret = 0; + unsigned int value; + + if (virPCIFile(&path, dev->name, "class") < 0) + return -1; + + /* class string is '0xNNNNNN\n' ... i.e. 9 bytes */ + if (virFileReadAll(path, 9, &id_str) < 0) { + VIR_FREE(path); + return -1; + } + + VIR_FREE(path); + + id_str[8] = '\0'; + ret = virStrToLong_ui(id_str, NULL, 16, &value); + if (ret == 0) + *device_class = (value >> 8) & 0xFFFF; + else + VIR_WARN("Unusual value in " PCI_SYSFS "devices/%s/class: %s", + dev->name, id_str); + + VIR_FREE(id_str); + return ret; +} + +static int virPCIDeviceWrite(virPCIDevicePtr dev, int cfgfd, unsigned int pos, @@ -645,8 +676,8 @@ virPCIDeviceIsParent(virPCIDevicePtr dev, virPCIDevicePtr check, void *data) return 0; /* Is it a bridge? */ - device_class = virPCIDeviceRead16(check, fd, PCI_CLASS_DEVICE); - if (device_class != PCI_CLASS_BRIDGE_PCI) + ret = virPCIDeviceReadClass(check, &device_class); + if (ret == -1 || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; /* Is it a plane? */ @@ -2110,6 +2141,7 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) unsigned int pos; int fd; int ret = 0; + uint16_t device_class; if ((fd = virPCIDeviceConfigOpen(dev, true)) < 0) return -1; @@ -2119,8 +2151,11 @@ virPCIDeviceDownstreamLacksACS(virPCIDevicePtr dev) goto cleanup; } + if (virPCIDeviceReadClass(dev, &device_class)) + goto cleanup; + pos = dev->pcie_cap_pos; - if (!pos || virPCIDeviceRead16(dev, fd, PCI_CLASS_DEVICE) != PCI_CLASS_BRIDGE_PCI) + if (!pos || device_class != PCI_CLASS_BRIDGE_PCI) goto cleanup; flags = virPCIDeviceRead16(dev, fd, pos + PCI_EXP_FLAGS); diff --git a/tests/virpcimock.c b/tests/virpcimock.c index a5cef46..49759b0 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -29,6 +29,7 @@ # include <fcntl.h> # include <sys/stat.h> # include <stdarg.h> +# include <dirent.h> # include "viralloc.h" # include "virstring.h" # include "virfile.h" @@ -42,6 +43,7 @@ static int (*real__xstat)(int ver, const char *path, struct stat *sb); static char *(*realcanonicalize_file_name)(const char *path); static int (*realopen)(const char *path, int flags, ...); static int (*realclose)(int fd); +static DIR * (*realopendir)(const char *name); /* Don't make static, since it causes problems with clang * when passed as an arg to virAsprintf() @@ -112,6 +114,7 @@ struct pciDevice { char *id; int vendor; int device; + int class; struct pciDriver *driver; /* Driver attached. NULL if attached to no driver */ }; @@ -351,6 +354,10 @@ pci_device_new_from_stub(const struct pciDevice *data) ABORT("@tmp overflow"); make_file(devpath, "device", tmp, -1); + if (snprintf(tmp, sizeof(tmp), "0x%.4x", dev->class) < 0) + ABORT("@tmp overflow"); + make_file(devpath, "class", tmp, -1); + if (pci_device_autobind(dev) < 0) ABORT("Unable to bind: %s", data->id); @@ -747,6 +754,7 @@ init_syms(void) LOAD_SYM(canonicalize_file_name); LOAD_SYM(open); LOAD_SYM(close); + LOAD_SYM(opendir); } static void @@ -776,6 +784,13 @@ init_env(void) MAKE_PCI_DEVICE("0000:00:01.0", 0x8086, 0x0044); MAKE_PCI_DEVICE("0000:00:02.0", 0x8086, 0x0046); MAKE_PCI_DEVICE("0000:00:03.0", 0x8086, 0x0048); + MAKE_PCI_DEVICE("0001:00:00.0", 0x1014, 0x03b9, .class = 0x060400); + MAKE_PCI_DEVICE("0001:01:00.0", 0x8086, 0x105e); + MAKE_PCI_DEVICE("0001:01:00.1", 0x8086, 0x105e); + MAKE_PCI_DEVICE("0005:80:00.0", 0x10b5, 0x8112, .class = 0x060400); + MAKE_PCI_DEVICE("0005:90:01.0", 0x1033, 0x0035); + MAKE_PCI_DEVICE("0005:90:01.1", 0x1033, 0x0035); + MAKE_PCI_DEVICE("0005:90:01.2", 0x1033, 0x00e0); } @@ -934,6 +949,24 @@ open(const char *path, int flags, ...) return ret; } +DIR * +opendir(const char *path) +{ + DIR *ret; + char *newpath = NULL; + + init_syms(); + + if (STRPREFIX(path, PCI_SYSFS_PREFIX) && + getrealpath(&newpath, path) < 0) + return NULL; + + ret = realopendir(newpath ? newpath : path); + + VIR_FREE(newpath); + return ret; +} + int close(int fd) { diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 5fe6d49..82a173a 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -183,6 +183,31 @@ cleanup: return ret; } +struct testPCIDevData { + unsigned int domain; + unsigned int bus; + unsigned int slot; + unsigned int function; +}; + +static int +testVirPCIDeviceIsAssignable(const void *opaque) +{ + const struct testPCIDevData *data = opaque; + int ret = -1; + virPCIDevicePtr dev; + + if (!(dev = virPCIDeviceNew(data->domain, data->bus, data->slot, data->function))) + goto cleanup; + + if (virPCIDeviceIsAssignable(dev, true)) + ret = 0; + + virPCIDeviceFree(dev); +cleanup: + return ret; +} + # define FAKESYSFSDIRTEMPLATE abs_builddir "/fakesysfsdir-XXXXXX" static int @@ -209,10 +234,19 @@ mymain(void) ret = -1; \ } while (0) +# define DO_TEST_PCI(fnc, domain, bus, slot, function) \ + do { \ + struct testPCIDevData data = { domain, bus, slot, function }; \ + if (virtTestRun(#fnc, fnc, &data) < 0) \ + ret = -1; \ + } while (0) + DO_TEST(testVirPCIDeviceNew); DO_TEST(testVirPCIDeviceDetach); DO_TEST(testVirPCIDeviceReset); DO_TEST(testVirPCIDeviceReattach); + DO_TEST_PCI(testVirPCIDeviceIsAssignable, 5, 0x90, 1, 0); + DO_TEST_PCI(testVirPCIDeviceIsAssignable, 1, 1, 0, 0); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakesysfsdir); diff --git a/tests/virpcitestdata/0001:00:00.0.config b/tests/virpcitestdata/0001:00:00.0.config new file mode 100644 index 0000000000000000000000000000000000000000..808d48993cfc0f41223fcb5f49deffc594f136b7 GIT binary patch literal 4096 zcmeH@I}XAy5Jca`5~RZg60MJb!~ys;a0<jx5^hCDNy!mt=t)n(8Yfir2x&(4YG(bB z{ig90wibyn0^=hytn<`78f&|D=zEvd5U8+Sxa1hw*nI*%I6fEDtkd58IUH=(-@Ei& z`ONZ@#r(MD|GagrnWu5_32tAW*RPg6sv;l)A|L`HAOa#F0wN#+A|L`H@J9q*PZkdc literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0001:01:00.0.config b/tests/virpcitestdata/0001:01:00.0.config new file mode 100644 index 0000000000000000000000000000000000000000..f63aacbea08fc83b345e1ee404756145e7d349a5 GIT binary patch literal 4096 zcmZo`h!bFD5MW?qU|>>UXkY*WAi>nY$iN6<qW}>B2WF7K379CR5||9#X~qjmCm0kM z6j>iMK<#Fl0AdIL{c(^7NNY$jIHrJ{?<fFO0H%Qc6alFM0YL>exUYeN42%s7Ec~1x z877=QWd`bav)TXue_{D2AeEzFGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!n I24e^S0CUn1m;e9( literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0001:01:00.1.config b/tests/virpcitestdata/0001:01:00.1.config new file mode 100644 index 0000000000000000000000000000000000000000..db9e3876a528266bb5a6e9651d7cd18b45b7d71f GIT binary patch literal 4096 zcmZo`h!bFD5MW?qU|>>UXkcJqU;z?r4T=nmKsG865pZAziJX85Gr<@GPcvRnI>Dg8 zpvd~50qPj02_PQ`0R3^02S{s3F*v4xobM<ARRE?K85l)Csz5+cfer3!pdbTd0|N^` zCrE|~GcZ8HK)?*t@n*CC|Np}BPaq<r<Y)+thQMeDjE2By2#kinXb6mkz-S1JhQMeD NjE2By2n@au000k05W)Ze literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0005:80:00.0.config b/tests/virpcitestdata/0005:80:00.0.config new file mode 100644 index 0000000000000000000000000000000000000000..cc4f94a849ed3d0a47f5b47331aaecdea88765c3 GIT binary patch literal 4096 zcmdlgAk@gtAi%JSfrX8Mfsp|Q8YawV_`sl`#L)Di>BE1RD1>%^ae>Mi1DK*fTmcO} zuqbOn1DJ*p0t|%^rUDm(pbry}Ey&Qo0}^ro5pYlpXVI6zg5+oV+Kg)3K=~il6$8f` z_5Z+y{a~<pH2w!eEDW3*M&p0r!hSH=JR1LlAr=PC4WsctaA7|fY#xpO!4L}r=Z4Yv IADFNQ0PH*z9smFU literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0005:90:01.0.config b/tests/virpcitestdata/0005:90:01.0.config new file mode 100644 index 0000000000000000000000000000000000000000..a60599bd342d3ebcdc7b8367ca36ad337f602fde GIT binary patch literal 256 zcmXpOFlAt45MXi^VCG@qXkY+>CJ=!Q7z5RUfCHEW5{!&mj0{Y5Fz#TaS&cX3;ByxM DCDjDB literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0005:90:01.1.config b/tests/virpcitestdata/0005:90:01.1.config new file mode 100644 index 0000000000000000000000000000000000000000..beee76534041a7020c08ae9ac03d9a349c6ea12e GIT binary patch literal 256 ycmXpOFlAt45MXi^VCG@qU|?VnU}yr8Sb;H6EeJS(Ng%<*sKv;@R0rb@MH&E<&;s)S literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0005:90:01.2.config b/tests/virpcitestdata/0005:90:01.2.config new file mode 100644 index 0000000000000000000000000000000000000000..cfd72e4d7165bff2751ecbdc570ce7f1e0646226 GIT binary patch literal 256 zcmXpOc)-BMAi%_;z|6zo!oa|wz|aIFu>xbDS`csmlR$!5K#7rosSd`)Mk^@TV-u#E T7_0Gy9FS#<5E~CbC<F-rZiWW} literal 0 HcmV?d00001 -- 1.7.1

3 4

[libvirt] [PATCH] Fix bridge configuration when OUTPUT policy is DROP on the host
by Lénaïc Huard 07 Jan '14

07 Jan '14

When the host is configured with very restrictive firewall (default policy is DROP for all chains, including OUTPUT), the bridge driver for Linux adds netfilter entries to allow DHCP and DNS requests to go from the VM to the dnsmasq of the host. The issue that this commit fixes is the fact that a DROP policy on the OUTPUT chain blocks the DHCP replies from the host’s dnsmasq to the VM. As DHCP replies are sent in UDP, they are not caught by any --ctstate ESTABLISHED rule and so, need to be explicitly allowed. Signed-off-by: Lénaïc Huard <lenaic(a)lhuard.fr.eu.org> --- src/libvirt_private.syms | 2 ++ src/network/bridge_driver_linux.c | 35 +++++++++++++--------- src/util/viriptables.c | 61 +++++++++++++++++++++++++++++++++++++++ src/util/viriptables.h | 7 +++++ 4 files changed, 92 insertions(+), 13 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2dbb8f8..c26ce29 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1290,6 +1290,7 @@ iptablesAddForwardRejectOut; iptablesAddOutputFixUdpChecksum; iptablesAddTcpInput; iptablesAddUdpInput; +iptablesAddUdpOutput; iptablesRemoveDontMasquerade; iptablesRemoveForwardAllowCross; iptablesRemoveForwardAllowIn; @@ -1301,6 +1302,7 @@ iptablesRemoveForwardRejectOut; iptablesRemoveOutputFixUdpChecksum; iptablesRemoveTcpInput; iptablesRemoveUdpInput; +iptablesRemoveUdpOutput; # util/virjson.h diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index 066779a..dcdd033 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -564,6 +564,13 @@ int networkAddGeneralFirewallRules(virNetworkObjPtr network) goto err2; } + if (iptablesAddUdpOutput(AF_INET, network->def->bridge, 68) < 0) { + virReportError(VIR_ERR_SYSTEM_ERROR, + _("failed to add iptables rule to allow DHCP replies to '%s'"), + network->def->bridge); + goto err3; + } + /* If we are doing local DHCP service on this network, attempt to * add a rule that will fixup the checksum of DHCP response * packets back to the guests (but report failure without @@ -582,14 +589,14 @@ int networkAddGeneralFirewallRules(virNetworkObjPtr network) virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow DNS requests from '%s'"), network->def->bridge); - goto err3; + goto err4; } if (iptablesAddUdpInput(AF_INET, network->def->bridge, 53) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow DNS requests from '%s'"), network->def->bridge); - goto err4; + goto err5; } /* allow TFTP requests through to dnsmasq if necessary */ @@ -598,7 +605,7 @@ int networkAddGeneralFirewallRules(virNetworkObjPtr network) virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow TFTP requests from '%s'"), network->def->bridge); - goto err5; + goto err6; } /* Catch all rules to block forwarding to/from bridges */ @@ -607,14 +614,14 @@ int networkAddGeneralFirewallRules(virNetworkObjPtr network) virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to block outbound traffic from '%s'"), network->def->bridge); - goto err6; + goto err7; } if (iptablesAddForwardRejectIn(AF_INET, network->def->bridge) < 0) { virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to block inbound traffic to '%s'"), network->def->bridge); - goto err7; + goto err8; } /* Allow traffic between guests on the same bridge */ @@ -622,31 +629,33 @@ int networkAddGeneralFirewallRules(virNetworkObjPtr network) virReportError(VIR_ERR_SYSTEM_ERROR, _("failed to add iptables rule to allow cross bridge traffic on '%s'"), network->def->bridge); - goto err8; + goto err9; } /* add IPv6 general rules, if needed */ if (networkAddGeneralIp6tablesRules(network) < 0) { - goto err9; + goto err10; } return 0; /* unwind in reverse order from the point of failure */ -err9: +err10: iptablesRemoveForwardAllowCross(AF_INET, network->def->bridge); -err8: +err9: iptablesRemoveForwardRejectIn(AF_INET, network->def->bridge); -err7: +err8: iptablesRemoveForwardRejectOut(AF_INET, network->def->bridge); -err6: +err7: if (ipv4def && ipv4def->tftproot) { iptablesRemoveUdpInput(AF_INET, network->def->bridge, 69); } -err5: +err6: iptablesRemoveUdpInput(AF_INET, network->def->bridge, 53); -err4: +err5: iptablesRemoveTcpInput(AF_INET, network->def->bridge, 53); +err4: + iptablesRemoveUdpOutput(AF_INET, network->def->bridge, 68); err3: iptablesRemoveUdpInput(AF_INET, network->def->bridge, 67); err2: diff --git a/src/util/viriptables.c b/src/util/viriptables.c index a1711bb..9b78d86 100644 --- a/src/util/viriptables.c +++ b/src/util/viriptables.c @@ -184,6 +184,28 @@ iptablesInput(int family, NULL); } +static int +iptablesOutput(int family, + const char *iface, + int port, + int action, + int tcp) +{ + char portstr[32]; + + snprintf(portstr, sizeof(portstr), "%d", port); + portstr[sizeof(portstr) - 1] = '\0'; + + return iptablesAddRemoveRule("filter", "OUTPUT", + family, + action, + "--out-interface", iface, + "--protocol", tcp ? "tcp" : "udp", + "--destination-port", portstr, + "--jump", "ACCEPT", + NULL); +} + /** * iptablesAddTcpInput: * @ctx: pointer to the IP table context @@ -262,6 +284,45 @@ iptablesRemoveUdpInput(int family, return iptablesInput(family, iface, port, REMOVE, 0); } +/** + * iptablesAddUdpOutput: + * @ctx: pointer to the IP table context + * @iface: the interface name + * @port: the UDP port to add + * + * Add an output to the IP table allowing access to the given @port from + * the given @iface interface for UDP packets + * + * Returns 0 in case of success or an error code in case of error + */ + +int +iptablesAddUdpOutput(int family, + const char *iface, + int port) +{ + return iptablesOutput(family, iface, port, ADD, 0); +} + +/** + * iptablesRemoveUdpOutput: + * @ctx: pointer to the IP table context + * @iface: the interface name + * @port: the UDP port to remove + * + * Removes an output from the IP table, hence forbidding access to the given + * @port from the given @iface interface for UDP packets + * + * Returns 0 in case of success or an error code in case of error + */ +int +iptablesRemoveUdpOutput(int family, + const char *iface, + int port) +{ + return iptablesOutput(family, iface, port, REMOVE, 0); +} + static char *iptablesFormatNetwork(virSocketAddr *netaddr, unsigned int prefix) diff --git a/src/util/viriptables.h b/src/util/viriptables.h index 6dfb992..2f9a212 100644 --- a/src/util/viriptables.h +++ b/src/util/viriptables.h @@ -40,6 +40,13 @@ int iptablesRemoveUdpInput (int family, const char *iface, int port); +int iptablesAddUdpOutput (int family, + const char *iface, + int port); +int iptablesRemoveUdpOutput (int family, + const char *iface, + int port); + int iptablesAddForwardAllowOut (virSocketAddr *netaddr, unsigned int prefix, const char *iface, -- 1.8.5.1

2 1

[libvirt] [PATCH] qemu: auto-create pci controller alias if missing from domain status
by Laine Stump 07 Jan '14

07 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1047429 The problem occurs when a host with a running guest is upgraded from pre-1.0.2 libvirt, and then a later attempt is made to hotplug a new PCI device (emulated or passthrough) to that guest without having power cycled / save-restored / migrated the guest. The hotplug fails with this error: internal error: Device alias was not set for PCI controller with index 0 required for device at address 0000:00:xx.x This happens because the pci controller newly auto-created for the status will not contain an alias because 1) assigning an alias is normally left up to the hypervisor driver to do at domain startup, or controller attach time. 2) under the older libvirt, the PCI controller was implicit, so it was never assigned an alias. 3) when libvirtd is restarted and re-attaches to each domain, there is no "re-attach device" operation, so the no-longer-implicit PCI controller will not get an alias assigned either. When explicit PCI controllers were first added (shortly before libvirt 1.0.2), the code was written such that each controller would get an alias named "pciN" placed in its status, but the commandlines would all ignore that and instead use "pci.N". This was changed in commit 01b8812 so that 1) the proper "pci.N" alias was stored in the status, 2) the alias name from the status was used when creating the qemu commandline, and 3) when a PCI device was being hotplugged, if the status for its PCI controller had no alias assigned, an internal error would be generated. This patch changes that error condition to instead make a temporary string to contain the required alias "pci.N" and put that in the proper place in the commandline. It does not fill in the alias in the status object just in case that might create some other problem (it didn't seem very polite for the qemuBuildDeviceAddressStr() for one device to be modifying the status object for a different device). Note that this does *not* address a similar problem that would occur when libvirt was upgraded from a version between 1.0.2 and 1.1.2 to a newer version - in these cases the status would contain "pciN" as the alias name, so qemuBuildDeviceAddressStr() would be successful, but the resulting command would fail (since the qemu process has no controller named "pciN", but instead has one named "pci.N"); the problem can anyway be worked around by restarting / save-restoring / migrating the domain, and solving this second problem would require special-casing a particular alias name pattern rather than just handling a missing name, which seems just a bit too ugly to have permanently cluttering the code. --- (Yes, another exceedingly long commit log message for a very short patch :-) I'm not 100% convinced that it's necessary to handle *this* case either (upgrading from pre-1.0.2), but thought I should send the patch to the list anyway to see what others think. My opinion is that it's creating permanent clutter in the code in order to handle a situation that will come up just once in the entire lifetime of a host (and even then only if libvirt is upgraded without somehow restarting a guest, and *then* a device is hotplugged to that guest), so it may be better if we just left the workaround ("restart/save-restore/migrate the domain if you need to hotplug a device") as a footnote somewhere instead. src/qemu/qemu_command.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d723dc8..a562e18 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1,7 +1,7 @@ /* * qemu_command.c: QEMU command generation * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -3021,6 +3021,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, { int ret = -1; char *devStr = NULL; + char *tempAlias = NULL; if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { const char *contAlias = NULL; @@ -3035,12 +3036,16 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, cont->idx == info->addr.pci.bus) { contAlias = cont->info.alias; if (!contAlias) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device alias was not set for PCI " - "controller with index %u required " - "for device at address %s"), - info->addr.pci.bus, devStr); - goto cleanup; + /* this could be a case where the domain had been + * started with an earlier version of libvirt that + * had no device entry for the PCI bus + * (pre-1.0.2), and in that case no alias would be + * set in the status XML, so we create one using + * the standard "pci.N" pattern. + */ + if (virAsprintf(&tempAlias, "pci.%u", info->addr.pci.bus) < 0) + goto cleanup; + contAlias = tempAlias; } break; } @@ -3118,6 +3123,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, ret = 0; cleanup: VIR_FREE(devStr); + VIR_FREE(tempAlias); return ret; } -- 1.8.4.2

2 3

[libvirt] [PATCH] lxc_controller: Don't leak @name
by Michal Privoznik 07 Jan '14

07 Jan '14

The @name variable is VIR_STRDUP()-ed into, but never freed. In fact, there's no need to duplicate a command line argument since all places where @name is used expect const char. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_controller.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c013147..1b43bd2 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2249,7 +2249,7 @@ int main(int argc, char *argv[]) { pid_t pid; int rc = -1; - char *name = NULL; + const char *name = NULL; size_t nveths = 0; char **veths = NULL; int handshakeFd = -1; @@ -2300,8 +2300,7 @@ int main(int argc, char *argv[]) break; case 'n': - if (VIR_STRDUP(name, optarg) < 0) - goto cleanup; + name = optarg; break; case 'v': -- 1.8.5.1

2 3

[libvirt] [PATCH] qemuProcessStop: Don't overwrite any errors
by Michal Privoznik 07 Jan '14

07 Jan '14

Currently, the qemuProcessStop tries to open the domain log file and saves the original error afterwards. Then all the cleanup is done after which the error is restored back. This has however one flaw: if opening of the log file fails an error is reported, which results in previous error being overwritten (the useful one, e.g. "PCI device XXXX:XXXX could not be found"). Hence, user sees something like: error: failed to create logfile /var/log/libvirt/qemu/ovirt_usb.log: No such file or directory instead of: error: internal error: Did not find USB device 8644:8003 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> Reported-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/qemu/qemu_process.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d0fde54..9331744 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4224,6 +4224,10 @@ void qemuProcessStop(virQEMUDriverPtr driver, return; } + /* This method is routinely used in clean up paths. Disable error + * reporting so we don't squash a legit error. */ + orig_err = virSaveLastError(); + /* * We may unlock the vm in qemuProcessKill(), and another thread * can lock the vm, and then call qemuProcessStop(). So we should @@ -4256,10 +4260,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virStrerror(errno, ebuf, sizeof(ebuf))); } - /* This method is routinely used in clean up paths. Disable error - * reporting so we don't squash a legit error. */ - orig_err = virSaveLastError(); - virDomainConfVMNWFilterTeardown(vm); if (cfg->macFilter) { -- 1.8.5.1

2 1

[libvirt] [sandbox PATCH] Fix FSF address on bin/virt-sandbox-service
by Cédric Bosdonnat 07 Jan '14

07 Jan '14

--- bin/virt-sandbox-service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..a7e71cd 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -16,7 +16,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA. # from gi.repository import LibvirtGObject -- 1.8.5.2

3 2

[libvirt] [PATCH] maint: fix comment typos in qemu numa code
by Eric Blake 07 Jan '14

07 Jan '14

Introduced in commit 81fae6b9. * src/qemu/qemu_driver.c (qemuDomainSetNumaParamsLive): Fix typos. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7e45ffc..004ec88 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1,7 +1,7 @@ /* * qemu_driver.c: core driver methods for managing qemu guests * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -8161,7 +8161,7 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, goto cleanup; } - /*Get Exisitng nodeset values */ + /* Get existing nodeset values */ if (virCgroupGetCpusetMems(priv->cgroup, &nodeset_str) < 0 || virBitmapParse(nodeset_str, 0, &temp_nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) @@ -8192,7 +8192,7 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, goto cleanup; VIR_FREE(nodeset_str); - /* Ensure the cpuset string is formated before passing to cgroup */ + /* Ensure the cpuset string is formatted before passing to cgroup */ if (!(nodeset_str = virBitmapFormat(nodeset))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to format nodeset")); -- 1.8.4.2

1 0

[libvirt] [PATCH v3] BSD: implement nodeGetMemoryStats
by Roman Bogorodskiy 07 Jan '14

07 Jan '14

Add a BSD implementation of nodeGetMemoryStats based on sysctl(3). --- src/nodeinfo.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1838547..05bc038 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -96,7 +96,85 @@ appleFreebsdNodeGetMemorySize(unsigned long *memory) return 0; } -#endif +#endif /* defined(__FreeBSD__) || defined(__APPLE__) */ + +#ifdef __FreeBSD__ +# define BSD_MEMORY_STATS_ALL 4 + +static int +freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params, + int *nparams) +{ + size_t i, j = 0; + unsigned long pagesize = getpagesize() >> 10; + long bufpages; + size_t bufpages_size = sizeof(bufpages); + struct field_sysctl_map { + const char *field; + const char *sysctl_name; + } sysctl_map[] = { + {VIR_NODE_MEMORY_STATS_TOTAL, "vm.stats.vm.v_page_count"}, + {VIR_NODE_MEMORY_STATS_FREE, "vm.stats.vm.v_free_count"}, + {VIR_NODE_MEMORY_STATS_CACHED, "vm.stats.vm.v_cache_count"}, + {NULL, NULL} + }; + + if ((*nparams) == 0) { + *nparams = BSD_MEMORY_STATS_ALL; + return 0; + } + + if ((*nparams) != BSD_MEMORY_STATS_ALL) { + virReportInvalidArg(nparams, + _("nparams in %s must be %d"), + __FUNCTION__, BSD_MEMORY_STATS_ALL); + return -1; + } + + for (i = 0; sysctl_map[i].field != NULL; i++) { + u_int value; + size_t value_size = sizeof(value); + virNodeMemoryStatsPtr param; + + if (sysctlbyname(sysctl_map[i].sysctl_name, &value, + &value_size, NULL, 0) < 0) { + virReportSystemError(errno, + _("sysctl failed for '%s'"), + sysctl_map[i].sysctl_name); + return -1; + } + + param = &params[j++]; + if (virStrcpyStatic(param->field, sysctl_map[i].field) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field '%s' too long for destination"), + sysctl_map[i].field); + return -1; + } + param->value = (unsigned long long)value * pagesize; + } + + { + virNodeMemoryStatsPtr param = &params[j++]; + + if (sysctlbyname("vfs.bufspace", &bufpages, &bufpages_size, NULL, 0) < 0) { + virReportSystemError(errno, + _("sysctl failed for '%s'"), + "vfs.bufspace"); + return -1; + } + if (virStrcpyStatic(param->field, VIR_NODE_MEMORY_STATS_BUFFERS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field '%s' too long for destination"), + VIR_NODE_MEMORY_STATS_BUFFERS); + return -1; + } + param->value = (unsigned long long)bufpages >> 10; + } + + return 0; +} +#endif /* __FreeBSD__ */ #ifdef __linux__ # define CPUINFO_PATH "/proc/cpuinfo" @@ -1041,6 +1119,8 @@ int nodeGetMemoryStats(int cellNum ATTRIBUTE_UNUSED, return ret; } +#elif defined(__FreeBSD__) + return freebsdNodeGetMemoryStats(params, nparams); #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node memory stats not implemented on this platform")); -- 1.8.4.3

3 3

[libvirt] [PATCH] qemuStateInitialize: Create qemu log directory
by Wangyufei (James) 07 Jan '14

07 Jan '14

>From 51782a44eecf5801e5100920e5965d8dfc46e4cc Mon Sep 17 00:00:00 2001 From: Zhou Yimin <zhouyimin(a)huawei.com> Date: Thu, 2 Jan 2014 16:32:46 +0800 Subject: [PATCH] qemuStateInitialize: Create qemu log directory When an error occurred in qemuProcessStart before qemu log directory created, it will fail to create qemu log file in qemuProcessStop during qemuProcessStart's cleanup phase. So when I start a VM whose PCI device not exist, the last error will be overwrited as "failed to create logfile XXX: No such file or directory" not the real reason "Device XXX not found:could not access XXX: No such file or directory". I fix it as following. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> Reviewed-by: Wang Yufei <james.wangyufei(a)huawei.com> --- src/qemu/qemu_driver.c | 5 +++++ src/qemu/qemu_process.c | 14 -------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45d11cd..ca3208e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -615,6 +615,11 @@ qemuStateInitialize(bool privileged, goto error; VIR_FREE(driverConf); + if (virFileMakePath(cfg->logDir) < 0) { + VIR_ERROR(_("Failed to create log dir '%s': %s"), + cfg->logDir, virStrerror(errno, ebuf, sizeof(ebuf))); + goto error; + } if (virFileMakePath(cfg->stateDir) < 0) { VIR_ERROR(_("Failed to create state dir '%s': %s"), cfg->stateDir, virStrerror(errno, ebuf, sizeof(ebuf))); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d0fde54..0382c06 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3737,13 +3737,6 @@ int qemuProcessStart(virConnectPtr conn, } } - if (virFileMakePath(cfg->logDir) < 0) { - virReportSystemError(errno, - _("cannot create log directory %s"), - cfg->logDir); - goto cleanup; - } - VIR_DEBUG("Creating domain log file"); if ((logfile = qemuDomainCreateLog(driver, vm, false)) < 0) goto cleanup; @@ -4503,13 +4496,6 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, driver->inhibitCallback(true, driver->inhibitOpaque); active = true; - if (virFileMakePath(cfg->logDir) < 0) { - virReportSystemError(errno, - _("cannot create log directory %s"), - cfg->logDir); - goto error; - } - VIR_FREE(priv->pidfile); if (VIR_STRDUP(priv->pidfile, pidfile) < 0) goto error; -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

3 2

[libvirt] [PATCH] Fix argument order at qemuMigrationPerformJob().
by Minoru Usui 07 Jan '14

07 Jan '14

Hi, everyone. I found a small bug at qemuMigrationPerformJob(). The order of argument, @listenAddress and @cookiein, should be changed place, because these order are mismatched caller and callee. Signed-off-by: Minoru Usui <usui(a)mxm.nes.nec.co.jp> --- src/qemu/qemu_migration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 9342062..53a4ae6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4045,8 +4045,8 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, const char *dconnuri, const char *uri, const char *graphicsuri, - const char *cookiein, const char *listenAddress, + const char *cookiein, int cookieinlen, char **cookieout, int *cookieoutlen, -- 1.7.2.3 -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

2 2

[libvirt] [PATCH 0/2] Fixes on shareable SCSI host device
by Osier Yang 07 Jan '14

07 Jan '14

It's easy to reproduce with two domains using the same SCSI generic device, both with <shareable> specified. It's expected to work. But the fact is: % virsh start f20-1 error: Failed to start domain b error: Requested operation is not valid: SCSI device 1:0:0:0 is in use by domain f20-0 Osier Yang (2): util: Add "shareable" field for virSCSIDevice struct qemu: Don't fail if the SCSI host device is shareable between domains src/libvirt_private.syms | 1 + src/qemu/qemu_cgroup.c | 3 ++- src/qemu/qemu_hostdev.c | 42 +++++++++++++++++++++++----------------- src/security/security_apparmor.c | 3 ++- src/security/security_dac.c | 6 ++++-- src/security/security_selinux.c | 6 ++++-- src/util/virscsi.c | 11 ++++++++++- src/util/virscsi.h | 4 +++- 8 files changed, 50 insertions(+), 26 deletions(-) -- 1.8.1.4

2 5

[libvirt] [PATCH] libxl: Fix initialization of nictype in libxl_device_nic
by Jim Fehlig 07 Jan '14

07 Jan '14

As pointed out by the Xen folks [1], HVM nics should always be set to type LIBXL_NIC_TYPE_VIF_IOEMU unless the user explicity requests LIBXL_NIC_TYPE_VIF via model='netfront'. The current logic in libxlMakeNic() only sets the nictype to LIBXL_NIC_TYPE_VIF_IOEMU if a model is specified that is not 'netfront', which breaks PXE booting configurations where no model is specified (i.e. use the hypervisor default). Reported-by: Stefan Bader <stefan.bader(a)canonical.com> [1] https://www.redhat.com/archives/libvir-list/2013-December/msg01156.html Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- I toyed with detecting whether to use an IOEMU nic in libxlMakeNicList() and passing the bool to libxlMakeNic(), but in the end left the detection to libxlMakeNic(). src/libxl/libxl_conf.c | 20 ++++++++++++++------ src/libxl/libxl_conf.h | 4 +++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index aaeb00e..04d01af 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -855,8 +855,12 @@ error: } int -libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic) +libxlMakeNic(virDomainDefPtr def, + virDomainNetDefPtr l_nic, + libxl_device_nic *x_nic) { + bool ioemu_nic = STREQ(def->os.type, "hvm"); + /* TODO: Where is mtu stored? * * x_nics[i].mtu = 1492; @@ -866,12 +870,16 @@ libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic) virMacAddrGetRaw(&l_nic->mac, x_nic->mac); - if (l_nic->model && !STREQ(l_nic->model, "netfront")) { - if (VIR_STRDUP(x_nic->model, l_nic->model) < 0) - return -1; + if (ioemu_nic) x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; - } else { + else x_nic->nictype = LIBXL_NIC_TYPE_VIF; + + if (l_nic->model) { + if (VIR_STRDUP(x_nic->model, l_nic->model) < 0) + return -1; + if (STREQ(l_nic->model, "netfront")) + x_nic->nictype = LIBXL_NIC_TYPE_VIF; } if (VIR_STRDUP(x_nic->ifname, l_nic->ifname) < 0) @@ -908,7 +916,7 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) return -1; for (i = 0; i < nnics; i++) { - if (libxlMakeNic(l_nics[i], &x_nics[i])) + if (libxlMakeNic(def, l_nics[i], &x_nics[i])) goto error; } diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index ffa93bd..90d590f 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -142,7 +142,9 @@ libxlMakeCapabilities(libxl_ctx *ctx); int libxlMakeDisk(virDomainDiskDefPtr l_dev, libxl_device_disk *x_dev); int -libxlMakeNic(virDomainNetDefPtr l_nic, libxl_device_nic *x_nic); +libxlMakeNic(virDomainDefPtr def, + virDomainNetDefPtr l_nic, + libxl_device_nic *x_nic); int libxlMakeVfb(libxlDriverPrivatePtr driver, virDomainGraphicsDefPtr l_vfb, libxl_device_vfb *x_vfb); -- 1.8.1.4

3 3

[libvirt] [PATCH] maint: Fix messy include of libvirt_internal.h
by Peter Krempa 07 Jan '14

07 Jan '14

The libvirt_internal.h header was included by the internal.h header. This made it painful to add new stuff to the header file that would require some more specific types. Remove inclusion by internal.h and add it to appropriate places manually. --- src/driver.h | 1 + src/internal.h | 2 -- src/libxl/libxl_conf.h | 1 + src/lxc/lxc_conf.h | 1 + src/uml/uml_conf.h | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/driver.h b/src/driver.h index b6927ea..5f4cd8d 100644 --- a/src/driver.h +++ b/src/driver.h @@ -25,6 +25,7 @@ # include <unistd.h> # include "internal.h" +# include "libvirt_internal.h" # include "viruri.h" /* * List of registered drivers numbers diff --git a/src/internal.h b/src/internal.h index 5035dac..4ba0e41 100644 --- a/src/internal.h +++ b/src/internal.h @@ -60,8 +60,6 @@ # include "libvirt/libvirt-qemu.h" # include "libvirt/virterror.h" -# include "libvirt_internal.h" - # include "c-strcase.h" # include "ignore-value.h" diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index ffa93bd..3ab8f20 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -29,6 +29,7 @@ # include <libxl.h> # include "internal.h" +# include "libvirt_internal.h" # include "domain_conf.h" # include "domain_event.h" # include "capabilities.h" diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index f6cbfc9..e04dcdd 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -26,6 +26,7 @@ # define LXC_CONF_H # include "internal.h" +# include "libvirt_internal.h" # include "domain_conf.h" # include "domain_event.h" # include "capabilities.h" diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index c23a177..a914be0 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -25,6 +25,7 @@ # define __UML_CONF_H # include "internal.h" +# include "libvirt_internal.h" # include "capabilities.h" # include "network_conf.h" # include "domain_conf.h" -- 1.8.5.2

2 2

[libvirt] [PATCH] lxcDomainShutdownFlags: Cleanup @flags usage
by Michal Privoznik 06 Jan '14

06 Jan '14

Currently, the @flags usage is a bit unclear at first sight to say the least. There's no need for such unclear code especially when we can borrow the working code from qemuDomainShutdownFlags(). In addition, this fixes one bug too. If user requested both VIR_DOMAIN_SHUTDOWN_INITCTL and VIR_DOMAIN_SHUTDOWN_SIGNAL at the same time, he is basically saying: 'Use the force Luke! If initctl fails try sending a signal.' But with the current code we don't do that. If initctl fails for some reason (e.g. inability to write to /dev/initctl) we don't try sending any signal but fail immediately. To make things worse, making a domain shutdown with bare _SIGNAL was working by blind chance of a @rc variable being placed at correct place on the stack so its initial value was zero. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc_driver.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c499182..a563b70 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2594,7 +2594,8 @@ lxcDomainShutdownFlags(virDomainPtr dom, virDomainObjPtr vm; char *vroot = NULL; int ret = -1; - int rc; + int rc = 0; + bool useInitctl = false, initctlRequested, signalRequested; virCheckFlags(VIR_DOMAIN_SHUTDOWN_INITCTL | VIR_DOMAIN_SHUTDOWN_SIGNAL, -1); @@ -2623,25 +2624,24 @@ lxcDomainShutdownFlags(virDomainPtr dom, (unsigned long long)priv->initpid) < 0) goto cleanup; - if (flags == 0 || - (flags & VIR_DOMAIN_SHUTDOWN_INITCTL)) { - if ((rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, - vroot)) < 0) { + initctlRequested = flags & VIR_DOMAIN_SHUTDOWN_INITCTL; + signalRequested = flags & VIR_DOMAIN_SHUTDOWN_SIGNAL; + + if (initctlRequested || !flags) + useInitctl = true; + + if (useInitctl) { + rc = virInitctlSetRunLevel(VIR_INITCTL_RUNLEVEL_POWEROFF, vroot); + if (rc < 0 && !signalRequested) goto cleanup; - } - if (rc == 0 && flags != 0 && - ((flags & ~VIR_DOMAIN_SHUTDOWN_INITCTL) == 0)) { + if (rc == 0 && !signalRequested) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Container does not provide an initctl pipe")); goto cleanup; } - } else { - rc = 0; } - if (rc == 0 && - (flags == 0 || - (flags & VIR_DOMAIN_SHUTDOWN_SIGNAL))) { + if (rc == 0 && !useInitctl) { if (kill(priv->initpid, SIGTERM) < 0 && errno != ESRCH) { virReportSystemError(errno, -- 1.8.5.1

3 4

[libvirt] [PATCH] build: fix bootstrap with older autoconf
by Eric Blake 06 Jan '14

06 Jan '14

Pavel Hrdina reported to me off-list that my gnulib update on Jan 1 broke the build on RHEL 6.4 and older: executing aclocal -I glm4 glm4/gl-openssl.m4:11: error: m4_defn: undefined macro: _m4_divert_diversion glm4/gl-openssl.m4:11: the top level autom4te: /usr/bin/m4 failed with exit status: 1 aclocal: autom4te failed with exit status: 1 It took me a while, but I fixed the regression in gnulib. * gnulib: Update to latest, for buid fixes. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. * .gnulib c7802e2...5a7fe2f (12): > md5, sha1, sha256, sha512: support older autoconf > include_next: port to autoconf 2.63 > maint: add a gnulib-local rule to keep non-ascii out of .texi files > freadable, fwritable, fwriting: declare with the "pure" attribute > maint.mk: adapt openat.h-include-without-use test > doc: use ASCII in .texi files where UTF-8 isn't needed > freading: declare with attribute "pure" > manywarnings: remove -Wmudflap > autoupdate > relocatable-script: remove unused code > maint: fix public-submodule-commit to work with newer git > autoupdate .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index c7802e2..5a7fe2f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c7802e2b418c40fa2bd270cf241314d0c8433a26 +Subproject commit 5a7fe2fe76d74d2cad663018bdf6ed40a90f085e -- 1.8.4.2

1 0

[libvirt] Setting devid for emulated NICs (Xen 4.3.1 / libvirt 1.2.0) using libxl driver
by Stefan Bader 06 Jan '14

06 Jan '14

Using virt-manager "hypervisor default" type: <interface type='bridge'> <mac address='00:16:3e:5e:09:9d'/> <source bridge='br0'/> <script path='vif-bridge'/> </interface> This causes the qemu call to have "-net none" which removes PXE boot abilities. A linux kernel has network through the xen pv-driver. Changing in virt-manager to "e1000" type: <interface type='bridge'> <mac address='00:16:3e:5e:09:9d'/> <source bridge='br0'/> <script path='vif-bridge'/> <model type='e1000'/> </interface> This currently (Xen 4.3.1 + libvirt 1.2.0) fails and the qemu arguments in the log look suspicious: -device e1000,id=nic-1,netdev=net-1,mac=00:16:3e:5e:09:9d -netdev type=tap,id=net-1,ifname=vif1.-1-emu,script=no,downscript=no Looking through git I found ba64b97134a6129a48684f22f31be92c3b6eef96 libxl: Allow libxl to set NIC devid which removes a line that sets the devid of new NICs. I assume the comment says (sorry I always seem to get confused reading it) that devid should be auto-set by the libxl library provided by Xen. But I could not find where that would be done. Even the xl command implementation sets it explicitly. libxl_device_nic_init sets it to -1 which would explain the wrong qemu arguments above. For testing I re-added the following after the libxlMakeNic call: --- libvirt-1.2.0.orig/src/libxl/libxl_conf.c 2013-12-11 17:04:17.000000000 +0 +++ libvirt-1.2.0/src/libxl/libxl_conf.c 2013-12-16 19:08:46.830016646 +0 @@ -907,6 +907,8 @@ libxlMakeNicList(virDomainDefPtr def, l for (i = 0; i < nnics; i++) { if (libxlMakeNic(l_nics[i], &x_nics[i])) goto error; + if (x_nics[i].devid < 0) + x_nics[i].devid = i; } d_config->nics = x_nics; And with that I get a working PXE boot when I set the device type in the config. (Side note that I think not using a type defaults to rtl8139 in the old xend driver. Maybe this should be the same for the xl driver). I am not sure how the right fix for it should look like as I am unsure which part was supposed to set the devid. Just right now it does not seem to be done. -Stefan

3 17

[libvirt] device removal
by Serge Hallyn 06 Jan '14

06 Jan '14

Hi, one of our tests was complaining that after an attach-device followed by detach-device, the device was still in the vm's apparmor whitelist. It turns out the device actually also still in the device's xml. qemuDomainDetachVirtioDiskDevice() is calling if (!qemuDomainWaitForDeviceRemoval(vm)) qemuDomainRemoveDiskDevice(driver, vm, detach); ret = 0; Return values for qemuDomainWaitForDeviceRemoval are: * -1 on error * 0 when DEVICE_DELETED event is unsupported * 1 when device removal finished * 2 device removal did not finish in QEMU_REMOVAL_WAIT_TIME Those don't seem in line with how the return value is used. (According to gdb, it is returning 2 in my case.) I don't understand how the async device removal proceeds, but if qemuDomainWaitForDeviceRemoval() returned an error (-1 or 2) should qemuDomainDetachVirtioDiskDevice() at least return an error, assuming it's not safe to call qemuDomainRemoveDiskDevice()? As it is, I get # serge@t1:~/qa-regression-testing/scripts$ virsh detach-device qatest-i386 /tmp/tmpivE45x/device.xml # Device detached successfully but the device is actually still in qatest-i386's xml. Seems like the caller should be informed that the device is still attached. Assuming I'm not completely mis-reading the situation. thanks, -serge

2 2

[libvirt] [php-libvirt] minimal libvirt requirement
by Remi Collet 06 Jan '14

06 Jan '14

Hi, >From configure: LIBVIRT_REQUIRED=0.6.2 But build fails with < 0.9 Tested with 0.8.8 and 0.8.2 (RHEL-5) libvirt-php.c:1080: error: 'VIR_NODE_CPU_STATS_ALL_CPUS' undeclared (first use in this function) Thanks Remi.

2 3

[libvirt] [PATCH libvirt-java] spec: Only install unversioned jar file
by Cole Robinson 06 Jan '14

06 Jan '14

As intended by Fedora's java packaging guidelines: https://bugzilla.redhat.com/show_bug.cgi?id=1022139 --- libvirt-java.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt-java.spec.in b/libvirt-java.spec.in index b5f1bf8..137af83 100644 --- a/libvirt-java.spec.in +++ b/libvirt-java.spec.in @@ -59,8 +59,7 @@ ant build jar docs rm -fr %{buildroot} install -d -m0755 %{buildroot}%{_javadir} install -d -m0755 %{buildroot}%{_javadocdir}/%{name}-%{version} -cp target/%{prefix}-%{version}.jar %{buildroot}%{_javadir} -%{__ln_s} %{_javadir}/%{prefix}-%{version}.jar %{buildroot}%{_javadir}/%{prefix}.jar +cp target/%{prefix}-%{version}.jar %{buildroot}%{_javadir}/%{prefix}.jar cp -r target/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} %{__ln_s} %{_javadocdir}/%{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -- 1.8.4.2

2 2

[libvirt] [RFC PATCH 0/3] improve virtio-serial port address allocation
by Jonathan Lebon 06 Jan '14

06 Jan '14

This series of patches improves the way in which virtio-serial port addresses are handled. See BZ1042505[1] for more background information. In a nutshell, the issue is that libvirt always assigns ports to the same virtio-serial controller (index 0). It does not take into account the maximum number of ports of the controller, nor whether there are other controllers with free ports. These patches modify the behaviour of libvirt in two ways: 1. Ports assigned out-of-range numbers are rejected right away, rather than having qemu failing at startup (see patch 2/3). 2. Ports without any explicit <address> elements are assigning a controller guaranteed to hold a free port, rather than always using controller index 0 (see patch 3/3). Care was taken to not override any field explicitly specified by the user (e.g. if the controller index is given, then that controller will be used). However, there are a few shortcomings with these patches (mostly due to my inexperience with the libvirt codebase and virtualization in general): 1. The limit of 31 ports per controller, mentioned here [2], is specific to qemu/kvm (although it is the only driver that supports virtio-serial ports for now). I've hardcoded the constant in these patches because I'm not sure how to properly contain them within qemu-specific code. There doesn't seem to be a way to query qemu to find out what the number of maximum ports are but looking at the qemu codebase indicates that the limit has always been 31. Not sure if a simple #define would be suitable for this. 2. I'm not sure how to handle the 'bus' attribute of virtio-serial port <address> elements. I haven't been able to get information regarding whether the bus is always 0, or how it affects port numbering. (So far haven't been able to start a VM with bus != 0). 3. More broadly, I'm not sure how in line these patches are with the overall design of libvirt. It seems like domain definitions should be completely independent of driver limitations, in which case enforcing a maximum number of ports at domain-definition-time might be the wrong thing to do. But since it is clear from the BZ that libvirt currently can modify the definition into an invalid unstartable state, it might be too late to go back on our word there. Advice and feedback appreciated, Jonathan [1] https://bugzilla.redhat.com/show_bug.cgi?id=1042505 [2] https://fedoraproject.org/wiki/Features/VirtioSerial?rd=VirtioSerial#Device Jonathan Lebon (3): add new function virDomainGetVirtioMaxPort check for out-of-range virtio-serial ports assign free controller to virtio-serial port src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 66 insertions(+), 11 deletions(-) -- 1.8.3.1

1 3

[libvirt] [PATCH V3] AArch64: Porting of armv7l conditons to run qemu for aarch64.
by Pranavkumar Sawargaonkar 06 Jan '14

06 Jan '14

AArch64 qemu has similar behavior as armv7l, like use of mmio etc. This patch adds similar bypass checks what we have for armv7l to aarch64. E.g. we are enabling mmio transport for Nicdev. Making addDefaultUSB and addDefaultMemballoon to false etc. V3: - Adding missing domain rng schema for aarcg64 and test case in testutilsqemu.c which was causing test suite failure while running make check. V2: - Added testcase to qemuxml2argvtest as suggested during review comments of V1. V1: - Initial patch. Signed-off-by: Anup Patel <anup.patel(a)linaro.org> Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar(a)linaro.org> --- docs/schemas/domaincommon.rng | 19 +++++++++ src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.c | 8 ++-- src/qemu/qemu_domain.c | 4 ++ .../qemuxml2argv-aarch64-virt-virtio.args | 14 ++++++ .../qemuxml2argv-aarch64-virt-virtio.xml | 45 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 +++ tests/testutilsqemu.c | 30 +++++++++++++ 8 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index be32c6b..86a60c9 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -305,6 +305,7 @@ <ref name="hvmppc64"/> <ref name="hvms390"/> <ref name="hvmarm"/> + <ref name="hvmaarch64"/> </choice> </optional> <value>hvm</value> @@ -432,6 +433,24 @@ </optional> </group> </define> + <define name="hvmaarch64"> + <group> + <optional> + <attribute name="arch"> + <choice> + <value>aarch64</value> + </choice> + </attribute> + </optional> + <optional> + <attribute name="machine"> + <data type="string"> + <param name="pattern">[a-zA-Z0-9_\.\-]+</param> + </data> + </attribute> + </optional> + </group> + </define> <define name="osexe"> <element name="os"> <element name="type"> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4f64f87..ed182e0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2917,7 +2917,7 @@ virQEMUCapsSupportsChardev(virDomainDefPtr def, !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) return false; - if (def->os.arch != VIR_ARCH_ARMV7L) + if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; /* This may not be true for all ARM machine types, but at least diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d723dc8..2c66718 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -427,7 +427,8 @@ qemuDomainSupportsNicdev(virDomainDefPtr def, return false; /* non-virtio ARM nics require legacy -net nic */ - if (def->os.arch == VIR_ARCH_ARMV7L && + if (((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) && net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) return false; @@ -1340,7 +1341,8 @@ static int qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { - if (def->os.arch == VIR_ARCH_ARMV7L && + if (((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) && (STRPREFIX(def->os.machine, "vexpress-") || STREQ(def->os.machine, "virt")) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { @@ -1872,7 +1874,7 @@ cleanup: static bool qemuDomainSupportsPCI(virDomainDefPtr def) { - if (def->os.arch != VIR_ARCH_ARMV7L) + if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64)) return true; if (STREQ(def->os.machine, "versatilepb")) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e964c75..c947e2e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -727,6 +727,10 @@ qemuDomainDefPostParse(virDomainDefPtr def, addDefaultUSB = false; addDefaultMemballoon = false; break; + case VIR_ARCH_AARCH64: + addDefaultUSB = false; + addDefaultMemballoon = false; + break; case VIR_ARCH_ALPHA: case VIR_ARCH_PPC: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args new file mode 100644 index 0000000..afd6e41 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args @@ -0,0 +1,14 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-aarch64 -S -M virt -m 1024 -smp 1 -nographic \ +-nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-boot c -kernel /aarch64.kernel -initrd /aarch64.initrd -append \ +'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ +-dtb /aarch64.dtb -device virtio-serial-device,id=virtio-serial0 -usb \ +-drive file=/aarch64.raw,if=none,id=drive-virtio-disk0 \ +-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \ +-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \ +-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ +-device virtconsole,chardev=charconsole1,id=console1 \ +-device virtio-balloon-device,id=balloon0 \ +-object rng-random,id=rng0,filename=/dev/random \ +-device virtio-rng-device,rng=rng0 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml new file mode 100644 index 0000000..184b62c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.xml @@ -0,0 +1,45 @@ +<domain type="qemu"> + <name>aarch64test</name> + <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch="aarch64" machine="virt">hvm</type> + <kernel>/aarch64.kernel</kernel> + <initrd>/aarch64.initrd</initrd> + <dtb>/aarch64.dtb</dtb> + <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset="utc"/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <source file='/aarch64.raw'/> + <target dev='vda' bus='virtio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + </interface> + <console type='pty'/> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='virtio'/> +  + <rng model='virtio'> + <backend model='random'>/dev/random</backend> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 847e96f..e451387 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1301,6 +1301,11 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("aarch64-virt-virtio", + QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB, + QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, + QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT, diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 92433ef..44e7e9d 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -175,6 +175,33 @@ error: return -1; } +static int testQemuAddAARCH64Guest(virCapsPtr caps) +{ + static const char *machines[] = { "virt"}; + virCapsGuestMachinePtr *capsmachines = NULL; + virCapsGuestPtr guest; + + capsmachines = virCapabilitiesAllocMachines(machines, + ARRAY_CARDINALITY(machines)); + if (!capsmachines) + goto error; + + guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_AARCH64, + "/usr/bin/qemu-system-aarch64", NULL, + ARRAY_CARDINALITY(machines), + capsmachines); + if (!guest) + goto error; + + if (!virCapabilitiesAddGuestDomain(guest, "qemu", NULL, NULL, 0, NULL)) + goto error; + + return 0; + +error: + virCapabilitiesFreeMachines(capsmachines, ARRAY_CARDINALITY(machines)); + return -1; +} virCapsPtr testQemuCapsInit(void) { virCapsPtr caps; @@ -303,6 +330,9 @@ virCapsPtr testQemuCapsInit(void) { if (testQemuAddArmGuest(caps)) goto cleanup; + if (testQemuAddAARCH64Guest(caps)) + goto cleanup; + if (virTestGetDebug()) { char *caps_str; -- 1.7.9.5

2 1

[libvirt] [PATCH 0/2] qemu: add range check for numa memory placement mode
by Peter Krempa 06 Jan '14

06 Jan '14

Peter Krempa (2): qemu: Clean up qemuDomainSetNumaParameters qemu: range check numa memory placement mode src/qemu/qemu_driver.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) -- 1.8.5.2

2 4

[libvirt] [PATCH] storage: Use VIR_DELETE_ELEMENT instead of open coding
by Peter Krempa 06 Jan '14

06 Jan '14

Replace the open coded array element deletion by our new helper. --- src/storage/storage_driver.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index baba9c9..aaa0f02 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1565,17 +1565,8 @@ storageVolDelete(virStorageVolPtr obj, VIR_INFO("Deleting volume '%s' from storage pool '%s'", vol->name, pool->def->name); virStorageVolDefFree(vol); - vol = NULL; - - if (i < (pool->volumes.count - 1)) - memmove(pool->volumes.objs + i, pool->volumes.objs + i + 1, - sizeof(*(pool->volumes.objs)) * (pool->volumes.count - (i + 1))); - - if (VIR_REALLOC_N(pool->volumes.objs, pool->volumes.count - 1) < 0) { - ; /* Failure to reduce memory allocation isn't fatal */ - } - pool->volumes.count--; + VIR_DELETE_ELEMENT(pool->volumes.objs, pool->volumes.count, i); break; } } -- 1.8.5.2

3 3

[libvirt] [PATCH 1/2] event: use bool in more places
by Eric Blake 06 Jan '14

06 Jan '14

No need to use an int that only ever stores 0 and 1. * src/conf/object_event_private.h (_virObjectEventCallback): Change deleted to bool. * src/conf/object_event.c (virObjectEventDispatchMatchCallback): Switch return type to bool. (virObjectEventCallbackListMarkDeleteID): Update client. * src/conf/domain_event.c (virDomainEventCallbackListMarkDelete): Likewise. --- src/conf/domain_event.c | 2 +- src/conf/object_event.c | 20 ++++++++------------ src/conf/object_event_private.h | 2 +- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 5e5bac5..df370f6 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -424,7 +424,7 @@ virDomainEventCallbackListMarkDelete(virConnectPtr conn, if (cbList->callbacks[i]->cb == VIR_OBJECT_EVENT_CALLBACK(callback) && cbList->callbacks[i]->eventID == VIR_DOMAIN_EVENT_ID_LIFECYCLE && cbList->callbacks[i]->conn == conn) { - cbList->callbacks[i]->deleted = 1; + cbList->callbacks[i]->deleted = true; for (i = 0; i < cbList->count; i++) { if (!cbList->callbacks[i]->deleted) ret++; diff --git a/src/conf/object_event.c b/src/conf/object_event.c index dad98d6..5173fdf 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -171,7 +171,7 @@ virObjectEventCallbackListMarkDeleteID(virConnectPtr conn, for (i = 0; i < cbList->count; i++) { if (cbList->callbacks[i]->callbackID == callbackID && cbList->callbacks[i]->conn == conn) { - cbList->callbacks[i]->deleted = 1; + cbList->callbacks[i]->deleted = true; for (i = 0; i < cbList->count; i++) { if (!cbList->callbacks[i]->deleted) ret++; @@ -577,18 +577,18 @@ virObjectEventQueuePush(virObjectEventQueuePtr evtQueue, } -static int +static bool virObjectEventDispatchMatchCallback(virObjectEventPtr event, virObjectEventCallbackPtr cb) { if (!cb) - return 0; + return false; if (cb->deleted) - return 0; + return false; if (!virObjectIsClass(event, cb->klass)) - return 0; + return false; if (cb->eventID != event->eventID) - return 0; + return false; if (cb->meta) { /* Deliberately ignoring 'id' for matching, since that @@ -597,13 +597,9 @@ virObjectEventDispatchMatchCallback(virObjectEventPtr event, * Xen sometimes renames guests during migration, thus * leaving 'uuid' as the only truly reliable ID we can use. */ - if (memcmp(event->meta.uuid, cb->meta->uuid, VIR_UUID_BUFLEN) == 0) - return 1; - - return 0; - } else { - return 1; + return memcmp(event->meta.uuid, cb->meta->uuid, VIR_UUID_BUFLEN) == 0; } + return true; } diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h index bc80425..d2e4666 100644 --- a/src/conf/object_event_private.h +++ b/src/conf/object_event_private.h @@ -67,7 +67,7 @@ struct _virObjectEventCallback { virConnectObjectEventGenericCallback cb; void *opaque; virFreeCallback freecb; - int deleted; + bool deleted; }; typedef void -- 1.8.4.2

3 25

[libvirt] Entering freeze on Wednesday for 1.2.1
by Daniel Veillard 06 Jan '14

06 Jan '14

Hello, Happy New Year and best wishes for 2014 ! small reminder after the vacations, based on our earlier decision to make a release mid-january and then the next one at the end of feb, we should enter freeze in the middle of the week to be able to make the release around the 15th, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Bug 1047429 �C Can't attach virtio disk device with 'internal error: Device alias was not set for PCI controller with index 0 required for device at address 0000:00:1e.0'
by hzguanqiang＠corp.netease.com 06 Jan '14

06 Jan '14

Hi experts, It seemed there is a bug of PCI controller, details are as: https://bugzilla.redhat.com/show_bug.cgi?id=1047429 Is there any expert focusing on this problem? Thanks~ ------------------ Best regards! GuanQiang 2014-01-06

2 2

[libvirt] [PATCH] spice: expose the disable file transfer option
by Francesco Romani 06 Jan '14

06 Jan '14

spice-server offers an API to disable file transfer messages on the agent channel between the client and the guest. This is supported in qemu through the disable-agent-file-xfer option. This patch exposes this option to libvirt. --- src/conf/domain_conf.c | 26 ++++++++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_command.c | 2 ++ 4 files changed, 40 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e65f3e3..5483a91 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -604,6 +604,12 @@ VIR_ENUM_IMPL(virDomainGraphicsSpiceClipboardCopypaste, "yes", "no"); +VIR_ENUM_IMPL(virDomainGraphicsSpiceAgentFileTransfer, + VIR_DOMAIN_GRAPHICS_SPICE_AGENT_FILE_TRANSFER_LAST, + "default", + "yes", + "no"); + VIR_ENUM_IMPL(virDomainHostdevMode, VIR_DOMAIN_HOSTDEV_MODE_LAST, "subsystem", "capabilities") @@ -8519,6 +8525,26 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, VIR_FREE(copypaste); def->data.spice.copypaste = copypasteVal; + } else if (xmlStrEqual(cur->name, BAD_CAST "filetransfer")) { + char *enable = virXMLPropString(cur, "enabled"); + int enableVal; + + if (!enable) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("spice filetransfer missing enable")); + goto error; + } + + if ((enableVal = + virDomainGraphicsSpiceAgentFileTransferTypeFromString(enable)) <= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown enable value '%s'"), enable); + VIR_FREE(enable); + goto error; + } + VIR_FREE(enable); + + def->data.spice.filetransfer = enableVal; } else if (xmlStrEqual(cur->name, BAD_CAST "mouse")) { char *mode = virXMLPropString(cur, "mode"); int modeVal; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 647d115..ce877fc 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1461,6 +1461,14 @@ enum virDomainGraphicsSpiceClipboardCopypaste { VIR_DOMAIN_GRAPHICS_SPICE_CLIPBOARD_COPYPASTE_LAST }; +enum virDomainGraphicsSpiceAgentFileTransfer { + VIR_DOMAIN_GRAPHICS_SPICE_AGENT_FILE_TRANSFER_DEFAULT = 0, + VIR_DOMAIN_GRAPHICS_SPICE_AGENT_FILE_TRANSFER_YES, + VIR_DOMAIN_GRAPHICS_SPICE_AGENT_FILE_TRANSFER_NO, + + VIR_DOMAIN_GRAPHICS_SPICE_AGENT_FILE_TRANSFER_LAST +}; + enum virDomainGraphicsListenType { VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE = 0, VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS, @@ -1531,6 +1539,7 @@ struct _virDomainGraphicsDef { int playback; int streaming; int copypaste; + int filetransfer; } spice; } data; /* nListens, listens, and *port are only useful if type is vnc, @@ -2693,6 +2702,7 @@ VIR_ENUM_DECL(virDomainInputBus) VIR_ENUM_DECL(virDomainGraphics) VIR_ENUM_DECL(virDomainGraphicsListen) VIR_ENUM_DECL(virDomainGraphicsAuthConnected) +VIR_ENUM_DECL(virDomainGraphicsSpiceAgentFileTransfer) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelName) VIR_ENUM_DECL(virDomainGraphicsSpiceChannelMode) VIR_ENUM_DECL(virDomainGraphicsSpiceImageCompression) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2dbb8f8..cafcb84 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -235,6 +235,8 @@ virDomainGraphicsListenGetType; virDomainGraphicsListenSetAddress; virDomainGraphicsListenSetNetwork; virDomainGraphicsListenSetType; +virDomainGraphicsSpiceAgentFileTransferTypeFromString; +virDomainGraphicsSpiceAgentFileTransferTypeToString; virDomainGraphicsSpiceChannelModeTypeFromString; virDomainGraphicsSpiceChannelModeTypeToString; virDomainGraphicsSpiceChannelNameTypeFromString; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d723dc8..e370853 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7394,6 +7394,8 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, virDomainGraphicsSpiceStreamingModeTypeToString(graphics->data.spice.streaming)); if (graphics->data.spice.copypaste == VIR_DOMAIN_GRAPHICS_SPICE_CLIPBOARD_COPYPASTE_NO) virBufferAddLit(&opt, ",disable-copy-paste"); + if (graphics->data.spice.filetransfer == VIR_DOMAIN_GRAPHICS_SPICE_AGENT_FILE_TRANSFER_NO) + virBufferAddLit(&opt, ",disable-agent-file-xfer"); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) { /* If qemu supports seamless migration turn it -- 1.8.4.2

2 2

[libvirt] error in compiling event-test.c
by rash g 06 Jan '14

06 Jan '14

Hello, I am trying to run event-test.c provided in libvirt package.I am using ubuntu 13.04. However,after compiling I am getting an error saying ->undefined reference to... I think this is because compiler is not able to find the functions and macros in the header files.However I am not able to solve the problem. I have provided my screenshot of error as an attachment. I shall be really grateful if anyone can help me. Thanks Rashmi

2 1

[libvirt] [PATCHv2] Fix explicit usage of default video PCI slots
by Ján Tomko 06 Jan '14

06 Jan '14

Do not leave the PCI address of the primary video card set to the legacy default (0000:00:02.0) if we're doing two-pass allocation. Since QEMU 1.6 (QEMU_CAPS_VIDEO_PRIMARY) we allow the primary video card to be on other slots than 0000:00:02.0 (as we use -device instead of -vga). However we fail to assign it an address if: * another device explicitly uses 0000:00:02.0 and * the primary video device has no address specified On the first pass, we have set the address to default, then checked if it's available, leaving it set even if it wasn't. This address got picked up by the second pass, resulting in a conflict: XML error: Attempted double use of PCI slot 0000:00:02.0 (may need "multifunction='on'" for device on function 0) Also fix the test that was supposed to catch this. --- v1: https://www.redhat.com/archives/libvir-list/2013-December/msg01125.html v2: no functional change rewrote the commit message to mention that this only happens with QEMU 1.6 and (hopefully) explain what 'this' is more clearly src/qemu/qemu_command.c | 50 +++++++++++++++++++++--------------------------- tests/qemuxml2argvtest.c | 3 ++- 2 files changed, 24 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d723dc8..2a64cd1 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2379,7 +2379,6 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, size_t i; virDevicePCIAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - virDevicePCIAddressPtr addrptr; char *addrStr = NULL; qemuDomainPCIConnectFlags flags = QEMU_PCI_CONNECT_HOTPLUGGABLE | QEMU_PCI_CONNECT_TYPE_PCI; @@ -2446,22 +2445,17 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, */ virDomainVideoDefPtr primaryVideo = def->videos[0]; if (primaryVideo->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - primaryVideo->info.addr.pci.domain = 0; - primaryVideo->info.addr.pci.bus = 0; - primaryVideo->info.addr.pci.slot = 2; - primaryVideo->info.addr.pci.function = 0; - addrptr = &primaryVideo->info.addr.pci; - - if (!(addrStr = qemuDomainPCIAddressAsString(addrptr))) + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = 2; + + if (!(addrStr = qemuDomainPCIAddressAsString(&tmp_addr))) goto cleanup; - if (!qemuDomainPCIAddressValidate(addrs, addrptr, + if (!qemuDomainPCIAddressValidate(addrs, &tmp_addr, addrStr, flags, false)) goto cleanup; - if (qemuDomainPCIAddressSlotInUse(addrs, addrptr)) { + if (qemuDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { if (qemuDeviceVideoUsable) { - virResetLastError(); if (qemuDomainPCIAddressReserveNextSlot(addrs, &primaryVideo->info, flags) < 0) @@ -2472,8 +2466,11 @@ qemuValidateDevicePCISlotsPIIX3(virDomainDefPtr def, "QEMU needs it for primary video")); goto cleanup; } - } else if (qemuDomainPCIAddressReserveSlot(addrs, addrptr, flags) < 0) { - goto cleanup; + } else { + if (qemuDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) + goto cleanup; + primaryVideo->info.addr.pci = tmp_addr; + primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; } } else if (!qemuDeviceVideoUsable) { if (primaryVideo->info.addr.pci.domain != 0 || @@ -2535,7 +2532,6 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, size_t i; virDevicePCIAddress tmp_addr; bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); - virDevicePCIAddressPtr addrptr; char *addrStr = NULL; qemuDomainPCIConnectFlags flags = QEMU_PCI_CONNECT_TYPE_PCIE; @@ -2619,22 +2615,17 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, */ virDomainVideoDefPtr primaryVideo = def->videos[0]; if (primaryVideo->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { - primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; - primaryVideo->info.addr.pci.domain = 0; - primaryVideo->info.addr.pci.bus = 0; - primaryVideo->info.addr.pci.slot = 1; - primaryVideo->info.addr.pci.function = 0; - addrptr = &primaryVideo->info.addr.pci; - - if (!(addrStr = qemuDomainPCIAddressAsString(addrptr))) + memset(&tmp_addr, 0, sizeof(tmp_addr)); + tmp_addr.slot = 1; + + if (!(addrStr = qemuDomainPCIAddressAsString(&tmp_addr))) goto cleanup; - if (!qemuDomainPCIAddressValidate(addrs, addrptr, + if (!qemuDomainPCIAddressValidate(addrs, &tmp_addr, addrStr, flags, false)) goto cleanup; - if (qemuDomainPCIAddressSlotInUse(addrs, addrptr)) { + if (qemuDomainPCIAddressSlotInUse(addrs, &tmp_addr)) { if (qemuDeviceVideoUsable) { - virResetLastError(); if (qemuDomainPCIAddressReserveNextSlot(addrs, &primaryVideo->info, flags) < 0) @@ -2645,8 +2636,11 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, "QEMU needs it for primary video")); goto cleanup; } - } else if (qemuDomainPCIAddressReserveSlot(addrs, addrptr, flags) < 0) { - goto cleanup; + } else { + if (qemuDomainPCIAddressReserveSlot(addrs, &tmp_addr, flags) < 0) + goto cleanup; + primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI; + primaryVideo->info.addr.pci = tmp_addr; } } else if (!qemuDeviceVideoUsable) { if (primaryVideo->info.addr.pci.domain != 0 || diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 847e96f..5a2bfcc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1193,7 +1193,8 @@ mymain(void) DO_TEST("video-device-pciaddr-default", QEMU_CAPS_KVM, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA); + QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA, + QEMU_CAPS_DEVICE_PCI_BRIDGE); DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); -- 1.8.3.2

2 2

[libvirt] [PATCH] Support transient attribute on vmware disks
by Wout Mertens 04 Jan '14

04 Jan '14

From: Wout Mertens <Wout.Mertens(a)gmail.com> vmx/vmx.c ignores the transient attribute on the disk xml format. This patch adds a 1-1 relationship between it and [disk].mode = "independent-nonpersistent". The other modes are ignored as before. It works in my testing. https://bugzilla.redhat.com/show_bug.cgi?id=1044023 --- src/vmx/vmx.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 48487f8..4282390 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1954,6 +1954,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con * busType = VIR_DOMAIN_DISK_BUS_FDC * controllerOrBus = [0] * unit = [0..1] + * */ int result = -1; @@ -1980,6 +1981,9 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con char writeThrough_name[32] = ""; bool writeThrough = false; + char mode_name[32] = ""; + char *mode = NULL; + if (def == NULL || *def != NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; @@ -2093,6 +2097,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con VMX_BUILD_NAME(fileType); VMX_BUILD_NAME(fileName); VMX_BUILD_NAME(writeThrough); + VMX_BUILD_NAME(mode); /* vmx:present */ if (virVMXGetConfigBoolean(conf, present_name, &present, false, true) < 0) { @@ -2121,6 +2126,11 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } + /* vmx:mode -> def:transient */ + if (virVMXGetConfigString(conf, mode_name, &mode, true) < 0) { + goto cleanup; + } + if (clientDevice) { /* * Just ignore devices in client mode, because I have no clue how to @@ -2172,6 +2182,7 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con (*def)->src = ctx->parseFileName(fileName, ctx->opaque); (*def)->cachemode = writeThrough ? VIR_DOMAIN_DISK_CACHE_WRITETHRU : VIR_DOMAIN_DISK_CACHE_DEFAULT; + (*def)->transient = STRCASEEQ(mode, "independent-nonpersistent") ? true: false; if ((*def)->src == NULL) { goto cleanup; @@ -3497,7 +3508,11 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def, return -1; } } - + + if (def->transient) { + virBufferAsprintf(buffer, "%s%d:%d.mode = \"independent-nonpersistent\"\n", + busType, controllerOrBus, unit); + } return 0; } -- 1.8.2.3

2 10

[libvirt] event detection in kvm
by rash g 04 Jan '14

04 Jan '14

Hello, I am student and doing a project in virtualization.My project requires detection of events in kvm like start of a virtual machine,shutoff of a virtual machine. So I want to know if there is any way by which I can detect these events.As in I want to write a code which will detect these events and then handle them.I am using ubuntu 13.04. I would be glad if anyone can help me. Thanks Rashmi

2 1

[libvirt] detection of events in kvm
by rash 04 Jan '14

04 Jan '14

Hello, I am student and doing a project in virtualization.My project requires detection of events in kvm like start of a virtual machine,shutoff of a virtual machine. So I want to know if there is any way by which I can detect these events.As in I want to write a code which will detect these events and then handle them.I am using ubuntu 13.04. I would be glad if anyone can help me. Thanks

2 1

[libvirt] [PATCH] vmware: os x support is broken
by Denis Kondratenko 04 Jan '14

04 Jan '14

Incorrect usage of virAsprintf and vmware-vmx reports to stderr. --- https://bugzilla.redhat.com/show_bug.cgi?id=1036248 diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 027e245..477dc72 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -271,17 +271,17 @@ vmwareExtractVersion(struct vmware_driver *driver) switch (driver->type) { case VMWARE_DRIVER_PLAYER: - if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer")) + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmplayer") < 0) goto cleanup; break; case VMWARE_DRIVER_WORKSTATION: - if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware")) + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware") < 0) goto cleanup; break; case VMWARE_DRIVER_FUSION: - if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx")) + if (virAsprintf(&bin, "%s/%s", vmwarePath, "vmware-vmx") < 0) goto cleanup; break; @@ -293,6 +293,9 @@ vmwareExtractVersion(struct vmware_driver *driver) cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); + + // OS X 10.9.1 and some earlier ver: vmware-vmx reports ver to stderr + virCommandSetErrorBuffer(cmd, &outbuf); if (virCommandRun(cmd, NULL) < 0) goto cleanup;

3 4

[libvirt] ANNOUNCE: Oz 0.12.0 release
by Chris Lalancette 03 Jan '14

03 Jan '14

All, I'm pleased to announce release 0.12.0 of Oz. Oz is a program for doing automated installation of guest operating systems with limited input from the user. Release 0.12.0 is a bugfix and feature release for Oz. Some of the highlights between Oz 0.11.0 and 0.12.0 are: * Fixes to concurrent oz-install invocations * Python 3 compatibility in the test suites * Support for Ubuntu 12.04.3 * Support for Mageia * Allow a MAC address to be passed in (instead of auto-generated) * Support for RHEL5.10 * Support for Ubuntu 13.10 * Use lxml instead of libxml2 for XML document processing (it has much better error messages) * Remove the unused "tunnels" functionality * Support FreeBSD 10.0 * Remove deprecated functions from the Guest class * Speed up guest customization on guests that support NetworkManager * Follow subprocess commands as they are executed (makes debugging easier) * Ensure that any paths from the user are absolute, otherwise things don't work properly * Add support for OpenSUSE 13.1 * Add support for Fedora 20 * Add support for RHEL-7 A tarball and zipfile of this release is available on the Github releases page: https://github.com/clalancette/oz/releases . Packages for Fedora-19, Fedora-20, and EPEL-6 have been built in Koji and will eventually make their way to stable. Instructions on how to get and use Oz are available at http://github.com/clalancette/oz/wiki . If you have questions or comments about Oz, please feel free to contact me at clalancette at gmail.com, or open up an issue on the github page: http://github.com/clalancette/oz/issues . Thanks to everyone who contributed to this release through bug reports, patches, and suggestions for improvement. Chris Lalancette

1 0

[libvirt] [PATCH v2] BSD: implement nodeGetMemoryStats
by Roman Bogorodskiy 03 Jan '14

03 Jan '14

Add a BSD implementation of nodeGetMemoryStats based on sysctl(3). --- src/nodeinfo.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 1838547..5e84e78 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -55,6 +55,8 @@ #define VIR_FROM_THIS VIR_FROM_NONE #if defined(__FreeBSD__) || defined(__APPLE__) +# define BSD_MEMORY_STATS_ALL 4 + static int appleFreebsdNodeGetCPUCount(void) { @@ -96,7 +98,81 @@ appleFreebsdNodeGetMemorySize(unsigned long *memory) return 0; } -#endif + +static int +appleFreebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params, + int *nparams) +{ + size_t i, j = 0; + unsigned long pagesize = getpagesize() >> 10; + long bufpages; + size_t bufpages_size = sizeof(bufpages); + struct field_sysctl_map { + const char *field; + const char *sysctl_name; + } sysctl_map[] = { + {VIR_NODE_MEMORY_STATS_TOTAL, "vm.stats.vm.v_page_count"}, + {VIR_NODE_MEMORY_STATS_FREE, "vm.stats.vm.v_free_count"}, + {VIR_NODE_MEMORY_STATS_CACHED, "vm.stats.vm.v_cache_count"}, + {NULL, NULL} + }; + + if ((*nparams) == 0) { + *nparams = BSD_MEMORY_STATS_ALL; + return 0; + } + + if ((*nparams) != BSD_MEMORY_STATS_ALL) { + virReportInvalidArg(nparams, + _("nparams in %s must be %d"), + __FUNCTION__, BSD_MEMORY_STATS_ALL); + return -1; + } + + for (i = 0; sysctl_map[i].field != NULL; i++) { + u_int value; + size_t value_size = sizeof(value); + virNodeMemoryStatsPtr param; + + if (sysctlbyname(sysctl_map[i].sysctl_name, &value, + &value_size, NULL, 0) < 0) { + virReportSystemError(errno, + _("sysctl failed for '%s'"), + sysctl_map[i].sysctl_name); + return -1; + } + + param = &params[j++]; + if (virStrcpyStatic(param->field, sysctl_map[i].field) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field '%s' too long for destination"), + sysctl_map[i].field); + return -1; + } + param->value = (unsigned long long)value * pagesize; + } + + { + virNodeMemoryStatsPtr param = &params[j++]; + + if (sysctlbyname("vfs.bufspace", &bufpages, &bufpages_size, NULL, 0) < 0) { + virReportSystemError(errno, + _("sysctl failed for '%s'"), + "vfs.bufspace"); + return -1; + } + if (virStrcpyStatic(param->field, VIR_NODE_MEMORY_STATS_BUFFERS) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Field '%s' too long for destination"), + VIR_NODE_MEMORY_STATS_BUFFERS); + return -1; + } + param->value = (unsigned long long)bufpages >> 10; + } + + return 0; +} +#endif /* defined(__FreeBSD__) || defined(__APPLE__) */ #ifdef __linux__ # define CPUINFO_PATH "/proc/cpuinfo" @@ -1041,6 +1117,8 @@ int nodeGetMemoryStats(int cellNum ATTRIBUTE_UNUSED, return ret; } +#elif defined(__FreeBSD__) || defined(__APPLE__) + return appleFreebsdNodeGetMemoryStats(params, nparams); #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("node memory stats not implemented on this platform")); -- 1.8.4.3

2 2

[libvirt] [PATCH 1/2] event: fix doc typos, and doc more public methods
by Eric Blake 03 Jan '14

03 Jan '14

While working on events, I found a number of minor issues; I'm hoisting these to the front rather than doing it piecemeal in the patches where I first noticed bad or missing documentation. * src/conf/object_event.c: Fix grammar, document all parameters of public functions; wrap some long lines. * src/conf/object_event.h: Likewise. * src/conf/network_event.c: Likewise. * src/conf/domain_event.c: Likewise (except for the large number of event creation functions). Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/domain_event.c | 64 +++++++++++++++++++++++++-------------- src/conf/network_event.c | 26 +++++++++++----- src/conf/object_event.c | 78 +++++++++++++++++++++++++++++++++++++++++++----- src/conf/object_event.h | 7 +++-- 4 files changed, 134 insertions(+), 41 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index e5f5796..8800568 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1,7 +1,7 @@ /* * domain_event.c: domain event queue processing helpers * - * Copyright (C) 2010-2013 Red Hat, Inc. + * Copyright (C) 2010-2014 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * @@ -70,7 +70,7 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, struct _virDomainEvent { virObjectEvent parent; - /* Unused attribute to get virDomainEvent class being created */ + /* Unused attribute to allow for subclass creation */ bool dummy; }; typedef struct _virDomainEvent virDomainEvent; @@ -172,7 +172,8 @@ typedef struct _virDomainEventDeviceRemoved virDomainEventDeviceRemoved; typedef virDomainEventDeviceRemoved *virDomainEventDeviceRemovedPtr; -static int virDomainEventsOnceInit(void) +static int +virDomainEventsOnceInit(void) { if (!(virDomainEventClass = virClassNew(virClassForObjectEvent(), @@ -246,32 +247,37 @@ static int virDomainEventsOnceInit(void) VIR_ONCE_GLOBAL_INIT(virDomainEvents) -static void virDomainEventDispose(void *obj) +static void +virDomainEventDispose(void *obj) { virDomainEventPtr event = obj; VIR_DEBUG("obj=%p", event); } -static void virDomainEventLifecycleDispose(void *obj) +static void +virDomainEventLifecycleDispose(void *obj) { virDomainEventLifecyclePtr event = obj; VIR_DEBUG("obj=%p", event); } -static void virDomainEventRTCChangeDispose(void *obj) +static void +virDomainEventRTCChangeDispose(void *obj) { virDomainEventRTCChangePtr event = obj; VIR_DEBUG("obj=%p", event); } -static void virDomainEventWatchdogDispose(void *obj) +static void +virDomainEventWatchdogDispose(void *obj) { virDomainEventWatchdogPtr event = obj; VIR_DEBUG("obj=%p", event); } -static void virDomainEventIOErrorDispose(void *obj) +static void +virDomainEventIOErrorDispose(void *obj) { virDomainEventIOErrorPtr event = obj; VIR_DEBUG("obj=%p", event); @@ -281,7 +287,8 @@ static void virDomainEventIOErrorDispose(void *obj) VIR_FREE(event->reason); } -static void virDomainEventGraphicsDispose(void *obj) +static void +virDomainEventGraphicsDispose(void *obj) { virDomainEventGraphicsPtr event = obj; VIR_DEBUG("obj=%p", event); @@ -307,7 +314,8 @@ static void virDomainEventGraphicsDispose(void *obj) } } -static void virDomainEventBlockJobDispose(void *obj) +static void +virDomainEventBlockJobDispose(void *obj) { virDomainEventBlockJobPtr event = obj; VIR_DEBUG("obj=%p", event); @@ -315,7 +323,8 @@ static void virDomainEventBlockJobDispose(void *obj) VIR_FREE(event->path); } -static void virDomainEventDiskChangeDispose(void *obj) +static void +virDomainEventDiskChangeDispose(void *obj) { virDomainEventDiskChangePtr event = obj; VIR_DEBUG("obj=%p", event); @@ -325,7 +334,8 @@ static void virDomainEventDiskChangeDispose(void *obj) VIR_FREE(event->devAlias); } -static void virDomainEventTrayChangeDispose(void *obj) +static void +virDomainEventTrayChangeDispose(void *obj) { virDomainEventTrayChangePtr event = obj; VIR_DEBUG("obj=%p", event); @@ -333,13 +343,15 @@ static void virDomainEventTrayChangeDispose(void *obj) VIR_FREE(event->devAlias); } -static void virDomainEventBalloonChangeDispose(void *obj) +static void +virDomainEventBalloonChangeDispose(void *obj) { virDomainEventBalloonChangePtr event = obj; VIR_DEBUG("obj=%p", event); } -static void virDomainEventDeviceRemovedDispose(void *obj) +static void +virDomainEventDeviceRemovedDispose(void *obj) { virDomainEventDeviceRemovedPtr event = obj; VIR_DEBUG("obj=%p", event); @@ -354,7 +366,9 @@ static void virDomainEventDeviceRemovedDispose(void *obj) * @cbList: the list * @callback: the callback to remove * - * Internal function to remove a callback from a virObjectEventCallbackListPtr + * Internal function to remove a callback from a virObjectEventCallbackListPtr, + * when registered via the older virConnectDomainEventRegister with no + * callbackID */ static int virDomainEventCallbackListRemove(virConnectPtr conn, @@ -430,9 +444,11 @@ virDomainEventCallbackListMarkDelete(virConnectPtr conn, * @conn: pointer to the connection * @cbList: the list * @callback: the callback to add - * @opaque: opaque data tio pass to callback + * @opaque: opaque data to pass to @callback + * @freecb: callback to free @opaque * - * Internal function to add a callback from a virObjectEventCallbackListPtr + * Internal function to add a callback from a virObjectEventCallbackListPtr, + * when registered via the older virConnectDomainEventRegister. */ static int virDomainEventCallbackListAdd(virConnectPtr conn, @@ -1355,8 +1371,8 @@ cleanup: * virDomainEventStateRegister: * @conn: connection to associate with callback * @state: object event state - * @callback: function to remove from event - * @opaque: data blob to pass to callback + * @callback: the callback to add + * @opaque: data blob to pass to @callback * @freecb: callback to free @opaque * * Register the function @callback with connection @conn, @@ -1409,14 +1425,16 @@ cleanup: * virDomainEventStateRegisterID: * @conn: connection to associate with callback * @state: object event state + * @dom: optional domain for filtering the event * @eventID: ID of the event type to register for - * @cb: function to remove from event - * @opaque: data blob to pass to callback + * @cb: function to invoke when event fires + * @opaque: data blob to pass to @callback * @freecb: callback to free @opaque * @callbackID: filled with callback ID * - * Register the function @callbackID with connection @conn, - * from @state, for events of type @eventID. + * Register the function @cb with connection @conn, from @state, for + * events of type @eventID, and return the registration handle in + * @callbackID. * * Returns: the number of callbacks now registered, or -1 on error */ diff --git a/src/conf/network_event.c b/src/conf/network_event.c index 3819702..a192ffe 100644 --- a/src/conf/network_event.c +++ b/src/conf/network_event.c @@ -1,6 +1,7 @@ /* * network_event.c: network event queue processing helpers * + * Copyright (C) 2014 Red Hat, Inc. * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * * This library is free software; you can redistribute it and/or @@ -31,7 +32,7 @@ struct _virNetworkEvent { virObjectEvent parent; - /* Unused attribute to get virNetworkEvent class being created */ + /* Unused attribute to allow for subclass creation */ bool dummy; }; typedef struct _virNetworkEvent virNetworkEvent; @@ -71,7 +72,7 @@ virNetworkEventsOnceInit(void) VIR_ONCE_GLOBAL_INIT(virNetworkEvents) -void +static void virNetworkEventDispose(void *obj) { virNetworkEventPtr event = obj; @@ -79,7 +80,7 @@ virNetworkEventDispose(void *obj) } -void +static void virNetworkEventLifecycleDispose(void *obj) { virNetworkEventLifecyclePtr event = obj; @@ -126,13 +127,14 @@ cleanup: * @state: object event state * @net: network to filter on or NULL for all networks * @eventID: ID of the event type to register for - * @cb: function to add to event - * @opaque: data blob to pass to callback + * @cb: function to invoke when event occurs + * @opaque: data blob to pass to @callback * @freecb: callback to free @opaque * @callbackID: filled with callback ID * - * Register the function @callbackID with connection @conn, - * from @state, for events of type @eventID. + * Register the function @cb with connection @conn, from @state, for + * events of type @eventID, and return the registration handle in + * @callbackID. * * Returns: the number of callbacks now registered, or -1 on error */ @@ -161,6 +163,16 @@ virNetworkEventStateRegisterID(virConnectPtr conn, cb, opaque, freecb, callbackID); } + +/** + * virNetworkEventLifecycleNew: + * @name: name of the network object the event describes + * @uuid: uuid of the network object the event describes + * @type: type of lifecycle event + * @detail: more details about @type + * + * Create a new network lifecycle event. + */ virObjectEventPtr virNetworkEventLifecycleNew(const char *name, const unsigned char *uuid, diff --git a/src/conf/object_event.c b/src/conf/object_event.c index c86974b..eca6a10 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -1,7 +1,7 @@ /* * object_event.c: object event queue processing helpers * - * Copyright (C) 2010-2013 Red Hat, Inc. + * Copyright (C) 2010-2014 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * @@ -43,7 +43,6 @@ struct _virObjectEventQueue { static virClassPtr virObjectEventClass; -static virClassPtr virObjectEventClass; static void virObjectEventDispose(void *obj); static int @@ -60,6 +59,12 @@ virObjectEventOnceInit(void) VIR_ONCE_GLOBAL_INIT(virObjectEvent) +/** + * virClassForObjectEvent: + * + * Return the class object to be used as a parent when creating an + * event subclass. + */ virClassPtr virClassForObjectEvent(void) { @@ -233,7 +238,8 @@ virObjectEventCallbackListPurgeMarked(virObjectEventCallbackListPtr cbList) * @klass: the base event class * @eventID: the event ID * @callback: the callback to add - * @opaque: opaque data tio pass to callback + * @opaque: opaque data to pass to @callback + * @freecb: callback to free @opaque * @callbackID: filled with callback ID * * Internal function to add a callback from a virObjectEventCallbackListPtr @@ -399,18 +405,33 @@ virObjectEventQueueNew(void) return ret; } + +/** + * virObjectEventStateLock: + * @state: the event state object + * + * Lock event state before calling functions from object_event_private.h. + */ void virObjectEventStateLock(virObjectEventStatePtr state) { virMutexLock(&state->lock); } + +/** + * virObjectEventStateUnlock: + * @state: the event state object + * + * Unlock event state after calling functions from object_event_private.h. + */ void virObjectEventStateUnlock(virObjectEventStatePtr state) { virMutexUnlock(&state->lock); } + /** * virObjectEventStateFree: * @list: virObjectEventStatePtr to free @@ -436,6 +457,16 @@ virObjectEventStateFree(virObjectEventStatePtr state) static void virObjectEventStateFlush(virObjectEventStatePtr state); + +/** + * virObjectEventTimer: + * @timer: id of the event loop timer + * @opaque: the event state object + * + * Register this function with the event state as its opaque data as + * the callback of a periodic timer on the event loop, in order to + * flush the callback queue. + */ void virObjectEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque) { @@ -444,8 +475,11 @@ virObjectEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque) virObjectEventStateFlush(state); } + /** * virObjectEventStateNew: + * + * Allocate a new event state object. */ virObjectEventStatePtr virObjectEventStateNew(void) @@ -477,6 +511,18 @@ error: return NULL; } + +/** + * virObjectEventNew: + * @klass: subclass of event to be created + * @dispatcher: callback for dispatching the particular subclass of event + * @eventID: id of the event + * @id: id of the object the event describes, or 0 + * @name: name of the object the event describes + * @uuid: uuid of the object the event describes + * + * Create a new event, with the information common to all events. + */ void * virObjectEventNew(virClassPtr klass, virObjectEventDispatchFunc dispatcher, @@ -514,6 +560,7 @@ virObjectEventNew(virClassPtr klass, return event; } + /** * virObjectEventQueuePush: * @evtQueue: the object event queue @@ -613,6 +660,16 @@ virObjectEventStateQueueDispatch(virObjectEventStatePtr state, queue->count = 0; } + +/** + * virObjectEventStateQueue: + * @state: the event state object + * @event: event to add to the queue + * + * Adds @event to the queue of events to be dispatched at the next + * safe moment. The caller should no longer use @event after this + * call. + */ void virObjectEventStateQueue(virObjectEventStatePtr state, virObjectEventPtr event) @@ -667,15 +724,19 @@ virObjectEventStateFlush(virObjectEventStatePtr state) * virObjectEventStateRegisterID: * @conn: connection to associate with callback * @state: domain event state + * @uuid: uuid of the object for event filtering + * @name: name of the object for event filtering + * @id: id of the object for event filtering, or 0 * @klass: the base event class * @eventID: ID of the event type to register for - * @cb: function to remove from event - * @opaque: data blob to pass to callback + * @cb: function to invoke when event occurs + * @opaque: data blob to pass to @callback * @freecb: callback to free @opaque * @callbackID: filled with callback ID * - * Register the function @callbackID with connection @conn, - * from @state, for events of type @eventID. + * Register the function @cb with connection @conn, from @state, for + * events of type @eventID, and return the registration handle in + * @callbackID. * * Returns: the number of callbacks now registered, or -1 on error */ @@ -746,7 +807,8 @@ virObjectEventStateDeregisterID(virConnectPtr conn, virObjectEventStateLock(state); if (state->isDispatching) ret = virObjectEventCallbackListMarkDeleteID(conn, - state->callbacks, callbackID); + state->callbacks, + callbackID); else ret = virObjectEventCallbackListRemoveID(conn, state->callbacks, callbackID); diff --git a/src/conf/object_event.h b/src/conf/object_event.h index 23ecb34..fa1281c 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -1,7 +1,7 @@ /* * object_event.h: object event queue processing helpers * - * Copyright (C) 2012 Red Hat, Inc. + * Copyright (C) 2012-2014 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * @@ -47,7 +47,7 @@ void virObjectEventStateFree(virObjectEventStatePtr state); virObjectEventStatePtr virObjectEventStateNew(void); -/* +/** * virConnectObjectEventGenericCallback: * @conn: the connection pointer * @obj: the object pointer @@ -60,7 +60,8 @@ typedef void (*virConnectObjectEventGenericCallback)(virConnectPtr conn, void *obj, void *opaque); -# define VIR_OBJECT_EVENT_CALLBACK(cb) ((virConnectObjectEventGenericCallback)(cb)) +# define VIR_OBJECT_EVENT_CALLBACK(cb) \ + ((virConnectObjectEventGenericCallback)(cb)) void virObjectEventStateQueue(virObjectEventStatePtr state, -- 1.8.4.2

2 4

[libvirt] [PATCHv5 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 03 Jan '14

03 Jan '14

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The serie of patches is rather big, and adds among other things some utility functions unrelated to VirtualBox in patches 1 & 2. The code review could be done in several parts: e.g. patches 1 & 2 separately to validate the utility functions. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling regexp and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only tested with Virtualbox 4.2 but the code is compliant with Virtualbox 4.3 API. Regards, Manuel VIVES v5: * The patches are modified according to a first review by Laine Stump: * renamed virSearchUuid to virSearchRegex and moved it from viruuid.{c,h} to virstring.{c,h}. * Various fixes. V4: * The code is compliant with Virtualbox 4.3 API * Some minor modifications in order to satisfy "make syntax-check" V3: * Use of STREQ_NULLABLE instead of STREQ in one case * Fix the method for finding uuids according to Ján Tomko review V2: * Fix a licence problem with the method for string replacement Manuel VIVES (5): virstring.h/c: Util method for finding regexp patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots po/POTFILES.in | 1 + src/libvirt_private.syms | 2 + src/util/virstring.c | 163 +++- src/util/virstring.h | 4 + src/vbox/vbox_tmpl.c | 2347 ++++++++++++++++++++++++++++++++++++++++++---- 5 files changed, 2346 insertions(+), 171 deletions(-) -- 1.7.10.4

1 5

[libvirt] [PATCH] BSD: implement nodeGetMemoryStats
by Roman Bogorodskiy 03 Jan '14

03 Jan '14

Implementation of nodeGetMemoryStats() for FreeBSD. I've added the code under __APPLE__ directives as well with the other similar code, however, I didn't test that on MacOS as I don't have one. It would be good if somebody could test that on MacOS, otherwise I'll probably just leave that code under #ifdef __FreeBSD__ only. Roman Bogorodskiy (1): BSD: implement nodeGetMemoryStats src/nodeinfo.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) -- 1.8.4.3

2 2

[libvirt] How to change the env PATH of a container?
by WANG Cheng D 03 Jan '14

03 Jan '14

Dear Laine, I will install a new version fedora as you said. Thank you. By the way, do you know how to change the PATH of the container? I tried to change the .bashrc, but it doesn’t work. I wonder if a container can have its own .bashrc. Have a nice day. Cheng From: sendmail [mailto:justsendmailnothingelse@gmail.com] On Behalf Of Laine Stump Sent: 2014年1月2日 17:21 To: libvir-list(a)redhat.com Cc: WANG Cheng D Subject: Re: [libvirt] How to execute an initial script in a container to start the network interface automatically On 01/02/2014 05:16 AM, WANG Cheng D wrote: Dear All, Happy new year to you. I have a similar question which had been replied by Daniel in the following post: http://www.redhat.com/archives/libvir-list/2010-March/msg00296.html I also want to assign a static IP to the container. As Daniel said, I can successfully assign a static IP to the container manually using “ # ifconfig eth0 192.168.122.3 netmask 255.255.255.0 up”. Daniel also said that we can use “the regular distro initscripts” to automatically start the network interface, but this doesn’t work on my system. My host is fedora16. I haven't played with lxc enough to answer your question, but you *definitely* need to upgrade your Fedora installation - Fedora 16 has been "out of support" (i.e. no new updates, not even for security holes) for almost a year now. Even if you're building your own libvirt from source (the 1.0.3 libvirt you're using is newer than the last update of libvirt for F16, but still several months out of date), the other packages on the system will be extremely out of date and likely to cause problems that will never be fixed (because no F16 package will ever again be updated). My libvirtd and virsh version is 1.0.3.

1 0

[libvirt] [RFC] Implementing ftrace support for libvirt
by yuxh 03 Jan '14

03 Jan '14

Hi all, Happy new year! The existing trace mechanism in libvirt is dtrace. Although the dtrace can work, it's not work well enough. Every time we want get information from the trace point we must write a systemtap script and run it together with libvirt. That's really unpractical on some occasion, especially on production server since the systemtap script can't be executed automatically. And some problems may be not easy to reproduce, then it will cost a lot of time to get the trace information again. So I think it is essential to add supporting for record the trace information automatically in libvirt to satisfy the user's requirement. That's why I'm currently implementing ftrace support in libvirt. How do you think about my idea? Any comment will be appreciated! Thanks, Yu

1 0

[libvirt] [PATCH python] define __GNUC_PREREQ macro before using it
by Doug Goldstein 02 Jan '14

02 Jan '14

We brought over use of the __GNUC_PREREQ macro from libvirt but didn't bring over the definition of it. This brings over the macro from libvirt sources. --- libvirt-utils.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libvirt-utils.h b/libvirt-utils.h index f55be7b..add7553 100644 --- a/libvirt-utils.h +++ b/libvirt-utils.h @@ -65,6 +65,15 @@ # endif # ifdef __GNUC__ + +# ifndef __GNUC_PREREQ +# if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +# else +# define __GNUC_PREREQ(maj,min) 0 +# endif + /** * ATTRIBUTE_UNUSED: * -- 1.8.3.2

3 4

[libvirt] [RFC] lxc.cgroup.blkio.weight_device automatic conversion
by Cedric Bosdonnat 02 Jan '14

02 Jan '14

Hi all, I wish you all a happy new year 2014. I'm currently implementing connectDomainXMLFromNative for the LXC driver. The idea is to convert sourceforge LXC's config file into domain XML files. I just hit a problem with converting blkio device weights. LXC's config directly stores the cgroup value, defining the device with it's major and minor numbers. It seems to me that there is no way to get a path from these numbers, so what would you think about extending _virBlkioDevice to store either a path or a major/minor pair and extend the domain XML schema accordingly? Regards, -- Cedric

1 1

[libvirt] Add patches to allow users to join running containers.
by dwalsh＠redhat.com 02 Jan '14

02 Jan '14

[PATCH 1/2] Add virGetUserDirectoryByUID to retrieve users homedir [PATCH 2/2] virt-login-shell joins users into lxc container. This patch implements most of the changes suggested by Dan Berrange and Eric Blake. Some replies to suggested changes. Removed mingw-libvirt.spec.in changes since virt lxc probably can not be supported in Windows. Not sure if I need to make changes so my code will not build on that platform. Did not make the changes to install virt-login-shell as 4755 automatically. I guess I want a more firm, make that change request... I did not make a helper function to parse a list of strings out of conf file. The getuid and getgid calls return the user that executed the program, when the app is setuid geteuid and getegid return "0". I believe getuid and getgid are correct. Added virt-login-shell --help, not sure what --program would do? The program is hard coded to LXC because there is no way that I know of for a ZZ process to join a running qemu instance. I have heard back from one security review from Miloslav Trmac, who had similar comments as Eric.

4 11

[libvirt] [PATCHv4 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 02 Jan '14

02 Jan '14

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The serie of patches is rather big, and adds among other things some utility functions unrelated to VirtualBox in patches 1 & 2. The code review could be done in several parts: e.g. patches 1 & 2 separately to validate the utility functions. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling uuid and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only tested with Virtualbox 4.2 but the code is compliant with Virtualbox 4.3 API. Regards, Manuel VIVES V4: * The code is compliant with Virtualbox 4.3 API * Some minor modifications in order to satisfy "make syntax-check" V3: * Use of STREQ_NULLABLE instead of STREQ in one case * Fix the method for finding uuids according to Ján Tomko review V2: * Fix a licence problem with the method for string replacement Manuel VIVES (5): viruuid.h/c: Util method for finding uuid patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots po/POTFILES.in | 1 + src/conf/domain_conf.c | 2 +- src/libvirt_private.syms | 2 + src/util/virstring.c | 48 ++ src/util/virstring.h | 2 + src/util/viruuid.c | 81 ++ src/util/viruuid.h | 1 + src/vbox/vbox_tmpl.c | 1854 +++++++++++++++++++++++++++++++++++++++++++--- 8 files changed, 1879 insertions(+), 112 deletions(-) -- 1.7.10.4

3 17

[libvirt] [PATCH] event: don't overwrite registration error message
by Eric Blake 02 Jan '14

02 Jan '14

Prior to this patch, an attempt to register an event without an event loop started results in the vague: libvirt: Remote Driver error : adding cb to list Now it gives the much nicer: libvirt: error : internal error: could not initialize domain event timer This also avoids hiding other reasonable error messages, such as attempts to register a duplicate callback or OOM errors. Also, document the event loop usage requirement, since that was how I ran into the issue. * src/remote/remote_driver.c (remoteConnectNetworkEventRegisterAny) (remoteConnectDomainEventRegister) (remoteConnectDomainEventRegisterAny): Preserve more detailed error. * src/libvirt.c (virConnectDomainEventRegister) (virConnectDomainEventRegisterAny) (virConnectNetworkEventRegisterAny): Document event loop requirement. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/libvirt.c | 24 +++++++++++++++--------- src/remote/remote_driver.c | 12 +++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 90773bb..f8b11b3 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -14829,11 +14829,13 @@ error: * @freecb: optional function to deallocate opaque when not used anymore * * Adds a callback to receive notifications of domain lifecycle events - * occurring on a connection + * occurring on a connection. This function requires that an event loop + * has been previously registered with virEventRegisterImpl() or + * virEventRegisterDefaultImpl(). * * Use of this method is no longer recommended. Instead applications * should try virConnectDomainEventRegisterAny() which has a more flexible - * API contract + * API contract. * * The virDomainPtr object handle passed into the callback upon delivery * of an event is only valid for the duration of execution of the callback. @@ -14842,7 +14844,7 @@ error: * The reference can be released once the object is no longer required * by calling virDomainFree. * - * Returns 0 on success, -1 on failure + * Returns 0 on success, -1 on failure. */ int virConnectDomainEventRegister(virConnectPtr conn, @@ -17541,10 +17543,12 @@ error: * @freecb: optional function to deallocate opaque when not used anymore * * Adds a callback to receive notifications of arbitrary domain events - * occurring on a domain. + * occurring on a domain. This function requires that an event loop + * has been previously registered with virEventRegisterImpl() or + * virEventRegisterDefaultImpl(). * * If @dom is NULL, then events will be monitored for any domain. If @dom - * is non-NULL, then only the specific domain will be monitored + * is non-NULL, then only the specific domain will be monitored. * * Most types of event have a callback providing a custom set of parameters * for the event. When registering an event, it is thus necessary to use @@ -17562,7 +17566,7 @@ error: * for the callback. To unregister a callback, this callback ID should * be passed to the virConnectDomainEventDeregisterAny() method. * - * Returns a callback identifier on success, -1 on failure + * Returns a callback identifier on success, -1 on failure. */ int virConnectDomainEventRegisterAny(virConnectPtr conn, @@ -17657,10 +17661,12 @@ error: * @freecb: optional function to deallocate opaque when not used anymore * * Adds a callback to receive notifications of arbitrary network events - * occurring on a network. + * occurring on a network. This function requires that an event loop + * has been previously registered with virEventRegisterImpl() or + * virEventRegisterDefaultImpl(). * * If @net is NULL, then events will be monitored for any network. If @net - * is non-NULL, then only the specific network will be monitored + * is non-NULL, then only the specific network will be monitored. * * Most types of event have a callback providing a custom set of parameters * for the event. When registering an event, it is thus necessary to use @@ -17678,7 +17684,7 @@ error: * for the callback. To unregister a callback, this callback ID should * be passed to the virConnectNetworkEventDeregisterAny() method. * - * Returns a callback identifier on success, -1 on failure + * Returns a callback identifier on success, -1 on failure. */ int virConnectNetworkEventRegisterAny(virConnectPtr conn, diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index be282d6..11785e2 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -2932,10 +2932,8 @@ remoteConnectNetworkEventRegisterAny(virConnectPtr conn, net, eventID, VIR_OBJECT_EVENT_CALLBACK(callback), opaque, freecb, - &callbackID)) < 0) { - virReportError(VIR_ERR_RPC, "%s", _("adding cb to list")); + &callbackID)) < 0) goto done; - } /* If this is the first callback for this eventID, we need to enable * events on the server */ @@ -4424,10 +4422,8 @@ static int remoteConnectDomainEventRegister(virConnectPtr conn, remoteDriverLock(priv); if ((count = virDomainEventStateRegister(conn, priv->domainEventState, - callback, opaque, freecb)) < 0) { - virReportError(VIR_ERR_RPC, "%s", _("adding cb to list")); + callback, opaque, freecb)) < 0) goto done; - } if (count == 1) { /* Tell the server when we are the first callback deregistering */ @@ -5234,10 +5230,8 @@ static int remoteConnectDomainEventRegisterAny(virConnectPtr conn, priv->domainEventState, dom, eventID, callback, opaque, freecb, - &callbackID)) < 0) { - virReportError(VIR_ERR_RPC, "%s", _("adding cb to list")); + &callbackID)) < 0) goto done; - } /* If this is the first callback for this eventID, we need to enable * events on the server */ -- 1.8.4.2

2 3

[libvirt] How to execute an initial script in a container to start the network interface automatically
by WANG Cheng D 02 Jan '14

02 Jan '14

Dear All, Happy new year to you. I have a similar question which had been replied by Daniel in the following post: http://www.redhat.com/archives/libvir-list/2010-March/msg00296.html I also want to assign a static IP to the container. As Daniel said, I can successfully assign a static IP to the container manually using " # ifconfig eth0 192.168.122.3 netmask 255.255.255.0 up". Daniel also said that we can use "the regular distro initscripts" to automatically start the network interface, but this doesn't work on my system. My host is fedora16. I used the command "yum --installroot=/root/fedora16lxc --releasever=16 install -y openssh, bridge-utils" to setup the rootfs for my container, but I am not sure if it is a right way. After rootfs installation, there is no sub-directory named "network-scripts" in "/etc/sysconfig" . So, I created this directory manually and added a file named "ifcfg-eth0". In my container's XML script, I use "<init>/bin/sh</init>". If I use "<init>/bin/init</init>", it seems that the container doesn't boot correctly because there are strings keeping rolling in the console. My libvirtd and virsh version is 1.0.3. I tried to add files ".bash_profile" and ".bashrc" in which I revised the shell environment variable such as PATH, I also added the "ifconfig" in the script to try to configure eth0 automatically, but it doesn't work. I wonder if there is a ".bashrc" for the root of a container? If there is, where should this file be located? In summary, I have two questions 1) How to setup rootfs for a container? 2) If a container can automatically execute an initial script when booting? Your reply is highly appreciated. With my warmest regards, Cheng

2 1

Re: [libvirt] libvirt live modify
by Michal Novotny 01 Jan '14

01 Jan '14

Hi Umar, please contact libvirt guys for python bindings. Python bindings for libvirt are not handled by me, I handle just the PHP bindings and I'm not aware of the function support in the Python bindings. Happy New Year! Thanks, Michal ----- Original Message ----- From: "Umar Draz" <unix.co(a)gmail.com> To: "Michal Novotny" <minovotn(a)redhat.com> Sent: Monday, December 23, 2013 7:03:17 PM Subject: Re: [libvirt] libvirt live modify Hi Michal Thanks, its work, Ok one question http://libvirt.org/php/api-reference.html#libvirt_domain_set_metadata the above link is php api reference link is there same kind of thing is available for python? Br. Umar On Mon, Dec 23, 2013 at 3:27 PM, Michal Novotny <minovotn(a)redhat.com> wrote: > Hi Umar, > I'm on PTO, fortunately I was checking my e-mail because of the goods to > declare so I can reply to you. > > For updating this please use the libvirt_domain_set_metadata() API > function, please see [1] for documentation. > > Hope it helps, > Michal > > [1] http://libvirt.org/php/api-reference.html#libvirt_domain_set_metadata > > ----- Original Message ----- > From: "Umar Draz" <unix.co(a)gmail.com> > To: "Michal Novotny" <minovotn(a)redhat.com> > Sent: Monday, December 23, 2013 11:05:11 AM > Subject: Re: [libvirt] libvirt live modify > > Hi Michal, > > Sorry to disturb you again, this works great > > $info = @libvirt_domain_get_metadata($res, > VIR_DOMAIN_METADATA_DESCRIPTION, '', VIR_DOMAIN_AFFECT_CURRENT); > > Now what I need to do for setting/updating for the domain description or > title > > Br. > > Umar > > > On Wed, Dec 18, 2013 at 8:25 PM, Michal Novotny <minovotn(a)redhat.com> > wrote: > > > Hi Umar, > > then you don't have working automake setup. Please google how to solve > > it, I apologize but I don't really have much time to solve it right now. > > > > Thanks for understanding, > > Michal > > > > On 12/18/2013 04:21 PM, Umar Draz wrote: > > > Hi Michal > > > > > > I tried > > > > > > but on autogen.sh is failed > > > > > > automake: error: global options already processed > > > automake: Please contact <bug-automake(a)gnu.org > > > <mailto:bug-automake@gnu.org>>. > > > at /usr/share/automake-1.14/Automake/Channels.pm line 662, <GEN0> > > > line 77. > > > Automake::Channels::msg('automake', '', 'global options > > > already processed') called at > > > /usr/share/automake-1.14/Automake/ChannelDefs.pm line 212 > > > Automake::ChannelDefs::prog_error('global options already > > > processed') called at /usr/share/automake-1.14/Automake/Options.pm > > > line 421 > > > > > > Automake::Options::process_global_option_list('HASH(0x246df60)') > > > called at /usr/bin/automake line 5331 > > > Automake::scan_autoconf_traces('configure.ac > > > <http://configure.ac>') called at /usr/bin/automake line 5431 > > > Automake::scan_autoconf_files() called at /usr/bin/automake > > > line 8259 > > > autoreconf: automake failed with exit status: 29 > > > > > > > > > Br. > > > > > > Umar > > > > > > > > > On Wed, Dec 18, 2013 at 7:50 PM, Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com>> wrote: > > > > > > Hi Umar, > > > you have to clone it from git repository and compile it and > > > install. You > > > can simply do it by: > > > > > > git clone git://libvirt.org/libvirt-php.git > > > <http://libvirt.org/libvirt-php.git> > > > ./autogen.sh > > > make > > > sudo make install > > > > > > And then you have to restart your Apache webserver. > > > > > > For example how to use it, see the test in > > > test-domain-create-get-metadata.phpt file (it's normal PHP script, > > > however I use phpt extension as PHP test but it's standard PHP > code). > > > > > > Michal > > > > > > On 12/18/2013 03:45 PM, Umar Draz wrote: > > > > Hi Michal, > > > > > > > > Thanks, Now what I need here? I already have > > > > installed libvirt-php-0.4.8, do I need to copy > > > > > > > > libvirt-php.c > > > > > > > < > > > http://libvirt.org/git/?p=libvirt-php.git;a=blob;f=src/libvirt-php.c;h=7a2a… > > > > > > > libvirt-php. > > > > > > > < > > > http://libvirt.org/git/?p=libvirt-php.git;a=blob;f=src/libvirt-php.c;h=7a2a… > > >h > > > > in the src directory and reconfigure the php-libvirt? > > > > > > > > Br. > > > > > > > > Umar > > > > > > > > > > > > On Wed, Dec 18, 2013 at 7:31 PM, Michal Novotny > > > <minovotn(a)redhat.com <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>> > wrote: > > > > > > > > Hi Umar, > > > > please see commit > > > > > > > > > > http://libvirt.org/git/?p=libvirt-php.git;a=commit;h=e3e783413d8f001ee0a266… > > > > . > > > > > > > > The functions mentioned below have been implemented. > > > > > > > > Michal > > > > > > > > On 12/18/2013 01:29 PM, Umar Draz wrote: > > > > > Hi Michal, > > > > > > > > > > Thanks for your efforts and help. If I need any other API > > > I will > > > > > definitely ask you. > > > > > > > > > > Br. > > > > > > > > > > Umar > > > > > > > > > > > > > > > On Wed, Dec 18, 2013 at 5:19 PM, Michal Novotny > > > > <minovotn(a)redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>>> wrote: > > > > > > > > > > Hi Umar, > > > > > that's fine. Give one or two days for this please. > > > Maybe I'll > > > > > implement > > > > > earlier but I'm a bit overloaded after my PTO so I > > > can't promise > > > > > it will > > > > > be earlier. > > > > > > > > > > Also, what APIs would you like to implement? > > > > > > > > > > I'm thinking of implementing these two: > > > > > > > > > > > > > > > > > http://libvirt.org/html/libvirt-libvirt.html#virDomainGetMetadata > > > > > > > > > > > > http://libvirt.org/html/libvirt-libvirt.html#virDomainSetMetadata > > > > > > > > > > Would you like any other APIs? > > > > > > > > > > Thanks, > > > > > Michal > > > > > > > > > > On 12/18/2013 01:15 PM, Umar Draz wrote: > > > > > > HI Michal, > > > > > > > > > > > > Ok , I will wait. I hope you will get sometime to do > > > this. > > > > > > > > > > > > Br. > > > > > > > > > > > > Umar > > > > > > > > > > > > > > > > > > On Wed, Dec 18, 2013 at 5:06 PM, Michal Novotny > > > > > <minovotn(a)redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>> > > > > > > <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>>>> > wrote: > > > > > > > > > > > > Hi Michal and Umar, > > > > > > it's correct I can't invoke this APIs via PHP > > > yet. Please > > > > > note that > > > > > > libvirt-php is not automatically generated when > > > doing > > > > libvirt > > > > > > build and > > > > > > it's a separate project. It's rather easy to > > > implement > > > > it to the > > > > > > libvirt-php so if you want to implement it, feel > > > free to > > > > > implement > > > > > > or if > > > > > > you can wait a day or two until I have some time > > > I can > > > > implement > > > > > > it (the > > > > > > project is not officially supported and it's done > > in > > > > the spare > > > > > > time mainly). > > > > > > > > > > > > I'd just like to ask you whether there are some > > more > > > > APIs you'd > > > > > > like me > > > > > > to implement when I'll be implementing it. Are > > > there any > > > > > other APIs > > > > > > you'd like? > > > > > > > > > > > > Thanks, > > > > > > Michal > > > > > > > > > > > > On 12/18/2013 12:59 PM, Michal Privoznik wrote: > > > > > > > On 18.12.2013 12:27, Umar Draz wrote: > > > > > > >> Hi Peter, > > > > > > >> > > > > > > >> Thanks for the response, Would you please > > > help how > > > > I can > > > > > > >> use *virDomainSetMetadata* with PHP or any > > > url for > > > > help? > > > > > > >> > > > > > > >> Br. > > > > > > >> > > > > > > >> Umar > > > > > > > [CC'ing Michal Novotny - the libvirt-php > > > maintainer] > > > > > > > > > > > > > > I don't think you can invoke those APIs via > > > PHP. But > > > > I expect > > > > > > them to be > > > > > > > able to add easily. Michal? > > > > > > > > > > > > > > Michal > > > > > > > > > > > > -- > > > > > > Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > > <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>>> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > > > <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>>>>>, > > > > > > RHCE, Red Hat > > > > > > Virtualization | libvirt-php bindings | > > > > php-virt-control.org <http://php-virt-control.org> > > > <http://php-virt-control.org> > > > > > <http://php-virt-control.org> > > > > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > > Umar Draz > > > > > > Network Architect > > > > > > > > > > -- > > > > > Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>> > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com> > > > > <mailto:minovotn@redhat.com <mailto:minovotn@redhat.com>>>>, > > > > > RHCE, Red Hat > > > > > Virtualization | libvirt-php bindings | > > > php-virt-control.org <http://php-virt-control.org> > > > > <http://php-virt-control.org> > > > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > > > > > > > > > > > -- > > > > > Umar Draz > > > > > Network Architect > > > > > > > > -- > > > > Michal Novotny <minovotn(a)redhat.com > > > <mailto:minovotn@redhat.com> <mailto:minovotn@redhat.com > > > <mailto:minovotn@redhat.com>>>, > > > > RHCE, Red Hat > > > > Virtualization | libvirt-php bindings | php-virt-control.org > > > <http://php-virt-control.org> > > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > > > > > > -- > > > > Umar Draz > > > > Network Architect > > > > > > -- > > > Michal Novotny <minovotn(a)redhat.com <mailto:minovotn@redhat.com>>, > > > RHCE, Red Hat > > > Virtualization | libvirt-php bindings | php-virt-control.org > > > <http://php-virt-control.org> > > > > > > > > > > > > > > > -- > > > Umar Draz > > > Network Architect > > > > -- > > Michal Novotny <minovotn(a)redhat.com>, RHCE, Red Hat > > Virtualization | libvirt-php bindings | php-virt-control.org > > > > > > > -- > Umar Draz > Network Architect > -- Umar Draz Network Architect

1 0

[libvirt] [PATCH] test: share state driver between test:///default connections
by Eric Blake 01 Jan '14

01 Jan '14

Prior to this patch, every test:/// URI has its own event manager, which means that registering for an event can only ever receive events from the connection where it issued the API that triggered the event. But the whole idea of events is to be able to learn about something where an API call did NOT trigger the action. In order to actually test asynchronous events, I wanted to be able to tie multiple test connections to the same state. Use of a file in a test URI is still per-connection state, but now parallel connections to test:///default (from the same binary, of course) now share common state and can affect one another. Here's the test program I used to expose the difference (maybe not the most polished, but does the trick): #include <stdbool.h> #include <stdlib.h> #include <errno.h> #include <stdio.h> #include <unistd.h> #include <signal.h> #include <libvirt/libvirt.h> #include <libvirt/virterror.h> static int counter; static int counter2; static virConnectPtr conn1; static virConnectPtr conn2; static virDomainPtr dom1; static virDomainPtr dom2; static int common(virConnectPtr conn, virDomainPtr dom, int event, int detail, void *opaque, int caller) { printf("%d: in callback %d, from domain %s (%d), event/detail %d/%d\n", counter2++, caller, virDomainGetName(dom), virDomainGetID(dom), event, detail); return 0; } static int callback1(virConnectPtr conn, virDomainPtr dom, int event, int detail, void *opaque) { return common(conn, dom, event, detail, opaque, 1); } static int callback2(virConnectPtr conn, virDomainPtr dom, int event, int detail, void *opaque) { return common(conn, dom, event, detail, opaque, 2); } static bool quit; static void handler(int sig) { quit = true; } static void timer(int id, void *opaque) { printf("%d: timer %d firing\n", counter++, id); unsigned long l; switch (counter) { case 1: if (virDomainSuspend(dom2) < 0) exit(10); printf("suspended\n"); break; case 2: if (virDomainResume(dom2) < 0) exit(11); printf("resumed\n"); break; case 4: quit = true; /* fallthrough */ default: virConnectGetLibVersion(conn1, &l); break; } } int main(int argc, char **argv) { signal(SIGINT, handler); conn1 = virConnectOpen("test:///default"); conn2 = virConnectOpen("test:///default"); if (!conn1 || !conn2) return 1; dom1 = virDomainLookupByName(conn1, "test"); dom2 = virDomainLookupByName(conn2, "test"); if (!dom1 || !dom2) return 2; if (virEventRegisterDefaultImpl() < 0) return 3; int id0 = virEventAddTimeout(1000, timer, NULL, NULL); if (id0 < 0) return 4; int id1 = virConnectDomainEventRegisterAny(conn1, dom1, VIR_DOMAIN_EVENT_ID_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(callback1), NULL, NULL); if (id1 < 0) return 5; int id2 = -1; if (argc > 1) { id2 = virConnectDomainEventRegisterAny(conn2, dom2, VIR_DOMAIN_EVENT_ID_LIFECYCLE, VIR_DOMAIN_EVENT_CALLBACK(callback2), NULL, NULL); if (id2 < 0) return 6; if (argc > 2) { if (virConnectDomainEventDeregisterAny(conn2, id2) < 0) return 7; } } while (!quit) if (virEventRunDefaultImpl() < 0) return 20; if (virConnectDomainEventDeregisterAny(conn1, id1) < 0) return 21; if (id2 >= 0 && virConnectDomainEventDeregisterAny(conn2, id2) < 0) return 22; if (virEventRemoveTimeout(id0) < 0) return 23; if (virDomainFree(dom1) < 0 || virDomainFree(dom2) < 0 || virConnectClose(conn1) < 0 || virConnectClose(conn2) < 0) return 24; return 0; } Pre-patch results: $ ./run ./bar 0: timer 1 firing suspended 1: timer 1 firing resumed 2: timer 1 firing 3: timer 1 firing Post-patch results: $ ./run ./bar 0: timer 1 firing suspended 0: in callback 1, from domain test (1), event/detail 3/0 1: timer 1 firing resumed 1: in callback 1, from domain test (1), event/detail 4/0 2: timer 1 firing 3: timer 1 firing $ ./run ./bar 1 0: timer 1 firing suspended 0: in callback 1, from domain test (1), event/detail 3/0 1: in callback 2, from domain test (1), event/detail 3/0 1: timer 1 firing resumed 2: in callback 1, from domain test (1), event/detail 4/0 3: in callback 2, from domain test (1), event/detail 4/0 2: timer 1 firing 3: timer 1 firing Valgrind didn't report any leaks. * src/test/test_driver.c (testConnectOpen): Move per-connection state initialization... (testOpenFromFile): ...here. (defaultConn, defaultConnections, defaultLock, testOnceInit): New shared state. (testOpenDefault): Only initialize on first connection. (testConnectClose): Don't clobber state if still shared. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm actually playing with moving my test out of the commit message and into tests/objecteventtest.c; if I get that working, I'll post a v2. src/test/test_driver.c | 88 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 64 insertions(+), 24 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a48404a..9696044 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,7 +1,7 @@ /* * test.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -105,6 +105,10 @@ struct _testConn { typedef struct _testConn testConn; typedef struct _testConn *testConnPtr; +static testConn defaultConn; +static int defaultConnections; +static virMutex defaultLock; + #define TEST_MODEL "i686" #define TEST_MODEL_WORDSIZE 32 #define TEST_EMULATOR "/usr/bin/test-hv" @@ -125,6 +129,14 @@ static int testConnectClose(virConnectPtr conn); static void testObjectEventQueue(testConnPtr driver, virObjectEventPtr event); +static int +testOnceInit(void) +{ + return virMutexInit(&defaultLock); +} + +VIR_ONCE_GLOBAL_INIT(test) + static void testDriverLock(testConnPtr driver) { @@ -665,9 +677,15 @@ cleanup: return ret; } -static int testOpenDefault(virConnectPtr conn) { + +/* Simultaneous test:///default connections should share the same + * common state (among other things, this allows testing event + * detection in one connection for an action caused in another). */ +static int +testOpenDefault(virConnectPtr conn) +{ int u; - testConnPtr privconn; + testConnPtr privconn = &defaultConn; virDomainDefPtr domdef = NULL; virDomainObjPtr domobj = NULL; virNetworkDefPtr netdef = NULL; @@ -679,18 +697,26 @@ static int testOpenDefault(virConnectPtr conn) { virNodeDeviceDefPtr nodedef = NULL; virNodeDeviceObjPtr nodeobj = NULL; - if (VIR_ALLOC(privconn) < 0) - return VIR_DRV_OPEN_ERROR; + virMutexLock(&defaultLock); + if (defaultConnections++) { + conn->privateData = &defaultConn; + virMutexUnlock(&defaultLock); + return VIR_DRV_OPEN_SUCCESS; + } + if (virMutexInit(&privconn->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); - VIR_FREE(privconn); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } - testDriverLock(privconn); conn->privateData = privconn; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(privconn->domains = virDomainObjListNew())) goto error; @@ -791,7 +817,7 @@ static int testOpenDefault(virConnectPtr conn) { } virNodeDeviceObjUnlock(nodeobj); - testDriverUnlock(privconn); + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_SUCCESS; @@ -802,10 +828,12 @@ error: virStoragePoolObjListFree(&privconn->pools); virNodeDeviceObjListFree(&privconn->devs); virObjectUnref(privconn->caps); - testDriverUnlock(privconn); + virObjectEventStateFree(privconn->domainEventState); + virMutexDestroy(&privconn->lock); conn->privateData = NULL; - VIR_FREE(privconn); virDomainDefFree(domdef); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } @@ -1327,6 +1355,9 @@ error: return ret; } + +/* No shared state between simultaneous test connections initialized + * from a file. */ static int testOpenFromFile(virConnectPtr conn, const char *file) { @@ -1355,6 +1386,9 @@ testOpenFromFile(virConnectPtr conn, const char *file) if (!(privconn->xmlopt = testBuildXMLConfig())) goto error; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(doc = virXMLParseFileCtxt(file, &ctxt))) { goto error; } @@ -1398,6 +1432,7 @@ testOpenFromFile(virConnectPtr conn, const char *file) virInterfaceObjListFree(&privconn->ifaces); virStoragePoolObjListFree(&privconn->pools); VIR_FREE(privconn->path); + virObjectEventStateFree(privconn->domainEventState); testDriverUnlock(privconn); VIR_FREE(privconn); conn->privateData = NULL; @@ -1410,10 +1445,12 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, unsigned int flags) { int ret; - testConnPtr privconn; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + if (testInitialize() < 0) + return VIR_DRV_OPEN_ERROR; + if (!conn->uri) return VIR_DRV_OPEN_DECLINED; @@ -1442,24 +1479,24 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, if (ret != VIR_DRV_OPEN_SUCCESS) return ret; - privconn = conn->privateData; - testDriverLock(privconn); - - privconn->domainEventState = virObjectEventStateNew(); - if (!privconn->domainEventState) { - testDriverUnlock(privconn); - testConnectClose(conn); - return VIR_DRV_OPEN_ERROR; - } - - testDriverUnlock(privconn); - return VIR_DRV_OPEN_SUCCESS; } static int testConnectClose(virConnectPtr conn) { testConnPtr privconn = conn->privateData; + + if (testInitialize() < 0) + return -1; + + if (privconn == &defaultConn) { + virMutexLock(&defaultLock); + if (--defaultConnections) { + virMutexUnlock(&defaultLock); + return 0; + } + } + testDriverLock(privconn); virObjectUnref(privconn->caps); virObjectUnref(privconn->xmlopt); @@ -1474,7 +1511,10 @@ static int testConnectClose(virConnectPtr conn) testDriverUnlock(privconn); virMutexDestroy(&privconn->lock); - VIR_FREE(privconn); + if (privconn == &defaultConn) + virMutexUnlock(&defaultLock); + else + VIR_FREE(privconn); conn->privateData = NULL; return 0; } -- 1.8.4.2

1 1

[libvirt] [PATCHv2] test: share state driver between test:///default connections
by Eric Blake 01 Jan '14

01 Jan '14

Prior to this patch, every test:/// URI has its own event manager, which means that registering for an event can only ever receive events from the connection where it issued the API that triggered the event. But the whole idea of events is to be able to learn about something where an API call did NOT trigger the action. In order to actually test asynchronous events, I wanted to be able to tie multiple test connections to the same state. Use of a file in a test URI is still per-connection state, but now parallel connections to test:///default (from the same binary, of course) now share common state and can affect one another. The updated testsuite fails without the rest of this patch. Valgrind didn't report any leaks. * src/test/test_driver.c (testConnectOpen): Move per-connection state initialization... (testOpenFromFile): ...here. (defaultConn, defaultConnections, defaultLock, testOnceInit): New shared state. (testOpenDefault): Only initialize on first connection. (testConnectClose): Don't clobber state if still shared. * tests/objecteventtest.c (testDomainStartStopEvent): Enhance to cover this. (timeout, mymain): Ensure test fails rather than blocks. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/test/test_driver.c | 88 +++++++++++++++++++++++++++++++++++-------------- tests/objecteventtest.c | 50 ++++++++++++++++++++++++---- 2 files changed, 107 insertions(+), 31 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index a48404a..9696044 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1,7 +1,7 @@ /* * test.c: A "mock" hypervisor for use by application unit tests * - * Copyright (C) 2006-2013 Red Hat, Inc. + * Copyright (C) 2006-2014 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -105,6 +105,10 @@ struct _testConn { typedef struct _testConn testConn; typedef struct _testConn *testConnPtr; +static testConn defaultConn; +static int defaultConnections; +static virMutex defaultLock; + #define TEST_MODEL "i686" #define TEST_MODEL_WORDSIZE 32 #define TEST_EMULATOR "/usr/bin/test-hv" @@ -125,6 +129,14 @@ static int testConnectClose(virConnectPtr conn); static void testObjectEventQueue(testConnPtr driver, virObjectEventPtr event); +static int +testOnceInit(void) +{ + return virMutexInit(&defaultLock); +} + +VIR_ONCE_GLOBAL_INIT(test) + static void testDriverLock(testConnPtr driver) { @@ -665,9 +677,15 @@ cleanup: return ret; } -static int testOpenDefault(virConnectPtr conn) { + +/* Simultaneous test:///default connections should share the same + * common state (among other things, this allows testing event + * detection in one connection for an action caused in another). */ +static int +testOpenDefault(virConnectPtr conn) +{ int u; - testConnPtr privconn; + testConnPtr privconn = &defaultConn; virDomainDefPtr domdef = NULL; virDomainObjPtr domobj = NULL; virNetworkDefPtr netdef = NULL; @@ -679,18 +697,26 @@ static int testOpenDefault(virConnectPtr conn) { virNodeDeviceDefPtr nodedef = NULL; virNodeDeviceObjPtr nodeobj = NULL; - if (VIR_ALLOC(privconn) < 0) - return VIR_DRV_OPEN_ERROR; + virMutexLock(&defaultLock); + if (defaultConnections++) { + conn->privateData = &defaultConn; + virMutexUnlock(&defaultLock); + return VIR_DRV_OPEN_SUCCESS; + } + if (virMutexInit(&privconn->lock) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot initialize mutex")); - VIR_FREE(privconn); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } - testDriverLock(privconn); conn->privateData = privconn; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(privconn->domains = virDomainObjListNew())) goto error; @@ -791,7 +817,7 @@ static int testOpenDefault(virConnectPtr conn) { } virNodeDeviceObjUnlock(nodeobj); - testDriverUnlock(privconn); + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_SUCCESS; @@ -802,10 +828,12 @@ error: virStoragePoolObjListFree(&privconn->pools); virNodeDeviceObjListFree(&privconn->devs); virObjectUnref(privconn->caps); - testDriverUnlock(privconn); + virObjectEventStateFree(privconn->domainEventState); + virMutexDestroy(&privconn->lock); conn->privateData = NULL; - VIR_FREE(privconn); virDomainDefFree(domdef); + defaultConnections--; + virMutexUnlock(&defaultLock); return VIR_DRV_OPEN_ERROR; } @@ -1327,6 +1355,9 @@ error: return ret; } + +/* No shared state between simultaneous test connections initialized + * from a file. */ static int testOpenFromFile(virConnectPtr conn, const char *file) { @@ -1355,6 +1386,9 @@ testOpenFromFile(virConnectPtr conn, const char *file) if (!(privconn->xmlopt = testBuildXMLConfig())) goto error; + if (!(privconn->domainEventState = virObjectEventStateNew())) + goto error; + if (!(doc = virXMLParseFileCtxt(file, &ctxt))) { goto error; } @@ -1398,6 +1432,7 @@ testOpenFromFile(virConnectPtr conn, const char *file) virInterfaceObjListFree(&privconn->ifaces); virStoragePoolObjListFree(&privconn->pools); VIR_FREE(privconn->path); + virObjectEventStateFree(privconn->domainEventState); testDriverUnlock(privconn); VIR_FREE(privconn); conn->privateData = NULL; @@ -1410,10 +1445,12 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, unsigned int flags) { int ret; - testConnPtr privconn; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + if (testInitialize() < 0) + return VIR_DRV_OPEN_ERROR; + if (!conn->uri) return VIR_DRV_OPEN_DECLINED; @@ -1442,24 +1479,24 @@ static virDrvOpenStatus testConnectOpen(virConnectPtr conn, if (ret != VIR_DRV_OPEN_SUCCESS) return ret; - privconn = conn->privateData; - testDriverLock(privconn); - - privconn->domainEventState = virObjectEventStateNew(); - if (!privconn->domainEventState) { - testDriverUnlock(privconn); - testConnectClose(conn); - return VIR_DRV_OPEN_ERROR; - } - - testDriverUnlock(privconn); - return VIR_DRV_OPEN_SUCCESS; } static int testConnectClose(virConnectPtr conn) { testConnPtr privconn = conn->privateData; + + if (testInitialize() < 0) + return -1; + + if (privconn == &defaultConn) { + virMutexLock(&defaultLock); + if (--defaultConnections) { + virMutexUnlock(&defaultLock); + return 0; + } + } + testDriverLock(privconn); virObjectUnref(privconn->caps); virObjectUnref(privconn->xmlopt); @@ -1474,7 +1511,10 @@ static int testConnectClose(virConnectPtr conn) testDriverUnlock(privconn); virMutexDestroy(&privconn->lock); - VIR_FREE(privconn); + if (privconn == &defaultConn) + virMutexUnlock(&defaultLock); + else + VIR_FREE(privconn); conn->privateData = NULL; return 0; } diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index ae29792..1f43070 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -1,4 +1,5 @@ /* + * Copyright (C) 2014 Red Hat, Inc. * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * * This library is free software; you can redistribute it and/or @@ -220,8 +221,10 @@ testDomainStartStopEvent(const void *data) lifecycleEventCounter counter; int eventId = VIR_DOMAIN_EVENT_ID_LIFECYCLE; int id; - int ret = 0; + int ret = -1; virDomainPtr dom; + virConnectPtr conn2 = NULL; + virDomainPtr dom2 = NULL; lifecycleEventCounter_reset(&counter); @@ -237,20 +240,40 @@ testDomainStartStopEvent(const void *data) virDomainDestroy(dom); virDomainCreate(dom); - if (virEventRunDefaultImpl() < 0) { - ret = -1; + if (virEventRunDefaultImpl() < 0) goto cleanup; - } if (counter.startEvents != 1 || counter.stopEvents != 1 || - counter.unexpectedEvents > 0) { - ret = -1; + counter.unexpectedEvents > 0) + goto cleanup; + + /* Repeat the test, but this time, trigger the events via an + * alternate connection. */ + if (!(conn2 = virConnectOpen("test:///default"))) + goto cleanup; + if (!(dom2 = virDomainLookupByName(conn2, "test"))) goto cleanup; - } + if (virDomainDestroy(dom2) < 0) + goto cleanup; + if (virDomainCreate(dom2) < 0) + goto cleanup; + + if (virEventRunDefaultImpl() < 0) + goto cleanup; + + if (counter.startEvents != 2 || counter.stopEvents != 2 || + counter.unexpectedEvents > 0) + goto cleanup; + + ret = 0; cleanup: virConnectDomainEventDeregisterAny(test->conn, id); virDomainFree(dom); + if (dom2) + virDomainFree(dom2); + if (conn2) + virConnectClose(conn2); return ret; } @@ -374,14 +397,26 @@ cleanup: return ret; } +static void +timeout(int id ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) +{ + fputs("test taking too long; giving up", stderr); + exit(EXIT_FAILURE); +} + static int mymain(void) { objecteventTest test; int ret = EXIT_SUCCESS; + int timer; virEventRegisterDefaultImpl(); + /* Set up a timer to abort this test if it takes 10 seconds. */ + if ((timer = virEventAddTimeout(10 * 1000, timeout, NULL, NULL)) < 0) + return EXIT_FAILURE; + if (!(test.conn = virConnectOpen("test:///default"))) return EXIT_FAILURE; @@ -411,6 +446,7 @@ mymain(void) virNetworkUndefine(test.net); virNetworkFree(test.net); virConnectClose(test.conn); + virEventRemoveTimeout(timer); return ret; } -- 1.8.4.2

1 0

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1807
by Jenkins CI 01 Jan '14

01 Jan '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1807/> ------------------------------------------ Started by upstream project "libvirt-build" build number 2016 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson5237641448459273791.sh + make syntax-check GEN bracket-spacing-check tests/virnetsockettest.c:64: perror ("getifaddrs"); maint.mk: incorrect whitespace, see HACKING for rules make: *** [bracket-spacing-check] Error 1 Build step 'Execute shell' marked build as failure

1 1

[libvirt] [PATCH 1/3] tests: virnetsockettest: Print the error if getifaddrs fails.
by Richard W.M. Jones 01 Jan '14

01 Jan '14

From: "Richard W.M. Jones" <rjones(a)redhat.com> --- tests/virnetsockettest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index eda95bc..82c202e 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -60,8 +60,10 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, *hasIPv4 = *hasIPv6 = false; *freePort = 0; - if (getifaddrs(&ifaddr) < 0) + if (getifaddrs(&ifaddr) < 0) { + perror ("getifaddrs"); goto cleanup; + } for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { if (!ifa->ifa_addr) -- 1.8.3.1

2 6

[libvirt] FYI: aarch64 test suite failures
by Richard W.M. Jones 01 Jan '14

01 Jan '14

Libvirt compiles fine on aarch64. You will need to configure with --without-dtrace as systemtap tracepoints are pretty broken, giving lots of strange compile-time errors/link failures in both libvirt and qemu. The test suite fails, see attachment. Note this is all running under qemu-arm64 userspace emulation[1], so certain things are expected to be a bit different. In particular, any aarch64 binary which the test suite runs is actually run under the qemu-arm64 interpreter (using binfmt). I'm guessing this explains the extra file descriptor in some tests. Also qemu intercepts system calls and thunks them into host system calls (an x86-64 host in this case), and its support for IPv6 seems shaky at best. Rich. [1] http://rwmj.wordpress.com/2013/12/22/how-to-run-aarch64-binaries-on-an-x86-… -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 100 libraries supported. http://fedoraproject.org/wiki/MinGW

1 3

[libvirt] [PATCH] aarch64: Disable -fstack-protector.
by Richard W.M. Jones 01 Jan '14

01 Jan '14

From: "Richard W.M. Jones" <rjones(a)redhat.com> I'm using gcc-4.8.2-7.fc21.aarch64 which does not appear to support this option. --- m4/virt-compile-warnings.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 1547e03..574fbc4 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -163,6 +163,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl -fstack-protector stuff passes gl_WARN_ADD with gcc dnl on Mingw32, but fails when actually used case $host in + aarch64-*-*) + dnl "error: -fstack-protector not supported for this target [-Werror]" + ;; *-*-linux*) dnl Fedora only uses -fstack-protector, but doesn't seem to dnl be great overhead in adding -fstack-protector-all instead -- 1.8.3.1

2 2

[libvirt] Build failed in Jenkins: libvirt-syntax-check #1804
by Jenkins CI 01 Jan '14

01 Jan '14

See <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/1804/> ------------------------------------------ Started by upstream project "libvirt-build" build number 2013 Building on master in workspace <http://honk.sigxcpu.org:8001/job/libvirt-syntax-check/ws/> [workspace] $ /bin/sh -xe /tmp/hudson1250971132809350241.sh + make syntax-check GEN bracket-spacing-check GFDL_version 0.53 GFDL_version TAB_in_indentation 0.41 TAB_in_indentation Wundef_boolean 0.21 Wundef_boolean avoid_attribute_unused_in_header 0.25 avoid_attribute_unused_in_header avoid_ctype_macros 0.64 avoid_ctype_macros avoid_if_before_free 8.01 avoid_if_before_free avoid_strcase 0.81 avoid_strcase avoid_write 0.55 avoid_write bindtextdomain 0.50 bindtextdomain cast_of_argument_to_free 1.37 cast_of_argument_to_free cast_of_x_alloc_return_value 1.22 cast_of_x_alloc_return_value changelog 0.22 changelog const_long_option 0.67 const_long_option copyright_check ./.gnulib/lib/version-etc.c maint.mk: out of date copyright in ./.gnulib/lib/version-etc.c; update it make: *** [sc_copyright_check] Error 1 Build step 'Execute shell' marked build as failure

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 01 Jan '14

01 Jan '14

'make syntax-check' wants a newer gnulib for 2014 copyright. Also, a couple of fixes for bootstrap issues reported on IRC: - on some older glibc systems, ./configure could deadlock due to a glibc malloc bug - on FreeBSD systems, a broken autom4te coupled with gettext 0.18.3 prevents bootstrap; we can't work around it, but can at least inform the user why they have a problem And as always, portability fixes in other modules, some of which are used by libvirt. * .gnulib: Update to latest, in part for bootstrap improvements, and for the new year. * bootstrap: Resync to gnulib. * gnulib/local/m4/ssize_t.m4.diff: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule now that 'make syntax-check' is impacted. * .gnulib 831b84c...c7802e2 (33): > doc: update main copyright year > maint: update copyright > version-etc: new year > autoupdate > passfd: give nicer error for recvfd at eof > autoupdate > gettimeofday: port recent C++ fix to Emacs > gettimeofday: fix C++ crosscompilation > qacl: port to Windows better > md5, sha1, sha256, sha512: fix compile error in c++ mode > open-tests: fix build failure with -Werror=old-style-declaration > md5, sha1, sha256, sha512: fix link error with partial libcrypto > md5, sha1, sha256, sha512: add gl_SET_CRYPTO_CHECK_DEFAULT > md5, sha1, sha256, sha512: add 'auto', and a way to specify default > autoupdate > bootstrap: warn about BSD toolchain snafu > open-tests: port to glibc with _FORTIFY_SOURCE and -O1 > include_next: minimize code duplication > getcwd: fix compile error in configure check > regex: suppress core dumps from detection code > md5, sha1, sha256, sha512: support mandating use of openssl > test-xvasprintf: disable some -Wformat-security diagnostics > regex: avoid glibc deadlock during configure > md5, sha1, sha256, sha512: use openssl routines if available > base64: fix recent compilation regression on some compilers > autoupdate > autoupdate > ignore-value: revert previous code change > selinux-h: improve stub types and add more stub functions > ignore-value: prefer GCC version back through 2.0 > pty: Activate the signature wrapper of forkpty. > maint: fix gendocs.sh permissions > autoupdate .gnulib | 2 +- bootstrap | 12 ++++++++++-- gnulib/local/m4/ssize_t.m4.diff | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gnulib b/.gnulib index 831b84c..1276a2c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 831b84c59ef413c57a36b67344467d66a8a2ba70 +Subproject commit 1276a2c5f24c0c932426aca9c899fa524d2443f2 diff --git a/bootstrap b/bootstrap index e31d17d..ce90bc4 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2013-08-15.22; # UTC +scriptversion=2013-12-05.23; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -551,6 +551,14 @@ if ! printf "$buildreq" | check_versions; then fi fi +# Warn the user if autom4te appears to be broken; this causes known +# issues with at least gettext 0.18.3. +probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -) +if test "x$probe" != xhi; then + warn_ "WARNING: your autom4te wrapper eats stdin;" + warn_ "if bootstrap fails, consider upgrading your autotools" +fi + echo "$0: Bootstrapping from checked-out $package sources..." # See if we can use gnulib's git-merge-changelog merge driver. diff --git a/gnulib/local/m4/ssize_t.m4.diff b/gnulib/local/m4/ssize_t.m4.diff index 93f8ad7..08c2b9c 100644 --- a/gnulib/local/m4/ssize_t.m4.diff +++ b/gnulib/local/m4/ssize_t.m4.diff @@ -5,7 +5,7 @@ index 209d64c..5ea72a1 100644 @@ -1,4 +1,4 @@ -# ssize_t.m4 serial 5 (gettext-0.18.2) +# ssize_t.m4 serial 6 (gettext-0.18.2) - dnl Copyright (C) 2001-2003, 2006, 2010-2013 Free Software Foundation, Inc. + dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,21 @@ AC_DEFUN([gt_TYPE_SSIZE_T], -- 1.8.4.2

1 0

[libvirt] [PATCH] docs: return paragraph must be last
by Eric Blake 01 Jan '14

01 Jan '14

Commit eb70ceb tried to create a code block for libvirt-libvirt.html#virConnectGetType, but failed to note that our doc generator treats everything after "Returns" as part of the return description rather than looking for paragraph and code layout. Fix some other API that also had generic details crammed into the return type paragraph. * src/libvirt.c (virConnectOpen, virConnectOpenReadOnly) (virConnectOpenAuth, virConnectListAllDomains): Fit doc pattern. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/libvirt.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f43718d..0752c3f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1379,8 +1379,6 @@ failed: * This function should be called first to get a connection to the * Hypervisor and xen store * - * Returns a pointer to the hypervisor connection or NULL in case of error - * * If @name is NULL, if the LIBVIRT_DEFAULT_URI environment variable is set, * then it will be used. Otherwise if the client configuration file * has the "uri_default" parameter set, then it will be used. Finally @@ -1393,6 +1391,8 @@ failed: * environment variable LIBVIRT_AUTOSTART=0 * * URIs are documented at http://libvirt.org/uri.html + * + * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr virConnectOpen(const char *name) @@ -1425,9 +1425,9 @@ error: * See virConnectOpen for notes about environment variables which can * have an effect on opening drivers * - * Returns a pointer to the hypervisor connection or NULL in case of error - * * URIs are documented at http://libvirt.org/uri.html + * + * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr virConnectOpenReadOnly(const char *name) @@ -1462,9 +1462,9 @@ error: * See virConnectOpen for notes about environment variables which can * have an effect on opening drivers * - * Returns a pointer to the hypervisor connection or NULL in case of error - * * URIs are documented at http://libvirt.org/uri.html + * + * Returns a pointer to the hypervisor connection or NULL in case of error */ virConnectPtr virConnectOpenAuth(const char *name, @@ -9374,12 +9374,6 @@ error: * VIR_CONNECT_LIST_DOMAINS_NO_SNAPSHOT, for filtering based on whether * a domain has snapshots. * - * Returns the number of domains found or -1 and sets domains to NULL in case of - * error. On success, the array stored into @domains is guaranteed to have an - * extra allocated element set to NULL but not included in the return count, to - * make iteration easier. The caller is responsible for calling virDomainFree() - * on each array element, then calling free() on @domains. - * * Example of usage: * * virDomainPtr *domains; @@ -9396,6 +9390,12 @@ error: * virDomainFree(domains[i]); * } * free(domains); + * + * Returns the number of domains found or -1 and sets domains to NULL in case of + * error. On success, the array stored into @domains is guaranteed to have an + * extra allocated element set to NULL but not included in the return count, to + * make iteration easier. The caller is responsible for calling virDomainFree() + * on each array element, then calling free() on @domains. */ int virConnectListAllDomains(virConnectPtr conn, -- 1.8.4.2

1 0

[libvirt] Release of libvirt-python-1.2.0
by Daniel Veillard 31 Dec '13

31 Dec '13

So this is the first release fo the separated libvirt-python code base out of the main libvirt git. In this case the two release have been made in tandem to avoid disruptions, but there is no guarantee that the future releases of both project will be bound together (though I will try to sync those to minimize churn when possible !) Tarball and rpms are now available on the new location: ftp://libvirt.org/libvirt/python/ The release obviously is mostly around making the switch to an independant package, and making sure that this will build on older version of libvirt already released. Hence a very large set of the patches are specific to portability issues: Features: - Separating libvirt-python releases from libvirt releases (Daniel P. Berrange and Doug Goldstein) - Add missing binding of security model/label APIs (Daniel P. Berrange) Bug Fixes: - Return right error code for baselineCPU (Don Dugger) - Add missing break to switch-case block (Doug Goldstein) Documentation: - Update README file contents and add HACKING file (Daniel P. Berrange) Portability: - Deal with old filenames for events/error functions (Daniel P. Berrange) - Ensure API overrides only used if API exists (Daniel P. Berrange) - Relax min required libvirt to version 0.9.11 (Daniel P. Berrange) - virConnectGetCPUModelNames API appeared in 1.1.3 (Doug Goldstein) - VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED appeared in 1.1.1 (Daniel P. Berrange) - virDomainCreateXMLWithFiles and virDomainCreateWithFiles APIs appeared in 1.1.1 (Doug Goldstein) - virDomainMigrate3 and virDomainMigrateToURI3 appeared in 1.1.0 (Doug Goldstein) - virTypedParams* API appeared in 1.0.2 and used in 1.1.0 (Doug Goldstein) - virDomainMigrateGetCompressionCache API appeared in 1.0.3 (Doug Goldstein) - virDomainGetJobStats API appeared in 1.0.3 (Doug Goldstein) - virNodeGetCPUMap API appeared in 1.0.0 (Doug Goldstein) - VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK appeared in 1.0.0 (Daniel P. Berrange) - virStoragePoolListAllVolumes API appeared in 0.10.2 (Doug Goldstein) - virNode{Get,Set}MemoryParameters API appeared in 0.10.2 (Doug Goldstein) - virConnectListAll* APIs appeared in 0.10.2 (Doug Goldstein) - virDomainQemuAgentCommand appeared in 0.10.0 (Daniel P. Berrange) - virDomainPinEmulator and virDomainGetEmulatorPinInfo APIs appeared in 0.10.0 (Doug Goldstein) - VIR_DOMAIN_EVENT_ID_BALLOON_CHANGED appeared in 0.10.0 (Daniel P. Berrange) - virConnect{Unr,R}egisterCloseCallback API appeared in 0.10.0 (Doug Goldstein) - virDomainSnapshotListAllChildren API appeared in 0.9.13 (Doug Goldstein) - virConnectListAllDomains API appeared in 0.9.13 (Doug Goldstein) - virDomainListAllSnapshots API appeared in 0.9.13 (Doug Goldstein) - Don't build LXC module when building less than 1.0.2 (Doug Goldstein) Improvements: - Improve quality of sanitytest check (Daniel P. Berrange) - Skip copying manually written python for C APIs which don't exist (Daniel P. Berrange) - Fix misc RPM specfile flaws (Daniel P. Berrange) - Fix code for avoiding overrides of non-existant functions (Daniel P. Berrange) - Avoid generating the methods in multiple classes (Daniel P. Berrange) - Make block pull event dispatcher private (Daniel P. Berrange) - Don't include virDomainSnapshotRef in python API (Daniel P. Berrange) - Call virGetLastError from mod rather than py wrapper (Doug Goldstein) - Make setup.py executable (Martin Kletzander) - maint: next release is 1.2.0 (Eric Blake) - Create array of modules to be built (Doug Goldstein) - Break generator.py to be called per module (Doug Goldstein) - Setup distutils build system (Daniel P. Berrange) - Add execute permission for sanitytest.py (Daniel P. Berrange) - Add build/ to python module path for sanitytest.py (Daniel P. Berrange) - Import some virTypedParams* APIs from libvirt (Doug Goldstein) - Import LIBVIR_CHECK_VERSION macro from libvirt (Doug Goldstein) - Import VIR_FORCE_CLOSE macro from libvirt (Daniel P. Berrange) - Remove use of virStrcpyStatic (Daniel P. Berrange) - Import VIR_ALLOC / VIR_ALLOC_N / VIR_REALLOC_N functions (Daniel P. Berrange) - Import code annotation macros from libvirt (Daniel P. Berrange) - Import gnulib's ignore_value macro (Daniel P. Berrange) - Import gnulib's xalloc_oversized macro (Daniel P. Berrange) - Add decl of MIN macro (Daniel P. Berrange) - Import STREQ macro from libvirt (Daniel P. Berrange) - Update header file includes (Daniel P. Berrange) - Update generator for new code layout (Daniel P. Berrange) - Remove obsolete Makefile.am (Daniel P. Berrange) - Move python example programs into python/examples/ subdirectory (Daniel P. Berrange) Cleanups: - Mostly revert "python: remove virConnectGetCPUModelNames from globals" (Daniel P. Berrange) - python: remove virConnectGetCPUModelNames from globals (Doug Goldstein) - python: remove virConnectGetCPUModelNames from globals (Doug Goldstein) - maint: fix comma style issues: python (Eric Blake) thanks everybody for your contributions to this release, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [RFC/PATCH python] expose the bindings version to Python
by Doug Goldstein 31 Dec '13

31 Dec '13

The method getVersion() retrieves the version of the libvirt library that the binaries are linked against but there is no way to retrieve the version of the bindings you are using. In the future if we support new APIs in Python that don't rely on features in the library there needs to be a way for programmers to detect the version. --- I would expect there's a cleaner way to implement this than I've done but I opted for what I saw as the smallest implementation. If anyone has a suggestion for a better way to do this I'm ok with redoing this patch. --- libvirt-override.py | 3 +++ setup.py | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/libvirt-override.py b/libvirt-override.py index 63f8ecb..ed8f73a 100644 --- a/libvirt-override.py +++ b/libvirt-override.py @@ -2,6 +2,9 @@ # Manually written part of python bindings for libvirt # +__version__ = '@VERSION@' +version = @VER_TUPLE@ + # On cygwin, the DLL is called cygvirtmod.dll import sys diff --git a/setup.py b/setup.py index 24d4cf2..ad4f406 100755 --- a/setup.py +++ b/setup.py @@ -119,6 +119,21 @@ if have_libvirt_lxc: class my_build(build): + def gen_version(self, filename): + os.rename(filename, filename + '.tmp') + + version = self.distribution.get_version() + ver_tuple = tuple(int(x) for x in version.split('.')) + + f1 = open(filename + '.tmp', 'r') + f2 = open(filename, 'w') + for line in f1: + f2.write(line + .replace('@VER_TUPLE@', str(ver_tuple)) + .replace('@VERSION@', version)) + f1.close() + f2.close() + def run(self): apis = get_api_xml_files() @@ -127,6 +142,7 @@ class my_build(build): if have_libvirt_lxc: self.spawn([sys.executable, "generator.py", "libvirt-lxc", apis[2]]) + self.gen_version('build/libvirt.py') build.run(self) class my_sdist(sdist): -- 1.8.3.2

3 3

[libvirt] [CFT] FreeBSD: new libvirt-python package
by Jason Helfman 31 Dec '13

31 Dec '13

Hello Everyone, Believe it or not, I don't have any test framework for testing FreeBSD libvirt, so was hoping there may be some folks out there that could help out on that front with this new port I was going to put into our ports tree. :) https://svn.redports.org/jgh/devel/py-libvirt/ Thanks! -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

1 1

[libvirt] [PATCH] Add test for transient disk support in VMX files
by Wout Mertens 30 Dec '13

30 Dec '13

From: Wout Mertens <Wout.Mertens(a)gmail.com> Adds test for transient disk translation in vmx files --- tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx | 6 +++++ tests/vmx2xmldata/vmx2xml-harddisk-transient.xml | 25 ++++++++++++++++++++++ tests/vmx2xmltest.c | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-transient.xml diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx b/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx new file mode 100644 index 0000000..68ef382 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx @@ -0,0 +1,6 @@ +config.version = "8" +virtualHW.version = "4" +ide0:0.present = "true" +ide0:0.deviceType = "ata-hardDisk" +ide0:0.fileName = "harddisk.vmdk" +ide0:0.mode = "independent-nonpersistent" diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml new file mode 100644 index 0000000..3786e2f --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml @@ -0,0 +1,25 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk.vmdk'/> + <target dev='hda' bus='ide'/> + <transient/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <video> + <model type='vmvga' vram='4096'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 13515f0..70178f7 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -221,6 +221,7 @@ mymain(void) DO_TEST("harddisk-scsi-file", "harddisk-scsi-file"); DO_TEST("harddisk-ide-file", "harddisk-ide-file"); + DO_TEST("harddisk-transient", "harddisk-transient"); DO_TEST("cdrom-scsi-file", "cdrom-scsi-file"); DO_TEST("cdrom-scsi-device", "cdrom-scsi-device"); -- 1.7.1

1 0

[libvirt] can't build python bindings on FreeBSD
by Jason Helfman 30 Dec '13

30 Dec '13

Any ideas? Clang: FreeBSD clang version 3.1 creating build/temp.freebsd-9.1-RELEASE-p4-i386-2.7 creating build/temp.freebsd-9.1-RELEASE-p4-i386-2.7/build clang -DNDEBUG -O2 -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -fPIC -I. -I/usr/local/include/python2.7 -c libvirt-override.c -o build/temp.freebsd-9.1-RELEASE-p4-i386-2.7/libvirt-override.o -I/usr/local/include In file included from libvirt-override.c:26: ./libvirt-utils.h:87:22: error: token is not a valid binary operator in a preprocessor subexpression # if __GNUC_PREREQ (3, 3) ~~~~~~~~~~~~~ ^ ./libvirt-utils.h:99:22: error: token is not a valid binary operator in a preprocessor subexpression # if __GNUC_PREREQ (3, 4) ~~~~~~~~~~~~~ ^ 2 errors generated. error: command 'clang' failed with exit status 1 *** [do-build] Error code 1 Stop in /usr/home/jgh/workspace/ports/devel/py-libvirt. Gcc: gcc (GCC) 4.2.1 20070831 gcc -DNDEBUG -O2 -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -fPIC -I. -I/usr/local/include/python2.7 -c libvirt-override.c -o build/temp.freebsd-9.1-RELEASE-p4-i386-2.7/libvirt-override.o -I/usr/local/include In file included from libvirt-override.c:26: libvirt-utils.h:87:22: error: missing binary operator before token "(" libvirt-utils.h:99:22: error: missing binary operator before token "(" error: command 'gcc' failed with exit status 1 *** [do-build] Error code 1 Thanks! -jgh -- Jason Helfman | FreeBSD Committer jgh(a)FreeBSD.org | http://people.freebsd.org/~jgh | The Power to Serve

2 3

[libvirt] newer libvirt version issues
by Franky Van Liedekerke 29 Dec '13

29 Dec '13

Hi, since we're running more than 20 hosts per KVM server, we needed to update libvirt to at least 1.1.2 for virtlockd to be able to cope with this (due to an old hardcoded limit that was in there before). But where 1.1.0 compiles and runs just fine on a fully-patched CentOS 6.4 server, newer version have all kinds of issues: Every version of libvirt >= 1.1.2 crashes with a segfault on up-to-date CentOS 6.4 servers (see below). Also, versions of libvirt >= 1.1.3 need a change in the spec file to be able to compile: apparently the %doc entries that are different with 1.1.2 prevent rpmbuild to succeed on CentOS servers. Using the %doc lines as per the 1.1.2 spec file results in a working rpmbuild. The 1.1.4 version has issues with a symbol not found after compiling and letting it run: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_network.so /usr/lib64/libvirt/connection-driver/libvirt_driver_network.so: undefined symbol: virNetworkList error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_storage.so /usr/lib64/libvirt/connection-driver/libvirt_driver_storage.so: undefined symbol: virAsprintf error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_nodedev.so /usr/lib64/libvirt/connection-driver/libvirt_driver_nodedev.so: undefined symbol: virNodeDeviceList 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_secret.so /usr/lib64/libvirt/connection-driver/libvirt_driver_secret.so: undefined symbol: virAsprintf 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so: undefined symbol: virAsprintf 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_interface.so /usr/lib64/libvirt/connection-driver/libvirt_driver_interface.so: undefined symbol: virAsprintf 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so /usr/lib64/libvirt/connection-driver/libvirt_driver_qemu.so: undefined symbol: networkAllocateActualDevice 31677: error : virDriverLoadModule:78 : failed to load module /usr/lib64/libvirt/connection-driver/libvirt_driver_lxc.so /usr/lib64/libvirt/connection-driver/libvirt_driver_lxc.so: undefined symbol: networkAllocateActualDevice And every time libvirt segfaults, there's this in the logs: debug : virJSONValueToString:1133 : result={"id":"libvirt-6","error":{"class":"CommandNotFound","desc":"The command qom-list has not been found","data":{"name":"qom-list"}}} debug : virEventPollRunOnce:627 : EVENT_POLL_RUN: nhandles=32 timeout=1684 9479: debug : qemuMonitorJSONCheckError:341 : unable to execute QEMU command {"execute":"qom-list","arguments":{"path":"/"},"id":"libvirt-6"}: {"id":"libvirt-6","error":{"class":"CommandNotFound","desc":"The command qom-list has not been found","data":{"name":"qom-list"}}} 9479: error : qemuMonitorJSONCheckError:352 : internal error: unable to execute QEMU command 'qom-list': The command qom-list has not been found Any insights on any of these issues? Franky

3 3

[libvirt] [PATCH] libxl: avoid crashing if calling `virsh numatune' on inactive domain
by Dario Faggioli 29 Dec '13

29 Dec '13

by, in libxlDomainGetNumaParameters(), calling libxl_bitmap_init() as soon as possible, which avoids getting to 'cleanup:', where libxl_bitmap_dispose() happens, without having initialized the nodemap, and hence crashing after some invalid free()-s: # ./daemon/libvirtd -v *** Error in `/home/xen/libvirt.git/daemon/.libs/lt-libvirtd': munmap_chunk(): invalid pointer: 0x00007fdd42592666 *** ======= Backtrace: ========= /lib64/libc.so.6(+0x7bbe7)[0x7fdd3f767be7] /lib64/libxenlight.so.4.3(libxl_bitmap_dispose+0xd)[0x7fdd2c88c045] /home/xen/libvirt.git/daemon/.libs/../../src/.libs/libvirt_driver_libxl.so(+0x12d26)[0x7fdd2caccd26] /home/xen/libvirt.git/src/.libs/libvirt.so.0(virDomainGetNumaParameters+0x15c)[0x7fdd4247898c] /home/xen/libvirt.git/daemon/.libs/lt-libvirtd(+0x1d9a2)[0x7fdd42ecc9a2] /home/xen/libvirt.git/src/.libs/libvirt.so.0(virNetServerProgramDispatch+0x3da)[0x7fdd424e9eaa] /home/xen/libvirt.git/src/.libs/libvirt.so.0(+0x1a6f38)[0x7fdd424e3f38] /home/xen/libvirt.git/src/.libs/libvirt.so.0(+0xa81e5)[0x7fdd423e51e5] /home/xen/libvirt.git/src/.libs/libvirt.so.0(+0xa783e)[0x7fdd423e483e] /lib64/libpthread.so.0(+0x7c53)[0x7fdd3febbc53] /lib64/libc.so.6(clone+0x6d)[0x7fdd3f7e1dbd] Signed-off-by: Dario Faggili <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Ian Jackson <Ian.Jackson(a)eu.citrix.com> --- src/libxl/libxl_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 29aa6c7..d91744f 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3958,6 +3958,8 @@ libxlDomainGetNumaParameters(virDomainPtr dom, * the filtering on behalf of older clients that can't parse it. */ flags &= ~VIR_TYPED_PARAM_STRING_OKAY; + libxl_bitmap_init(&nodemap); + if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; @@ -3972,8 +3974,6 @@ libxlDomainGetNumaParameters(virDomainPtr dom, priv = vm->privateData; - libxl_bitmap_init(&nodemap); - if ((*nparams) == 0) { *nparams = LIBXL_NUMA_NPARAM; ret = 0;

4 5

[libvirt] [PATCH] docs: fix layout of code snippets
by Eric Blake 28 Dec '13

28 Dec '13

Similar to commit 52dbeac, we should indent code snippets in other places to ensure they appear correctly in html. See http://libvirt.org/html/libvirt-libvirt.html#virNodeGetCPUStats for an example improved by this patch. Also fix some missing semicolons in the samples. * src/libvirt.c: Indent code samples in comments. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/libvirt.c | 97 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 77f481e..66841c8 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1150,9 +1150,9 @@ do_open(const char *name, } /* - * If no URI is passed, then check for an environment string if not - * available probe the compiled in drivers to find a default hypervisor - * if detectable. + * If no URI is passed, then check for an environment string if not + * available probe the compiled in drivers to find a default hypervisor + * if detectable. */ if (!name && virConnectGetDefaultURI(conf, &name) < 0) @@ -7629,14 +7629,14 @@ error: * * Here is a sample code snippet: * - * if ((virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, 0) == 0) && - * (nparams != 0)) { - * if ((params = malloc(sizeof(virNodeCPUStats) * nparams)) == NULL) - * goto error; - * memset(params, 0, sizeof(virNodeCPUStats) * nparams); - * if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, 0)) - * goto error; - * } + * if (virNodeGetCPUStats(conn, cpuNum, NULL, &nparams, 0) == 0 && + * nparams != 0) { + * if ((params = malloc(sizeof(virNodeCPUStats) * nparams)) == NULL) + * goto error; + * memset(params, 0, sizeof(virNodeCPUStats) * nparams); + * if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, 0)) + * goto error; + * } * * This function doesn't require privileged access to the hypervisor. * This function expects the caller to allocate the @params. @@ -7722,14 +7722,14 @@ error: * * Here is the sample code snippet: * - * if ((virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, 0) == 0) && - * (nparams != 0)) { - * if ((params = malloc(sizeof(virNodeMemoryStats) * nparams)) == NULL) - * goto error; - * memset(params, cellNum, 0, sizeof(virNodeMemoryStats) * nparams); - * if (virNodeGetMemoryStats(conn, params, &nparams, 0)) - * goto error; - * } + * if (virNodeGetMemoryStats(conn, cellNum, NULL, &nparams, 0) == 0 && + * nparams != 0) { + * if ((params = malloc(sizeof(virNodeMemoryStats) * nparams)) == NULL) + * goto error; + * memset(params, cellNum, 0, sizeof(virNodeMemoryStats) * nparams); + * if (virNodeGetMemoryStats(conn, params, &nparams, 0)) + * goto error; + * } * * This function doesn't require privileged access to the hypervisor. * This function expects the caller to allocate the @params. @@ -8134,14 +8134,14 @@ error: * * Here is a sample code snippet: * - * char *ret = virDomainGetSchedulerType(dom, &nparams); - * if (ret && nparams != 0) { - * if ((params = malloc(sizeof(*params) * nparams)) == NULL) - * goto error; - * memset(params, 0, sizeof(*params) * nparams); - * if (virDomainGetSchedulerParametersFlags(dom, params, &nparams, 0)) - * goto error; - * } + * char *ret = virDomainGetSchedulerType(dom, &nparams); + * if (ret && nparams != 0) { + * if ((params = malloc(sizeof(*params) * nparams)) == NULL) + * goto error; + * memset(params, 0, sizeof(*params) * nparams); + * if (virDomainGetSchedulerParametersFlags(dom, params, &nparams, 0)) + * goto error; + * } * * Returns -1 in case of error, 0 in case of success. */ @@ -9381,24 +9381,21 @@ error: * on each array element, then calling free() on @domains. * * Example of usage: - * virDomainPtr *domains; - * size_t i; - * int ret; - * unsigned int flags = VIR_CONNECT_LIST_DOMAINS_RUNNING | - * VIR_CONNECT_LIST_DOMAINS_PERSISTENT; - * - * ret = virConnectListAllDomains(conn, &domains, flags); - * if (ret < 0) - * error(); * - * for (i = 0; i < ret; i++) { - * do_something_with_domain(domains[i]); - * - * //here or in a separate loop if needed - * virDomainFree(domains[i]); - * } - * - * free(domains); + * virDomainPtr *domains; + * size_t i; + * int ret; + * unsigned int flags = VIR_CONNECT_LIST_DOMAINS_RUNNING | + * VIR_CONNECT_LIST_DOMAINS_PERSISTENT; + * ret = virConnectListAllDomains(conn, &domains, flags); + * if (ret < 0) + * error(); + * for (i = 0; i < ret; i++) { + * do_something_with_domain(domains[i]); + * //here or in a separate loop if needed + * virDomainFree(domains[i]); + * } + * free(domains); */ int virConnectListAllDomains(virConnectPtr conn, @@ -17023,7 +17020,7 @@ virStreamRef(virStreamPtr stream) * API looks like * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_RDONLY) + * int fd = open("demo.iso", O_RDONLY); * * virConnectUploadFile(conn, "demo.iso", st); * @@ -17040,7 +17037,7 @@ virStreamRef(virStreamPtr stream) * } * int offset = 0; * while (offset < got) { - * int sent = virStreamSend(st, buf+offset, got-offset) + * int sent = virStreamSend(st, buf+offset, got-offset); * if (sent < 0) { * virStreamAbort(st); * goto done; @@ -17117,7 +17114,7 @@ error: * API looks like * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_WRONLY, 0600) + * int fd = open("demo.iso", O_WRONLY, 0600); * * virConnectDownloadFile(conn, "demo.iso", st); * @@ -17132,7 +17129,7 @@ error: * } * int offset = 0; * while (offset < got) { - * int sent = write(fd, buf+offset, got-offset) + * int sent = write(fd, buf + offset, got - offset); * if (sent < 0) { * virStreamAbort(st); * goto done; @@ -17216,7 +17213,7 @@ error: * } * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_RDONLY) + * int fd = open("demo.iso", O_RDONLY); * * virConnectUploadFile(conn, st); * if (virStreamSendAll(st, mysource, &fd) < 0) { @@ -17313,7 +17310,7 @@ cleanup: * } * * virStreamPtr st = virStreamNew(conn, 0); - * int fd = open("demo.iso", O_WRONLY) + * int fd = open("demo.iso", O_WRONLY); * * virConnectUploadFile(conn, st); * if (virStreamRecvAll(st, mysink, &fd) < 0) { -- 1.8.4.2

1 0

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 28 Dec '13

28 Dec '13

A couple of fixes for bootstrap issues reported on IRC: - on some older glibc systems, ./configure could deadlock due to a glibc malloc bug - on FreeBSD systems, a broken autom4te coupled with gettext 0.18.3 prevents bootstrap; we can't work around it, but can at least inform the user why they have a problem And as always, portability fixes in other modules, some of which are used by libvirt. * .gnulib: Update to latest, in part for bootstrap improvements. * bootstrap: Resync to gnulib. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Hmm, in reading this gnulib changelog, I'm not sure I want to push right away: the line about md5 being tweaked to use openssl makes me wonder if this update is dragging in a new library dependency; I'll have to do a bit more investigation. But here's the patch, if anyone else also wants to investigate. * .gnulib 831b84c...fdfe96f (18): > bootstrap: warn about BSD toolchain snafu > open-tests: port to glibc with _FORTIFY_SOURCE and -O1 > include_next: minimize code duplication > getcwd: fix compile error in configure check > regex: suppress core dumps from detection code > md5, sha1, sha256, sha512: support mandating use of openssl > test-xvasprintf: disable some -Wformat-security diagnostics > regex: avoid glibc deadlock during configure > md5, sha1, sha256, sha512: use openssl routines if available > base64: fix recent compilation regression on some compilers > autoupdate > autoupdate > ignore-value: revert previous code change > selinux-h: improve stub types and add more stub functions > ignore-value: prefer GCC version back through 2.0 > pty: Activate the signature wrapper of forkpty. > maint: fix gendocs.sh permissions > autoupdate .gnulib | 2 +- bootstrap | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 831b84c..fdfe96f 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 831b84c59ef413c57a36b67344467d66a8a2ba70 +Subproject commit fdfe96fe43746d63364f823ab3032c8301d53d1f diff --git a/bootstrap b/bootstrap index e31d17d..5acbe5b 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2013-08-15.22; # UTC +scriptversion=2013-12-05.23; # UTC # Bootstrap this package from checked-out sources. @@ -551,6 +551,14 @@ if ! printf "$buildreq" | check_versions; then fi fi +# Warn the user if autom4te appears to be broken; this causes known +# issues with at least gettext 0.18.3. +probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -) +if test "x$probe" != xhi; then + warn_ "WARNING: your autom4te wrapper eats stdin;" + warn_ "if bootstrap fails, consider upgrading your autotools" +fi + echo "$0: Bootstrapping from checked-out $package sources..." # See if we can use gnulib's git-merge-changelog merge driver. -- 1.8.3.1

2 2

[libvirt] [PATCHv2] maint: improve debug of libvirt-{qemu, lxc} apis
by Eric Blake 28 Dec '13

28 Dec '13

I noticed that the virDomainQemuMonitorCommand debug output wasn't telling me the name of the domain it was working on. While it was easy enough to determine which pointer matches the domain based on other log messages, it is nicer to be consistent. * src/util/viruuid.h (VIR_UUID_DEBUG): Moved here from... * src/libvirt.c (VIR_UUID_DEBUG): ...here. (VIR_ARG15, VIR_HAS_COMMA, VIR_DOMAIN_DEBUG_EXPAND) (VIR_DOMAIN_DEBUG_PASTE, VIR_DOMAIN_DEBUG_0, VIR_DOMAIN_DEBUG_1) (VIR_DOMAIN_DEBUG_2, VIR_DOMAIN_DEBUG): Move... * src/datatypes.h: ...here. * src/libvirt-qemu.c (virDomainQemuMonitorCommand) (virDomainQemuAgentCommand): Better debug messages. * src/libvirt-lxc.c (virDomainLxcOpenNamespace): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The simpler part of my changes; the work on cleaning up the remaining virLib*Error() calls in libvirt.c is turning into a bigger cleanup project. src/datatypes.h | 60 ++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-lxc.c | 4 +-- src/libvirt-qemu.c | 11 +++++---- src/libvirt.c | 71 ------------------------------------------------------ src/util/viruuid.h | 20 ++++++++++++++- 5 files changed, 86 insertions(+), 80 deletions(-) diff --git a/src/datatypes.h b/src/datatypes.h index 6026bb0..7f325b0 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -1,7 +1,7 @@ /* * datatypes.h: management of structs for public data types * - * Copyright (C) 2006-2008, 2010-2011 Red Hat, Inc. + * Copyright (C) 2006-2008, 2010-2011, 2013 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 @@ -94,6 +94,64 @@ extern virClassPtr virStoragePoolClass; (VIR_IS_SNAPSHOT(obj) && VIR_IS_DOMAIN((obj)->domain)) +/* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This + * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but + * can easily be expanded if needed. + * + * Note that gcc provides extensions of "define a(b...) b" or + * "define a(b,...) b,##__VA_ARGS__" as a means of eliding a comma + * when no var-args are present, but we don't want to require gcc. + */ +# define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \ + _11, _12, _13, _14, _15, ...) _15 +# define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) + +/* Form the name VIR_DOMAIN_DEBUG_[01], then call that macro, + * according to how many arguments are present. Two-phase due to + * macro expansion rules. */ +# define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ + VIR_DOMAIN_DEBUG_PASTE(a, b, __VA_ARGS__) +# define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ + a##b(__VA_ARGS__) + +/* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ +# define VIR_DOMAIN_DEBUG_0(dom) \ + VIR_DOMAIN_DEBUG_2(dom, "%s", "") + +/* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. */ +# define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ + VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) + +/* Internal use only, with final format. */ +# define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ + do { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + const char *_domname = NULL; \ + \ + if (!VIR_IS_DOMAIN(dom)) { \ + memset(_uuidstr, 0, sizeof(_uuidstr)); \ + } else { \ + virUUIDFormat((dom)->uuid, _uuidstr); \ + _domname = (dom)->name; \ + } \ + \ + VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s)" fmt, \ + dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ + } while (0) + +/** + * VIR_DOMAIN_DEBUG: + * @dom: domain + * @fmt: optional format for additional information + * @...: optional arguments corresponding to @fmt. + */ +# define VIR_DOMAIN_DEBUG(...) \ + VIR_DOMAIN_DEBUG_EXPAND(VIR_DOMAIN_DEBUG_, \ + VIR_HAS_COMMA(__VA_ARGS__), \ + __VA_ARGS__) + + typedef struct _virConnectCloseCallbackData virConnectCloseCallbackData; typedef virConnectCloseCallbackData *virConnectCloseCallbackDataPtr; diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c index c8cdcea..5cbe8bf 100644 --- a/src/libvirt-lxc.c +++ b/src/libvirt-lxc.c @@ -28,6 +28,7 @@ #include "virfile.h" #include "virlog.h" #include "virprocess.h" +#include "viruuid.h" #include "datatypes.h" #ifdef WITH_SELINUX # include <selinux/selinux.h> @@ -69,8 +70,7 @@ virDomainLxcOpenNamespace(virDomainPtr domain, { virConnectPtr conn; - VIR_DEBUG("domain=%p, fdlist=%p flags=%x", - domain, fdlist, flags); + VIR_DOMAIN_DEBUG(domain, "fdlist=%p flags=%x", fdlist, flags); virResetLastError(); diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 83fb3b3..2fa5522 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -2,7 +2,7 @@ * libvirt-qemu.c: Interfaces for the libvirt library to handle qemu-specific * APIs. * - * Copyright (C) 2010-2012 Red Hat, Inc. + * Copyright (C) 2010-2013 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 @@ -25,6 +25,7 @@ #include "virerror.h" #include "virlog.h" +#include "viruuid.h" #include "datatypes.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -75,8 +76,8 @@ virDomainQemuMonitorCommand(virDomainPtr domain, const char *cmd, { virConnectPtr conn; - VIR_DEBUG("domain=%p, cmd=%s, result=%p, flags=%x", - domain, cmd, result, flags); + VIR_DOMAIN_DEBUG(domain, "cmd=%s, result=%p, flags=%x", + cmd, result, flags); virResetLastError(); @@ -213,8 +214,8 @@ virDomainQemuAgentCommand(virDomainPtr domain, virConnectPtr conn; char *ret; - VIR_DEBUG("domain=%p, cmd=%s, timeout=%d, flags=%x", - domain, cmd, timeout, flags); + VIR_DOMAIN_DEBUG(domain, "cmd=%s, timeout=%d, flags=%x", + cmd, timeout, flags); if (!VIR_IS_CONNECTED_DOMAIN(domain)) { virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); diff --git a/src/libvirt.c b/src/libvirt.c index 77f481e..37de991 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -327,77 +327,6 @@ static struct gcry_thread_cbs virTLSThreadImpl = { }; #endif /* WITH_GNUTLS_GCRYPT */ -/* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This - * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but - * can easily be expanded if needed. - * - * Note that gcc provides extensions of "define a(b...) b" or - * "define a(b,...) b,##__VA_ARGS__" as a means of eliding a comma - * when no var-args are present, but we don't want to require gcc. - */ -#define VIR_ARG15(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, ...) _15 -#define VIR_HAS_COMMA(...) VIR_ARG15(__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0) - -/* Form the name VIR_DOMAIN_DEBUG_[01], then call that macro, - * according to how many arguments are present. Two-phase due to - * macro expansion rules. */ -#define VIR_DOMAIN_DEBUG_EXPAND(a, b, ...) \ - VIR_DOMAIN_DEBUG_PASTE(a, b, __VA_ARGS__) -#define VIR_DOMAIN_DEBUG_PASTE(a, b, ...) \ - a##b(__VA_ARGS__) - -/* Internal use only, when VIR_DOMAIN_DEBUG has one argument. */ -#define VIR_DOMAIN_DEBUG_0(dom) \ - VIR_DOMAIN_DEBUG_2(dom, "%s", "") - -/* Internal use only, when VIR_DOMAIN_DEBUG has three or more arguments. */ -#define VIR_DOMAIN_DEBUG_1(dom, fmt, ...) \ - VIR_DOMAIN_DEBUG_2(dom, ", " fmt, __VA_ARGS__) - -/* Internal use only, with final format. */ -#define VIR_DOMAIN_DEBUG_2(dom, fmt, ...) \ - do { \ - char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ - const char *_domname = NULL; \ - \ - if (!VIR_IS_DOMAIN(dom)) { \ - memset(_uuidstr, 0, sizeof(_uuidstr)); \ - } else { \ - virUUIDFormat((dom)->uuid, _uuidstr); \ - _domname = (dom)->name; \ - } \ - \ - VIR_DEBUG("dom=%p, (VM: name=%s, uuid=%s)" fmt, \ - dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ - } while (0) - -/** - * VIR_DOMAIN_DEBUG: - * @dom: domain - * @fmt: optional format for additional information - * @...: optional arguments corresponding to @fmt. - */ -#define VIR_DOMAIN_DEBUG(...) \ - VIR_DOMAIN_DEBUG_EXPAND(VIR_DOMAIN_DEBUG_, \ - VIR_HAS_COMMA(__VA_ARGS__), \ - __VA_ARGS__) - -/** - * VIR_UUID_DEBUG: - * @conn: connection - * @uuid: possibly null UUID array - */ -#define VIR_UUID_DEBUG(conn, uuid) \ - do { \ - if (uuid) { \ - char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ - virUUIDFormat(uuid, _uuidstr); \ - VIR_DEBUG("conn=%p, uuid=%s", conn, _uuidstr); \ - } else { \ - VIR_DEBUG("conn=%p, uuid=(null)", conn); \ - } \ - } while (0) - static bool virGlobalError = false; static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER; diff --git a/src/util/viruuid.h b/src/util/viruuid.h index bebd338..b3b1d49 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -1,7 +1,7 @@ /* * viruuid.h: helper APIs for dealing with UUIDs * - * Copyright (C) 2007, 2011, 2012 Red Hat, Inc. + * Copyright (C) 2007, 2011-2013 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 @@ -26,6 +26,24 @@ # include "internal.h" + +/** + * VIR_UUID_DEBUG: + * @conn: connection + * @uuid: possibly null UUID array + */ +# define VIR_UUID_DEBUG(conn, uuid) \ + do { \ + if (uuid) { \ + char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ + virUUIDFormat(uuid, _uuidstr); \ + VIR_DEBUG("conn=%p, uuid=%s", conn, _uuidstr); \ + } else { \ + VIR_DEBUG("conn=%p, uuid=(null)", conn); \ + } \ + } while (0) + + int virSetHostUUIDStr(const char *host_uuid); int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1); -- 1.8.4.2

1 1

[libvirt] [PATCH] maint: fix typo in error message
by Eric Blake 27 Dec '13

27 Dec '13

* src/util/virerror.h (virReportInvalidZeroArg): Fix double space. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/util/virerror.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virerror.h b/src/util/virerror.h index 05e9950..87272e9 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -1,7 +1,7 @@ /* * virerror.c: error handling and reporting code for libvirt * - * Copyright (C) 2006-2009, 2011 Red Hat, Inc. + * Copyright (C) 2006-2013 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 @@ -121,7 +121,7 @@ void virReportSystemErrorFull(int domcode, #argname, \ NULL, \ 0, 0, \ - _("%s in %s must be zero"), \ + _("%s in %s must be zero"), \ #argname, __FUNCTION__) # define virReportInvalidNonNegativeArg(argname) \ virRaiseErrorFull(__FILE__, __FUNCTION__, __LINE__, \ -- 1.8.4.2

1 0

[libvirt] fail to live migration is related to virtio-console
by yue 27 Dec '13

27 Dec '13

hi,all this error occured when live migration windows os, log of that vm is: features 0x1e unsupported allowed features 0x71000002 qemu warning error while loading state for instance 0x0 of device '0000:00:04.4/virtio-console' do you have some idea about that? thanks

2 1

[libvirt] [PATCH] initial version of the bhyve driver
by Roman Bogorodskiy 27 Dec '13

27 Dec '13

Hi, This is an initial version of the bhyve driver. bhyve is a hypervisor for FreeBSD: http://bhyve.org/. I've tried to make this initial version as small as possible but functional, e.g. so it could be tested without lots of manual actions outside of libvirt. Hopefully it's not large enough for review, because I have no idea how to make it smaller yet functional. About the driver itself. It supports the following operations on domains (not counting service ones): * define * start * destroy Domain configuration is limited, user can define RAM, vcpus, can specify only one block device and attach the domain to only one network of 'bridge' type (default network works fine). Having that, you can start a bhyve VM and it will get a network connectivity. Network supported added at the early state, because the only way to get inside VM but network is via stdout/stdin, which is not convenient at all. That was fixed in -CURRENT and one could use tty device, but I haven't upgrade my development box to that version yet. Testing information: I use an domain xml like that: https://gist.github.com/novel/8151244 On both host and guest I use FreeBSD amd64 10-BETA3. Guest image doesn't have much configuration except: ifconfig_vtnet0="DHCP" in /etc/rc.conf And allowing root loging for sshd. Also, if one wants to manually test the image outside of libvirt, this line is needed in /etc/ttys to be able to login from console: ttyu2 "/usr/libexec/getty std.9600" vt100 on secure Roman Bogorodskiy (1): bhyve: add a basic driver configure.ac | 37 ++++ daemon/libvirtd.c | 9 + include/libvirt/virterror.h | 1 + src/Makefile.am | 35 +++ src/bhyve/bhyve_driver.c | 529 ++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_driver.h | 28 +++ src/bhyve/bhyve_process.c | 386 ++++++++++++++++++++++++++++++++ src/bhyve/bhyve_process.h | 36 +++ src/bhyve/bhyve_utils.h | 48 ++++ src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 3 + src/util/virerror.c | 1 + 14 files changed, 1117 insertions(+), 1 deletion(-) create mode 100644 src/bhyve/bhyve_driver.c create mode 100644 src/bhyve/bhyve_driver.h create mode 100644 src/bhyve/bhyve_process.c create mode 100644 src/bhyve/bhyve_process.h create mode 100644 src/bhyve/bhyve_utils.h -- 1.8.4.3

1 1

[libvirt] fail to live migration
by yue 27 Dec '13

27 Dec '13

hi,all i have no idea why? does this error have anything to do with virtio-channel via which outside process can communicate with guest's process. ------------------my app log-------- File "/usr/lib64/python2.6/site-packages/mcvda/libvirtconnection.py", line 87, in wrapper ret = f(*args, **kwargs) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 1178, in migrateToURI2 if ret == -1: raise libvirtError ('virDomainMigrateToURI2() failed', dom=self) libvirtError: Failed to inquire lock: No such process --log libvirtd.log 2013-12-26 09:09:15.514+0000: 18953: error : qemuMonitorIORead:513 : Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:646 : Error on monitor Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0530 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:680 : Triggering error callback 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleMonitorError:357 : Received error on 0x7fd6940cd410 'QY-n1' 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectRef:168 : OBJECT_REF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: error : qemuAgentIO:642 : internal error End of file from monitor 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentIO:675 : Error on monitor internal error End of file from monitor 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentIO:698 : Triggering EOF callback 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleAgentEOF:125 : Received EOF from agent on 0x7fd6940cd410 'QY-n1' 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentClose:814 : mon=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : virFileClose:72 : Closed fd 29 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:137 : OBJECT_DISPOSE: obj=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : qemuAgentDispose:169 : mon=0x7fd6940d0640 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleAgentDestroy:186 : Received destroy agent=0x7fd6940d0640 vm=0x7fd6940cd410 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectRef:168 : OBJECT_REF: obj=0x7fd6940d0530 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:646 : Error on monitor Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.514+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0530 2013-12-26 09:09:15.514+0000: 18953: debug : qemuMonitorIO:669 : Triggering EOF callback 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleMonitorEOF:298 : Received EOF on 0x7fd6940cd410 'QY-n1' 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessHandleMonitorEOF:317 : Monitor connection to 'QY-n1' closed without SHUTDOWN event; assuming the domain crashed 2013-12-26 09:09:15.514+0000: 18953: debug : qemuProcessStop:4192 : Shutting down VM 'QY-n1' pid=20542 flags=0 2013-12-26 09:09:15.515+0000: 18953: debug : virFileClose:72 : Closed fd 28 2013-12-26 09:09:15.515+0000: 18953: debug : qemuMonitorClose:837 : QEMU_MONITOR_CLOSE: mon=0x7fd6940d0530 refs=3 2013-12-26 09:09:15.515+0000: 18953: debug : virFileClose:72 : Closed fd 30 2013-12-26 09:09:15.515+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940d0530 2013-12-26 09:09:15.515+0000: 18953: debug : qemuProcessKill:4090 : vm=QY-n1 pid=20542 flags=5 2013-12-26 09:09:15.515+0000: 18957: debug : qemuMonitorSend:915 : Send command resulted in error Unable to read from monitor: Connection reset by peer 2013-12-26 09:09:15.715+0000: 18953: debug : virObjectRef:168 : OBJECT_REF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockProcessPause:194 : plugin=0x7fd698003020 dom=0x7fd6940cd410 state=0x7fd6940d93d8 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerNew:128 : plugin=0x7fd698003020 dom=0x7fd6940cd410 withResources=1 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerPluginGetDriver:283 : plugin=0x7fd698003020 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerNew:307 : driver=0x7fd69d17e900 type=0 nparams=5 params=0x7fd6a2f33720 flags=0 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:107 : key=uuid type=uuid value=2619ef7c-d047-4468-b047-3099695f95b7 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:100 : key=name type=string value=QY-n1 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:88 : key=id type=uint value=4294967295 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:88 : key=pid type=uint value=20542 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerLogParams:103 : key=uri type=cstring value=(null) 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerNew:140 : Adding leases 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerNew:145 : Adding disks 2013-12-26 09:09:15.715+0000: 18957: debug : virDomainLockManagerAddDisk:86 : Add disk /rhev/data-center/e0495ee4-cc01-41ca-9530-a58e184f6e29/c3a83221-1393-4bec-bc3a-214d82e7433c/images/cae86c44-d7fd-45d4-9c2c-ffba89ae31ad/1d04094d-9d76-407e-8924-63d2015f17ed 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerAddResource:336 : lock=0x7fd6880018f0 type=0 name=/rhev/data-center/e0495ee4-cc01-41ca-9530-a58e184f6e29/c3a83221-1393-4bec-bc3a-214d82e7433c/images/cae86c44-d7fd-45d4-9c2c-ffba89ae31ad/1d04094d-9d76-407e-8924-63d2015f17ed nparams=0 params=(nil) flags=0 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerRelease:369 : lock=0x7fd6880018f0 state=0x7fd6940d93d8 flags=0 2013-12-26 09:09:15.715+0000: 18957: error : virLockManagerSanlockRelease:1047 : Failed to inquire lock: No such process 2013-12-26 09:09:15.715+0000: 18957: debug : virLockManagerFree:391 : lock=0x7fd6880018f0 2013-12-26 09:09:15.715+0000: 18957: warning : qemuProcessStartCPUs:2846 : Unable to release lease on QY-n1 2013-12-26 09:09:15.715+0000: 18957: debug : qemuProcessStartCPUs:2847 : Preserving lock state '(null)' 2013-12-26 09:09:15.715+0000: 18957: debug : qemuProcessStop:4192 : Shutting down VM 'QY-n1' pid=20542 flags=1 2013-12-26 09:09:15.715+0000: 18957: debug : qemuProcessStop:4195 : VM 'QY-n1' not active 2013-12-26 09:09:15.715+0000: 18957: debug : qemuDomainObjEndAsyncJob:955 : Stopping async job: migration in 2013-12-26 09:09:15.715+0000: 18957: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18957: debug : virNetServerProgramSendError:150 : prog=536903814 ver=1 proc=217 type=1 serial=6 msg=0x2263720 rerr=0x7fd6a2f33b80 2013-12-26 09:09:15.715+0000: 18953: debug : virObjectUnref:135 : OBJECT_UNREF: obj=0x7fd6940cd410 2013-12-26 09:09:15.715+0000: 18953: debug : qemuDomainCleanupRun:1995 : driver=0x7fd69801fe50, vm=QY-n1 2013-12-26 09:09:15.715+0000: 18953: debug : qemuProcessAutoDestroyRemove:4670 : vm=QY-n1

1 0

[libvirt] python setMetadata issue
by Umar Draz 25 Dec '13

25 Dec '13

Hi I am trying to set Metada of running virtual machine, but its giving me an error. Here is my code import libvirt conn = libvirt.open('qemu+tcp://10.0.128.12/system') dom = conn.lookupByName('virtspace') type = 'VIR_DOMAIN_METADATA_DESCRIPTION' key = '' uri = '' dom.setMetadata(conn, type, 'myDescription', key, uri) and here is the error. Traceback (most recent call last): File "setMeta.py", line 11, in <module> dom.setMetadata(conn, type, 'meta_test', key, uri) File "/usr/lib64/python2.6/site-packages/libvirt.py", line 1460, in setMetadata ret = libvirtmod.virDomainSetMetadata(self._o, type, metadata, key, uri, flags) AttributeError: virConnect instance has no attribute '__trunc__'

2 1

[libvirt] [PATCH] domain: don't try to interpret <driver> as virtio config for hostdev interfaces
by Laine Stump 24 Dec '13

24 Dec '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1046337 The <driver> type attribute of an interface is interpreted in two different ways depending on the <interface> type - if the interface is type='hostdev', then the driver name describes which backend to use for the hostdev device assignment (vfio or kvm), but if the interface is any emulated type *and* the model type is "virtio", then the driver name can be "vhost" or "qemu", telling which backend qemu should use to communicate with the emulated device. The problem comes when someone has defined a an interface like this (which is accepted by the parser as long as no <driver name='xxx'/> is specified): <interface type='hostdev'> ... <model type='virtio'/> ... </interface> As libvirt storing this definition in the domain's status, the driver name is automatically filled in with the backend that was automatically decided by libvirt, so it stores this in the status: <interface type='hostdev'> ... <driver name='vfio'/> ... <model type='virtio'/> ... </interface> This isn't noticed until the next time libvirtd is restarted - as it is reading the status of all domains, it encounters the above interface definition, logs an error: internal error: Unknown interface <driver name='vfio'> has been specified and fails to reload the domain status, so the domain is marked as inactive. The solution is to stop the parser from interpreting <driver> attributes as if the device was an emulated virtio device, when it is actually a hostdev. (Although the bug has existed since vfio support was added, it has just recently become more apparent because libvirt previously didn't automatically set the driver name for hostdev interfaces in the domain status to vfio/kvm as it does since commit f094aa, first appearing in v1.1.4.) --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 80bc85f..e65f3e3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6752,7 +6752,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, model = NULL; } - if (def->model && STREQ(def->model, "virtio")) { + if (def->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && + STREQ_NULLABLE(def->model, "virtio")) { if (backend != NULL) { int name; if ((name = virDomainNetBackendTypeFromString(backend)) < 0 || -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/3] libxl: improve vcpu pinning
by Dario Faggioli 24 Dec '13

24 Dec '13

Hi, Take two, with the comments from Jim on v1 fixed. Basically, that means I've added a few comments and removed some non necessary safety checking. Series available here: git://xenbits.xen.org/people/dariof/libvirt.git libxl/VcpuPinX-v2 Regards, Dario --- Dario Faggioli (3): libxl: implement virDomainGetVcpuPinInfo libxl: implement virDomainPinVcpuFlags libxl: correctly handle affinity reset in virDomainPinVcpu[Flags] src/libxl/libxl_driver.c | 166 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 145 insertions(+), 21 deletions(-) -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

2 4

[libvirt] [PATCH] virt-login-shell: clean up usage
by Eric Blake 24 Dec '13

24 Dec '13

I noticed a couple odd things in 'virt-login-shell --help' output. * tools/virt-login-shell.c (usage): At most one option accepted, drop trailing colon. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tools/virt-login-shell.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c index 758d1af..8b35e34 100644 --- a/tools/virt-login-shell.c +++ b/tools/virt-login-shell.c @@ -161,10 +161,10 @@ usage(void) fprintf(stdout, _("\n" "Usage:\n" - " %s [options]\n\n" + " %s [option]\n\n" "Options:\n" - " -h | --help Display program help:\n" - " -V | --version Display program version:\n" + " -h | --help Display program help\n" + " -V | --version Display program version\n" "\n" "libvirt login shell\n"), progname); -- 1.8.4.2

1 0

[libvirt] [PATCH 00/14] Fix flaw in virt-login-shell CVE-2013-4400
by Daniel P. Berrange 24 Dec '13

24 Dec '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The following series of patches have been pushed to master as a fix for CVE-2013-4400. The first four patches are the core fix. The remaining 10 patches are preventative measures to help avoid further problems in the future. I will be pushing at least the first 4 patches to stable branches and any of the further patches if I find they apply without merge problems. Daniel P. Berrange (14): Add helpers for getting env vars in a setuid environment Only allow 'stderr' log output when running setuid (CVE-2013-4400) Close all non-stdio FDs in virt-login-shell (CVE-2013-4400) Don't link virt-login-shell against libvirt.so (CVE-2013-4400) Set a sane $PATH for virt-login-shell Make virCommand env handling robust in setuid env Remove all direct use of getenv Block all use of getenv with syntax-check Only allow the UNIX transport in remote driver when setuid Don't allow remote driver daemon autostart when running setuid Add stub getegid impl for platforms lacking it Remove (nearly) all use of getuid()/getgid() Block all use of libvirt.so in setuid programs Move virt-login-shell into libvirt-login-shell sub-RPM Makefile.am | 1 + bootstrap.conf | 1 + cfg.mk | 8 ++++ config-post.h | 44 ++++++++++++++++++ configure.ac | 1 + daemon/Makefile.am | 1 + daemon/libvirtd.c | 2 +- examples/domain-events/events-c/Makefile.am | 3 +- examples/hellolibvirt/Makefile.am | 2 +- examples/openauth/Makefile.am | 2 +- gnulib/lib/Makefile.am | 2 +- libvirt.spec.in | 28 +++++++---- python/Makefile.am | 1 + src/Makefile.am | 72 +++++++++++++++++++++++++++++ src/driver.c | 3 +- src/libvirt.c | 54 +++++++++++++++------- src/libvirt_private.syms | 6 ++- src/locking/lock_daemon.c | 6 +-- src/locking/lock_driver_lockd.c | 6 +-- src/locking/lock_manager.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 4 +- src/lxc/lxc_process.c | 2 +- src/qemu/qemu_command.c | 8 ++-- src/qemu/qemu_driver.c | 6 +-- src/remote/remote_driver.c | 37 +++++++++++---- src/rpc/virnetsocket.c | 16 +++---- src/rpc/virnettlscontext.c | 4 +- src/storage/storage_backend.c | 4 +- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_logical.c | 2 +- src/util/virauth.c | 2 +- src/util/vircommand.c | 50 +++++++++++++++----- src/util/vircommand.h | 8 +++- src/util/virfile.c | 23 +++++---- src/util/viridentity.c | 8 ++-- src/util/virlog.c | 18 ++++++-- src/util/virrandom.c | 2 +- src/util/virstoragefile.c | 2 +- src/util/virutil.c | 47 +++++++++++++++++-- src/util/virutil.h | 8 ++++ src/vbox/vbox_XPCOMCGlue.c | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_tmpl.c | 6 +-- tests/commandtest.c | 8 ++-- tests/qemumonitortestutils.c | 2 +- tests/virnetsockettest.c | 4 +- tools/Makefile.am | 9 +++- tools/virsh.c | 18 ++++---- tools/virt-login-shell.c | 14 ++++++ 50 files changed, 430 insertions(+), 137 deletions(-) create mode 100644 config-post.h -- 1.8.3.1

2 16