- Devel - libvirt List Archives

[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