- Devel - libvirt List Archives

[libvirt] [PATCH] Fix documentation and comment typos
by Paolo Bonzini 01 Oct '09

01 Oct '09

Fix a few mispellings :-) of "successfully" and regenerate docs/libvirt-*.xml. The regeneration also includes the changes in 47c8709. * src/libvirt.c: Fix typos. * src/secret/secret_driver.c: Fix typos. * docs/libvirt-api.xml: Regenerate. * docs/libvirt-refs.xml: Regenerate. --- docs/libvirt-api.xml | 6 +++--- docs/libvirt-refs.xml | 10 +++------- src/libvirt.c | 4 ++-- src/secret/secret_driver.c | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml index 795701c..88dc246 100644 --- a/docs/libvirt-api.xml +++ b/docs/libvirt-api.xml @@ -2847,7 +2847,7 @@ API looks like ...report an error... virStreamFree(st); close(fd);]]></info> - <return type='int' info='0 if all the data was succesfully received. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> + <return type='int' info='0 if all the data was successfully received. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> <arg name='stream' type='virStreamPtr' info='pointer to the stream object'/> <arg name='handler' type='virStreamSinkFunc' info='sink callback for writing data to application'/> <arg name='opaque' type='void *' info='application defined data'/> @@ -2864,7 +2864,7 @@ the caller no longer needs the reference to this object.]]></info> <info><![CDATA[Write a series of bytes to the stream. This method may block the calling application for an arbitrary amount of time. Once an application has finished sending data -it should call virStreamFinish to wait for succesful +it should call virStreamFinish to wait for successful confirmation from the driver, or detect any error This method may not be used if a stream source has been @@ -2939,7 +2939,7 @@ API looks like ...report an error... virStreamFree(st); close(fd);]]></info> - <return type='int' info='0 if all the data was succesfully sent. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> + <return type='int' info='0 if all the data was successfully sent. The caller should invoke virStreamFinish(st) to flush the stream upon success and then virStreamFree Returns -1 upon any error, with virStreamAbort() already having been called, so the caller need only call virStreamFree()'/> <arg name='stream' type='virStreamPtr' info='pointer to the stream object'/> <arg name='handler' type='virStreamSourceFunc' info='source callback for reading data from application'/> <arg name='opaque' type='void *' info='application defined data'/> diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml index 428f847..08034e4 100644 --- a/docs/libvirt-refs.xml +++ b/docs/libvirt-refs.xml @@ -7176,21 +7176,17 @@ <ref name='virNetworkCreate'/> <ref name='virStreamEventUpdateCallback'/> </word> - <word name='succesful'> - <ref name='virStreamSend'/> - </word> - <word name='succesfully'> - <ref name='virStreamRecvAll'/> - <ref name='virStreamSendAll'/> - </word> <word name='successful'> <ref name='virDomainMigrate'/> <ref name='virDomainSave'/> <ref name='virNodeDeviceCreateXML'/> + <ref name='virStreamSend'/> </word> <word name='successfully'> <ref name='virConnectOpen'/> <ref name='virStreamFinish'/> + <ref name='virStreamRecvAll'/> + <ref name='virStreamSendAll'/> </word> <word name='such'> <ref name='virConnCopyLastError'/> diff --git a/src/libvirt.c b/src/libvirt.c index 4cc19ec..dacf8c4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -9638,7 +9638,7 @@ error: * virStreamFree(st); * close(fd); * - * Returns 0 if all the data was succesfully sent. The caller + * Returns 0 if all the data was successfully sent. The caller * should invoke virStreamFinish(st) to flush the stream upon * success and then virStreamFree * @@ -9735,7 +9735,7 @@ cleanup: * virStreamFree(st); * close(fd); * - * Returns 0 if all the data was succesfully received. The caller + * Returns 0 if all the data was successfully received. The caller * should invoke virStreamFinish(st) to flush the stream upon * success and then virStreamFree * diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9c4102e..d61c24a 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -751,7 +751,7 @@ secretDefineXML(virConnectPtr conn, const char *xml, if (secretDeleteSaved(conn, driver, secret) < 0) goto restore_backup; } - /* Saved succesfully - drop old values */ + /* Saved successfully - drop old values */ new_attrs = NULL; virSecretDefFree(backup); @@ -843,7 +843,7 @@ secretSetValue(virSecretPtr obj, const unsigned char *value, if (secretSaveValue(obj->conn, driver, secret) < 0) goto restore_backup; } - /* Saved succesfully - drop old value */ + /* Saved successfully - drop old value */ if (old_value != NULL) { memset(old_value, 0, old_value_size); VIR_FREE(old_value); -- 1.6.2.5

2 1

[libvirt] [PATCH] Allows for a <description> tag for domains
by Daniel Veillard 01 Oct '09

01 Oct '09

https://bugzilla.redhat.com/show_bug.cgi?id=523639 feature request which makes sense to me, the simple patch attached seems to be sufficient, one can define and have the description back in the dump. Doesn't try to keep the location of the tag, it always get serialized after <uuid>. The only drawbacks I can think of are: - others XML formats may require the same, but honnestly it's trivial - machine generated description (for example if the history log of a domain gets stored there) could grow a lot and I wonder if we have a hard limit on the size when transmitting xml descriptions Oh and I didn't found a good place to test the feature, i.e. no test seems to parse and reserialize XML it's always about conversions. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

4 8

[libvirt] [PATCH] Avoid a libvirtd crash on broken input 523418
by Daniel Veillard 01 Oct '09

01 Oct '09

