- Devel - libvirt List Archives

[Libvir] PATCH: Autogenerate table of contents for docs
by Daniel P. Berrange 30 Apr '08

30 Apr '08

Alot of the docs pages have manually written table of contents linking to headings with the page. I figured this is a good candidate for being auto-generated. The basic idea is that given a document with a series of headings <h2><a name="xxx">Foo</a></h2> .. <h3><a name="xxx">Bar</a></h3> .. <h3><a name="xxx">Wizz</a></h3> .. <h2><a name="xxx">Oooh</a></h2> .. <h3><a name="xxx">Ahhh</a></h3> Then, generate a table of contents with a nested set of lists <ul>. THe XSL below attempts todo this for heading levels h2 -> h6, and splices the TOC into the page where it sees an <ul id='toc'></ul> element (typically just after <h1>). I'm kind of out of practice with XSL, so there's probably a nicer way to write the 'toc' template below... Dan. Index: docs/page.xsl =================================================================== RCS file: /data/cvs/libvirt/docs/page.xsl,v retrieving revision 1.7 diff -u -r1.7 page.xsl --- docs/page.xsl 28 Apr 2008 08:29:35 -0000 1.7 +++ docs/page.xsl 30 Apr 2008 12:55:20 -0000 @@ -59,6 +59,54 @@ </ul> </xsl:template> + <xsl:template name="toc"> + <ul> + <xsl:for-each select="/html/body/h2[count(a) = 1]"> + <xsl:variable name="thishead" select="."/> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h3[preceding-sibling::h2[1] = $thishead and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h3[preceding-sibling::h2[1] = $thishead and count(a) = 1]"> + <xsl:variable name="thissubhead" select="."/> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h4[preceding-sibling::h3[1] = $thissubhead and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h4[preceding-sibling::h3[1] = $thissubhead and count(a) = 1]"> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h5[preceding-sibling::h4[1] = $thissubhead and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h5[preceding-sibling::h4[1] = $thissubhead and count(a) = 1]"> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + <xsl:if test="count(./following-sibling::h6[preceding-sibling::h5[1] = $thissubhead and count(a) = 1]) > 0"> + <ul> + <xsl:for-each select="./following-sibling::h6[preceding-sibling::h5[1] = $thissubhead and count(a) = 1]"> + <li> + <a href="#{a/@name}"><xsl:value-of select="a/text()"/></a> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:if> + </li> + </xsl:for-each> + </ul> + </xsl:template> +  <xsl:template match="/" mode="page"> <xsl:param name="pagename"/> @@ -93,7 +141,16 @@ </xsl:apply-templates> </div> <div id="content"> - <xsl:copy-of select="html/body/*"/> + <xsl:for-each select="html/body/*"> + <xsl:choose> + <xsl:when test="name() = 'ul' and @id = 'toc'"> + <xsl:call-template name="toc"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="."/> + </xsl:otherwise> + </xsl:choose> + </xsl:for-each> </div> </div> <div id="footer"> -- |: Red Hat, Engineering, Boston -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[Daniel Veillard] Re: [Libvir] [PATCH] update from gnulib
by Jim Meyering 30 Apr '08

30 Apr '08

Forwarding, on request: Date: Wed, 30 Apr 2008 04:53:43 -0400 From: Daniel Veillard <veillard(a)redhat.com> To: Jim Meyering <meyering(a)redhat.com> Cc: undisclosed-recipients: ; Subject: Re: [Libvir] [PATCH] update from gnulib Message-ID: <20080430085343.GF25119(a)redhat.com> Reply-To: veillard(a)redhat.com References: <20080430072336.4A4D18E0038(a)hormel.redhat.com> In-Reply-To: <20080430072336.4A4D18E0038(a)hormel.redhat.com> User-Agent: Mutt/1.5.13 (2006-09-08) On Tue, Apr 29, 2008 at 05:57:36PM +0200, Jim Meyering wrote: > > Signed-off-by: Jim Meyering <meyering(a)redhat.com> Hum, to me the gnulib update side is under your control, I don't feel it's necessary for you to post the patch, unless you know there may be an associated change for the other developpers. Others may disagree but I don't think I can really review those :-) Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

2 2

[Libvir] [PATCH] remove useless tests before xmlFree
by Jim Meyering 29 Apr '08

29 Apr '08

I've just fixed a bug in my useless-if-detecting script, committed in gnulib. Using that new script with today's change adding xmlFree to the list exposed a bunch of useless tests. This first change set removes those tests. Below it is a separate patch that updates gnulib-related files, including that script and vc-list-files. I verified that with these changes "make distcheck" passes. If no one objects, I'll push these in about 12 hours. remove useless tests before xmlFree * src/qemu_conf.c (qemudParseDiskXML, qemudParseInterfaceXML): (qemudParseInputXML, qemudParseDhcpRangesXML): * src/remote_internal.c (doRemoteOpen): * src/storage_conf.c (virStoragePoolDefParseDoc): * src/xm_internal.c (xenXMParseXMLDisk, xenXMParseXMLVif): (xenXMParseXMLToConfig, xenXMAttachInterface): * src/xml.c (virDomainParseXMLDiskDesc, virDomainParseXMLIfDesc): (virDomainXMLDevID): Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/qemu_conf.c | 48 ++++++++++++++++-------------------------------- src/remote_internal.c | 8 ++++---- src/storage_conf.c | 3 +-- src/xm_internal.c | 42 ++++++++++++++---------------------------- src/xml.c | 30 ++++++++++-------------------- 5 files changed, 45 insertions(+), 86 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 07dfe47..a0c4a8f 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -680,14 +680,10 @@ static int qemudParseDiskXML(virConnectPtr conn, return 0; error: - if (type) - xmlFree(type); - if (target) - xmlFree(target); - if (source) - xmlFree(source); - if (device) - xmlFree(device); + xmlFree(type); + xmlFree(target); + xmlFree(source); + xmlFree(device); return -1; } @@ -941,18 +937,12 @@ static int qemudParseInterfaceXML(virConnectPtr conn, return 0; error: - if (network) - xmlFree(network); - if (address) - xmlFree(address); - if (port) - xmlFree(port); - if (ifname) - xmlFree(ifname); - if (script) - xmlFree(script); - if (bridge) - xmlFree(bridge); + xmlFree(network); + xmlFree(address); + xmlFree(port); + xmlFree(ifname); + xmlFree(script); + xmlFree(bridge); return -1; } @@ -1334,18 +1324,14 @@ static int qemudParseInputXML(virConnectPtr conn, input->bus = QEMU_INPUT_BUS_USB; } - if (type) - xmlFree(type); - if (bus) - xmlFree(bus); + xmlFree(type); + xmlFree(bus); return 0; error: - if (type) - xmlFree(type); - if (bus) - xmlFree(bus); + xmlFree(type); + xmlFree(bus); return -1; } @@ -2860,10 +2846,8 @@ static int qemudParseDhcpRangesXML(virConnectPtr conn, free(range); } - if (start) - xmlFree(start); - if (end) - xmlFree(end); + xmlFree(start); + xmlFree(end); cur = cur->next; } diff --git a/src/remote_internal.c b/src/remote_internal.c index ef34a3a..70aa5e9 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -434,9 +434,9 @@ doRemoteOpen (virConnectPtr conn, } #ifdef HAVE_XMLURI_QUERY_RAW - if (uri->query_raw) xmlFree (uri->query_raw); + xmlFree (uri->query_raw); #else - if (uri->query) xmlFree (uri->query); + xmlFree (uri->query); #endif if (( @@ -464,10 +464,10 @@ doRemoteOpen (virConnectPtr conn, transport_str[-1] = '\0'; } /* Remove the username, server name and port number. */ - if (uri->user) xmlFree (uri->user); + xmlFree (uri->user); uri->user = 0; - if (uri->server) xmlFree (uri->server); + xmlFree (uri->server); uri->server = 0; uri->port = 0; diff --git a/src/storage_conf.c b/src/storage_conf.c index 4499ae2..be21d3b 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -357,8 +357,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, cleanup: free(uuid); - if (type) - xmlFree(type); + xmlFree(type); virStoragePoolDefFree(ret); return NULL; } diff --git a/src/xm_internal.c b/src/xm_internal.c index a70436d..08e3e8e 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1657,10 +1657,8 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch } if (target == NULL) { - if (source != NULL) - xmlFree(source); - if (device != NULL) - xmlFree(device); + xmlFree(source); + xmlFree(device); return (-1); } @@ -1687,10 +1685,8 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch } if (source == NULL && !cdrom) { - if (target != NULL) - xmlFree(target); - if (device != NULL) - xmlFree(device); + xmlFree(target); + xmlFree(device); return (-1); } @@ -1765,8 +1761,7 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch xmlFree(drvName); xmlFree(device); xmlFree(target); - if(source) - xmlFree(source); + xmlFree(source); *disk = buf; return (ret); @@ -1877,14 +1872,10 @@ static char *xenXMParseXMLVif(virConnectPtr conn, xmlNodePtr node, int hvm) { cleanup: free(bridge); - if (mac != NULL) - xmlFree(mac); - if (source != NULL) - xmlFree(source); - if (script != NULL) - xmlFree(script); - if (ip != NULL) - xmlFree(ip); + xmlFree(mac); + xmlFree(source); + xmlFree(script); + xmlFree(ip); return buf; } @@ -2164,8 +2155,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { strcat(val, ",vncdisplay="); strcat(val, portstr); } - if (vncport) - xmlFree(vncport); + xmlFree(vncport); if (vnclisten) { strcat(val, ",vnclisten="); strcat(val, (const char*)vnclisten); @@ -2310,8 +2300,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { error: if (conf) virConfFree(conf); - if (prop != NULL) - xmlFree(prop); + xmlFree(prop); xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); if (doc != NULL) @@ -2960,12 +2949,9 @@ xenXMAttachInterface(virDomainPtr domain, xmlXPathContextPtr ctxt, int hvm, goto cleanup; node_cleanup: - if (node_tmp) - xmlFree(node_tmp); - if (attr_node) - xmlFree(attr_node); - if (text_node) - xmlFree(text_node); + xmlFree(node_tmp); + xmlFree(attr_node); + xmlFree(text_node); cleanup: free(type); free(source); diff --git a/src/xml.c b/src/xml.c index e889cdd..25eba3d 100644 --- a/src/xml.c +++ b/src/xml.c @@ -1341,16 +1341,11 @@ virDomainParseXMLDiskDesc(virConnectPtr conn, xmlNodePtr node, virBufferAddLit(buf, ")"); cleanup: - if (drvType) - xmlFree(drvType); - if (drvName) - xmlFree(drvName); - if (device) - xmlFree(device); - if (target) - xmlFree(target); - if (source) - xmlFree(source); + xmlFree(drvType); + xmlFree(drvName); + xmlFree(device); + xmlFree(target); + xmlFree(source); return (ret); } @@ -1466,14 +1461,10 @@ virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, virBufferAddLit(buf, ")"); ret = 0; error: - if (mac != NULL) - xmlFree(mac); - if (source != NULL) - xmlFree(source); - if (script != NULL) - xmlFree(script); - if (ip != NULL) - xmlFree(ip); + xmlFree(mac); + xmlFree(source); + xmlFree(script); + xmlFree(ip); return (ret); } @@ -1953,8 +1944,7 @@ virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class, cleanup: if (xml != NULL) xmlFreeDoc(xml); - if (attr != NULL) - xmlFree(attr); + xmlFree(attr); return ret; } #endif /* WITH_XEN */ -- 1.5.5.1.68.gbdcd8

2 4

[Libvir] Basic VMWare support
by Marek 'marx' Grac 29 Apr '08

29 Apr '08

Hi, I know that there is no support for VMWare ESX yet but I would like to know if someone is working on it. I need just three basic operations: status/power on/power off but I never saw the source code of libvirt :) Do you think it is possible to write this support (using VMWare API) in acceptable time? week? month? Thanks, for any suggestions m, -- Marek Grac Red Hat Czech s.r.o.

3 2

[Libvir] Basic VMWare support
by Marek 'marx' Grac 29 Apr '08

29 Apr '08

Hi, I know that there is no support for VMWare ESX yet but I would like to know if someone is working on it. I need just three basic operations: status/power on/power off but I never saw the source code of libvirt :) Do you think it is possible to write this support (using VMWare API) in acceptable time? week? month? Thanks, for any suggestions m, -- Marek Grac Red Hat Czech s.r.o.

