- Devel - libvirt List Archives

[Libvir] [PATCH] Don't access line[-1] for a zero-length "line" from fgets.
by Jim Meyering 21 Jan '08

21 Jan '08

In reviewing the StorageAPI patches, I saw that some bogus input could cause a segfault. There's similar code in libvirt.c, so this fixes both. Note that virsh.c does this, too, but it already has the required guard. The src/libvirt.c patch applies to the trunk, but isn't a big deal, since it's in the sample AuthCallback function. The storage_backend.c part applies to the work-in-progress mercurial queue, but does matter, because we have no guarantee what the exec'd command will output. Don't access line[-1] for a zero-length "line" from fgets. A NUL byte at beginning of input, or just after a newline would provoke an invalid buf[-1] access (possible segfault). * src/libvirt.c (virConnectAuthCallbackDefault): * src/storage_backend.c (virStorageBackendRunProgRegex): Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/libvirt.c | 6 ++++-- src/storage_backend.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2972382..331c937 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -74,6 +74,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, for (i = 0 ; i < ncred ; i++) { char buf[1024]; char *bufptr = buf; + size_t len; if (printf("%s:", cred[i].prompt) < 0) return -1; @@ -92,8 +93,9 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, } return -1; } - if (buf[strlen(buf)-1] == '\n') - buf[strlen(buf)-1] = '\0'; + len = strlen(buf); + if (len != 0 && buf[len-1] == '\n') + buf[len-1] = '\0'; break; case VIR_CRED_PASSPHRASE: diff --git a/src/storage_backend.c b/src/storage_backend.c index 32a8d65..58d8642 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -338,7 +338,7 @@ int virStorageBackendRunProgRegex(virConnectPtr conn, while (fgets(line, sizeof(line), list) != NULL) { /* Strip trailing newline */ int len = strlen(line); - if (line[len-1] == '\n') + if (len && line[len-1] == '\n') line[len-1] = '\0'; for (i = 0 ; i <= maxReg && i < nregex ; i++) { -- 1.5.4.rc4.1.g1895

3 3

[Libvir] PATCH: Fix qemu-dm path in capabilities info
by Daniel P. Berrange 21 Jan '08

21 Jan '08