A simple typo in an XML domain file could lead to a crash, because we called STRPREFIX() on the looked up value without checking it was non-null. Patch is trivial, and should go in but I wonder if we shouldn't make those STR macros safer too like turning #define STRPREFIX(a,b) (strncmp((a),(b),strlen((b))) == 0) into #define STRPREFIX(a,b) ((a) && (b) && (strncmp((a),(b),strlen((b))) == 0)) anyway I think we should apply the patch independently, without it libvirtd crash, with it we get the proper error report: [root@paphio ~]# virsh define RHEL-5.4-64.xml 18:32:21.982: warning : processCallDispatchReply:7570 : Method call error error: Failed to define domain from RHEL-5.4-64.xml error: internal error No <source> 'dev' attribute specified with <interface type='bridge'/> Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] Fix USB device re-labelling
by Mark McLoughlin 01 Oct '09

01 Oct '09

A simple misplaced break out of a switch results in: libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./vendor': No such file or directory libvir: error : Failed to open file '/sys/bus/pci/devices/0000:00:54c./device': No such file or directory libvir: error : this function is not supported by the hypervisor: Failed to read product/vendor ID for 0000:00:54c. when trying to passthrough a USB host device to qemu. * src/security_selinux.c: fix a switch/break thinko --- src/security/security_selinux.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index bdd9eb2..d08d502 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -492,12 +492,11 @@ SELinuxSetSecurityHostdevLabel(virConnectPtr conn, ret = usbDeviceFileIterate(conn, usb, SELinuxSetSecurityUSBLabel, vm); usbFreeDevice(conn, usb); - - break; } else { /* XXX deal with product/vendor better */ ret = 0; } + break; } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: { -- 1.6.2.5

2 1

[libvirt] [OT] Relocation lookup
by Rakotomandimby Mihamina 01 Oct '09

01 Oct '09

Hi all, Given the Social and Political reality in my country (Madagascar), I am obliged to look for a relocation. This is my public profile: http://www.linkedin.com/in/mihaminarakotomandimby Would you be aware of a position I could fit in? Thank you. -- Architecte Informatique chez Blueline/Gulfsat: Administration Systeme, Recherche & Developpement +261 34 29 155 34

1 0

[libvirt] [PATCH] incorrect error message in virDomainNetDefParseXML
by Florian Vichot 01 Oct '09

01 Oct '09

When declaring a <interface type="bridge"> tag, <source> needs a "bridge" attribute, but the parser complains about a missing "dev" attribute. Florian

3 4

[libvirt] "virsh destroy" deletes extra VMs
by Shi Jin 30 Sep '09

30 Sep '09