2 1

[Libvir] also check for useless test-before-xmlFree
by Jim Meyering 29 Apr '08

29 Apr '08

Some time ago, Daniel Veillard assured me that xmlFree(NULL) is valid in regular use, and with upstream code since January it's ok even in a debug mode that's not normally available because it's ifdef'd out: http://mail.gnome.org/archives/svn-commits-list/2008-January/msg02233.html Since the potential NULL-deref in debug mode is now gone, we can now use this to prevent any new useless tests: also check for useless test-before-xmlFree * Makefile.cfg (useless_free_options): Add --name=xmlFree. diff --git a/Makefile.cfg b/Makefile.cfg index e0d5528..cbf97c2 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -53,5 +53,6 @@ local-checks-to-skip = \ useless_free_options = \ --name=sexpr_free \ + --name=xmlFree \ --name=xmlXPathFreeContext \ --name=xmlXPathFreeObject -- 1.5.5.1.68.gbdcd8

2 1

[Libvir] PATCH: Avoid buffer out of bounds access in Xen capabilities
by Daniel P. Berrange 29 Apr '08

29 Apr '08

The Xen driver uses a regex to process the hypervisor capabilities data "(xen|hvm)-[[:digit:]]+\\.[[:digit:]]+-(x86_32|x86_64|ia64|powerpc64)(p|be)?"; notice how the last match group, however, is optional due to the '?'. The code processing matches does not check to see if the match is present or not, and just indexes the string on match 3 if (strncmp (&token[subs[3].rm_so], "p", 1) == 0) Unfortunately, subs[3].rm_so is -1 if the match was not present, so we're doing an out of bounds array access here. This is fairly harmless, but it is still good to fix it. So this patch adds a check for -1 before accessing the match. I also replace the strncmp() calls with a call to the brand new STRPREFIX() convenience macro Dan. Index: src/xen_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xen_internal.c,v retrieving revision 1.119 diff -u -r1.119 xen_internal.c --- src/xen_internal.c 10 Apr 2008 16:54:54 -0000 1.119 +++ src/xen_internal.c 28 Apr 2008 22:07:12 -0000 @@ -2349,28 +2349,31 @@ if (regexec (&xen_cap_rec, token, sizeof subs / sizeof subs[0], subs, 0) == 0) { - int hvm = strncmp (&token[subs[1].rm_so], "hvm", 3) == 0; + int hvm = STRPREFIX(&token[subs[1].rm_so], "hvm"); const char *model; int bits, pae = 0, nonpae = 0, ia64_be = 0; - if (strncmp (&token[subs[2].rm_so], "x86_32", 6) == 0) { + + if (STRPREFIX(&token[subs[2].rm_so], "x86_32")) { model = "i686"; bits = 32; - if (strncmp (&token[subs[3].rm_so], "p", 1) == 0) + if (subs[3].rm_so != -1 && + STRPREFIX(&token[subs[3].rm_so], "p")) pae = 1; else nonpae = 1; } - else if (strncmp (&token[subs[2].rm_so], "x86_64", 6) == 0) { + else if (STRPREFIX(&token[subs[2].rm_so], "x86_64")) { model = "x86_64"; bits = 64; } - else if (strncmp (&token[subs[2].rm_so], "ia64", 4) == 0) { + else if (STRPREFIX(&token[subs[2].rm_so], "ia64")) { model = "ia64"; bits = 64; - if (strncmp (&token[subs[3].rm_so], "be", 2) == 0) + if (subs[3].rm_so != -1 && + STRPREFIX(&token[subs[3].rm_so], "be")) ia64_be = 1; } - else if (strncmp (&token[subs[2].rm_so], "powerpc64", 4) == 0) { + else if (STRPREFIX(&token[subs[2].rm_so], "powerpc64")) { model = "ppc64"; bits = 64; } else { @@ -2380,7 +2383,7 @@ /* Search for existing matching (model,hvm) tuple */ for (i = 0 ; i < nr_guest_archs ; i++) { - if (!strcmp(guest_archs[i].model, model) && + if (STREQ(guest_archs[i].model, model) && guest_archs[i].hvm == hvm) { break; } -- |: Red Hat, Engineering, Boston -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[Libvir] [PATCH] Avoid "make syntax-check" failures.
by Jim Meyering 29 Apr '08