The current Xen capabilities XML data chooses between /usr/lib/xen/bin/qemu-dm and /usr/lib64/xen/bin/qemu-dm based on whether the guest arch is 64 bit. This is incorrect because the path is actually determined based on the host OS. Only x86_64 uses /usr/lib64, all other arches just use /usr/lib - even on ia64. So this patch changes the logic so that /usr/lib64 is only used if we see an x86_64 guest present - this implies host is x86_64 and that all guests whether 32 or 64bit shoudl use /usr/lib64 Dan. diff -r 38f2abccef9b src/xen_internal.c --- a/src/xen_internal.c Sun Jan 20 11:28:37 2008 -0500 +++ b/src/xen_internal.c Sun Jan 20 12:36:23 2008 -0500 @@ -2186,6 +2186,7 @@ xenHypervisorMakeCapabilitiesXML(virConn int ia64_be; } guest_archs[32]; int nr_guest_archs = 0; + int lib64 = 0; virBufferPtr xml; char *xml_str; @@ -2261,6 +2262,7 @@ xenHypervisorMakeCapabilitiesXML(virConn else if (strncmp (&token[subs[2].rm_so], "x86_64", 6) == 0) { model = "x86_64"; bits = 64; + lib64 = 1; } else if (strncmp (&token[subs[2].rm_so], "ia64", 4) == 0) { model = "ia64"; @@ -2376,7 +2378,7 @@ xenHypervisorMakeCapabilitiesXML(virConn <machine>pc</machine>\n\ <machine>isapc</machine>\n\ <loader>/usr/lib/xen/boot/hvmloader</loader>\n", - guest_archs[i].bits == 64 ? "64" : ""); + lib64 ? "64" : ""); if (r == -1) goto vir_buffer_failed; } r = virBufferAdd (xml, -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 2

[Libvir] Dom0 and entitlement
by Katti, Vadiraj (STSD-Openview) 21 Jan '08

21 Jan '08

Hi, I've some questions related to xen. Can anybody help me regarding the following questions. 1. Is dom0 a logical system(like any other vm's that are configured on it) ? If yes, then all xm commands should be applicable to it (ex : vcpu-set) . 2. /proc on dom0 reflects the physical or logical utilization. 3. Is there any entitelment concept in xen for cpu and memory? What is cpu weight used for and how is set. 4. virt-manager shows physical or logical utilization (cpu, memory) 5. How do i get the IP address of each of the guests from dom0 ? 6. What are the interfaces in domU to tell me that its a guest (or dom0) and also the type of virtualization ( eg. XEN/ VMWARE etc ) Thanks, Vadiraj

2 1

[Libvir] Question about building libvirt on Windows
by Atsushi SAKAI 21 Jan '08

21 Jan '08

Hi, Rich I try to build on current libvirt on Windows. But failed in attached compilation message. I would be appreciate If you have any suggestions. My Instruction is follows. build cygwinenvironment. Install gettext-devel, gnutls, gnutls-devel additionally. install sunrpc-4.0-4 on / compile libvirt(current) and fails and get attached message. I have not added any additional patches to libvirt. Thanks Atsushi SAKAI

2 1

[Libvir] Windows support document seems little bit old.
by Atsushi SAKAI 21 Jan '08

21 Jan '08

Hi, Rich I am trying to build libvirt on Windows for checking Xen domain operation. I am doing this based on following instruction. http://libvirt.org/windows.html Anyway Your document seems old. since the suggest patch is already applied to libvirt itself. Is there any plan to update it? Thanks Atsushi SAKAI

2 1

[Libvir] OCaml libvirt 0.4.0.2 released
by Richard W.M. Jones 21 Jan '08

21 Jan '08

This is an experimental release of the OCaml libvirt bindings and tools. The main changes are that we have moved to automatically generating as many of the C bindings as possible, and this includes experimental support for the libvirt storage API. Main site: http://libvirt.org/ocaml/ Source tarball: http://libvirt.org/sources/ocaml/ocaml-libvirt-0.4.0.2.tar.gz Changes: http://libvirt.org/ocaml/ChangeLog.txt I've revamped and improved the API documentation. You can find full API documentation here: http://libvirt.org/ocaml/html/Libvirt.html Example module - the job control API: http://libvirt.org/ocaml/html/Libvirt.Job.html Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 2

[Libvir] [PATCH] NIC should define in order
by Hiroyuki Kaguchi 21 Jan '08

21 Jan '08

Currently NIC definition order is reversed. If we set over 4-NICs for a domain by virt-install, this causes a network communication problem. This is because virtual mac to eth relation is lost. This patch fixes the NIC definition order. N.B. If less than 3-NICs, this problem does not occur. Sign-off-by: Hiroyuki Kaguchi <fj7025cf(a)aa.jp.fujitsu.com> Index: xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.53 diff -u -p -r1.53 xm_internal.c --- xm_internal.c 14 Dec 2007 15:51:42 -0000 1.53 +++ xm_internal.c 16 Jan 2008 00:43:17 -0000 @@ -2232,7 +2232,7 @@ virConfPtr xenXMParseXMLToConfig(virConn } vifs->type = VIR_CONF_LIST; vifs->list = NULL; - for (i = 0; i < obj->nodesetval->nodeNr; i++) { + for (i = obj->nodesetval->nodeNr - 1; i >= 0; i--) { virConfValuePtr thisVif; char *vif = xenXMParseXMLVif(conn, obj->nodesetval->nodeTab[i], hvm); if (!vif)

2 1

[Libvir] What do the docs/APIchunk*.html files do ?
by Daniel P. Berrange 21 Jan '08

21 Jan '08

Whenever we change any of the embedded API docs or add new APIs we end up with huge diffs on the docs/APIchunk*.html files. These HTML files don't seem to be visible anywhere on the website, nor are there even any <a href> links to them in other pages on the website. Can we just kill off these APIchunk* files from the doc generator in CVS Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 3

[Libvir] PATCH: Add xstrtol variants for long long
by Daniel P. Berrange 20 Jan '08

20 Jan '08

Jim's xstrtol convenience function simplified the use of strtol, but only support the 'int' variant. For the storage drivers I need a similar function that will always be at minimum 64-bit since we may have files > 2 GB even on 32-bit. So this adds a variant of the xstrtol functions which use a long long / unsigned long long type Regards, Dan. diff -r 83e80c558f4d src/internal.h --- a/src/internal.h Wed Jan 16 09:28:01 2008 -0500 +++ b/src/internal.h Wed Jan 16 09:28:05 2008 -0500 @@ -304,6 +304,42 @@ xstrtol_ui(char const *s, char **end_ptr return 0; } +static inline int +xstrtol_ll(char const *s, char **end_ptr, int base, long long *result) +{ + long long val; + char *p; + int err; + + errno = 0; + val = strtoll(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (long long) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + +/* Just like xstrtol_i, above, but produce an "unsigned long long" value. */ +static inline int +xstrtol_ull(char const *s, char **end_ptr, int base, unsigned long long *result) +{ + unsigned long long val; + char *p; + int err; + + errno = 0; + val = strtoull(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (unsigned long long) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} #ifdef __cplusplus } #endif /* __cplusplus */ Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 4

[Libvir] PATCH: RFC: env var to set default connection URI
by Daniel P. Berrange 20 Jan '08

20 Jan '08

Currently, if the app provides NULL as the connect URI, we always connect to a Xen hypervisor. virsh provides a VIR_DEFAULT_CONNECT_URI env var which can be used to override this. virt-install/virt-manager never use NULL, and now try to 'guess' a default URI based on whether /dev/kvm or /proc/xen exist. Users have requested that VIR_DEFAULT_CONNECT_URI apply to other apps besides virsh. So this patch adds support for LIBVIRT_DEFAULT_URI env variable which will be used if the connect URI is NULL. If that variable is not set it will still default to Xen. diff -r 673c98e11c78 src/libvirt.c --- a/src/libvirt.c Wed Jan 16 09:27:56 2008 -0500 +++ b/src/libvirt.c Wed Jan 16 09:28:00 2008 -0500 @@ -516,8 +516,13 @@ do_open (const char *name, xmlURIPtr uri; /* Convert NULL or "" to xen:/// for back compat */ - if (!name || name[0] == '\0') - name = "xen:///"; + if (!name || name[0] == '\0') { + char *defname = getenv("LIBVIRT_DEFAULT_URI"); + if (defname && *defname) + name = defname; + else + name = "xen:///"; + } /* Convert xen -> xen:/// for back compat */ if (!strcasecmp(name, "xen")) Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 3