Hi there, I am running Ubuntu 9.04 X64 server with KVM/libvirt. I recently found that the "virsh destroy" command actually delete VMs it should not delete. For example, please see the following screen copy: root@node1:/srv/cloud/ImgRep/WinXP# virsh list Connecting to uri: qemu:///system Id Name State ---------------------------------- 27 one-80 running 28 one-81 running 29 one-83 running 30 one-82 running 31 one-79 running root@node1:/srv/cloud/ImgRep/WinXP# virsh destroy 29 Connecting to uri: qemu:///system Domain 29 destroyed root@node1:/srv/cloud/ImgRep/WinXP# virsh list Connecting to uri: qemu:///system Id Name State ---------------------------------- 27 one-80 running 28 one-81 running 31 one-79 running Please note that VM 30 was deleted when we tried to delete VM 29. The /var/log/messages showed the following information: ep 30 08:58:59 node1 kernel: [238101.304619] br1: port 5(vnet4) entering disabled state Sep 30 08:58:59 node1 kernel: [238101.342851] device vnet4 left promiscuous mode Sep 30 08:58:59 node1 kernel: [238101.342854] br1: port 5(vnet4) entering disabled state Sep 30 08:58:59 node1 kernel: [238101.424851] br1: port 4(vnet3) entering disabled state Sep 30 08:59:00 node1 kernel: [238101.463031] device vnet3 left promiscuous mode Sep 30 08:59:00 node1 kernel: [238101.463035] br1: port 4(vnet3) entering disabled state Sep 30 09:10:53 node1 -- MARK -- Sep 30 09:30:53 node1 -- MARK -- Sep 30 09:50:53 node1 -- MARK -- Sep 30 09:51:31 node1 kernel: [241253.266955] device vnet3 entered promiscuous mode Sep 30 09:51:31 node1 kernel: [241253.268857] br1: port 4(vnet3) entering learning state Sep 30 09:51:40 node1 kernel: [241262.260147] br1: topology change detected, propagating Sep 30 09:51:40 node1 kernel: [241262.260152] br1: port 4(vnet3) entering forwarding state Sep 30 09:53:59 node1 kernel: [241401.204570] br1: port 4(vnet3) entering disabled state Sep 30 09:53:59 node1 kernel: [241401.232395] device vnet3 left promiscuous mode Sep 30 09:53:59 node1 kernel: [241401.232399] br1: port 4(vnet3) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.694803] br1: port 2(vnet0) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.733095] device vnet0 left promiscuous mode Sep 30 09:54:20 node1 kernel: [241421.733099] br1: port 2(vnet0) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.815209] br2: port 2(vnet1) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.853728] device vnet1 left promiscuous mode Sep 30 09:54:20 node1 kernel: [241421.853732] br2: port 2(vnet1) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.935254] br1: port 3(vnet2) entering disabled state Sep 30 09:54:20 node1 kernel: [241421.963527] device vnet2 left promiscuous mode Sep 30 09:54:20 node1 kernel: [241421.963531] br1: port 3(vnet2) entering disabled state Sep 30 09:55:29 node1 kernel: [241490.644204] br1: port 6(vnet5) entering disabled state Sep 30 09:55:29 node1 kernel: [241490.673195] device vnet5 left promiscuous mode Sep 30 09:55:29 node1 kernel: [241490.673199] br1: port 6(vnet5) entering disabled state Sep 30 10:10:53 node1 -- MARK -- Sep 30 10:11:49 node1 kernel: [242470.955142] device vnet0 entered promiscuous mode Sep 30 10:11:49 node1 kernel: [242470.957051] br1: port 2(vnet0) entering learning state Sep 30 10:11:52 node1 kernel: [242474.180036] device vnet1 entered promiscuous mode Sep 30 10:11:52 node1 kernel: [242474.181943] br1: port 3(vnet1) entering learning state Sep 30 10:11:55 node1 kernel: [242477.431693] device vnet2 entered promiscuous mode Sep 30 10:11:55 node1 kernel: [242477.433558] br1: port 4(vnet2) entering learning state Sep 30 10:11:58 node1 kernel: [242479.950082] br1: topology change detected, propagating Sep 30 10:11:58 node1 kernel: [242479.950086] br1: port 2(vnet0) entering forwarding state Sep 30 10:12:00 node1 kernel: [242482.059146] device vnet3 entered promiscuous mode Sep 30 10:12:00 node1 kernel: [242482.060330] br1: port 5(vnet3) entering learning state Sep 30 10:12:01 node1 kernel: [242483.180170] br1: topology change detected, propagating Sep 30 10:12:01 node1 kernel: [242483.180173] br1: port 3(vnet1) entering forwarding state Sep 30 10:12:04 node1 kernel: [242485.710948] device vnet4 entered promiscuous mode Sep 30 10:12:04 node1 kernel: [242485.712109] br1: port 6(vnet4) entering learning state Sep 30 10:12:04 node1 kernel: [242486.430098] br1: topology change detected, propagating Sep 30 10:12:04 node1 kernel: [242486.430104] br1: port 4(vnet2) entering forwarding state Sep 30 10:12:09 node1 kernel: [242491.051857] br1: topology change detected, propagating Sep 30 10:12:09 node1 kernel: [242491.051862] br1: port 5(vnet3) entering forwarding state Sep 30 10:12:13 node1 kernel: [242494.711792] br1: topology change detected, propagating Sep 30 10:12:13 node1 kernel: [242494.711797] br1: port 6(vnet4) entering forwarding state Sep 30 10:22:00 node1 kernel: [243082.274008] br1: port 4(vnet2) entering disabled state Sep 30 10:22:00 node1 kernel: [243082.312108] device vnet2 left promiscuous mode Sep 30 10:22:00 node1 kernel: [243082.312112] br1: port 4(vnet2) entering disabled state Sep 30 10:22:00 node1 kernel: [243082.365331] br1: port 5(vnet3) entering disabled state Sep 30 10:22:00 node1 kernel: [243082.393430] device vnet3 left promiscuous mode Sep 30 10:22:00 node1 kernel: [243082.393433] br1: port 5(vnet3) entering disabled state I have 4 NICs and the ifconfig shows root@node1:/srv/cloud/ImgRep/WinXP# ifconfig bond0 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 inet6 addr: fe80::224:e8ff:fe6b:d57/64 Scope:Link UP BROADCAST RUNNING MASTER MULTICAST MTU:1500 Metric:1 RX packets:7799931 errors:0 dropped:0 overruns:0 frame:0 TX packets:6879357 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:4360166425 (4.3 GB) TX bytes:4350243659 (4.3 GB) br0 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 inet addr:192.168.1.128 Bcast:192.168.1.255 Mask:255.255.255.0 inet6 addr: fe80::224:e8ff:fe6b:d57/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:7641913 errors:0 dropped:0 overruns:0 frame:0 TX packets:6412260 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:4169876739 (4.1 GB) TX bytes:4291182908 (4.2 GB) br1 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5b inet6 addr: fe80::224:e8ff:fe6b:d5b/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:152606 errors:0 dropped:0 overruns:0 frame:0 TX packets:6 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:11276026 (11.2 MB) TX bytes:468 (468.0 B) br2 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5d inet6 addr: fe80::224:e8ff:fe6b:d5d/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:152596 errors:0 dropped:0 overruns:0 frame:0 TX packets:6 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:11286132 (11.2 MB) TX bytes:468 (468.0 B) eth0 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:3622205 errors:0 dropped:0 overruns:0 frame:0 TX packets:3443103 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:1758147112 (1.7 GB) TX bytes:2174389369 (2.1 GB) Interrupt:36 Memory:d6000000-d6012700 eth1 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:57 UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 RX packets:4177726 errors:0 dropped:0 overruns:0 frame:0 TX packets:3436254 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:2602019313 (2.6 GB) TX bytes:2175854290 (2.1 GB) Interrupt:48 Memory:d8000000-d8012700 eth2 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5b inet6 addr: fe80::224:e8ff:fe6b:d5b/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:256014 errors:0 dropped:0 overruns:0 frame:0 TX packets:91549 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:20680139 (20.6 MB) TX bytes:17317087 (17.3 MB) Interrupt:32 Memory:da000000-da012700 eth3 Link encap:Ethernet HWaddr 00:24:e8:6b:0d:5d inet6 addr: fe80::224:e8ff:fe6b:d5d/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:245189 errors:0 dropped:0 overruns:0 frame:0 TX packets:32669 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:20866257 (20.8 MB) TX bytes:8265329 (8.2 MB) Interrupt:42 Memory:dc000000-dc012700 lo Link encap:Local Loopback inet addr:127.0.0.1 Mask:255.0.0.0 inet6 addr: ::1/128 Scope:Host UP LOOPBACK RUNNING MTU:16436 Metric:1 RX packets:324787 errors:0 dropped:0 overruns:0 frame:0 TX packets:324787 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:0 RX bytes:571707504 (571.7 MB) TX bytes:571707504 (571.7 MB) vnet0 Link encap:Ethernet HWaddr 52:c3:a3:d0:09:84 inet6 addr: fe80::50c3:a3ff:fed0:984/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:72 errors:0 dropped:0 overruns:0 frame:0 TX packets:533 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:10410 (10.4 KB) TX bytes:49306 (49.3 KB) vnet1 Link encap:Ethernet HWaddr 02:0d:4c:1e:5c:82 inet6 addr: fe80::d:4cff:fe1e:5c82/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:36 errors:0 dropped:0 overruns:0 frame:0 TX packets:563 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:6023 (6.0 KB) TX bytes:53245 (53.2 KB) vnet4 Link encap:Ethernet HWaddr a6:58:67:2b:37:8a inet6 addr: fe80::a458:67ff:fe2b:378a/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:42 errors:0 dropped:0 overruns:0 frame:0 TX packets:552 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:6733 (6.7 KB) TX bytes:52189 (52.1 KB) Note that there is no IP address assigned to the br1 device which is used here. I don't think that should be a problem. Also the first 2 NICs are bonded first and then created as a bridge br0 and I don't think it is a problem either. root@node1:/srv/cloud/ImgRep/WinXP# virsh --version Connecting to uri: qemu:///system 0.6.1 root@node1:/srv/cloud/ImgRep/WinXP# kvm -h QEMU PC emulator version 0.9.1 (kvm-84), Copyright (c) 2003-2008 Fabrice Bellard Has anyone had similar problem before? How can I fix it? Thanks a lot. Shi -- Shi Jin, PhD