29 Apr '08

Including config.h from memory.c is probably required only on um, ... unusual systems, but technically, it is required for the definition of a possibly missing "size_t" or "ptrdiff_t" type. Avoid "make syntax-check" failures. * src/memory.c: Include "config.h". Remove trailing blanks. diff --git a/src/memory.c b/src/memory.c index fe41e38..1ca67fb 100644 --- a/src/memory.c +++ b/src/memory.c @@ -19,6 +19,7 @@ * */ +#include <config.h> #include <stdlib.h> #include "memory.h" @@ -72,7 +73,7 @@ int virAlloc(void *ptrptr, size_t size) * @size: number of bytes to allocate * @count: number of elements to allocate * - * Allocate an array of memory 'count' elements long, + * Allocate an array of memory 'count' elements long, * each with 'size' bytes. Return the address of the * allocated memory in 'ptrptr'. The newly allocated * memory is filled with zeros. @@ -101,7 +102,7 @@ int virAllocN(void *ptrptr, size_t size, size_t count) * Resize the block of memory in 'ptrptr' to be an array of * 'count' elements, each 'size' bytes in length. Update 'ptrptr' * with the address of the newly allocated memory. On failure, - * 'ptrptr' is not changed and still points to the original memory + * 'ptrptr' is not changed and still points to the original memory * block. The newly allocated memory is filled with zeros. * * Returns -1 on failure to allocate, zero on success -- 1.5.5.1.68.gbdcd8

