April 2008 - Devel - libvirt List Archives

[Libvir] Don't fail to read a file because it's non-seekable (e.g., a pipe).
by Jim Meyering 08 Apr '08

08 Apr '08

FYI, I expect to add fread_file_lim or something like it to gnulib, and it already has some unit tests (passed). I removed the "* tab-width: 4" line because it seriously mangled the code that I initially added. Besides saying "tab-width 4" is contradictory with the "indent-tabs-mode: nil" setting. This fix addresses a problem exposed in an ovirt script whereby trying to use bash process substitution, e.g., in virsh define <(command to generate xml) would fail. Oops. Just noticed that the indentation in the added function (gnulib style) is not consistent with the rest of the file. I'll adjust that before committing, of course. Don't fail to read a file because it's non-seekable (e.g., a pipe). * src/util.c (fread_file_lim): New function. (__virFileReadAll): Use fread_file_lim, rather than requiring that stat.st_size provide a usable file size. * tests/read-non-seekable: New test, for the above. * tests/Makefile.am (test_scripts): Add read-non-seekable. * tests/test-lib.sh (mkfifo_or_skip_): New helper function. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/util.c | 87 +++++++++++++++++++++++++++++++++++++--------- tests/Makefile.am | 1 + tests/read-non-seekable | 47 +++++++++++++++++++++++++ tests/test-lib.sh | 12 ++++++ 4 files changed, 130 insertions(+), 17 deletions(-) create mode 100755 tests/read-non-seekable diff --git a/src/util.c b/src/util.c index 0667780..e951eb5 100644 --- a/src/util.c +++ b/src/util.c @@ -49,6 +49,10 @@ #include "util-lib.c" +#ifndef MIN +# define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif + #define MAX_ERROR_LEN 1024 #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) @@ -283,6 +287,61 @@ virExecNonBlock(virConnectPtr conn, #endif /* __MINGW32__ */ +/* Like gnulib's fread_file, but read no more than the specified maximum + number of bytes. If the length of the input is <= max_len, and + upon error while reading that data, it works just like fread_file. */ +static char * +fread_file_lim (FILE *stream, size_t max_len, size_t *length) +{ + char *buf = NULL; + size_t alloc = 0; + size_t size = 0; + int save_errno; + + for (;;) + { + size_t count; + size_t requested; + + if (size + BUFSIZ + 1 > alloc) + { + char *new_buf; + + alloc += alloc / 2; + if (alloc < size + BUFSIZ + 1) + alloc = size + BUFSIZ + 1; + + new_buf = realloc (buf, alloc); + if (!new_buf) + { + save_errno = errno; + break; + } + + buf = new_buf; + } + + /* Ensure that (size + requested <= max_len); */ + requested = MIN (size < max_len ? max_len - size : 0, + alloc - size - 1); + count = fread (buf + size, 1, requested, stream); + size += count; + + if (count != requested || requested == 0) + { + save_errno = errno; + if (ferror (stream)) + break; + buf[size] = '\0'; + *length = size; + return buf; + } + } + + free (buf); + errno = save_errno; + return NULL; +} int __virFileReadAll(const char *path, int maxlen, @@ -291,6 +350,8 @@ int __virFileReadAll(const char *path, FILE *fh; struct stat st; int ret = -1; + size_t len; + char *s; if (!(fh = fopen(path, "r"))) { virLog("Failed to open file '%s': %s", @@ -309,28 +370,21 @@ int __virFileReadAll(const char *path, goto error; } - if (st.st_size > maxlen) { - virLog("File '%s' is too large %d, max %d", path, (int)st.st_size, maxlen); - goto error; - } - - *buf = malloc(st.st_size + 1); - if (*buf == NULL) { - virLog("Failed to allocate data"); + s = fread_file_lim(fh, maxlen+1, &len); + if (s == NULL) { + virLog("Failed to read '%s': %s", path, strerror (errno)); goto error; } - if ((ret = fread(*buf, st.st_size, 1, fh)) != 1) { - free(*buf); - *buf = NULL; - virLog("Failed to read config file '%s': %s", - path, strerror(errno)); + if (len > maxlen || (int)len != len) { + free(s); + virLog("File '%s' is too large %d, max %d", + path, (int)st.st_size, maxlen); goto error; } - (*buf)[st.st_size] = '\0'; - - ret = st.st_size; + *buf = s; + ret = len; error: if (fh) @@ -739,6 +793,5 @@ virParseMacAddr(const char* str, unsigned char *addr) * indent-tabs-mode: nil * c-indent-level: 4 * c-basic-offset: 4 - * tab-width: 4 * End: */ diff --git a/tests/Makefile.am b/tests/Makefile.am index 901e88a..ca12b84 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,6 +46,7 @@ noinst_PROGRAMS = xmlrpctest xml2sexprtest sexpr2xmltest virshtest conftest \ test_scripts = \ daemon-conf \ int-overflow \ + read-non-seekable \ vcpupin EXTRA_DIST += $(test_scripts) diff --git a/tests/read-non-seekable b/tests/read-non-seekable new file mode 100755 index 0000000..9bb4a21 --- /dev/null +++ b/tests/read-non-seekable @@ -0,0 +1,47 @@ +#!/bin/sh +# ensure that certain file-reading commands can handle non-seekable files + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if test "$VERBOSE" = yes; then + set -x + virsh --version +fi + +. $srcdir/test-lib.sh + +fail=0 + +cat <<\EOF > dom +<domain type='test' id='2'> + <name>t2</name> + <uuid>004b96e1-2d78-c30f-5aa5-000000000000</uuid> + <memory>8388608</memory> + <vcpu>2</vcpu> + <on_reboot>restart</on_reboot> + <on_poweroff>destroy</on_poweroff> + <on_crash>restart</on_crash> +</domain> +EOF + +virsh -c test:///default define dom > /dev/null || fail=1 + +mkfifo_or_skip_ fifo +cat dom > fifo & + +virsh -c test:///default define fifo > /dev/null || fail=1 + +(exit $fail); exit $fail diff --git a/tests/test-lib.sh b/tests/test-lib.sh index cdbea5d..a007109 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -120,6 +120,18 @@ skip_if_root_() { uid_is_privileged_ && skip_test_ "must be run as non-root"; } error_() { echo "$0: $@" 1>&2; (exit 1); exit 1; } framework_failure() { error_ 'failure in testing framework'; } +mkfifo_or_skip_() +{ + test $# = 1 || framework_failure + if ! mkfifo "$1"; then + # Make an exception of this case -- usually we interpret framework-creation + # failure as a test failure. However, in this case, when running on a SunOS + # system using a disk NFS mounted from OpenBSD, the above fails like this: + # mkfifo: cannot make fifo `fifo-10558': Not owner + skip_test_ 'NOTICE: unable to create test prerequisites' + fi +} + test_dir_=$(pwd) this_test_() { echo "./$0" | sed 's,.*/,,'; } -- 1.5.5.rc2.7.g144a

3 6

[Libvir] FYI: configure.in (ALL_LINGUAS): Fix typo: s/Latn/latin/
by Jim Meyering 08 Apr '08

08 Apr '08

FYI, I committed this: Mon Apr 8 17:32:07 CET 2008 Jim Meyering <meyering(a)redhat.com> + * configure.in (ALL_LINGUAS): Fix typo: s/Latn/latin/. + Don't fail to read a file because it's non-seekable (e.g., a pipe). * src/util.c (fread_file_lim): New function. (__virFileReadAll): Use fread_file_lim, rather than requiring diff --git a/configure.in b/configure.in index cc41185..bd6b744 100644 --- a/configure.in +++ b/configure.in @@ -888,7 +888,7 @@ if test -d po then ALL_LINGUAS=`(cd po > /dev/null && ls *.po) | sed 's+\.po$++'` else - ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et eu_ES fa fi fr gl gu he hi hr hu hy id is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nn no nso or pa pl pt_BR pt ro ru si sk sl sq sr@Latn sr sv ta te th tr uk ur vi zh_CN zh_TW zu" + ALL_LINGUAS="af am ar as be bg bn_IN bn ca cs cy da de el en_GB es et eu_ES fa fi fr gl gu he hi hr hu hy id is it ja ka kn ko ku lo lt lv mk ml mr ms my nb nl nn no nso or pa pl pt_BR pt ro ru si sk sl sq sr@latin sr sv ta te th tr uk ur vi zh_CN zh_TW zu" fi dnl Extra link-time flags for Cygwin. -- 1.5.5.rc3.14.g78bf3

1 0

[Libvir] Zombie KVMs?
by Henri Cook 08 Apr '08

08 Apr '08

Hey all, Does anyone ever see: root 18628 3.2 0.0 0 0 ? Z 17:30 0:40 \_ [kvm] <defunct> Zombie copies of KVM under libvirtd? They're unkillable (without restarting libvirtd) - although libvirt all still functions as normal Henri

2 1

[Libvir] [PATCH] Catch qemu VM-start errors
by Richard W.M. Jones 08 Apr '08

08 Apr '08

Patch to fix the aforementioned problem when qemu subprocess fails to start. 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

3 2

[Libvir] [PATCH] Add xen and hvm guest types to test drive caps
by Cole Robinson 08 Apr '08

08 Apr '08

The attached patch adds xen and hvm guest types to the test driver's capabilities. It was currently set to offer only a 'linux' type which doesn't seem to follow the conventions of the other drivers, so I removed that. Please yell if I'm wrong :) Thanks, Cole diff --git a/src/test.c b/src/test.c index f401d7d..9b2ca56 100644 --- a/src/test.c +++ b/src/test.c @@ -984,6 +984,8 @@ static char *testGetCapabilities (virConnectPtr conn) char *xml; int cell1[] = { 0, 2, 4, 6, 8, 10, 12, 14 }; int cell2[] = { 1, 3, 5, 7, 9, 11, 13, 15 }; + const char *guest_types[] = { "hvm", "xen" }; + int num_guest_types = 2, i; if ((caps = virCapabilitiesNew(TEST_MODEL, 0, 0)) == NULL) goto no_memory; @@ -998,29 +1000,33 @@ static char *testGetCapabilities (virConnectPtr conn) if (virCapabilitiesAddHostNUMACell(caps, 1, 8, cell2) < 0) goto no_memory; - if ((guest = virCapabilitiesAddGuest(caps, - "linux", - TEST_MODEL, - TEST_MODEL_WORDSIZE, - NULL, - NULL, - 0, - NULL)) == NULL) - goto no_memory; - - if (virCapabilitiesAddGuestDomain(guest, - "test", - NULL, - NULL, - 0, - NULL) == NULL) - goto no_memory; - - - if (virCapabilitiesAddGuestFeature(guest, "pae", 1, 1) == NULL) - goto no_memory; - if (virCapabilitiesAddGuestFeature(guest ,"nonpae", 1, 1) == NULL) - goto no_memory; + for (i = 0; i < num_guest_types; ++i) { + + if ((guest = virCapabilitiesAddGuest(caps, + guest_types[i], + TEST_MODEL, + TEST_MODEL_WORDSIZE, + NULL, + NULL, + 0, + NULL)) == NULL) + goto no_memory; + + if (virCapabilitiesAddGuestDomain(guest, + "test", + NULL, + NULL, + 0, + NULL) == NULL) + goto no_memory; + + if (strcmp(guest_types[i], "xen")) { + if (virCapabilitiesAddGuestFeature(guest, "pae", 1, 1) == NULL) + goto no_memory; + if (virCapabilitiesAddGuestFeature(guest ,"nonpae", 1, 1) == NULL) + goto no_memory; + } + } if ((xml = virCapabilitiesFormatXML(caps)) == NULL) goto no_memory;

4 4

[Libvir] Web Interface Question
by Henri Cook 07 Apr '08

07 Apr '08

Hey guys, I'm designing a web interface for libvirt so that my customers can manage their DomUs - unless you know of a good one that already exists??? I'm thinking that the best way to run this is have the web server connected to libvirtd - but I can't find any documentation about the API it presents - can you help? I considered giving the web server access to virsh and parsing that, but that has obvious security implications as it would need root/sudo access Regards, Henri

5 10

Re: [Libvir] Web Interface Question
by Henri Cook 06 Apr '08

06 Apr '08

That sounds quite exciting; is it open source? I'm looking at build something that works with KVM/Xen but i'm sure many of the operations are the same; especially for status type, read only queries. Do you know if there's anything like an RFC document for libvirtd? What did you base all your queries off while making the product? Thanks for getting back to me, Henri Shuveb Hussain wrote: > Hello Henri, > > On Sun, Apr 6, 2008 at 2:05 AM, Henri Cook > <henri(a)theplayboymansion.net <mailto:henri@theplayboymansion.net>> wrote: > > Hey guys, > > I'm designing a web interface for libvirt so that my customers can > manage their DomUs - unless you know of a good one that already > exists??? > > > We, from BinaryKarma are the folks who contributed OpenVZ support for > Libvirt and are experts in the area. We already have a product FluidVM > that manages Xen and OpenVZ based virtual machines with support for > Linux Containers and VMWare ESX coming up. FluidVM also ships with a > browser based interface. > > Currently, there is also VPSCart, a free application built on top of > the FluidVM platform available where you can create plans and expose > them on a portal. customers can then choose and buy any of them. > Users with the right privileges are automatically provisioned. They > can login and manage their VPSs. Usage of VPSCart is completely optional. > > FluidVM ships with support for Local and SAN storage as well. You can > evaluate a fully capable copy of FluidVM for a period of 45 days by > downloading it from our web site. Here are the details: > > *FluidVM Screenshots:* > http://www.binarykarma.com/fluidvm_screenshots.php > > *FluidVM Demo Videos:* > http://www.binarykarma.com/demo.php > > *FluidVM Manuals, free License and User Manuals:* > http://www.binarykarma.com/download.php > > If you have any further questions, we'll be happy to clarify them. > > > Thanks & regards, > -- > Shuveb Hussain > B I N A R Y K A R M A > Chennai, India. > Phone : +91 44-64621656 > Mobile: +91 98403-80386 > http://www.binarykarma.com

1 0

[Libvir] [PATCH] add error message for the case of "vcpupin" fails
by S.Sakamoto 05 Apr '08

05 Apr '08

Hi, When I set a number that is bigger than virtual CPU's setting of guest_dom to <vcpu>, No error-messages are shown. I try follow, # virsh vcpupin guest_dom 100 0,1 [no error messages] # echo $? 1 I make the patch to solve this problem. Thanks, Shigeki Sakamoto. Index: virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.140 diff -u -p -r1.140 virsh.c --- virsh.c 27 Mar 2008 13:43:01 -0000 1.140 +++ virsh.c 4 Apr 2008 05:21:47 -0000 @@ -1747,6 +1747,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cm } if (vcpu >= info.nrVirtCpu) { + vshError(ctl, FALSE, _("vcpupin: Invalid vCPU number.")); virDomainFree(dom); return FALSE; }

3 2

[Libvir] virsh define appears to succeed, but doesn't add bridge
by Jim Meyering 04 Apr '08

04 Apr '08

While trying to test this tiny script on rawhide, http://hg.et.redhat.com/virt/websites/ovirt-web--devel?f=e4f3ee8de5a1;file=… I was surprised to see I couldn't provoke this failure: echo 1>&2 "$0: you seem to have already run this script"; exit 1; } The idea is to dump xml, insert 4 lines describing a bridge, and use virsh "define" to apply the new definition. However, that last step doesn't seem to work, even though virsh exits successfully. If the new XML is somehow insufficient, the least it could do is give a diagnostic. Otherwise it has to honor the request. # cat $tmpfile <domain type='kvm' id='1'> <name>developer</name> <uuid>f2af0696-77ea-dd8f-3f6c-cf3f38d5216e</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> <boot dev='cdrom'/> </os> <features> <acpi/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/var/lib/libvirt/images/developer.img'/> <target dev='hda'/> </disk> <disk type='file' device='cdrom'> <source file='/var/lib/libvirt/images/Fedora-8-x86_64-rescuecd.iso'/> <target dev='hdc'/> <readonly/> </disk> <interface type='network'> <mac address='00:16:3e:46:e2:8a'/> <source network='default'/> <target dev='vnet0'/> </interface> <interface type="bridge"> <mac address="00:16:3e:12:34:56"/> <source bridge="dummybridge"/> </interface> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' listen='127.0.0.1'/> </devices> </domain> # virsh -c qemu:///system define "$tmpfile" Domain developer defined from /t/jt2884.FGSiY6/tmp.JVPZ4LBMVf # virsh -c qemu:///system dumpxml developer <domain type='kvm' id='1'> <name>developer</name> <uuid>f2af0696-77ea-dd8f-3f6c-cf3f38d5216e</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> <boot dev='cdrom'/> </os> <features> <acpi/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/var/lib/libvirt/images/developer.img'/> <target dev='hda'/> </disk> <disk type='file' device='cdrom'> <source file='/var/lib/libvirt/images/Fedora-8-x86_64-rescuecd.iso'/> <target dev='hdc'/> <readonly/> </disk> <interface type='network'> <mac address='00:16:3e:46:e2:8a'/> <source network='default'/> <target dev='vnet0'/> </interface> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' listen='127.0.0.1'/> </devices> </domain>

1 0

[Libvir] FYI: Reporting 'upstream' bugs for libvirt & virt tools
by Daniel P. Berrange 04 Apr '08

04 Apr '08

This is a quick mail to let people know of a new bug reporting policy for virtualization related tools. 1. Only, if you are using binary RPMs from official Fedora repositories, bugs should be reported under the 'Fedora' product, with the component matching the RPM you're reporting against: https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora 2. For all other cases. ie If you are using self-built binaries, or checkouts from the source repos, or forwarding bugs from a non-Fedora distribution, then use the generic 'Virtualization Tools' product: https://bugzilla.redhat.com/enter_bug.cgi?product=Virtualization%20Tools This is our master 'upstream' bug tracking product now. This is important because Fedora recently instituted a number of bug house keeping policies against things under 'Fedora', which may result in your bugs being incorrectly closed. Using 'Virtualization Tools' product in bugzilla ensures we can distinguish upstream bugs from Fedora bugs. This applies to the following applications: libvirt virt-df virt-manager virt-p2v virt-top virt-viewer virtinst Regards, Daniel. -- |: 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 :|

1 0