2 2

[libvirt] [PATCH] fixes to allow 'make rpm' to work again
by Daniel Veillard 30 Sep '09

30 Sep '09

Just a few oversights: - examples/domain-events has no makefile, but domain-events/events-c does - we should still add examples/domain-events/events-python to the tarballs in make dist - python/libvirtclass.txt seems to have vanished from dist and builds not a big deal but don't assume it's there in the spec file. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH] Fix emission of domain events messages
by Daniel P. Berrange 30 Sep '09

30 Sep '09

The code which updated the message length after writing the payload wrote the updated length word in the wrong place since the XDR object was given a buffer pointing to the start of the header payload, rather than message start. * daemon/remote.c: Fix updating of event message length so that we actually send the payload, not just the header --- daemon/remote.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 6d4cc1c..2b58045 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4559,17 +4559,19 @@ remoteDispatchDomainEventSend (struct qemud_client *client, /* Serialise the return header and event. */ xdrmem_create (&xdr, - msg->buffer + msg->bufferOffset, - msg->bufferLength - msg->bufferOffset, + msg->buffer, + msg->bufferLength, XDR_ENCODE); - if (!xdr_remote_domain_event_msg(&xdr, data)) + /* Skip over the header we just wrote */ + if (xdr_setpos (&xdr, msg->bufferOffset) == 0) goto xdr_error; + if (!xdr_remote_domain_event_msg(&xdr, data)) + goto xdr_error; - /* Update length word */ - msg->bufferOffset += xdr_getpos (&xdr); - len = msg->bufferOffset; + /* Update length word to include payload*/ + len = msg->bufferOffset = xdr_getpos (&xdr); if (xdr_setpos (&xdr, 0) == 0) goto xdr_error; -- 1.6.2.5

2 3

[libvirt] Tunnelled migration
by Chris Lalancette 30 Sep '09

30 Sep '09

At long last, now that the stream stuff is committed to the tree, I can repost the tunnelled migration patches. Note that these patches will conflict in some places with danpb's previously posted "PEER2PEER" patches, but it should be easy to resolve the differences.

2 15

[libvirt] Fix apibuild.py warnings
by Matthias Bolte 30 Sep '09

30 Sep '09

apibuild.py warns about misformatted function comment for virStreamEventAddCallback, virStreamEventUpdateCallback and virStreamEventRemoveCallback. The attached patch adds the missing ':' and contains the resulting changes in docs/libvirt-api.xml and docs/libvirt-refs.xml Matthias

3 2

[libvirt] [PATCH] minor fix's
by Pritesh Kothari 30 Sep '09

30 Sep '09

Hi All, Just minor fix's. Regards, Pritesh

3 2

[libvirt] [PATCH 0/7] Add support for qcow2 backing files to sVirt
by Mark McLoughlin 30 Sep '09

30 Sep '09

Hey, https://bugzilla.redhat.com/497131 shows that sVirt cannot currently handle qcow2 files with a backing store. Because we do not re-label the backing store, qemu cannot read it. The fix is fairly straightforward - when we go to re-label a file, check its header and if it has a backing store, re-label that too. Most of this series involves moving the header probing code from the storage driver into libvirt_util so that the security driver can use it. Cheers, Mark.

3 28

[libvirt] Fix memleaks in libvirtd's message processing
by Matthias Bolte 30 Sep '09

30 Sep '09

I tracked down a memleak in libvirtd's message processing. The leak was introduced in commit 47cab734995fa9521b1df05d37e9978eedd8d3a2 "Split out code for handling incoming method call messages". This commit changed the way qemud_client_message objects were reused. Before this commit: - qemudWorker() removes a message from dispatch queue and passes it to remoteDispatchClientRequest() - remoteDispatchClientRequest() handles the message and reuses the same message for the response. If an error occurs the same message is used to report it (rpc_error label). If another error occurs while trying to report the first error remoteDispatchClientRequest() would return -1 and the message will be freed in qemudWorker() After this commit: - qemudWorker() removes a message from dispatch queue and passes it to remoteDispatchClientRequest() - remoteDispatchClientRequest() calls remoteDispatchClientCall() if the message it is an remote call or otherwise respond with a new error message by calling remoteSerializeReplyError() and the original message leaks - remoteDispatchClientCall() handles the message and reuses the same message for the response. If an error occurs it calls remoteSerializeReplyError() and the original message leaks. If a fatal error occurs remoteDispatchClientCall() returns -1 and the original message will be freed in qemudWorker() To fix this leak the original message has to be freed if remoteSerializeReplyError() succeeds. If remoteSerializeReplyError() fails the original message will be freed in qemudWorker(). In addition I came across another leak in remoteSerializeError(). If an error occurs while serializing the initial error the message leaks. To fix this leak the message has to be freed in case of an XDR error. Matthias

2 2

[libvirt] virtio network problems with kvm guests with 2.6.26 kernel
by Jim Paris 29 Sep '09

29 Sep '09

Hi, After upgrading libvirt on one system, my kvm guests running a 2.6.26 kernel with virtio networking could no longer communicate with the network. It seems that the problem is caused by newer libvirt versions unconditionally enabling GSO support by setting IFF_VNET_HDR [1]. However, support for this feature is apparently broken in 2.6.26. Ubuntu seems to have also discovered this problem [2] and they currently work around it by removing GSO support from kvm [3]. Currently, I'm running with a patched libvirt that never sets IFF_VNET_HDR, and it's working fine once again. While this is not a libvirt problem per se, it certainly violated the principle of least surprise given that libvirt was the only thing that changed! But I don't know if there's much that libvirt can do to avoid this problem, as it's really something that needs to get fixed in kvm, or the guest needs to be upgraded, or switched away from virtio. At the very least, maybe this info helps someone else who runs across the same problem. -jim [1] http://www.redhat.com/archives/libvir-list/2009-January/msg00642.html [2] https://bugs.launchpad.net/kvm/+bug/331128 [3] http://patches.ubuntu.com/k/kvm/extracted/virtio-net_disable_gso.patch

3 4

[libvirt] [PATCH] Minor comment changes.
by Laine Stump 29 Sep '09

29 Sep '09

Fix some minor grammer (and one other) nits in comments that end up in generated API reference documentation. No functional/binary differences. --- src/libvirt.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ca8e003..ce3d6ba 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -592,9 +592,9 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) /** * virRegisterInterfaceDriver: - * @driver: pointer to a interface driver block + * @driver: pointer to an interface driver block * - * Register a interface virtualization driver + * Register an interface virtualization driver * * Returns the driver priority or -1 in case of error. */ @@ -5365,7 +5365,7 @@ error: /** * virNetworkGetXMLDesc: * @network: a network object - * @flags: and OR'ed set of extraction flags, not used yet + * @flags: an OR'ed set of extraction flags, not used yet * * Provide an XML description of the network. The description may be reused * later to relaunch the network with virNetworkCreateXML(). @@ -5545,7 +5545,7 @@ error: /** * virInterfaceGetConnect: - * @iface: pointer to a interface + * @iface: pointer to an interface * * Provides the connection pointer associated with an interface. The * reference counter on the connection is not increased by this @@ -5819,7 +5819,7 @@ error: /** * virInterfaceGetName: - * @iface: a interface object + * @iface: an interface object * * Get the public name for that interface * @@ -5842,9 +5842,9 @@ virInterfaceGetName(virInterfacePtr iface) /** * virInterfaceGetMACString: - * @iface: a interface object + * @iface: an interface object * - * Get the MAC for a interface as string. For more information about + * Get the MAC for an interface as string. For more information about * MAC see RFC4122. * * Returns a pointer to the MAC address (in null-terminated ASCII @@ -5867,11 +5867,11 @@ virInterfaceGetMACString(virInterfacePtr iface) /** * virInterfaceGetXMLDesc: - * @iface: a interface object - * @flags: and OR'ed set of extraction flags, not used yet + * @iface: an interface object + * @flags: an OR'ed set of extraction flags, not used yet * * Provide an XML description of the interface. The description may be reused - * later to recreate the interface with virInterfaceCreateXML(). + * later to redefine the interface with virInterfaceDefineXML(). * * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. * the caller must free() the returned value. @@ -6100,7 +6100,7 @@ error: * This method is typically useful for applications where multiple * threads are using a connection, and it is required that the * connection remain open until all threads have finished using - * it. ie, each new thread using a interface would increment + * it. ie, each new thread using an interface would increment * the reference count. * * Returns 0 in case of success, -1 in case of failure. @@ -6121,7 +6121,7 @@ virInterfaceRef(virInterfacePtr iface) /** * virInterfaceFree: - * @iface: a interface object + * @iface: an interface object * * Free the interface object. The interface itself is unaltered. * The data structure is freed and should not be used thereafter. -- 1.6.2.5

1 1

[libvirt] [PATCH] bug in vboxDomainDestroy in vbox driver
by Pritesh Kothari 29 Sep '09

29 Sep '09

Hi All, There is bug in vboxDomainDestroy() where in the while powerdown the method doesn't wait till its completion. Fix in the attached patch. Regards, Pritesh

2 1

[libvirt] Libvirtd on Non Linux?
by Yushu Yao 29 Sep '09

29 Sep '09

Hi Experts, Just wondering is it possible now to run libvirt deamon on non-linux platforms (mainly windows and mac)? If yes, are there instructions on how to build it. If no, what was the roadblock? I'm trying to find a tool that can control the VMM for desktop/laptop users under win/mac/linux. Mainly for automation of deployment of some appliances. The best tool I've heard is libvirt, but couldn't find any doc on using it for other platforms. Any help is greatly appreciated. -Yushu

2 1

[libvirt] [PATCH] in Vbox driver, OpenHardDisk is called with NULL instead of ""
by Florian Vichot 29 Sep '09

29 Sep '09

This patch replaces the use of NULL with empty strings ("") in a call to OpenHardDisk, which otherwise fails with E_INVALIDARG. Florian

3 2

[libvirt] PATCH] Stop double free
by Mark Hamzy 29 Sep '09

29 Sep '09

This prevents a the following trap. Program received signal SIGABRT, Aborted. 0x00000035ad830265 in raise () from /lib64/libc.so.6 (gdb) bt #0 0x00000035ad830265 in raise () from /lib64/libc.so.6 #1 0x00000035ad831d10 in abort () from /lib64/libc.so.6 #2 0x00000035ad86a84b in __libc_message () from /lib64/libc.so.6 #3 0x00000035ad8722ef in _int_free () from /lib64/libc.so.6. #4 0x00000035ad87273b in free () from /lib64/libc.so.6. #5 0x00000000004066f1 in vshDeinit () #6 0x0000000000406925 in vshError ()) #7 0x0000000000406744 in vshDeinit () #8 0x00000000004130be in main () --- src/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 4825f1c..5fc6c8f 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -8201,7 +8201,7 @@ vshError(vshControl *ctl, int doexit, const char *format, ...) fputc('\n', stderr); if (doexit) { - if (ctl) + if (ctl && ctl->conn) vshDeinit(ctl); exit(EXIT_FAILURE); } -- 1.6.4.1 -- Mark You must be the change you wish to see in the world. -- Mahatma Gandhi Worrying is praying for that you do not wish to happen.

4 5

[libvirt] Error messages with --debug
by Fred Leeflang 29 Sep '09

29 Sep '09

Oh, regarding my previous post, I ran virt-manager --debug so see what's going on (I'm missing much more than just the vm names). I'm thinking I either missed installing some bits or my gtk/glade setup is already obsolete (Debian Lenny). Any hints? (virt-manager.py:27842): libglade-WARNING **: unknown property `orientation' for class `GtkVBox' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Restore saved machine...' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Add Connection...' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Virtual Machine Details' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id 'Delete' (virt-manager.py:27842): libglade-WARNING **: could not look up stock id '_Contents' (virt-manager.py:27842): libglade-WARNING **: unknown property `orientation' for class `GtkVBox' /usr/local/share/virt-manager/virtManager/manager.py:150: GtkWarning: gtk_toolbar_set_icon_size: assertion `icon_size != GTK_ICON_SIZE_INVALID' failed self.window = gtk.glade.XML(config.get_glade_dir() + "/vmm-manager.glade", "vmm-manager", domain="virt-manager") /usr/local/share/virt-manager/virtManager/manager.py:394: GtkWarning: Failed to set text from markup due to error parsing markup: Attribute 'font' is not allowed on the <span> tag on line 1 char 40 win.show_all() /usr/local/share/virt-manager/virt-manager.py:371: GtkWarning: Failed to set text from markup due to error parsing markup: Attribute 'font' is not allowed on the <span> tag on line 1 char 24 gtk.main() /usr/local/share/virt-manager/virt-manager.py:371: GtkWarning: Failed to set text from markup due to error parsing markup: Attribute 'font' is not allowed on the <span> tag on line 1 char 25 gtk.main()

2 1

[libvirt] Screenshot
by Fred Leeflang 29 Sep '09

29 Sep '09

Hi, Got my git/hg builds of libvirtd/virt-manager running together with kvm. Took some time but finally think I'm getting the hang of it. I noticed two things going from my pre-packaged Debian packages. The older xml files I had seemed to generate a faulty kvm cmdline: <disk type='file' device='cdrom'> <target dev='hdc' bus='ide'/> <readonly/> </disk> This seems to translate into a -drive file=,... The file argument for kvm may be empty but should then not be defined: "If you don’t specify the "file=" argument, you define an empty drive". As a result the first vm I tried to start came back with a message saying it could not open the diskfile. Additionally, check below screenshot; the vm names appear to be missing. Here's the complete XML of one vm, did anything change coming from this one? <domain type='kvm'> <name>vm1</name> <uuid>ea14abdc-12a4-48cb-1424-46cdf15405f4</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </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/kvm</emulator> <disk type='file' device='disk'> <source file='/kvmimages/vm1.qcow2'/> <target dev='vda' bus='virtio'/> </disk> <interface type='bridge'> <mac address='54:52:00:0a:dc:10'/> <source bridge='br0'/> <model type='virtio'/> </interface> <serial type='pty'> <source path='/dev/pts/1'/> <target port='0'/> </serial> <console type='pty' tty='/dev/pts/1'> <source path='/dev/pts/1'/> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' keymap='en-us'/> </devices> </domain>

1 0

[libvirt] [PATCH] Maintain value of ctxt->node in virInterfaceDefParseDhcp.
by Laine Stump 29 Sep '09

29 Sep '09

This was causing subsequent calls to virXPathxxx() to fail, since ctxt->node was left pointing at the dhcp node, rather than the protocol node. Previously this had gone unnoticed, as the dhcp node was the only thing parsed under ip, if it was there. --- src/conf/interface_conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index 632f28f..818cff2 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -229,10 +229,12 @@ virInterfaceDefParseBondArpValid(virConnectPtr conn, xmlXPathContextPtr ctxt) { static int virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def, xmlNodePtr dhcp, xmlXPathContextPtr ctxt) { + xmlNodePtr save; char *tmp; int ret = 0; def->proto.dhcp = 1; + save = ctxt->node; ctxt->node = dhcp; /* Not much to do in the current version */ tmp = virXPathString(conn, "string(./@peerdns)", ctxt); @@ -250,6 +252,7 @@ virInterfaceDefParseDhcp(virConnectPtr conn, virInterfaceDefPtr def, } else def->proto.peerdns = -1; + ctxt->node = save; return(ret); } -- 1.6.2.5