2 1

[Libvir] [PATCH] Ancient libparted
by Soren Hansen 29 Apr '08

29 Apr '08

Some of us are stuck with an ancient libparted, which doesn't know about PED_PARTITION_PROTECTED. This patch allows us to compile libvirt. === modified file 'src/parthelper.c' --- src/parthelper.c 2008-04-10 16:53:29 +0000 +++ src/parthelper.c 2008-04-29 07:47:08 +0000 @@ -67,8 +67,10 @@ content = "free"; else if (part->type & PED_PARTITION_METADATA) content = "metadata"; +#ifdef PED_PARTITION_PROTECTED else if (part->type & PED_PARTITION_PROTECTED) content = "protected"; +#endif else content = "data"; } else if (part->type == PED_PARTITION_EXTENDED) { @@ -80,8 +82,10 @@ content = "free"; else if (part->type & PED_PARTITION_METADATA) content = "metadata"; +#ifdef PED_PARTITION_PROTECTED else if (part->type & PED_PARTITION_PROTECTED) content = "protected"; +#endif else content = "data"; } -- Soren Hansen | Virtualisation specialist | Ubuntu Server Team Canonical Ltd. | http://www.ubuntu.com/

4 3

[Libvir] [PATCH] Allow selection of the NIC model in QEMU/KVM
by Richard W.M. Jones 29 Apr '08

29 Apr '08

This patch allows selection of the NIC model for QEMU/KVM domains. The selection is done by adding a <model/> element to the XML, as in this example: <interface type='user'> <mac address='00:16:3e:33:b8:d3'/> <model type='ne2k_pci'/> </interface> The model type string is only checked to make sure it's a short alpha-numeric + underscore, since it seems impractical to extract the actual list of supported models. If you choose a supported model then QEMU starts up with this extra -nic parameter: /usr/bin/qemu-kvm -M pc -m 500 -smp 1 -monitor pty \ -boot c -hda /var/lib/xen/images/rhel51x32kvm.img \ -net nic,macaddr=00:16:3e:33:b8:d3,vlan=0,model=ne2k_pci -net user,vlan=0 \ -usb -vnc 127.0.0.1:0 If you choose a non-existant model then you get the error: libvir: QEMU error : internal error QEMU quit during monitor startup Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

6 8