2 1

[libvirt] [PATCH] fix some XPath relative node resets
by Daniel Veillard 29 Sep '09

29 Sep '09

The virXPath... function take extra care to preserve the XPath context node (ctxt->node) but in the case of virXPathString and virXPathBoolean they forgot to do this on the error path. This patch fixes this and move all ctxt->node = relnode instuctions just after the xmlXPathEval() to make sure this doesn't happen if this code is modified. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 5

[libvirt] [PATCH] Fix API doc extractor to stop munging comment formatting
by Daniel P. Berrange 28 Sep '09

28 Sep '09

The python method help docs are copied across from the C funtion comments, but in the process all line breaks and indentation was being lost. This made the resulting text and code examples completely unreadable. Both the API doc extractor and the python generator were destroying whitespace & this fixes them to preserve it exactly. * docs/apibuild.py: Preserve all whitespace when extracting function comments. Print function comment inside a <![CDATA[ section to fully preserve all whitespace. Look for the word 'returns' to describe return values, instead of 'return' to avoid getting confused with code examples including the C 'return' statement. * python/generator.py: Preserve all whitespace when printing function help docs * src/libvirt.c: Change any return parameter indicated by 'return' to be 'returns', to avoid confusing the API extractor --- docs/apibuild.py | 31 +++++++++++++++++++--------- python/generator.py | 25 ++++++++++++----------- src/libvirt.c | 54 +++++++++++++++++++++++++------------------------- 3 files changed, 61 insertions(+), 49 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index 855569b..70a7efc 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -838,14 +838,20 @@ class CParser: arg, name)) while len(lines) > 0 and lines[0] == '*': del lines[0] - desc = "" + desc = None while len(lines) > 0: l = lines[0] - while len(l) > 0 and l[0] == '*': - l = l[1:] - l = string.strip(l) - if len(l) >= 6 and l[0:6] == "return" or l[0:6] == "Return": - try: + i = 0 + # Remove all leading '*', followed by at most one ' ' character + # since we need to preserve correct identation of code examples + while i < len(l) and l[i] == '*': + i = i + 1 + if i > 0: + if i < len(l) and l[i] == ' ': + i = i + 1 + l = l[i:] + if len(l) >= 6 and l[0:7] == "returns" or l[0:7] == "Returns": + try: l = string.split(l, ' ', 1)[1] except: l = "" @@ -859,9 +865,14 @@ class CParser: retdesc = retdesc + " " + l del lines[0] else: - desc = desc + " " + l + if desc is not None: + desc = desc + "\n" + l + else: + desc = l del lines[0] + if desc is None: + desc = "" retdesc = string.strip(retdesc) desc = string.strip(desc) @@ -1716,7 +1727,7 @@ class docBuilder: try: (args, desc) = id.info if desc != None and desc != "": - output.write(" <info>%s</info>\n" % (escape(desc))) + output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) for arg in args: (name, desc) = arg @@ -1760,7 +1771,7 @@ class docBuilder: try: desc = id.extra if desc != None and desc != "": - output.write(">\n <info>%s</info>\n" % (escape(desc))) + output.write(">\n <info><![CDATA[%s]]></info>\n" % (desc)) output.write(" </typedef>\n") else: output.write("/>\n") @@ -1796,7 +1807,7 @@ class docBuilder: output.write(" <cond>%s</cond>\n"% (apstr)); try: (ret, params, desc) = id.info - output.write(" <info>%s</info>\n" % (escape(desc))) + output.write(" <info><![CDATA[%s]]></info>\n" % (desc)) self.indexString(name, desc) if ret[0] != None: if ret[0] == "void": diff --git a/python/generator.py b/python/generator.py index c34cb34..178a415 100755 --- a/python/generator.py +++ b/python/generator.py @@ -44,6 +44,7 @@ if sgmlop: self.finish_starttag = target.start self.finish_endtag = target.end self.handle_data = target.data + self.handle_cdata = target.cdata # activate parser self.parser = sgmlop.XMLParser() @@ -78,6 +79,7 @@ class SlowParser(xmllib.XMLParser): def __init__(self, target): self.unknown_starttag = target.start self.handle_data = target.data + self.handle_cdata = target.cdata self.unknown_endtag = target.end xmllib.XMLParser.__init__(self) @@ -108,6 +110,11 @@ class docParser: print "data %s" % text self._data.append(text) + def cdata(self, text): + if debug: + print "data %s" % text + self._data.append(text) + def start(self, tag, attrs): if debug: print "start %s, %s" % (tag, attrs) @@ -843,20 +850,14 @@ def writeDoc(name, args, indent, output): val = string.replace(val, "NULL", "None"); output.write(indent) output.write('"""') - while len(val) > 60: - if val[0] == " ": - val = val[1:] - continue - str = val[0:60] - i = string.rfind(str, " "); - if i < 0: - i = 60 - str = val[0:i] - val = val[i:] + i = string.find(val, "\n") + while i >= 0: + str = val[0:i+1] + val = val[i+1:] output.write(str) - output.write('\n '); + i = string.find(val, "\n") output.write(indent) - output.write(val); + output.write(val) output.write(' """\n') def buildWrappers(): diff --git a/src/libvirt.c b/src/libvirt.c index 441f308..9d4d94b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -818,7 +818,7 @@ virRegisterStateDriver(virStateDriverPtr driver) * * Initialize all virtualization drivers. * - * Return 0 if all succeed, -1 upon any failure. + * Returns 0 if all succeed, -1 upon any failure. */ int virStateInitialize(int privileged) { int i, ret = 0; @@ -839,7 +839,7 @@ int virStateInitialize(int privileged) { * * Run each virtualization driver's cleanup method. * - * Return 0 if all succeed, -1 upon any failure. + * Returns 0 if all succeed, -1 upon any failure. */ int virStateCleanup(void) { int i, ret = 0; @@ -857,7 +857,7 @@ int virStateCleanup(void) { * * Run each virtualization driver's reload method. * - * Return 0 if all succeed, -1 upon any failure. + * Returns 0 if all succeed, -1 upon any failure. */ int virStateReload(void) { int i, ret = 0; @@ -875,7 +875,7 @@ int virStateReload(void) { * * Run each virtualization driver's "active" method. * - * Return 0 if none are active, 1 if at least one is. + * Returns 0 if none are active, 1 if at least one is. */ int virStateActive(void) { int i, ret = 0; @@ -7044,7 +7044,7 @@ virStoragePoolRef(virStoragePoolPtr pool) * involve communicating with a remote server, and/or initializing * new devices at the OS layer * - * Return 0 if the volume list was refreshed, -1 on failure + * Returns 0 if the volume list was refreshed, -1 on failure */ int virStoragePoolRefresh(virStoragePoolPtr pool, @@ -7089,7 +7089,7 @@ error: * * Fetch the locally unique name of the storage pool * - * Return the name of the pool, or NULL on error + * Returns the name of the pool, or NULL on error */ const char* virStoragePoolGetName(virStoragePoolPtr pool) @@ -7113,7 +7113,7 @@ virStoragePoolGetName(virStoragePoolPtr pool) * * Fetch the globally unique ID of the storage pool * - * Return 0 on success, or -1 on error; + * Returns 0 on success, or -1 on error; */ int virStoragePoolGetUUID(virStoragePoolPtr pool, @@ -7149,7 +7149,7 @@ error: * * Fetch the globally unique ID of the storage pool as a string * - * Return 0 on success, or -1 on error; + * Returns 0 on success, or -1 on error; */ int virStoragePoolGetUUIDString(virStoragePoolPtr pool, @@ -7190,7 +7190,7 @@ error: * Get volatile information about the storage pool * such as free space / usage summary * - * returns 0 on success, or -1 on failure. + * Returns 0 on success, or -1 on failure. */ int virStoragePoolGetInfo(virStoragePoolPtr pool, @@ -7240,7 +7240,7 @@ error: * storage pool. This is suitable for later feeding back * into the virStoragePoolCreateXML method. * - * returns a XML document, or NULL on error + * Returns a XML document, or NULL on error */ char * virStoragePoolGetXMLDesc(virStoragePoolPtr pool, @@ -7287,7 +7287,7 @@ error: * Fetches the value of the autostart flag, which determines * whether the pool is automatically started at boot time * - * return 0 on success, -1 on failure + * Returns 0 on success, -1 on failure */ int virStoragePoolGetAutostart(virStoragePoolPtr pool, @@ -7333,7 +7333,7 @@ error: * * Sets the autostart flag * - * returns 0 on success, -1 on failure + * Returns 0 on success, -1 on failure */ int virStoragePoolSetAutostart(virStoragePoolPtr pool, @@ -7494,7 +7494,7 @@ virStorageVolGetConnect (virStorageVolPtr vol) * Fetch a pointer to a storage volume based on its name * within a pool * - * return a storage volume, or NULL if not found / error + * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr virStorageVolLookupByName(virStoragePoolPtr pool, @@ -7539,7 +7539,7 @@ error: * Fetch a pointer to a storage volume based on its * globally unique key * - * return a storage volume, or NULL if not found / error + * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr virStorageVolLookupByKey(virConnectPtr conn, @@ -7582,7 +7582,7 @@ error: * Fetch a pointer to a storage volume based on its * locally (host) unique path * - * return a storage volume, or NULL if not found / error + * Returns a storage volume, or NULL if not found / error */ virStorageVolPtr virStorageVolLookupByPath(virConnectPtr conn, @@ -7625,7 +7625,7 @@ error: * Fetch the storage volume name. This is unique * within the scope of a pool * - * return the volume name, or NULL on error + * Returns the volume name, or NULL on error */ const char* virStorageVolGetName(virStorageVolPtr vol) @@ -7650,7 +7650,7 @@ virStorageVolGetName(virStorageVolPtr vol) * unique, so the same volume will have the same * key no matter what host it is accessed from * - * return the volume key, or NULL on error + * Returns the volume key, or NULL on error */ const char* virStorageVolGetKey(virStorageVolPtr vol) @@ -7677,7 +7677,7 @@ virStorageVolGetKey(virStorageVolPtr vol) * on an XML description. Not all pools support * creation of volumes * - * return the storage volume, or NULL on error + * Returns the storage volume, or NULL on error */ virStorageVolPtr virStorageVolCreateXML(virStoragePoolPtr pool, @@ -7727,7 +7727,7 @@ error: * volume (name, perms) are passed via a typical volume * XML description. * - * return the storage volume, or NULL on error + * Returns the storage volume, or NULL on error */ virStorageVolPtr virStorageVolCreateXMLFrom(virStoragePoolPtr pool, @@ -7781,7 +7781,7 @@ error: * * Delete the storage volume from the pool * - * Return 0 on success, or -1 on error + * Returns 0 on success, or -1 on error */ int virStorageVolDelete(virStorageVolPtr vol, @@ -7827,7 +7827,7 @@ error: * Release the storage volume handle. The underlying * storage volume continues to exist. * - * Return 0 on success, or -1 on error + * Returns 0 on success, or -1 on error */ int virStorageVolFree(virStorageVolPtr vol) @@ -7885,7 +7885,7 @@ virStorageVolRef(virStorageVolPtr vol) * Fetches volatile information about the storage * volume such as its current allocation * - * Return 0 on success, or -1 on failure + * Returns 0 on success, or -1 on failure */ int virStorageVolGetInfo(virStorageVolPtr vol, @@ -7934,7 +7934,7 @@ error: * Fetch an XML document describing all aspects of * the storage volume * - * Return the XML document, or NULL on error + * Returns the XML document, or NULL on error */ char * virStorageVolGetXMLDesc(virStorageVolPtr vol, @@ -8165,7 +8165,7 @@ error: * Fetch an XML document describing all aspects of * the device. * - * Return the XML document, or NULL on error + * Returns the XML document, or NULL on error */ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags) { @@ -9381,7 +9381,7 @@ virSecretRef(virSecretPtr secret) * * Release the secret handle. The underlying secret continues to exist. * - * Return 0 on success, or -1 on error + * Returns 0 on success, or -1 on error */ int virSecretFree(virSecretPtr secret) @@ -9852,7 +9852,7 @@ cleanup: * used in conjunction with non-blocking data streams * to integrate into an event loop * - * Return 0 on success, -1 upon error + * Returns 0 on success, -1 upon error */ int virStreamEventAddCallback(virStreamPtr stream, int events, @@ -9934,7 +9934,7 @@ error: * * Remove a event callback from the stream * - * Return 0 on success, -1 on error + * Returns 0 on success, -1 on error */ int virStreamEventRemoveCallback(virStreamPtr stream) { -- 1.6.2.5

2 6