- Devel - libvirt List Archives

[Libvir] [PATCH] remove trailing newlines in error strings
by Guido Günther 24 Mar '08

24 Mar '08

Most of the error messages don't pass a final newline. Strip the ones that still do so for consistency. Please apply. -- Guido --- src/qemu_driver.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 719f46e..adb33a7 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -962,14 +962,14 @@ qemudAddIptablesRules(virConnectPtr conn, /* allow DHCP requests through to dnsmasq */ if ((err = iptablesAddTcpInput(driver->iptables, network->bridge, 67))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to allow DHCP requests from '%s' : %s\n"), + _("failed to add iptables rule to allow DHCP requests from '%s' : %s"), network->bridge, strerror(err)); goto err1; } if ((err = iptablesAddUdpInput(driver->iptables, network->bridge, 67))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to allow DHCP requests from '%s' : %s\n"), + _("failed to add iptables rule to allow DHCP requests from '%s' : %s"), network->bridge, strerror(err)); goto err2; } @@ -977,14 +977,14 @@ qemudAddIptablesRules(virConnectPtr conn, /* allow DNS requests through to dnsmasq */ if ((err = iptablesAddTcpInput(driver->iptables, network->bridge, 53))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to allow DNS requests from '%s' : %s\n"), + _("failed to add iptables rule to allow DNS requests from '%s' : %s"), network->bridge, strerror(err)); goto err3; } if ((err = iptablesAddUdpInput(driver->iptables, network->bridge, 53))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to allow DNS requests from '%s' : %s\n"), + _("failed to add iptables rule to allow DNS requests from '%s' : %s"), network->bridge, strerror(err)); goto err4; } @@ -994,14 +994,14 @@ qemudAddIptablesRules(virConnectPtr conn, if ((err = iptablesAddForwardRejectOut(driver->iptables, network->bridge))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to block outbound traffic from '%s' : %s\n"), + _("failed to add iptables rule to block outbound traffic from '%s' : %s"), network->bridge, strerror(err)); goto err5; } if ((err = iptablesAddForwardRejectIn(driver->iptables, network->bridge))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to block inbound traffic to '%s' : %s\n"), + _("failed to add iptables rule to block inbound traffic to '%s' : %s"), network->bridge, strerror(err)); goto err6; } @@ -1009,7 +1009,7 @@ qemudAddIptablesRules(virConnectPtr conn, /* Allow traffic between guests on the same bridge */ if ((err = iptablesAddForwardAllowCross(driver->iptables, network->bridge))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to allow cross bridge traffic on '%s' : %s\n"), + _("failed to add iptables rule to allow cross bridge traffic on '%s' : %s"), network->bridge, strerror(err)); goto err7; } @@ -1027,7 +1027,7 @@ qemudAddIptablesRules(virConnectPtr conn, network->bridge, network->def->forwardDev))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to allow forwarding from '%s' : %s\n"), + _("failed to add iptables rule to allow forwarding from '%s' : %s"), network->bridge, strerror(err)); goto err8; } @@ -1038,7 +1038,7 @@ qemudAddIptablesRules(virConnectPtr conn, network->bridge, network->def->forwardDev))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to allow forwarding to '%s' : %s\n"), + _("failed to add iptables rule to allow forwarding to '%s' : %s"), network->bridge, strerror(err)); goto err9; } @@ -1048,7 +1048,7 @@ qemudAddIptablesRules(virConnectPtr conn, network->def->network, network->def->forwardDev))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to add iptables rule to enable masquerading : %s\n"), + _("failed to add iptables rule to enable masquerading : %s"), strerror(err)); goto err10; } @@ -1169,14 +1169,14 @@ static int qemudStartNetworkDaemon(virConnectPtr conn, if (network->def->forwardDelay && (err = brSetForwardDelay(driver->brctl, network->bridge, network->def->forwardDelay))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to set bridge forward delay to %d\n"), + _("failed to set bridge forward delay to %d"), network->def->forwardDelay); goto err_delbr; } if ((err = brSetEnableSTP(driver->brctl, network->bridge, network->def->disableSTP ? 0 : 1))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to set bridge STP to %s\n"), + _("failed to set bridge STP to %s"), network->def->disableSTP ? "off" : "on"); goto err_delbr; } @@ -1184,7 +1184,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn, if (network->def->ipAddress[0] && (err = brSetInetAddress(driver->brctl, network->bridge, network->def->ipAddress))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("cannot set IP address on bridge '%s' to '%s' : %s\n"), + _("cannot set IP address on bridge '%s' to '%s' : %s"), network->bridge, network->def->ipAddress, strerror(err)); goto err_delbr; } @@ -1192,7 +1192,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn, if (network->def->netmask[0] && (err = brSetInetNetmask(driver->brctl, network->bridge, network->def->netmask))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("cannot set netmask on bridge '%s' to '%s' : %s\n"), + _("cannot set netmask on bridge '%s' to '%s' : %s"), network->bridge, network->def->netmask, strerror(err)); goto err_delbr; } @@ -1200,7 +1200,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn, if (network->def->ipAddress[0] && (err = brSetInterfaceUp(driver->brctl, network->bridge, 1))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to bring the bridge '%s' up : %s\n"), + _("failed to bring the bridge '%s' up : %s"), network->bridge, strerror(err)); goto err_delbr; } @@ -1211,7 +1211,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn, if (network->def->forward && !qemudEnableIpForwarding()) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, - _("failed to enable IP forwarding : %s\n"), strerror(err)); + _("failed to enable IP forwarding : %s"), strerror(err)); goto err_delbr2; } @@ -1238,7 +1238,7 @@ static int qemudStartNetworkDaemon(virConnectPtr conn, err_delbr: if ((err = brDeleteBridge(driver->brctl, network->bridge))) { - qemudLog(QEMUD_WARN, _("Failed to delete bridge '%s' : %s\n"), + qemudLog(QEMUD_WARN, _("Failed to delete bridge '%s' : %s"), network->bridge, strerror(err)); } @@ -1263,12 +1263,12 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, if (network->def->ipAddress[0] && (err = brSetInterfaceUp(driver->brctl, network->bridge, 0))) { - qemudLog(QEMUD_WARN, _("Failed to bring down bridge '%s' : %s\n"), + qemudLog(QEMUD_WARN, _("Failed to bring down bridge '%s' : %s"), network->bridge, strerror(err)); } if ((err = brDeleteBridge(driver->brctl, network->bridge))) { - qemudLog(QEMUD_WARN, _("Failed to delete bridge '%s' : %s\n"), + qemudLog(QEMUD_WARN, _("Failed to delete bridge '%s' : %s"), network->bridge, strerror(err)); } @@ -1277,7 +1277,7 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, kill(network->dnsmasqPid, SIGKILL); if (waitpid(network->dnsmasqPid, NULL, 0) != network->dnsmasqPid) qemudLog(QEMUD_WARN, - "%s", _("Got unexpected pid for dnsmasq\n")); + "%s", _("Got unexpected pid for dnsmasq")); } network->bridge[0] = '\0'; -- 1.5.4.3

2 1

[Libvir] Looking to hire coder w/ libvir exp
by Robert J. Adams (jason) 24 Mar '08

24 Mar '08

Hello everyone, We're looking to hire a programmer w/ libvir experience to develop a VPS/VM hosting control panel (supporting xen). Anyone with interest (and spare time) please shoot me an email. Thanks, Robert J. Adams Apex Hosting Group.

2 1

[Libvir] Adding suppport for daemon restarts with stateful drivers
by Daniel P. Berrange 22 Mar '08

22 Mar '08

The libvirt daemon has the ability to reload itself by sending it SIGHUP. For the QEMU & network drivers this makes it reload the config files for VMs and re-init the iptables rules. It would be desirable though to allow the daemon to perform a full restart. Principally this is for RPM upgrades where you want toensure the daemon is running the new code. The tricky thing is figuring out how to handle driver state. Looking at the QEMU, network, storage and LXC drivers, there is not actually all that much state to deal with. It basically comes down to: - PID of child processes (eg QEMU, dnsmasq, container) - FDs for STDIN/OUT/ERR of the child processes - A possible logfile FD - Flag to indicate whether some objects are active or not That is more or less it. Anything else is kept in the config files and can be reloaded at will. So I was thinking about whether we could provide a simple protocol to allow each stateful driver to save its state into some location, the daemon could just 'exec()' itself again, and upon startup the drivers reload their active state. Since the daemon just exec()'s itself it would still own the child processes & still have all the neccessary FD's open. Dan. -- |: 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] [RFC] 0 of 4 Linux Container support
by Dave Leskovec 22 Mar '08

22 Mar '08

Greetings, Following are the patches adding linux container support. The first three patches are updated versions of the original three I posted. They've been updated for the feedback I've received so far and to include some other recent libvirt changes. The last patch adds support for starting a container. Still working on shutdown and destroy but wanted to get the start code out for comments. The XML format has been updated to this: <domain type='linuxcontainer'> <name>TestContainer1</name> <os> <init>/home/dlesko/src/dev/lxc/lxc_rcinit</init> </os> <memory>65536</memory> <devices> <filesystem type='mount'> <source dir='/home/dlesko/lxc_files/tmp/'/> <target dir='/tmp/'/> </filesystem> <console tty='/dev/ptmx'/> </devices> </domain> All comments and questions are welcome. -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

4 11

[Libvir] [RFC] 4 of 4 Linux Container support - start container
by Dave Leskovec 21 Mar '08

21 Mar '08

This patch adds the start container support. A couple new source files are added - lxc_container.h and lxc_container.c These contain the setup code that runs within the container namespace prior to exec'ing the user specified init. This is a rough outline of the functions involved in starting a container and the namespace and process under which they run: lxcVmStart() - runs under callers process lxcSetupTtyTunnel() - opens a tty and socket pair, tty stored in vmDef double fork to separate from parent process grandchild calls lxcStartContainer() see below parent continues wait for child process(es) if child process was successful, change vm state to running return lxcStartContainer() - runs in parent namespace, child process from lxcVmStart Allocate stack for container clone() - child process will start in lxcChild() see below exit() - once lxcTtyForward returns, the container has exited lxcChild() - runs within container, child process from clone() mount user filesystems mount container /proc lxcExecWithTty() - see below, will not return lxcExecWithTty() - runs within container lxcSetupContainerTty() - opens tty for container Set up SIGCHLD handler fork() Child calls lxcExecContainerInit() see below Parent continues lxcTtyForward - shuttles data between file descriptors until flag is set in this case between the master end of the container tty and the master end of the parent tty exit() - when lxcTtyForward returns, container init has exited lxcExecContainerInit() - runs within contianer, child process from lxcExecWithTty exec containers init if exec fails, exit() There's (at least) a couple issues I don't have good solutions for - 1) In this setup with a tty console, we end up with at least 2 processes per container. One process is running the user init. The CMD listed under ps will be the init as specified in the XML (unless it changes it to something else). The other process is forwarding console traffic between the parent and container pts. The CMD listed in ps depends will depend on the mgmt app used to start the container. Using virsh, it's something like this outside the container: root 10141 1 93 22:05 pts/6 00:27:50 /home/dlesko/src/dev/libvirt-ss/libvirt/src/.libs/lt-virsh -c lxc:/// and this inside the container: root 1 0 93 22:05 pts/6 00:29:19 /home/dlesko/src/dev/libvirt-ss/libvirt/src/.libs/lt-virsh -c lxc:/// This can be a bit confusing. I'm not sure how important it is but it would be nice to change this to something a little more meaningful as is done by ssh. 2) The container can stall when nothing is connected to the parent side pty and console output fills up the buffer. To avoid this, we set the parent side pty to be non-blocking. The result of this is that we will discard any console output once the buffer has filled. When a user does connect to the console, they may get a flood of (potentially very) old data. It would be nice to be able to provide some more recent output once someone connects to the console. -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

4 9

[Libvir] [RFC] 2 of 4 Linux Container support - lxc_conf files
by Dave Leskovec 21 Mar '08

21 Mar '08

This patch adds the lxc_conf source files. -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

3 2

[Libvir] [PATCH] Fix MAC address parsing for 1-digit case
by Hiroyuki Kaguchi 21 Mar '08

21 Mar '08

libvirt fails in parsing when MAC address like "00:16:3e:12:3:61" is specified for installation. This is because virt-install can pass 1-digit (like 3) for MAC address from Cset:316 for Solaris But libvirt cannot support this MAC 1-digit (like 3) parameter. This patch fixes libvirt parsing in the MAC address against virt-inst Cset:316 Thanks Signed-off-by: Hiroyuki Kaguchi <fj7025cf(a)aa.jp.fujitsu.com> ? parse_macaddr.patch Index: src/xml.c =================================================================== RCS file: /data/cvs/libvirt/src/xml.c,v retrieving revision 1.113 diff -u -r1.113 xml.c --- src/xml.c 27 Feb 2008 04:35:08 -0000 1.113 +++ src/xml.c 18 Mar 2008 05:30:14 -0000 @@ -17,6 +17,7 @@ #include <string.h> #include <stdarg.h> #include <limits.h> +#include <ctype.h> #ifdef WITH_XEN #include <xs.h> #endif @@ -537,6 +538,44 @@ ************************************************************************/ #if WITH_XEN /** + * parseMacAddr: + * @str: mac addrress string + * @addr: mac addrress numbers + * + * Parse a mac addrress + * + * Returns 0 in case success or -1 in case of error. + */ +static int +parseMacAddr(const char* str, unsigned char *addr) +{ + int i; + for (i = 0; i < 6; i++) { + char *end_ptr; + unsigned long result; + + if (!isdigit(*str) && !isalpha(*str)) + break; + + result = strtoul(str, &end_ptr, 16); + + if ((end_ptr - str) < 1 || 2 < (end_ptr - str) || + (errno == ERANGE) || + (0xFF < result)) + break; + + addr[i] = (unsigned char) result; + + if (*end_ptr != ':') + return (i == 5) ? 0 : -1; + + str = end_ptr + 1; + } + + return -1; +} + +/** * virtDomainParseXMLGraphicsDescImage: * @conn: pointer to the hypervisor connection * @node: node containing graphics description @@ -1233,22 +1272,8 @@ virBufferAddLit(buf, "(vif "); if (mac != NULL) { - unsigned int addr[12]; - int tmp = sscanf((const char *) mac, - "%01x%01x:%01x%01x:%01x%01x:%01x%01x:%01x%01x:%01x%01x", - (unsigned int *) &addr[0], - (unsigned int *) &addr[1], - (unsigned int *) &addr[2], - (unsigned int *) &addr[3], - (unsigned int *) &addr[4], - (unsigned int *) &addr[5], - (unsigned int *) &addr[6], - (unsigned int *) &addr[7], - (unsigned int *) &addr[8], - (unsigned int *) &addr[9], - (unsigned int *) &addr[10], - (unsigned int *) &addr[11]); - if (tmp != 12 || strlen((const char *) mac) != 17) { + unsigned char addr[6]; + if (parseMacAddr((const char*) mac, addr) == -1) { virXMLError(conn, VIR_ERR_INVALID_MAC, (const char *) mac, 0); goto error; }

4 7

[Libvir] [RFC] 1 of 4 Linux Container support - base
by Dave Leskovec 20 Mar '08

20 Mar '08

This patch adds the base linux container support. -- Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

2 2

[Libvir] [PATCH] Add new testing framework and the first test to use it.
by Jim Meyering 20 Mar '08

20 Mar '08

A week or so ago, I read a bug report on this list with a simple reproducer + fix that was just begging for a test suite addition. This change adds framework to make that easy, and adds the first test. I uncovered problems in tests/Makefile.am along the way and just posted a patch for that. This adds most of a portable (bourne-shell-based) test framework that also provides for convenient isolation of individual tests (so we can easily parallelize them without worrying one will tromp on files of another). In a couple years when running "make check" runs hundreds of tests, you'll definitely want them to run in parallel. The mktempd script is not new. I first used it in coreutils and parted, but removed it from coreutils after that package acquired its own C-based implementation. test-lib.sh is from coreutils, but was inspired by the file by the same name in git.git's own t/ (tests) directory. Add new testing framework and the first test to use it. * tests/Makefile.am (test_scripts): Add vcpupin. (EXTRA_DIST): Add test-lib.sh. * tests/test-lib.sh: Testing framework, from coreutils. * tests/vcpupin: New file. * build-aux/mktempd: New file, from gnulib. * bootstrap: Add posix-shell and mktempd to the list of imported modules. * gnulib/m4/posix-shell.m4: New file, from gnulib. This also updates lots of files from gnulib, as you can see from the diffstat output. The diffs below include everything not under gnulib/. --- bootstrap | 2 + build-aux/.cvsignore | 1 + build-aux/mktempd | 132 ++++++++++++++++++++++++++++++++ build-aux/useless-if-before-free | 6 +- gnulib/lib/Makefile.am | 37 +++++++--- gnulib/lib/alloca.in.h | 4 +- gnulib/lib/getaddrinfo.c | 2 +- gnulib/lib/getdelim.c | 6 +- gnulib/lib/unistd.in.h | 22 +++++- gnulib/lib/xsize.h | 2 +- gnulib/m4/absolute-header.m4 | 49 ------------ gnulib/m4/fseeko.m4 | 8 ++- gnulib/m4/gnulib-cache.m4 | 6 +- gnulib/m4/gnulib-comp.m4 | 6 +- gnulib/m4/include_next.m4 | 7 +- gnulib/m4/lib-link.m4 | 66 ++++++++++++----- gnulib/m4/posix-shell.m4 | 58 ++++++++++++++ gnulib/m4/unistd_h.m4 | 6 +- gnulib/tests/Makefile.am | 2 +- tests/Makefile.am | 7 ++- tests/test-lib.sh | 155 ++++++++++++++++++++++++++++++++++++++ tests/vcpupin | 37 +++++++++ 22 files changed, 521 insertions(+), 100 deletions(-) create mode 100755 build-aux/mktempd delete mode 100644 gnulib/m4/absolute-header.m4 create mode 100644 gnulib/m4/posix-shell.m4 create mode 100644 tests/test-lib.sh create mode 100755 tests/vcpupin diff --git a/bootstrap b/bootstrap index d8b79d9..f7b6aec 100755 --- a/bootstrap +++ b/bootstrap @@ -79,6 +79,8 @@ $gnulib_tool \ sys_stat vasprintf strndup \ strsep poll gettext getpass \ useless-if-before-free \ + posix-shell \ + mktempd \ vc-list-files rm -f \ diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore index 1798f40..096cccb 100644 --- a/build-aux/.cvsignore +++ b/build-aux/.cvsignore @@ -7,3 +7,4 @@ install-sh ltmain.sh missing mkinstalldirs +mktempd diff --git a/build-aux/mktempd b/build-aux/mktempd new file mode 100755 index 0000000..7ac914b --- /dev/null +++ b/build-aux/mktempd @@ -0,0 +1,132 @@ +#!/bin/sh +# Create a temporary directory, much like mktemp -d does. + +# Copyright (C) 2007-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/>. + +# Written by Jim Meyering. + +# Usage: mktempd /tmp phoey.XXXXXXXXXX + +# First, try to use the mktemp program. +# Failing that, we'll roll our own mktemp-like function: +# - try to get random bytes from /dev/urandom +# - failing that, generate output from a combination of quickly-varying +# sources and gzip. Ignore non-varying gzip header, and extract +# "random" bits from there. +# - given those bits, map to file-name bytes using tr, and try to create +# the desired directory. +# - make only $MAX_TRIES attempts + +ME=`basename "$0"` +die() { echo >&2 "$ME: $@"; exit 1; } + +MAX_TRIES=4 + +rand_bytes() +{ + n=$1 + + chars=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + + dev_rand=/dev/urandom + if test -r "$dev_rand"; then + # Note: 256-length($chars) == 194; 3 copies of $chars is 186 + 8 = 194. + head -c$n "$dev_rand" | tr -c $chars 01234567$chars$chars$chars + return + fi + + cmds='date; date +%N; free; who -a; w; ps auxww; ps ef; netstat -n' + data=` (eval "$cmds") 2>&1 | gzip ` + + n_plus_50=`expr $n + 50` + + # Ensure that $data has length at least 50+$n + while :; do + len=`echo "$data"|wc -c` + test $n_plus_50 -le $len && break; + data=` (echo "$data"; eval "$cmds") 2>&1 | gzip ` + done + + echo "$data" \ + | dd bs=1 skip=50 count=$n 2>/dev/null \ + | tr -c $chars 01234567$chars$chars$chars +} + +mktempd() +{ + case $# in + 2);; + *) die "Usage: $ME DIR TEMPLATE";; + esac + + destdir=$1 + template=$2 + + # Disallow any trailing slash on specified destdir: + # it would subvert the post-mktemp "case"-based destdir test. + case $destdir in + /) ;; + */) die "invalid destination dir: remove trailing slash(es)";; + esac + + case $template in + *XXXX) ;; + *) die "invalid template: $template (must have a suffix of at least 4 X's)";; + esac + + fail=0 + + # First, try to use mktemp. + d=`env -u TMPDIR mktemp -d -t -p "$destdir" "$template" 2>/dev/null` \ + || fail=1 + + # The resulting name must be in the specified directory. + case $d in "$destdir"*);; *) fail=1;; esac + + # It must have created the directory. + test -d "$d" || fail=1 + + # It must have 0700 permissions. Handle sticky "S" bits. + perms=`ls -dgo "$d" 2>/dev/null|tr S -` || fail=1 + case $perms in drwx------*) ;; *) fail=1;; esac + + test $fail = 0 && { + echo "$d" + return + } + + # If we reach this point, we'll have to create a directory manually. + + # Get a copy of the template without its suffix of X's. + base_template=`echo "$template"|sed 's/XX*$//'` + + # Calculate how many X's we've just removed. + nx=`expr length "$template" - length "$base_template"` + + err= + i=1 + while :; do + X=`rand_bytes $nx` + candidate_dir="$destdir/$base_template$X" + err=`mkdir -m 0700 "$candidate_dir" 2>&1` \ + && { echo "$candidate_dir"; return; } + test $MAX_TRIES -le $i && break; + i=`expr $i + 1` + done + die "$err" +} + +mktempd "$@" diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free index eb18483..626d19a 100755 --- a/build-aux/useless-if-before-free +++ b/build-aux/useless-if-before-free @@ -2,7 +2,7 @@ # Detect instances of "if (p) free (p);". # Likewise for "if (p != NULL) free (p);". And with braces. -my $VERSION = '2008-02-11 08:08'; # UTC +my $VERSION = '2008-03-12 13:06'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -123,8 +123,8 @@ EOF { if ($line =~ /\b(if\s*$\s*(\S+?)(?:\s*!=\s*NULL)?\s*$ - (?: \s*$regexp\s*$\s*\2\s*$| - \s*\{\s*$regexp\s*$\s*\2\s*$\s*;\s*\}))/sx) + (?: \s*$regexp\s*$(?:\s*\([^)]+$)\s*\2\s*\)| + \s*\{\s*$regexp\s*$(?:\s*\([^)]+$)\s*\2\s*\)\s*;\s*\}))/sx) { $found_match = 1; $list diff --git a/tests/test-lib.sh b/tests/test-lib.sh new file mode 100644 index 0000000..cdbea5d --- /dev/null +++ b/tests/test-lib.sh @@ -0,0 +1,155 @@ +# source this file; set up for tests + +# Skip this test if the shell lacks support for functions. +unset function_test +eval 'function_test() { return 11; }; function_test' +if test $? != 11; then + echo "$0: /bin/sh lacks support for functions; skipping this test." 1>&2 + (exit 77); exit 77 +fi + +skip_test_() +{ + echo "$0: skipping test: $@" 1>&2 + (exit 77); exit 77 +} + +require_acl_() +{ + getfacl --version < /dev/null > /dev/null 2>&1 \ + && setfacl --version < /dev/null > /dev/null 2>&1 \ + || skip_test_ "This test requires getfacl and setfacl." + + id -u bin > /dev/null 2>&1 \ + || skip_test_ "This test requires a local user named bin." +} + +require_ulimit_() +{ + ulimit_works=yes + # Expect to be able to exec a program in 10MB of virtual memory, + # but not in 20KB. I chose "date". It must not be a shell built-in + # function, so you can't use echo, printf, true, etc. + # Of course, in coreutils, I could use $top_builddir/src/true, + # but this should be able to work for other projects, too. + ( ulimit -v 10000; date ) > /dev/null 2>&1 || ulimit_works=no + ( ulimit -v 20; date ) > /dev/null 2>&1 && ulimit_works=no + + test $ulimit_works = no \ + && skip_test_ "this shell lacks ulimit support" +} + +require_readable_root_() +{ + test -r / || skip_test_ "/ is not readable" +} + +# Skip the current test if strace is not available or doesn't work. +require_strace_() +{ + strace -V < /dev/null > /dev/null 2>&1 || + skip_test_ 'no strace program' + + strace -qe unlink echo > /dev/null 2>&1 || + skip_test_ 'strace does not work' +} + +require_built_() +{ + skip_=no + for i in "$@"; do + case " $built_programs " in + *" $i "*) ;; + *) echo "$i: not built" 1>&2; skip_=yes ;; + esac + done + + test $skip_ = yes && skip_test_ "required program(s) not built" +} + +uid_is_privileged_() +{ + # Make sure id -u succeeds. + my_uid=$(id -u) \ + || { echo "$0: cannot run \`id -u'" 1>&2; return 1; } + + # Make sure it gives valid output. + case $my_uid in + 0) ;; + *[!0-9]*) + echo "$0: invalid output (\`$my_uid') from \`id -u'" 1>&2 + return 1 ;; + *) return 1 ;; + esac +} + +skip_if_() +{ + case $1 in + root) skip_test_ must be run as root ;; + non-root) skip_test_ must be run as non-root ;; + *) ;; # FIXME? + esac +} + +require_selinux_() +{ + case `ls -Zd .` in + '? .'|'unlabeled .') + skip_test_ "this system (or maybe just" \ + "the current file system) lacks SELinux support" + ;; + esac +} + +very_expensive_() +{ + if test "$RUN_VERY_EXPENSIVE_TESTS" != yes; then + skip_test_ ' +This test is very expensive, so it is disabled by default. +To run it anyway, rerun make check with the RUN_VERY_EXPENSIVE_TESTS +environment variable set to yes. E.g., + + env RUN_VERY_EXPENSIVE_TESTS=yes make check +' + fi +} + +require_root_() { uid_is_privileged_ || skip_test_ "must be run as root"; } +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'; } + +test_dir_=$(pwd) + +this_test_() { echo "./$0" | sed 's,.*/,,'; } +this_test=$(this_test_) + +# This is a stub function that is run upon trap (upon regular exit and +# interrupt). Override it with a per-test function, e.g., to unmount +# a partition, or to undo any other global state changes. +cleanup_() { :; } + +mktempd="$abs_top_srcdir/build-aux/mktempd" +t_=$("$SHELL" "$mktempd" "$test_dir_" lv-$this_test.XXXXXXXXXX) \ + || error_ "failed to create temporary directory in $test_dir_" + +# Run each test from within a temporary sub-directory named after the +# test itself, and arrange to remove it upon exception or normal exit. +trap 'st=$?; cleanup_; d='"$t_"'; + cd '"$test_dir_"' && chmod -R u+rwx "$d" && rm -rf "$d" && exit $st' 0 +trap '(exit $?); exit $?' 1 2 13 15 + +cd "$t_" || error_ "failed to cd to $t_" + +if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then + compare() { diff -u "$@"; } +elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then + compare() { cmp -s "$@"; } +else + compare() { cmp "$@"; } +fi + +# Local Variables: +# indent-tabs-mode: nil +# End: diff --git a/tests/vcpupin b/tests/vcpupin new file mode 100755 index 0000000..b56c7f2 --- /dev/null +++ b/tests/vcpupin @@ -0,0 +1,37 @@ +#!/bin/sh +# ensure that an invalid CPU spec elicits a diagnostic + +# 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 +virsh --connect test:///default vcpupin test a 0,1 > out 2>&1 +test $? = 1 || fail=1 + +cat <<\EOF > exp || fail=1 +error: vcpupin: Invalid or missing vCPU number. + +EOF + +compare out exp || fail=1 + +(exit $fail); exit $fail -- 1.5.4.4.482.g16f99

3 2

[Libvir] [PATCH] Fix bugs in tests/Makefile.am.
by Jim Meyering 20 Mar '08

20 Mar '08

I added a new test (coming in next message), but it failed due to problems fixed here: Fix bugs in tests/Makefile.am. * tests/Makefile.am (abs_top_builddir): Correct invalid settings of abs_top_builddir and abs_top_srcdir. Also prepend src/ to PATH, so we test the just-built virsh, not whatever happens to be in the original $PATH. diff --git a/tests/Makefile.am b/tests/Makefile.am index 644715e..4810179 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -53,13 +53,15 @@ if ENABLE_XEN_TESTS TESTS += reconnect endif +path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud + # NB, automake < 1.10 does not provide the real # abs_top_{src/build}dir variables, so don't rely # on them here. Fake them with 'pwd' TESTS_ENVIRONMENT = \ - abs_top_builddir=`pwd`/'$(top_builddir)' \ - abs_top_srcdir=`pwd`/'$(top_srcdir)' \ - PATH="$$abs_top_builddir/qemud$(PATH_SEPARATOR)$$PATH" \ + abs_top_builddir=`cd '$(top_builddir)'; pwd` \ + abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \ + PATH="$(path_add)$(PATH_SEPARATOR)$$PATH" \ $(VG) valgrind: -- 1.5.4.4.482.g16f99

2 1

[Libvir] [PATCH] Sync Makefile rules from coreutils.
by Jim Meyering 20 Mar '08

20 Mar '08

This change is a net no-op for "make all" builds. For "make syntax-check", it adds the getopt.h check, and... It includes name-space clean-up and VPATH "make distcheck" support in GNUmakefile, and factoring and renaming changes in Makefile.maint. Sync Makefile rules from coreutils. * Makefile.maint: Merge. * GNUmakefile: Update from coreutils. --- GNUmakefile | 8 ++- Makefile.maint | 159 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 85 insertions(+), 82 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 9eefe40..157f432 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -4,7 +4,7 @@ # It is necessary if you want to build targets usually of interest # only to the maintainer. -# Copyright (C) 2001, 2003, 2006-2007 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2006-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 @@ -29,11 +29,11 @@ else SHELL = sh endif -have-Makefile := $(shell test -f Makefile && echo yes) +_have-Makefile := $(shell test -f Makefile && echo yes) # If the user runs GNU make but has not yet run ./configure, # give them a diagnostic. -ifeq ($(have-Makefile),yes) +ifeq ($(_have-Makefile),yes) # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner @@ -50,6 +50,8 @@ all: @echo "You must run ./configure before running \`make'." 1>&2 @exit 1 +check dist distcheck install: all + endif # Tell version 3.79 and up of GNU make to not build goals in this diff --git a/Makefile.maint b/Makefile.maint index 92cdf29..3a838c5 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -8,25 +8,23 @@ gzip_rsyncable := \ $(shell gzip --help 2>/dev/null|grep rsyncable >/dev/null && echo --rsyncable) GZIP_ENV = '--no-name --best $(gzip_rsyncable)' -CVS_LIST = build-aux/vc-list-files +VC_LIST = build-aux/vc-list-files -CVS_LIST_EXCEPT = \ -$(CVS_LIST) | if test -f .x-$@; then grep -vEf .x-$@; else grep -v ChangeLog; fi +VC_LIST_EXCEPT = \ + $(VC_LIST) | if test -f .x-$@; then grep -vEf .x-$@; else grep -v ChangeLog; fi # Prevent programs like 'sort' from considering distinct strings to be equal. # Doing it here saves us from having to set LC_ALL elsewhere in this file. export LC_ALL = C # Collect the names of rules starting with `sc_'. -syntax-check-rules := $(shell sed -n 's/^$sc_[a-zA-Z0-9_-]*$:.*/\1/p' $(ME)) +syntax-check-rules := $(shell sed -n 's/^$sc_[a-zA-Z0-9_-]*$:.*/\1/p' \ + $(srcdir)/$(ME)) .PHONY: $(syntax-check-rules) -# Checks that don't require cvs. -# Run `changelog-check' last, as previous test may reveal problems requiring -# new ChangeLog entries. local-checks-available = \ po-check copyright-check m4-check author_mark_check \ - changelog-check patch-check strftime-check $(syntax-check-rules) \ + patch-check strftime-check $(syntax-check-rules) \ makefile_path_separator_check \ makefile-check check-AUTHORS .PHONY: $(local-checks-available) @@ -34,23 +32,29 @@ local-checks-available = \ local-check := $(filter-out $(local-checks-to-skip), $(local-checks-available)) syntax-check: $(local-check) +# @grep -nE '# *include <(limits|std(def|arg|bool))\.h>' \ +# $$(find -type f -name '*.[chly]') && \ +# { echo '$(ME): found conditional include' 1>&2; \ +# exit 1; } || : -## --------------- ## -## Sanity checks. ## -## --------------- ## +# grep -nE '^# *include <(string|stdlib)\.h>' \ +# $(srcdir)/{lib,src}/*.[chy] && \ +# { echo '$(ME): FIXME' 1>&2; \ +# exit 1; } || : +# FIXME: don't allow `#include .strings\.h' anywhere sc_avoid_if_before_free: @$(srcdir)/build-aux/useless-if-before-free \ $(useless_free_options) \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found useless "if" before "free" above' 1>&2; \ exit 1; } || : # Avoid uses of write(2). Either switch to streams (fwrite), or use # the safewrite wrapper. sc_avoid_write: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - grep '\<write *(' $$($(CVS_LIST_EXCEPT) | grep '\.c$$') && \ + @if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + grep '\<write *(' $$($(VC_LIST_EXCEPT) | grep '\.c$$') && \ { echo "$(ME): the above files use write;" \ " consider using the safewrite wrapper instead" \ 1>&2; exit 1; } || :; \ @@ -58,22 +62,22 @@ sc_avoid_write: fi sc_cast_of_argument_to_free: - @grep -nE '\<free $\(' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\<free \(\(' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast free argument' 1>&2; \ exit 1; } || : sc_cast_of_x_alloc_return_value: - @grep -nE '\*$ *x(m|c|re)alloc\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\*\) *x(m|c|re)alloc\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast x*alloc return value' 1>&2; \ exit 1; } || : sc_cast_of_alloca_return_value: - @grep -nE '\*\) *alloca\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\*\) *alloca\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast alloca return value' 1>&2; \ exit 1; } || : sc_space_tab: - @grep -n '[ ] ' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '[ ] ' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found SPACE-TAB sequence; remove the SPACE' \ 1>&2; exit 1; } || : @@ -81,14 +85,14 @@ sc_space_tab: # They provide no error checking mechanism. # Instead, use strto* functions. sc_prohibit_atoi_atof: - @grep -nE '\<([fs]?scanf|ato([filq]|ll))\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\<([fs]?scanf|ato([filq]|ll))\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): do not use *scan''f, ato''f, ato''i, ato''l, ato''ll, ato''q, or ss''canf' \ 1>&2; exit 1; } || : # Use STREQ rather than comparing strcmp == 0, or != 0. sc_prohibit_strcmp: - @grep -nE '! *str''cmp $|\<str''cmp \([^)]+$ *==' \ - $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '! *str''cmp $|\<str''cmp \([^)]+$ *==' \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): use STREQ in place of the above uses of str''cmp' \ 1>&2; exit 1; } || : @@ -101,66 +105,61 @@ sc_error_exit_success: exit 1; } || : sc_file_system: - @grep -ni 'file''system' $$($(CVS_LIST_EXCEPT)) && \ + @grep -ni 'file''system' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found use of "file''system";' \ 'rewrite to use "file system"' 1>&2; \ exit 1; } || : sc_no_have_config_h: - @grep -n '^# *if.*HAVE''_CONFIG_H' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '^# *if.*HAVE''_CONFIG_H' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found use of HAVE''_CONFIG_H; remove' \ 1>&2; exit 1; } || : # Nearly all .c files must include <config.h>. sc_require_config_h: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + @if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ grep -L '^# *include <config\.h>' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$') \ + $$($(VC_LIST_EXCEPT) | grep '\.c$$') \ | grep . && \ { echo '$(ME): the above files do not include <config.h>' \ 1>&2; exit 1; } || :; \ else :; \ fi +# To use this "command" macro, you must first define two shell variables: +# h: the header, enclosed in <> or "" +# re: a regular expression that matches IFF something provided by $h is used. +define _header_without_use + h_esc=`echo "$$h"|sed 's/\./\\./'`; \ + if $(VC_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + files=$$(grep -l '^# *include '"$$h_esc" \ + $$($(VC_LIST_EXCEPT) | grep '\.c$$')) && \ + grep -LE "$$re" $$files | grep . && \ + { echo "$(ME): the above files include $$h but don't use it" \ + 1>&2; exit 1; } || :; \ + else :; \ + fi +endef + # Prohibit the inclusion of assert.h without an actual use of assert. sc_prohibit_assert_without_use: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - files=$$(grep -l '# *include <assert\.h>' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ - grep -L '\<assert (' $$files \ - | grep . && \ - { echo "$(ME): the above files include <assert.h> but don't use it" \ - 1>&2; exit 1; } || :; \ - else :; \ - fi + @h='<assert.h>' re='\<assert *\(' $(_header_without_use) + +# Prohibit the inclusion of getopt.h without an actual use. +sc_prohibit_getopt_without_use: + @h='<getopt.h>' re='\<getopt(_long)? *\(' $(_header_without_use) # Don't include quotearg.h unless you use one of its functions. sc_prohibit_quotearg_without_use: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - files=$$(grep -l '# *include "quotearg\.h"' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ - grep -LE '\<quotearg(_[^ ]+)? \(' $$files \ - | grep . && \ - { echo "$(ME): the above files include "quotearg.h" but don't use it" \ - 1>&2; exit 1; } || :; \ - else :; \ - fi + @h='"quotearg.h"' re='\<quotearg(_[^ ]+)? *\(' $(_header_without_use) # Don't include quote.h unless you use one of its functions. sc_prohibit_quote_without_use: - @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ - files=$$(grep -l '# *include "quote\.h"' \ - $$($(CVS_LIST_EXCEPT) | grep '\.c$$')) && \ - grep -LE '\<quote(_n)? \(' $$files \ - | grep . && \ - { echo "$(ME): the above files include "quote.h" but don't use it" \ - 1>&2; exit 1; } || :; \ - else :; \ - fi + @h='"quote.h"' re='\<quote(_n)? *$' $(_header_without_use) sc_obsolete_symbols: @grep -nE '\<(HAVE''_FCNTL_H|O''_NDELAY)\>' \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): do not use HAVE''_FCNTL_H or O''_NDELAY' \ 1>&2; exit 1; } || : @@ -194,7 +193,7 @@ endif # Make sure that none are inadvertently reintroduced. sc_prohibit_jm_in_m4: @grep -nE 'jm_[A-Z]' \ - $$($(CVS_LIST) m4 |grep '\.m4$$'; echo /dev/null) && \ + $$($(VC_LIST) m4 |grep '\.m4$$'; echo /dev/null) && \ { echo '$(ME): do not use jm_ in m4 macro names' \ 1>&2; exit 1; } || : @@ -202,8 +201,8 @@ sc_root_tests: @if test -d tests \ && grep check-root tests/Makefile.am>/dev/null 2>&1; then \ t1=sc-root.expected; t2=sc-root.actual; \ - grep -nl '^PRIV_CHECK_ARG=require-root' \ - $$($(CVS_LIST) tests) |sed s,tests,., |sort > $$t1; \ + grep -nl '^require_root_$$' \ + $$($(VC_LIST) tests) |sed s,tests,., |sort > $$t1; \ sed -n 's, cd \([^ ]*$ .*MAKE..check TESTS=$.*$,./\1/\2,p' \ $(srcdir)/tests/Makefile.am |sort > $$t2; \ diff -u $$t1 $$t2 || diff=1; \ @@ -242,7 +241,7 @@ headers_with_interesting_macro_defs = \ sc_always_defined_macros: .re-defmac @if test -f $(srcdir)/src/system.h; then \ trap 'rc=$$?; rm -f .re-defmac; exit $$rc' 0 1 2 3 15; \ - grep -f .re-defmac $$($(CVS_LIST)) \ + grep -f .re-defmac $$($(VC_LIST)) \ && { echo '$(ME): define the above via some gnulib .h file' \ 1>&2; exit 1; } || :; \ fi @@ -262,7 +261,7 @@ sc_system_h_headers: .re-list @if test -f $(srcdir)/src/system.h; then \ trap 'rc=$$?; rm -f .re-list; exit $$rc' 0 1 2 3 15; \ grep -nE -f .re-list \ - $$($(CVS_LIST) src | \ + $$($(VC_LIST) src | \ grep -Ev '((copy|system)\.h|parse-gram\.c)$$') \ && { echo '$(ME): the above are already included via system.h'\ 1>&2; exit 1; } || :; \ @@ -271,12 +270,12 @@ sc_system_h_headers: .re-list sc_sun_os_names: @grep -nEi \ 'solaris[^[:alnum:]]*2\.(7|8|9|[1-9][0-9])|sunos[^[:alnum:]][6-9]' \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found misuse of Sun OS version numbers' 1>&2; \ exit 1; } || : sc_the_the: - @grep -ni '\<the ''the\>' $$($(CVS_LIST_EXCEPT)) && \ + @grep -ni '\<the ''the\>' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found use of "the ''the";' 1>&2; \ exit 1; } || : @@ -284,7 +283,7 @@ sc_tight_scope: $(MAKE) -C src $@ sc_trailing_blank: - @grep -n '[ ]$$' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '[ ]$$' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found trailing blank(s)' \ 1>&2; exit 1; } || : @@ -294,7 +293,7 @@ sc_trailing_blank: longopt_re = --[a-z][0-9A-Za-z-]*(\[?=[0-9A-Za-z-]*\]?)? sc_two_space_separator_in_usage: @grep -nE '^ *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$' \ - $$($(CVS_LIST_EXCEPT)) && \ + $$($(VC_LIST_EXCEPT)) && \ { echo "$(ME): help2man requires at least two spaces between"; \ echo "$(ME): an option and its description"; \ 1>&2; exit 1; } || : @@ -309,32 +308,32 @@ err_func_re = \ # "%s", _("no storage vol w..." sc_unmarked_diagnostics: @grep -nE \ - '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \ + '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(VC_LIST_EXCEPT)) \ | grep -v '_''(' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : - @{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(CVS_LIST_EXCEPT)); \ - grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(CVS_LIST_EXCEPT)); } \ + @{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT)); \ + grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ | sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \ | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : sc_prohibit_virBufferAdd_with_string_literal: - @grep -nE '\<virBufferAdd *\([^,]+, *"[^"]' $$($(CVS_LIST_EXCEPT)) && \ + @grep -nE '\<virBufferAdd *\([^,]+, *"[^"]' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): use virBufferAddLit, not virBufferAdd,' \ 'with a string literal' 1>&2; exit 1; } || : # Avoid useless parentheses like those in this example: # #if defined (SYMBOL) || defined (SYM2) sc_useless_cpp_parens: - @grep -n '^# *if .*defined *(' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n '^# *if .*defined *(' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): found useless parentheses in cpp directive' \ 1>&2; exit 1; } || : # Require the latest GPL. sc_GPL_version: - @grep -n 'either ''version [^3]' $$($(CVS_LIST_EXCEPT)) && \ + @grep -n 'either ''version [^3]' $$($(VC_LIST_EXCEPT)) && \ { echo '$(ME): GPL vN, N!=3' 1>&2; exit 1; } || : # Ensure that the c99-to-c89 patch applies cleanly. @@ -410,12 +409,16 @@ po-check: grep -E -v '^(#|$$)' po/POTFILES.in \ | grep -v '^src/false\.c$$' | sort > $@-1; \ files=; \ - for file in $$($(CVS_LIST_EXCEPT)); do \ + for file in $$($(VC_LIST_EXCEPT)); do \ + case $$file in \ + djgpp/* | man/*) continue;; \ + */c99-to-c89.diff) continue;; \ + esac; \ case $$file in \ *.[ch]) \ base=`expr " $$file" : ' $.*$\..'`; \ { test -f $$base.l || test -f $$base.y; } && continue;; \ - *) continue;; \ + *) continue;; \ esac; \ files="$$files $$file"; \ done; \ @@ -447,16 +450,14 @@ makefile_path_separator_check: # Check that `make alpha' will not fail at the end of the process. writable-files: if test -d $(release_archive_dir); then :; else \ - mkdir $(release_archive_dir); \ + for file in $(distdir).tar.gz \ + $(release_archive_dir)/$(distdir).tar.gz; do \ + test -e $$file || continue; \ + test -w $$file \ + || { echo ERROR: $$file is not writable; fail=1; }; \ + done; \ + test "$$fail" && exit 1 || : fi - for file in $(distdir).tar.gz $(xd-delta) \ - $(release_archive_dir)/$(distdir).tar.gz \ - $(release_archive_dir)/$(xd-delta); do \ - test -e $$file || continue; \ - test -w $$file \ - || { echo ERROR: $$file is not writable; fail=1; }; \ - done; \ - test "$$fail" && exit 1 || : v_etc_file = lib/version-etc.c sample-test = tests/sample-test -- 1.5.4.4.482.g16f99

2 1

[Libvir] Announcement : Enomalism 2.0 Alpha Released
by Reuven Cohen 19 Mar '08

19 Mar '08

This is an general announcement of the release of Enomalism 2.0 (Alpha) Now Available for Download. -- Enomaly, Inc. is pleased to announce the Alpha release of the Enomalism Elastic Computing Platform. The Enomalism v2.0 Alpha has been completely redeveloped from the ground up and further builds on the concept of " Elastic / Cloud Computing". The platform extensively uses libvirt to manage several virtual environments including Amazon EC2 (Elastic Compute Cloud). Over the coming weeks there will be ongoing developments as we continue to improve the application. We hope to move to a stable "BETA" within a couple weeks. The current release is considered "Alpha" and should be used at your own risk. New Enomalism Features include: * Web Services API - RESTful * Automated VM Deployment with Elastic Valet * Multi-Server Support * Virtual Cluster Engine * Extensible system monitoring integration * Flexible business process management with SOA (jBPM) * Integrated appliance / module repository * Extended User / Group Management * Elastic Dashboard / Portal Framework * System Metering (Utility / Chargeback) * Increased Virtual Machine / Hypervisor Support o Xen, KVM, Qemu, OpenVZ, Amazon EC2 * (Ec2 Module) * Support for installation in Linux & Windows * New Open Source License (AGPL) For installation Documentation and core distribution download, please visit http://trac.enomalism.com/enomalism/ BETA TESTERS We are currently seeking BETA testers to assist with the following tasks * Interface Debugging CSS, JS (IE7,Firefox) * Platform Testing (Linux,Windows,BSD,OSX) * Cluster Testing * Amazon EC2 Testing * Repository / Appliance Testing * Module Testing * User Management Testing * REST API Testing * Anything else that needs fixing. If you are interested in lending a hand, please visit the Enomalism forums at http://www.enomalism.com/resources/community-center/ Reuven Cohen Chief Technologist, Enomaly Inc. www.enomaly.com :: 212 203 4734 x 1

1 0

[Libvir] [PATCH] * qemud/remote.c: Don't include <getopt.h>. Not used.
by Jim Meyering 19 Mar '08

19 Mar '08

I had a few in-progress changes from a week or two ago, and am clearing the decks. I added a new build-checking rule (coming separately) and it exposed an unnecessary include: * qemud/remote.c: Don't include <getopt.h>. Not used. diff --git a/qemud/remote.c b/qemud/remote.c index 85df9cd..c7db5fa 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -41,7 +41,6 @@ #include <syslog.h> #include <string.h> #include <errno.h> -#include <getopt.h> #include <ctype.h> #include <fnmatch.h> -- 1.5.4.4.482.g16f99

3 8

[Libvir] [PATCH] Implement memory operations for qemu driver
by Cole Robinson 19 Mar '08

19 Mar '08

The attached patch implements the following operations for the qemu driver: virDomainGetMaxMemory virDomainSetMaxMemory virDomainSetMemory A few questions/comments: 1) I changed maxmem and memory in the qemu_vm_def struct to unsigned long to match the public api for memory values. Seems to work, but not sure if there are any undesirable side effects to this. 2) Should SetMaxMem be able to be called on a running guest? This code allows it, since maxmem is basically a metavalue that doesn't directly affect a guest. 3) Should maxmem be able to be set lower than the currently allocated mem? This code does not allow this. If this changed, would also need to take into account how we would handle this if we can change the maxmem while the guest is running. After rethinking, we probably should be able to do this, but I haven't changed the code. Thanks, Cole diff --git a/src/qemu_conf.c b/src/qemu_conf.c index a196bb8..f6ae06b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1650,7 +1650,7 @@ int qemudBuildCommandLine(virConnectPtr conn, (vm->def->graphicsType == QEMUD_GRAPHICS_SDL ? 0 : 1)) + /* graphics */ (vm->migrateFrom[0] ? 3 : 0); /* migrateFrom */ - snprintf(memory, sizeof(memory), "%d", vm->def->memory/1024); + snprintf(memory, sizeof(memory), "%lu", vm->def->memory/1024); snprintf(vcpus, sizeof(vcpus), "%d", vm->def->vcpus); if (!(*argv = malloc(sizeof(**argv) * (len+1)))) @@ -2820,9 +2820,9 @@ char *qemudGenerateXML(virConnectPtr conn, virUUIDFormat(uuid, uuidstr); if (virBufferVSprintf(buf, " <uuid>%s</uuid>\n", uuidstr) < 0) goto no_memory; - if (virBufferVSprintf(buf, " <memory>%d</memory>\n", def->maxmem) < 0) + if (virBufferVSprintf(buf, " <memory>%lu</memory>\n", def->maxmem) < 0) goto no_memory; - if (virBufferVSprintf(buf, " <currentMemory>%d</currentMemory>\n", def->memory) < 0) + if (virBufferVSprintf(buf, " <currentMemory>%lu</currentMemory>\n", def->memory) < 0) goto no_memory; if (virBufferVSprintf(buf, " <vcpu>%d</vcpu>\n", def->vcpus) < 0) goto no_memory; diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 12aa6ae..c1aae75 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -193,8 +193,8 @@ struct qemud_vm_def { unsigned char uuid[VIR_UUID_BUFLEN]; char name[QEMUD_MAX_NAME_LEN]; - int memory; - int maxmem; + unsigned long memory; + unsigned long maxmem; int vcpus; int noReboot; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 2b4c2a6..215f4c4 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1765,6 +1765,66 @@ static char *qemudDomainGetOSType(virDomainPtr dom) { return type; } +/* Returns max memory in kb, 0 if error */ +static unsigned long qemudDomainGetMaxMemory(virDomainPtr dom) { + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid); + + if (!vm) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid '%s'", dom->uuid); + return 0; + } + + return vm->def->maxmem; +} + +static int qemudDomainSetMaxMemory(virDomainPtr dom, unsigned long memory) { + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid); + + if (!vm) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid '%s'", dom->uuid); + return -1; + } + + if (memory < vm->def->maxmem) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + "cannot set max memory lower than current memory"); + return -1; + } + + vm->def->maxmem = memory; + return 0; +} + +static int qemudDomainSetMemory(virDomainPtr dom, unsigned long memory) { + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + struct qemud_vm *vm = qemudFindVMByUUID(driver, dom->uuid); + + if (!vm) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + "no domain with matching uuid '%s'", dom->uuid); + return -1; + } + + if (qemudIsActiveVM(vm)) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + "cannot set memory of an active domain"); + return -1; + } + + if (memory > vm->def->maxmem) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + "cannot set memory higher than max memory"); + return -1; + } + + vm->def->memory = memory; + return 0; +} + static int qemudDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; @@ -2886,9 +2946,9 @@ static virDriver qemuDriver = { NULL, /* domainReboot */ qemudDomainDestroy, /* domainDestroy */ qemudDomainGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ + qemudDomainGetMaxMemory, /* domainGetMaxMemory */ + qemudDomainSetMaxMemory, /* domainSetMaxMemory */ + qemudDomainSetMemory, /* domainSetMemory */ qemudDomainGetInfo, /* domainGetInfo */ qemudDomainSave, /* domainSave */ qemudDomainRestore, /* domainRestore */

4 8

Re: [Libvir] Accessing qemu from windows
by Richard W.M. Jones 19 Mar '08

19 Mar '08

On Wed, Mar 19, 2008 at 03:14:44PM +0200, Gabriel Kaufmann wrote: > Hi, > Sorry for my late reply, I was having technical problems with the machine that has the KVM installed in. > > I run libvirtd with the --verbose flag, but I still receive the same message with no extra details libvirtd prints nothing extra at all? Can you follow up with the full output of libvirtd. Also please send messages to the list. Thanks, 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

1 0

[libvir] How to seek a running QEMU instance
by Anton Protopopov 19 Mar '08

19 Mar '08

Hi, I have the following question. How can virsh (or, more accurately, libvirt) detect a running QEMU vm, when latter was already started? For example, I have got the following: [aspsk@localhost Server-4.0.1]$ qemu -hda Server-4.0.1.img -m 256 & [1] 12001 [aspsk@localhost Server-4.0.1]$ Could not configure '/dev/rtc' to have a 1024 Hz timer. This is not a fatal error, but for better emulation accuracy either use a 2.6 host Linux kernel or type 'echo 1024 > /proc/sys/dev/rtc/max-user-freq' as root. Could not open '/dev/kqemu' - QEMU acceleration layer not activated: No such file or directory Could not open '/dev/qvm86' - QEMU acceleration layer not activated: No such file or directory [aspsk@localhost Server-4.0.1]$ sudo virsh -c qemu:///system list --all Id Name State ---------------------------------- [aspsk@localhost Server-4.0.1]$ A.

3 4

[Libvir] persistent guests (save guest at shutdown and reload it at boot)
by Matthias Pfafferodt 17 Mar '08

17 Mar '08

Hello, I added the following entry to the libvirt bugzilla (Bugzilla Bug 437204). Daniel Veillard ask me to post this to the list for discussion. Description of problem: libvirt can save and restore guests. It is also possible to autostart guest at boot time. I miss a similar option: 'persistent' booting the host: * the guest is restored if there is a saved version * else it is booted shutdown of the host * the guest is saved The xendomain script does something like this. There the 'autostart' option checks if the domain was saved. If it was this domain is restored else it is created. At shutdown of the dom0 all running domU's are saved. Matthias Pfafferodt

2 2

[Libvir] PATCH: Fix dir/fs storage pool when SELinux is disabled
by Daniel P. Berrange 17 Mar '08

17 Mar '08

When SELinux is disabled fgetfilecon() may well return -1, if a file has no extended attribute with security context data. This causes the storage pool to skip that file. The fix is to check whether errno is ENODATA and treat that as an expected error case & ignore it. Dan. Index: src/storage_backend.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend.c,v retrieving revision 1.8 diff -u -p -r1.8 storage_backend.c --- src/storage_backend.c 27 Feb 2008 10:37:19 -0000 1.8 +++ src/storage_backend.c 14 Mar 2008 21:21:05 -0000 @@ -240,17 +240,22 @@ virStorageBackendUpdateVolInfoFD(virConn #if HAVE_SELINUX if (fgetfilecon(fd, &filecon) == -1) { - virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot get file context of %s: %s"), - vol->target.path, strerror(errno)); - return -1; - } - vol->target.perms.label = strdup(filecon); - if (vol->target.perms.label == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("context")); - return -1; + if (errno != ENODATA) { + virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot get file context of %s: %s"), + vol->target.path, strerror(errno)); + return -1; + } else { + vol->target.perms.label = NULL; + } + } else { + vol->target.perms.label = strdup(filecon); + if (vol->target.perms.label == NULL) { + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("context")); + return -1; + } + freecon(filecon); } - freecon(filecon); #else vol->target.perms.label = NULL; #endif -- |: 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 :|

3 4

[Libvir] PATCH: Fix xen unified driver open logic
by Daniel P. Berrange 17 Mar '08

17 Mar '08

When adding PolicyKit support we disabled the proxy driver, but did not correctly fix up the Xen unified driver. The result is that it is still trying to run the proxy setuid helper which doesn't exist and thus it fails the open operation before the remote driver gets the opportunity to process the URI. I attempted to fix this by just disabling the proxy driver in the unified driver, but came to the conclusion the logic of the current code is just not flexible enough for what we need to be able todo these days. THe core problem is the 'for(;;)' loop iterating over the drivers - it already has several special cases in the loop body to skip drivers, or ignore errors and adding more special cases is making my mind hurt trying to trace the logic. So I have removed the loop, and encode the desired logic explicitly. The diff a little unpleasant to read, so to summarize the logic is thus: - If root only, try open the hypervisor driver -> Failure to open is fatal, do not try other drivers - Try to open the XenD driver - If XenD suceeds -> If XenD < 3.0.4, then open the XM driver for inactive domains -> Try to open the XS driver => Failure to open is fatal if root - Else XenD fails ->.If proxy is compiled in, try to open proxy => Failure to open is fatal This should result in one of the following combinations of drivers being activated: root: (HV + XenD + XS) root: (HV + XenD + XS + XM) non-root: (XenD) non-root: (XenD + XS) non-root: (proxy) If non-root, and the proxy is not compiled in, we'll hand off to the remote driver. Any other scenario will result in an explicit fail. Dan. ? docs/apibuild.pyc Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.133 diff -u -p -r1.133 configure.in --- configure.in 3 Mar 2008 14:42:37 -0000 1.133 +++ configure.in 10 Mar 2008 18:59:23 -0000 @@ -873,6 +873,9 @@ fi AC_MSG_RESULT([$with_xen_proxy]) AM_CONDITIONAL(WITH_PROXY,[test "$with_xen_proxy" = "yes"]) +if test "$with_xen_proxy" = "yes"; then + AC_DEFINE(WITH_PROXY, 1, [Whether Xen proxy is enabled]) +fi dnl Enable building libvirtd? AM_CONDITIONAL(WITH_LIBVIRTD,[test "x$with_libvirtd" = "xyes"]) Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.61 diff -u -p -r1.61 remote_internal.c --- src/remote_internal.c 26 Feb 2008 07:05:18 -0000 1.61 +++ src/remote_internal.c 10 Mar 2008 18:59:24 -0000 @@ -835,6 +835,14 @@ remoteOpen (virConnectPtr conn, } } #endif +#if WITH_XEN + if (uri && + uri->scheme && STREQ (uri->scheme, "xen") && + (!uri->server || STREQ (uri->server, "")) && + (!uri->path || STREQ(uri->path, "/"))) { + rflags |= VIR_DRV_OPEN_REMOTE_UNIX; + } +#endif priv->magic = DEAD; priv->sock = -1; Index: src/xen_unified.c =================================================================== RCS file: /data/cvs/libvirt/src/xen_unified.c,v retrieving revision 1.38 diff -u -p -r1.38 xen_unified.c --- src/xen_unified.c 27 Feb 2008 10:37:19 -0000 1.38 +++ src/xen_unified.c 10 Mar 2008 18:59:24 -0000 @@ -42,6 +42,7 @@ #include "util.h" #define DEBUG(fmt,...) VIR_DEBUG(__FILE__, fmt,__VA_ARGS__) +#define DEBUG0(msg) VIR_DEBUG(__FILE__, "%s", msg) static int xenUnifiedNodeGetInfo (virConnectPtr conn, virNodeInfoPtr info); @@ -239,7 +242,7 @@ xenUnifiedProbe (void) static int xenUnifiedOpen (virConnectPtr conn, xmlURIPtr uri, virConnectAuthPtr auth, int flags) { - int i, j; + int i; xenUnifiedPrivatePtr priv; /* Refuse any scheme which isn't "xen://" or "http://". */ @@ -276,41 +279,69 @@ xenUnifiedOpen (virConnectPtr conn, xmlU priv->xshandle = NULL; priv->proxy = -1; - for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) { - priv->opened[i] = 0; - /* Only use XM driver for Xen <= 3.0.3 (ie xendConfigVersion <= 2) */ - if (drivers[i] == &xenXMDriver && - priv->xendConfigVersion > 2) - continue; - - /* Ignore proxy for root */ - if (i == XEN_UNIFIED_PROXY_OFFSET && getuid() == 0) - continue; - - if (drivers[i]->open) { - DEBUG("trying Xen sub-driver %d", i); - if (drivers[i]->open (conn, uri, auth, flags) == VIR_DRV_OPEN_SUCCESS) - priv->opened[i] = 1; - DEBUG("Xen sub-driver %d open %s\n", - i, priv->opened[i] ? "ok" : "failed"); - } + /* Hypervisor is only run as root & required to succeed */ + if (getuid() == 0) { + DEBUG0("Trying hypervisor sub-driver"); + if (drivers[XEN_UNIFIED_HYPERVISOR_OFFSET]->open(conn, uri, auth, flags) != + VIR_DRV_OPEN_SUCCESS) + goto fail; + + priv->opened[XEN_UNIFIED_HYPERVISOR_OFFSET] = 1; + } - /* If as root, then all drivers must succeed. - If non-root, then only proxy must succeed */ - if (!priv->opened[i] && - (getuid() == 0 || i == XEN_UNIFIED_PROXY_OFFSET)) { - for (j = 0; j < i; ++j) - if (priv->opened[j]) drivers[j]->close (conn); - free (priv); - /* The assumption is that one of the underlying drivers - * has set virterror already. - */ - return VIR_DRV_OPEN_ERROR; + /* XenD is required to suceed if root. + * If it fails as non-root, then the proxy driver may take over + */ + DEBUG0("Trying XenD sub-driver"); + if (drivers[XEN_UNIFIED_XEND_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_XEND_OFFSET] = 1; + + /* XenD is active, so try the xm & xs drivers too, both requird to + * succeed if root, optional otherwise */ + if (priv->xendConfigVersion <= 2) { + DEBUG0("Trying XM sub-driver"); + if (drivers[XEN_UNIFIED_XM_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_XM_OFFSET] = 1; + } + } + DEBUG0("Trying XS sub-driver"); + if (drivers[XEN_UNIFIED_XS_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_XS_OFFSET] = 1; + } else { + if (getuid() == 0) + goto fail; /* XS is mandatory as root */ + } + } else { + if (getuid() == 0) { + goto fail; /* XenD is mandatory as root */ + } else { +#if WITH_PROXY + DEBUG0("Trying proxy sub-driver"); + if (drivers[XEN_UNIFIED_PROXY_OFFSET]->open(conn, uri, auth, flags) == + VIR_DRV_OPEN_SUCCESS) { + priv->opened[XEN_UNIFIED_PROXY_OFFSET] = 1; + } else { + goto fail; /* Proxy is mandatory if XenD failed */ + } +#else + DEBUG0("Handing off for remote driver"); + return VIR_DRV_OPEN_DECLINED; /* Let remote_driver try instead */ +#endif } } return VIR_DRV_OPEN_SUCCESS; + + fail: + DEBUG0("Failed mandatory driver"); + for (i = 0 ; i < XEN_UNIFIED_NR_DRIVERS ; i++) + if (priv->opened[i]) drivers[i]->close(conn); + free(priv); + return VIR_DRV_OPEN_ERROR; } #define GET_PRIVATE(conn) \ Index: src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.173 diff -u -p -r1.173 xend_internal.c --- src/xend_internal.c 7 Mar 2008 09:23:30 -0000 1.173 +++ src/xend_internal.c 10 Mar 2008 18:59:24 -0000 @@ -234,14 +234,13 @@ do_connect(virConnectPtr xend) close(s); errno = serrno; s = -1; - /* - * not being able to connect via the socket as a normal user - * is rather normal, this should fallback to the proxy (or - * remote) mechanism. - */ - if ((getuid() == 0) || (xend->flags & VIR_CONNECT_RO)) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, - _("failed to connect to xend")); + + /* + * Connecting to XenD as root is mandatory, so log this error + */ + if (getuid() == 0) { + virXendError(xend, VIR_ERR_INTERNAL_ERROR, + _("failed to connect to xend")); } } -- |: 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 3

[Libvir] [PATCH] fix typos (part?)
by Atsushi SAKAI 17 Mar '08

17 Mar '08

Various typos fix. priviledged => privileged neccessary => necessary hve => have advertizement => advertisement supervizing => supervising (Saori Fukuta suggest us as typo) poool => pool persitent => persistent numbber => number overriden => overridden independantly => independently hypvisor => hypervisor adminstrator => administrator maintainance => maintenance targetted => targeted from Longman Dictionary of Contemporary English http://pewebdic2.cw.idm.fr/ I hope no one suggest typo on libvirt. docs/FAQ.html | 6 +++--- docs/architecture.html | 12 ++++++------ docs/auth.html | 14 +++++++------- docs/devhelp/libvirt-libvirt.html | 30 +++++++++++++++--------------- docs/html/libvirt-libvirt.html | 30 +++++++++++++++--------------- docs/libvir.html | 20 ++++++++++---------- docs/libvirt-api.xml | 34 +++++++++++++++++----------------- docs/libvirt-refs.xml | 10 +++++----- docs/news.html | 2 +- docs/virsh.pod | 2 +- include/libvirt/libvirt.h | 2 +- include/libvirt/libvirt.h.in | 2 +- qemud/mdns.h | 12 ++++++------ src/libvirt.c | 28 ++++++++++++++-------------- src/qemu.conf | 2 +- src/remote_internal.c | 2 +- src/xend_internal.c | 2 +- tests/confdata/libvirtd.conf | 2 +- tests/confdata/libvirtd.out | 2 +- virsh.1 | 2 +- 20 files changed, 108 insertions(+), 108 deletions(-) Thanks Atsushi SAKAI

3 2

[Libvir] regarding libvirt windows support...
by Deepa.Lingaraj＠cognizant.com 17 Mar '08

17 Mar '08

We are not able to execute make command.... The errors we ae getting make[2]: *** [libvirt_la-libvirt.lo] Error 1 make[2]: Leaving directory `/cygdrive/d/libvirt-0.4.1/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/cygdrive/d/libvirt-0.4.1' make: *** [all] Error 2 Thanks and Regards, Deepa Lingaraj. This e-mail and any files transmitted with it are for the sole use of the intended recipient(s) and may contain confidential and privileged information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message. Any unauthorized review, use, disclosure, dissemination, forwarding, printing or copying of this email or any action taken in reliance on this e-mail is strictly prohibited and may be unlawful.

3 2

[Libvir] PATCH: Fix virStoragePoolCreate() operation
by Daniel P. Berrange 15 Mar '08

15 Mar '08

The virStoragePoolCreate() was not checking for a potentially NULL field against startPool() backend driver. It was also failing to run the refresh operation after starting it. The former caused a crash, the latter caused no volumes to show up Dan. Index: src/storage_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_driver.c,v retrieving revision 1.2 diff -u -p -r1.2 storage_driver.c --- src/storage_driver.c 22 Feb 2008 16:26:13 -0000 1.2 +++ src/storage_driver.c 14 Mar 2008 21:34:04 -0000 @@ -416,8 +416,12 @@ storagePoolCreate(virConnectPtr conn, return NULL; } - if (backend->startPool(conn, pool) < 0) { - virStoragePoolObjRemove(driver, pool); + if (backend->startPool && + backend->startPool(conn, pool) < 0) + return NULL; + if (backend->refreshPool(conn, pool) < 0) { + if (backend->stopPool) + backend->stopPool(conn, pool); return NULL; } pool->active = 1; -- |: 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

[Libvir] java-libvirt on cvs:libvirt.org
by Daniel Schwager 14 Mar '08

14 Mar '08

Hallo list, i took the java-libvirt port from Tóth István (Thank you - great work !!) and added - the some features from libvirt 0.4.0 - integrate of xsd XML-description / validator - added auto generation of XML-beans related to the XSD file. - project build.xml file - integration of testng - remote building of JNI library - remote testing of junit/testing tests So, I want to publish to port to a public cvs-tree. Is there a little space on the libvirt website for this port ? regards Danny

4 3

[Libvir] question about "informations"
by Atsushi SAKAI 14 Mar '08

14 Mar '08

Hi, I have a question about "informations". Is this english word usual? Since this "informations" exists in many places. (over 100 in libvirt code) I do not want to change this to "information". Thanks Atsushi SAKAI

2 3

[Libvir] [PATCH] fix and update help.
by Atsushi SAKAI 13 Mar '08

13 Mar '08

This patch fix and update help. 1)update virsh domstate, setvcpus supports inactive domain. 2)fix 4 points of adress => address (xgettext needed for regenerate po file) bridge.c | 4 ++-- virsh.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) Thanks Tatsuro Enokura Atsushi SAKAI

2 1

[Libvir] [PATCH] Fix cdrom connect/disconnect for qemu
by Cole Robinson 13 Mar '08

13 Mar '08

The attached patch fixes cdrom changing for a live qemu guest. There were a few issues preventing it from working: 1) It didn't anticipate no <source> block in the xml. 2) No support for ejecting the media 3) Small bug which prevented the running guest xml from being updated. I've tested this via virt-manager, and now qemu and xen seem to have parity wrt cdrom connect/disconnect. Thanks, Cole diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e54da5b..ebbd251 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -594,9 +594,16 @@ static int qemudParseDiskXML(virConnectPtr conn, } if (source == NULL) { - qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); - goto error; + /* There is a case without the source + * to the CD-ROM device + */ + if (!device || STRNEQ((const char *) device, "cdrom")) { + qemudReportError(conn, NULL, NULL, VIR_ERR_NO_SOURCE, + target ? "%s" : NULL, target); + goto error; + } } + if (target == NULL) { qemudReportError(conn, NULL, NULL, VIR_ERR_NO_TARGET, source ? "%s" : NULL, source); goto error; @@ -630,7 +637,7 @@ static int qemudParseDiskXML(virConnectPtr conn, goto error; } - strncpy(disk->src, (const char *)source, NAME_MAX-1); + strncpy(disk->src, (source ? (const char *) source : "\0"), NAME_MAX-1); disk->src[NAME_MAX-1] = '\0'; strncpy(disk->dst, (const char *)target, NAME_MAX-1); @@ -1747,9 +1754,15 @@ int qemudBuildCommandLine(virConnectPtr conn, char dev[NAME_MAX]; char file[PATH_MAX]; if (!strcmp(disk->dst, "hdc") && - disk->device == QEMUD_DISK_CDROM) - snprintf(dev, NAME_MAX, "-%s", "cdrom"); - else + disk->device == QEMUD_DISK_CDROM) { + if (disk->src[0]) + snprintf(dev, NAME_MAX, "-%s", "cdrom"); + else { + /* Don't put anything on the cmdline for an empty cdrom*/ + disk = disk->next; + continue; + } + } else snprintf(dev, NAME_MAX, "-%s", disk->dst); snprintf(file, PATH_MAX, "%s", disk->src); @@ -2906,8 +2919,10 @@ char *qemudGenerateXML(virConnectPtr conn, types[disk->type], devices[disk->device]) < 0) goto no_memory; - if (virBufferVSprintf(buf, " <source %s='%s'/>\n", typeAttrs[disk->type], disk->src) < 0) - goto no_memory; + if (disk->src[0]) + if (virBufferVSprintf(buf, " <source %s='%s'/>\n", + typeAttrs[disk->type], disk->src) < 0) + goto no_memory; if (virBufferVSprintf(buf, " <target dev='%s'/>\n", disk->dst) < 0) goto no_memory; diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 21f0fed..2b4c2a6 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2223,23 +2223,29 @@ static int qemudDomainChangeCDROM(virDomainPtr dom, struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; char *cmd, *reply, *safe_path; - /* Migrate to file */ - safe_path = qemudEscapeMonitorArg(newdisk->src); - if (!safe_path) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, - "out of memory"); - return -1; - } - if (asprintf (&cmd, "change %s \"%s\"", - /* XXX qemu may support multiple CDROM in future */ - /* olddisk->dst */ "cdrom", - safe_path) == -1) { + if (newdisk->src[0]) { + safe_path = qemudEscapeMonitorArg(newdisk->src); + if (!safe_path) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "out of memory"); + return -1; + } + if (asprintf (&cmd, "change %s \"%s\"", + /* XXX qemu may support multiple CDROM in future */ + /* olddisk->dst */ "cdrom", + safe_path) == -1) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "out of memory"); + free(safe_path); + return -1; + } + free(safe_path); + + } else if (asprintf(&cmd, "eject cdrom") == -1) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "out of memory"); - free(safe_path); return -1; } - free(safe_path); if (qemudMonitorCommand(driver, vm, cmd, &reply) < 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "cannot change cdrom media"); @@ -2248,7 +2254,7 @@ static int qemudDomainChangeCDROM(virDomainPtr dom, } free(reply); free(cmd); - strcpy(olddisk->dst, newdisk->dst); + strcpy(olddisk->src, newdisk->src); olddisk->type = newdisk->type; return 0; }

2 1

[Libvir] Release of libvirt-0.4.1
by Daniel Veillard 12 Mar '08

12 Mar '08

It was really time for a new release, quite a lot of patches had accumulated since the previous one ! Available at ftp://libvirt.org/libvirt * New features: - build on MacOSX (Richard Jones) - storage management (Daniel Berrange) - Xenner - Xen on KVM - support (Daniel Berrange) * Documentation: - Fix of various typos (Atsushi SAKAI) - memory and vcpu settings details (Richard Jones) - ethernet bridging typo (Maxwell Bottiger) - add storage APIs documentation (Daniel Berrange) * Bug fixes: - OpenVZ code compilation (Mikhail Pokidko) - crash in policykit auth handling (Daniel Berrange) - large config files (Daniel Berrange) - cpumap hypercall size (Saori Fukuta) - crash in remote auth (Daniel Berrange) - ssh args error (Daniel Berrange) - preserve vif order from config files (Hiroyuki Kaguchi) - invalid pointer access (Jim Meyering) - virDomainGetXMLDesc flag handling - device name conversion on stats (Daniel Berrange) - double mutex lock (Daniel Berrange) - config file reading crashes (Guido Guenther) - xenUnifiedDomainSuspend bug (Marcus Meissner) - do not crash if /sys/hypervisor/capabilities is missing (Mark McLoughlin) - virHashRemoveSet bug (Hiroyuki Kaguchi) - close-on-exec flag for qemud signal pipe (Daniel Berrange) - double free in OpenVZ (Anton Protopopov) - handle mac without addresses (Shigeki Sakamoto) - MAC addresses checks (Shigeki Sakamoto and Richard Jones) * Improvements: - Windows build (Richard Jones) - KVM/QEmu shutdown (Guido Guenther) - catch virExec output on debug (Mark McLoughlin) - integration of iptables and lokkit (Mark McLoughlin) - keymap parameter for VNC servers (Daniel Hokka Zakrisson) - enable debug by default using VIR_DEBUG (Daniel Berrange) - xen 3.2 fixes (Daniel Berrange) - Python bindings for VCPU and scheduling (Daniel Berrange) - framework for automatic code syntax checks (Jim Meyering) - allow kernel+initrd setup in Xen PV (Daniel Berrange) - allow change of Disk/NIC of an inactive domains (Shigeki Sakamoto) - virsh commands to manipulate and create storage(Daniel Berrange) - update use of PolicyKit APIs - better detection of fedault hypervisor - block device statistics for QEmu/KVM (Richard Jones) - various improvements for Xenner (Daniel Berrange) * Code cleanups: - avoid warnings (Daniel Berrange) - virRun helper function (Dan Berrange) - iptable code fixes (Mark McLoughlin) - static and const cleanups (Jim Meyering) - malloc and python cleanups (Jim Meyering) - xstrtol_ull and xstrtol_ll functions (Daniel Berrange) - remove no-op networking from OpenVZ (Daniel Berrange) - python generator cleanups (Daniel Berrange) - cleanup ref counting (Daniel Berrange) - remove uninitialized warnings (Jim Meyering) - cleanup configure for RHEL4 (Daniel Berrange) - CR/LF cleanups (Richard Jones) - various automatic code check and associated cleanups (Jim Meyering) - various memory leaks (Jim Meyering) - fix compilation when building without Xen (Guido Guenther) - mark translatables strings (Jim Meyering) - use virBufferAddLit for constant strings (Jim Meyering) - fix make distcheck (Jim Meyering) - return values for python bindings (Cole Robinson) - trailing blanks fixes (Jim Meyering) - gcc-4.3.0 fixes (Mark McLoughlin) - use safe read and write routines (Jim Meyering) - refactoring of code dealing with hypervisor capabilities (Daniel Berrange) - qemudReportError to use virErrorMsg (Cole Robinson) - intemediate library and Makefiles for compiling static and coverage rule support (Jim Meyering) - cleanup of various leaks (Jim Meyering) Thanks to everybody who helped by providing code, patches or reporting problems ! 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/

3 3

[Libvir] "virsh list" command of libvirt consumes a lot of CPU in the domain-0
by jean-paul.pigache＠bull.net 12 Mar '08

12 Mar '08

Hi all, I know that this is not a libvirt issue but this badly impacts libvirt usage. Is anyone aware of any status on this issue ? Daniel ? Here is some history I could get from the libvirt mailing list : * October 12, 2006 (Daniel Berrange). I've been trying to track down just why talking to XenD is resulting in so much CPU time being comsumed by both xend & xenstored. As a test case, I'm running 'virsh dominfo demo' which results in a single HTTP request to Xend to fetch domain info, eg 'GET /xend/domains/demo' Run this in a tight loop & I'll see xenstored taking > 50% CPU, and XenD taking another 11% PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ COMMAND 2647 root 16 0 6188 840 464 R 52 0.0 0:55.04 xenstored 11600 root 18 0 259m 7568 1516 S 11 0.2 0:04.53 python Its not surprising that xend is consuming time since we are making many requests per second, but for an operation which is only doing reads it having so much time attributed to xenstored seems very excessive. So I ran oprofile & collected some data about xenstored: CPU: AMD64 processors, speed 2211.33 MHz (estimated) Counted CPU_CLK_UNHALTED events (Cycles outside of halt state) with a unit mask of 0x00 (No unit mask) count 100000 samples % image name symbol name 347226 45.9445 ext3 (no symbols) 264664 35.0200 jbd (no symbols) 31778 4.2048 libc-2.5.so memset 10763 1.4241 xenstored main 8884 1.1755 libc-2.5.so _int_malloc 7053 0.9332 libc-2.5.so vfprintf 4264 0.5642 xenstored initialize_set So almost 80% of xenstored's CPU time is attributed to ext3 & journalling modules, suggesting xenstored is doing alot of disk I/O. strace()'ing the xenstored process shows the only file it is opening is: # strace -p 2647 -e trace=open,rename,unlink Process 2647 attached - interrupt to quit open("/var/lib/xenstored/tdb.0x62aa80", O_WRONLY|O_CREAT|O_TRUNC, 0640) = 13 open("/var/lib/xenstored/tdb.0x62aa80", O_RDWR) = 15 rename("/var/lib/xenstored/tdb.0x62aa80", "/var/lib/xenstored/tdb") = 0 unlink("/var/lib/xenstored/tdb.0x62aa80") = -1 ENOENT (No such file or directory) open("/var/lib/xenstored/tdb.0x62b2b0", O_WRONLY|O_CREAT|O_TRUNC, 0640) = 13 open("/var/lib/xenstored/tdb.0x62b2b0", O_RDWR) = 14 rename("/var/lib/xenstored/tdb.0x62b2b0", "/var/lib/xenstored/tdb") = 0 unlink("/var/lib/xenstored/tdb.0x62b2b0") = -1 ENOENT (No such file or directory) ... So basically it is repeatedly copying its persistent TBD database over and over again. The TDB on this system is 128 KB in size and each individual HTTP GET on /xend/domain/demo is resulting in 16 copies being made. Do the maths - 128 * 16 == 2 MB of reads, and 2 MB of writes - for a single read in XenD. Now if I monitor the status of 20 domains, once per second that's causing 40 MB of writes & 40 MB of reads every second which is utterly ridiculous & completely non scalable for enterprise deployment :-( There's two problems I see here: 1. Why the need for xenstored to be doing any of this I/O in the first place? If the DB needs to be kept on disk at all, it really needs to have a much saner update/transactional model to only update bits which actually change, rather than re-creating the entire DB on every transaction. But it strikes me that the DB could potentially be kept entirely in memory removing the disk I/O completely. Sure yyou wouldn't be able to restart the daemon then, but even today you can't restart xenstored & expect things to still be working. 2. Why does XenD create sooo many transactions in XenStored for a read op ? Having instrumented Xend it sems that the root cause of the problem is the xen.xend.xenstore.xstransact class. This alllows one to start a transaction, do a bunch of reads/writes & then commit the transaction. At the same time though it has a bunch of static 'convenience' methods for read & write which will implicitly start & commit a transaction. Well 90% of the code in XenD seems to be using these 'convenience' methods instead of explicitly starting a transaction to cover a piece of work - the result is a simple GET causes 16 transactions ....and an 'xm create' results in 80 transactions. These convenience methods are utterly destroying performance. Clearly we can't address these for 3.0.3, but I think both of these areas need serious work in 3.0.4 if we want a scalable control plane in Dom0. Fixing the XenD bit looks particularly hard because any single method using the convenience xenstored read functions can be called under many different contexts, so of which needs transactions, others which don't. It ought to be possible to trace back all the calls & make it possible to pass explicit xstransct objects into all calls & then kill off the convenience methods. * Answer, same day (October 12, 2006) Yes, xenstored is very simple minded in many respects. We will certainly be improving this during 3.0.4 development -- I think we can get the costs down very significantly for commonplace operations without enormous effort. * Avril 25, 2007 (Daniel Berrange) > Xen 3.0.3 has a serious performance bug > (see http://lists.xensource.com/archives/html/xen-devel/2006-10/msg00487.html) > This bug is fixed in Xen 3.0.4 No it isn't. The performance bug is actually at least x2 worse in Xen 3.0.4

2 1

[Libvir] Snapshots for Xen and KVM
by Gabriel Kaufmann 12 Mar '08

12 Mar '08

Hi, Does anyone knows if Xen and KVM support snapshots (regardless if Libvirt provides the API for them). If yes, will libvirt add API for it? Best Regards, Gabriel Kaufmann Software Engineer Gabriel.Kaufmann(a)ericom.com<mailto:Gabriel.Kaufmann@ericom.com> Ericom Software Tel (Dir): +972 2 591 1700 Ext 754 Tel (Main): +972 2 591 1700 http://www.ericom.com Access Done Right Empower Enterprise-Wide Access to Microsoft(r) Terminal Server, Virtual Desktops and Legacy Applications

5 4

Re: [Libvir] virsh start problem + patch
by Daniel P. Berrange 11 Mar '08

11 Mar '08

On Tue, Mar 11, 2008 at 06:57:33AM +0100, Toth Istvan wrote: > # virsh list --all > Id Name State > ---------------------------------- > 0 Domain-0 running > - windows-xen shut off > - windows-xen2 no state > > # xm list > Name ID Mem VCPUs State > Time(s) > Domain-0 0 3489 4 r----- > 853.6 > windows-xen 1 512 0 > -b-s-d 39.4 > windows-xen2 4 512 0 > ------ 22.5 > > The windows-xen, and windows-xen2 domains were installed the very same > way, except I've had a Dom0 reboot since I've installed windows-xen, so > xen has had the opportunity to sort it's state out, whil the > windows-xen2 domain is a fresh install. Starting and stopping (by xm) a > freshly installed windows hvm domain does not sort out the state, only a > Dom0 reboot (or a xend restart) does. > > I have attached the output of xm list --long command. This shows that it is all XenD related - inactive domains should *not* have a 'domid' or 'state' field set in the 'xm list --long' output. In both your windows-xen & windows-xen2 VM, these fields are incorrectly present. > This problem indeed does look like a Xend bug, but it turns out that it > does not actually affect virsh. (It does affect virt-manager, as I've > written to the other list) > The other problem is I am pretty sure, a virsh logic bug, and is > independent of the first one. No, it is again a Xen bug. Inactive domains are *mandated* to have a domain ID of -1. They do not exist in the hypervisor anymore and thus have no domain ID associated with them. If XenD is not clearing the domain ID properly this is a XenD problem. That all said, we may need to workaround this XenD brokenness in the libirt XenD driver. Working around it in virsh is the wrong place. > and I get this: > > ./virsh start windows-xen > <warnings> > error: Domain is already active > virDomainGetID(dom) returns 1 > > ./virsh start windows-xen2 > <warnings> > error: Domain is already active > virDomainGetID(dom) returns 3 > > so virDomainGetID() does not return -1, but returns the actual xen > domain id of the managed, but inactive xen domain, and I believe this is > what it should do, > as it's job is not to tell us about the state of the domain, but to tell > the id of the domain, regardles of its state. No. Inactive domains are mandated to have an ID of -1. Dan. -- |: 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

Re: [Libvir] Accessing qemu from windows
by Richard W.M. Jones 11 Mar '08

11 Mar '08

On Tue, Mar 11, 2008 at 06:00:31PM +0200, Gabriel Kaufmann wrote: > I'm sure it actually makes a remote TCP connection since on the server side I get the error: > 'libvir: error : could not connect to qemu:///system?' It actually prints this out on the server side? Can you run the server with the --verbose option, you'll get a lot more detail about what is happening. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 0

[Libvir] Accessing qemu from windows
by Gabriel Kaufmann 11 Mar '08

11 Mar '08

Hi, I'm running virsh from linux machine with the URI qemu+tcp://<user>:<password>@<ip>/system >From a linux machine (not the same that runs the libvirtd deamon) with libvirt 0.3.0, this URI allows me to connect. In the other hand, using the Virsh.exe (that comes with ocaml-libvirt-0.4.0.1.exe<http://libvirt.org/sources/ocaml/ocaml-libvirt-0.4.0.1.exe> ) on Windows XP, I receive the error 'Virtualization error: libvirt: VIR_ERROR_NO_CONNECT: VIR_FROM_NONE: could not connect to qemu:///system?' Is it a known bug, or is it configuration problem on my server? Best Regards, Gabriel Kaufmann Software Engineer Gabriel.Kaufmann(a)ericom.com<mailto:Gabriel.Kaufmann@ericom.com> Ericom Software Tel (Dir): +972 2 591 1700 Ext 754 Tel (Main): +972 2 591 1700 http://www.ericom.com Access Done Right Empower Enterprise-Wide Access to Microsoft(r) Terminal Server, Virtual Desktops and Legacy Applications

2 1

[libvir] Could not connect to xend
by Anton Protopopov 11 Mar '08

11 Mar '08

Hi. When I tried to run virsh to connect to xen, I have got an error --- libvirt failed to open connection to xend. Here is output with DEBUG enabled. What kind of additional information do you need? [root@localhost ~]# LIBVIRT_DEBUG=SPAM virsh DEBUG: libvirt.c: virInitialize (register drivers) DEBUG: libvirt.c: virConnectOpenAuth (name=(null), auth=0xb7ed79d8, flags=0) DEBUG: libvirt.c: do_open (Probed xen:///) DEBUG: libvirt.c: do_open (Using xen:/// as default URI, 1 hypervisor found) DEBUG: libvirt.c: do_open (name "xen:///" to URI components: scheme xen opaque (null) authority (null) server (null) user (null) port 0 path / ) DEBUG: libvirt.c: do_open (trying driver 0 (Test) ...) DEBUG: libvirt.c: do_open (driver 0 Test returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 1 (QEMU) ...) DEBUG: libvirt.c: do_open (driver 1 QEMU returned DECLINED) DEBUG: libvirt.c: do_open (trying driver 2 (Xen) ...) DEBUG: xen_unified.c: xenUnifiedOpen (trying Xen sub-driver 0) DEBUG: xen_unified.c: xenUnifiedOpen (Xen sub-driver 0 open ok ) DEBUG: xen_unified.c: xenUnifiedOpen (trying Xen sub-driver 2) libvir: Xen Daemon error : internal error failed to connect to xend libvir: Xen Daemon error : internal error failed to connect to xend DEBUG: xen_unified.c: xenUnifiedOpen (Xen sub-driver 2 open failed ) DEBUG: libvirt.c: do_open (driver 2 Xen returned ERROR) DEBUG: hash.c: virUnrefConnect (unref connection 0x807bf88 xen:/// 1) DEBUG: hash.c: virReleaseConnect (release connection 0x807bf88 xen:///) error: failed to connect to the hypervisor

2 1

[Libvir] Need Help on Error handling.
by Ajishrao.r 11 Mar '08

11 Mar '08

Hi, I am using libvirt to manage, The Hypervisor, Can Any one Help me about handling error? My main questions are. --- What is Library level Error Handling? --- Any Example to use void virSetErrorFunc (void * userData,virErrorFunc <http://libvirt.org/html/libvirt-virterror.html#virErrorFunc> handler) --- What is the difference between these two funtions? int virConnCopyLastError (virConnectPtr <http://libvirt.org/html/libvirt-libvirt.html#virConnectPtr> conn,virErrorPtr <http://libvirt.org/html/libvirt-virterror.html#virErrorPtr> to) virErrorPtr <http://libvirt.org/html/libvirt-virterror.html#virErrorPtr> virConnGetLastError (virConnectPtr <http://libvirt.org/html/libvirt-libvirt.html#virConnectPtr> conn) -- Thanks&Regards Ajeesh

3 3

[Libvir] PATCH: Don't make connection read-only when non-root
by Daniel P. Berrange 11 Mar '08

11 Mar '08

The virsh commands has long forced the connection to be read-only if running as non-root. This is bogus because it is perfectly capable of authenticating full read-write connections as non-root since we gained kerberos/policykit support. The user can always use the explicit --readonly flag if they only want a read only connection Dan. Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.135 diff -r1.135 virsh.c 6048,6054d6047 < #ifndef __MINGW32__ < /* Force a non-root, Xen connection to readonly */ < if ((ctl->name == NULL || < !strcasecmp(ctl->name, "xen")) && ctl->uid != 0) < ctl->readonly = 1; < #endif < -- |: 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 :|

3 2

[Libvir] PATCH: Fix libvirtd to not shutdown at startup
by Daniel P. Berrange 11 Mar '08

11 Mar '08

Changes to the daemon to make it called qemudShutdown() broke the network driver when run in --daemon mode. This is because the main daemon forks into the background, and the original PID then exits destroying any active networks & removing the iptables rules. # /usr/sbin/libvirtd --daemon Shutting down network 'default'iptables: No chain/target/match by that name iptables: Bad rule (does a matching rule exist in that chain?) iptables: Bad rule (does a matching rule exist in that chain?) iptables: Bad rule (does a matching rule exist in that chain?) iptables: No chain/target/match by that name iptables: No chain/target/match by that name iptables: Bad rule (does a matching rule exist in that chain?) iptables: Bad rule (does a matching rule exist in that chain?) iptables: Bad rule (does a matching rule exist in that chain?) iptables: Bad rule (does a matching rule exist in that chain?) Failed to bring down bridge 'virbr0' : No such device Failed to delete bridge 'virbr0' : No such device or address The core issue is that when forking into daemon mode the original process should immediately exit & not do invoke cleanup functions. This patch makes it do that Dan. Index: qemud/qemud.c =================================================================== RCS file: /data/cvs/libvirt/qemud/qemud.c,v retrieving revision 1.89 diff -u -r1.89 qemud.c --- qemud/qemud.c 3 Mar 2008 18:10:19 -0000 1.89 +++ qemud/qemud.c 9 Mar 2008 20:56:27 -0000 @@ -393,7 +393,7 @@ case -1: return -1; default: - return nextpid; + _exit(0); } cleanup: @@ -418,8 +418,7 @@ status != 0) { return -1; } - - return pid; + _exit(0); } } } @@ -2116,16 +2115,12 @@ goto error1; if (godaemon) { - int pid; openlog("libvirtd", 0, 0); - pid = qemudGoDaemon(); - if (pid < 0) { + if (qemudGoDaemon() < 0) { qemudLog(QEMUD_ERR, _("Failed to fork as daemon: %s"), strerror(errno)); goto error1; } - if (pid > 0) - goto out; /* Choose the name of the PID file. */ if (!pid_file) { @@ -2172,7 +2167,6 @@ if (godaemon) closelog(); - out: ret = 0; error2: -- |: 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 :|

3 2

Re: [Libvir] virsh start problem + patch
by Richard W.M. Jones 11 Mar '08

11 Mar '08

OK, I think that's a good explanation but I'll leave it to Dan to comment 'coz he wrote the code ... Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 0

[Libvir] virsh start problem + patch
by Toth Istvan 11 Mar '08

11 Mar '08

Hello! I've been trying to use virsh to manage my Xen domains on Fedora 8. I found that I am unable to start any xen managed domains from virsh, because virsh complains that 'Domain is already running'. Actually, I am able to start them once, but once they are stopped, they are impossible to re-start. steps to reprouce: 1. use virt-install to install HVM domain 2. virsh start domain 3. shut down the domain from within the guest (i.e. Start-> shutdown) 4. virsh start domain -> error The problem appears with stock F8 (with current updates), but I've also tried the same with libvirt 4.1, with the same results. I've looked into the virsh code, and it seems that it was written with only only old-style xen in mind, and xen 3.1's managed domains break the logic. I've attached a simple patch against 0.4.1 that checks the actual domain state, instead of simply checking if libvirt knows about the domain. I have experienced a similar problem with virt-manager 0.5.3, where virt-manager is stuck showing 'running' status even after a domain has been shut down, hence it is not able to start the domain. regards István Tóth

4 3

[Libvir] PATCH: Remove use of polkit-grant
by Daniel P. Berrange 10 Mar '08

10 Mar '08

I formerly added support for calling polkit-auth and/or polkit-grant to get PolicyKit credentials. It turns out that polkit-grant is fundamentally flawed & unusable, so this patch removes use of polkit-grant. This is not a big issue, since polkit-auth is more functional and present in 0.7 or later. Second, it removes use of virRun() and does a direct execve() since we need to keep stdin & stdout open in all circumstances so the polkit-auth can prompt for & accept passwords depending on config. Dan. Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.133 diff -u -p -r1.133 configure.in --- configure.in 3 Mar 2008 14:42:37 -0000 1.133 +++ configure.in 9 Mar 2008 21:00:21 -0000 @@ -450,10 +450,6 @@ if test "x$with_polkit" = "xyes" -o "x$w CFLAGS="$old_CFLAGS" LDFLAGS="$old_LDFLAGS" - AC_PATH_PROG(POLKIT_GRANT, polkit-grant) - if test "x$POLKIT_GRANT" != "x"; then - AC_DEFINE_UNQUOTED([POLKIT_GRANT],["$POLKIT_GRANT"],[Location of polkit-grant program]) - fi AC_PATH_PROG(POLKIT_AUTH, polkit-auth) if test "x$POLKIT_AUTH" != "x"; then AC_DEFINE_UNQUOTED([POLKIT_AUTH],["$POLKIT_AUTH"],[Location of polkit-auth program]) Index: src/libvirt.c =================================================================== RCS file: /data/cvs/libvirt/src/libvirt.c,v retrieving revision 1.125 diff -u -p -r1.125 libvirt.c --- src/libvirt.c 26 Feb 2008 07:06:48 -0000 1.125 +++ src/libvirt.c 9 Mar 2008 21:00:24 -0000 @@ -19,6 +19,7 @@ #include <sys/stat.h> #include <unistd.h> #include <assert.h> +#include <sys/wait.h> #include <libxml/parser.h> #include <libxml/xpath.h> @@ -66,6 +67,39 @@ static int initialized = 0; int debugFlag = 0; #endif +#if defined(POLKIT_AUTH) +static int virConnectAuthGainPolkit(const char *privilege) { + const char *const args[] = { + POLKIT_AUTH, "--obtain", privilege, NULL + }; + int childpid, status, ret; + + /* Root has all rights */ + if (getuid() == 0) + return 0; + + if ((childpid = fork()) < 0) + return -1; + + if (!childpid) { + execvp(args[0], (char **)args); + _exit(-1); + } + + while ((ret = waitpid(childpid, &status, 0) == -1) && errno == EINTR); + if (ret == -1) { + return -1; + } + + if (!WIFEXITED(status) || + (WEXITSTATUS(status) != 0 && WEXITSTATUS(status) != 1)) { + return -1; + } + + return 0; +} +#endif + static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, unsigned int ncred, void *cbdata ATTRIBUTE_UNUSED) { @@ -77,25 +111,15 @@ static int virConnectAuthCallbackDefault size_t len; switch (cred[i].type) { -#if defined(POLKIT_GRANT) || defined(POLKIT_AUTH) +#if defined(POLKIT_AUTH) case VIR_CRED_EXTERNAL: { int ret; - const char *const args[] = { -#if defined(POLKIT_GRANT) - POLKIT_GRANT, "--gain", cred[i].prompt, NULL -#else - POLKIT_AUTH, "--obtain", cred[i].prompt, NULL -#endif - }; - if (STRNEQ(cred[i].challenge, "PolicyKit")) return -1; - if (virRun(NULL, (char **) args, &ret) < 0) - return -1; - if (!WIFEXITED(ret) || - (WEXITSTATUS(ret) != 0 && WEXITSTATUS(ret) != 1)) + if (virConnectAuthGainPolkit(cred[i].prompt) < 0) return -1; + break; } #endif @@ -158,7 +182,7 @@ static int virConnectCredTypeDefault[] = VIR_CRED_REALM, VIR_CRED_PASSPHRASE, VIR_CRED_NOECHOPROMPT, -#if defined(POLKIT_AUTH) || defined(POLKIT_GRANT) +#if defined(POLKIT_AUTH) VIR_CRED_EXTERNAL, #endif }; -- |: 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

[Libvir] PATCH: Allow Xen HVM kernel+initrd booting
by Daniel P. Berrange 10 Mar '08

10 Mar '08

The latest xen-unstable tree has support for booting HVM guests using an explicit kernel+initrd+cmdline, as an alternative to the traditional BIOS boot from harddisk/cdrom/network. This gives Xen HVM parity with KVM in terms of boot methods. The current libvirt Xen driver though assumes that Xen paravirt is always kernel+initrd or bootloader based, while Xen HVM is always BIOS based. This patch re-factors the Xen driver so that it allows kernel+initrd for both Xen paravirt and HVM guests. NB, Xen HVM previously abused the 'kernel' parameter in the SEXPR to refer to the HVM guest firmware (ie /usr/lib/xen/boot/hvmloader). With the new support for booting kernel+initrd in HVM guests, the firmware can now be specified using an explicit 'loader' parameter - for backwards compatability you can still use the old 'kernel' parameter too if doing a BIOS boot. Second, it is also now possible for a paravirt guest to provide an explicit patch to a QEMU device model, aka the <emulator> tag in libvirt, so this pach also enables that functionality for paravirt guests. Finally, since the paravirt framebuffer is tied up in all this code too, I also include John's patch to make us deal with <graphics> properly in legacy guests and old XenD. Thankfully we have a large test suite of SEXPR/XML files, so while this is a pretty major refactoring of code, I'm fairly confident we won't cause bad regressions. A couple of the existing test cases needed their sample SEXPR tweaked since we now generate a couple of (...) bits in a different order, the result is functionally the same though. Finally as an example, we can create a HVM guest on xen-unstable using this XML snippet - note how we can now pass parameters to the installer for HVM too ! <domain type='xen'> <name>kernel</name> <uuid>06ed00fe-1162-4fc4-b5d8-11993ee4a8b9</uuid> <os> <type>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <kernel>/root/vmlinuz.f864</kernel> <initrd>/root/initrd.img.f864</initrd> <cmdline>console=ttyS0 console=tty0</cmdline> </os> <memory>540672</memory> <currentMemory>531456</currentMemory> <vcpu>1</vcpu> <on_poweroff>preserve</on_poweroff> <on_reboot>preserve</on_reboot> <on_crash>preserve</on_crash> <features> <acpi/> <apic/> <pae/> </features> <devices> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <interface type='bridge'> <source bridge='xenbr0'/> <mac address='00:16:3e:0e:e8:b7'/> <script path='vif-bridge'/> </interface> <disk type='file' device='disk'> <driver name='file'/> <source file='/root/kernel.img'/> <target dev='hda'/> </disk> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='-1' listen='0.0.0.0'/> <console tty='pty'/> </devices> </domain> src/xend_internal.c | 122 +++++++------ src/xml.c | 183 ++++++++------------ tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr | 1 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 26 ++ tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr | 70 +++++++ tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 33 +++ tests/sexpr2xmltest.c | 20 ++ tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 1 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 24 ++ tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 2 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 2 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr | 2 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 2 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 2 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 2 tests/xml2sexprdata/xml2sexpr-fv.sexpr | 2 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 2 tests/xml2sexprtest.c | 11 + 18 files changed, 346 insertions(+), 161 deletions(-) Dan. Index: src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.165 diff -u -p -r1.165 xend_internal.c --- src/xend_internal.c 30 Jan 2008 16:38:18 -0000 1.165 +++ src/xend_internal.c 3 Feb 2008 18:37:17 -0000 @@ -1280,65 +1280,84 @@ xend_log(virConnectPtr xend, char *buffe static int xend_parse_sexp_desc_os(virConnectPtr xend, struct sexpr *node, virBufferPtr buf, int hvm, int bootloader) { - const char *tmp; + const char *loader = NULL; + const char *kernel = NULL; + const char *initrd = NULL; + const char *cmdline = NULL; + const char *root = NULL; if (node == NULL || buf == NULL) { return(-1); } virBufferAdd(buf, " <os>\n", 7); + if (hvm) + virBufferAdd(buf, " <type>hvm</type>\n", -1); + else + virBufferAdd(buf, " <type>linux</type>\n", -1); + if (hvm) { - virBufferVSprintf(buf, " <type>hvm</type>\n"); - tmp = sexpr_node(node, "domain/image/hvm/kernel"); - if (tmp == NULL) - tmp = sexpr_node(node, "domain/image/hvm/loader"); - if (tmp == NULL && !bootloader) { - virXendError(xend, VIR_ERR_INTERNAL_ERROR, - _("domain information incomplete, missing kernel & bootloader")); - return(-1); - } - if (tmp) - virBufferVSprintf(buf, " <loader>%s</loader>\n", tmp); - tmp = sexpr_node(node, "domain/image/hvm/boot"); - if ((tmp != NULL) && (tmp[0] != 0)) { - while (*tmp) { - if (*tmp == 'a') - /* XXX no way to deal with boot from 2nd floppy */ - virBufferAdd(buf, " <boot dev='fd'/>\n", 21 ); - else if (*tmp == 'c') - /* - * Don't know what to put here. Say the vm has been given 3 - * disks - hda, hdb, hdc. How does one identify the boot disk? - * We're going to assume that first disk is the boot disk since - * this is most common practice - */ - virBufferAdd(buf, " <boot dev='hd'/>\n", 21 ); - else if (*tmp == 'd') - virBufferAdd(buf, " <boot dev='cdrom'/>\n", 24 ); - else if (*tmp == 'n') - virBufferAdd(buf, " <boot dev='network'/>\n", 26 ); - tmp++; + loader = sexpr_node(node, "domain/image/hvm/loader"); + if (loader == NULL) { + loader = sexpr_node(node, "domain/image/hvm/kernel"); + + if (loader == NULL) { + virXendError(xend, VIR_ERR_INTERNAL_ERROR, + _("domain information incomplete, missing HVM loader")); + return(-1); } + } else { + kernel = sexpr_node(node, "domain/image/hvm/kernel"); + initrd = sexpr_node(node, "domain/image/hvm/ramdisk"); + cmdline = sexpr_node(node, "domain/image/hvm/args"); + root = sexpr_node(node, "domain/image/hvm/root"); } } else { - virBufferVSprintf(buf, " <type>linux</type>\n"); - tmp = sexpr_node(node, "domain/image/linux/kernel"); - if (tmp == NULL && !bootloader) { + kernel = sexpr_node(node, "domain/image/linux/kernel"); + initrd = sexpr_node(node, "domain/image/linux/ramdisk"); + cmdline = sexpr_node(node, "domain/image/linux/args"); + root = sexpr_node(node, "domain/image/linux/root"); + } + + if (hvm) + virBufferVSprintf(buf, " <loader>%s</loader>\n", loader); + + if (kernel) { + virBufferVSprintf(buf, " <kernel>%s</kernel>\n", kernel); + if (initrd && initrd[0]) + virBufferVSprintf(buf, " <initrd>%s</initrd>\n", initrd); + if (root && root[0]) + virBufferVSprintf(buf, " <root>%s</root>\n", root); + if (cmdline && cmdline[0]) + virBufferEscapeString(buf, " <cmdline>%s</cmdline>\n", cmdline); + } else { + if (hvm) { + const char *boot = sexpr_node(node, "domain/image/hvm/boot"); + if ((boot != NULL) && (boot[0] != 0)) { + while (*boot) { + if (*boot == 'a') + /* XXX no way to deal with boot from 2nd floppy */ + virBufferAdd(buf, " <boot dev='fd'/>\n", 21 ); + else if (*boot == 'c') + /* + * Don't know what to put here. Say the vm has been given 3 + * disks - hda, hdb, hdc. How does one identify the boot disk? + * We're going to assume that first disk is the boot disk since + * this is most common practice + */ + virBufferAdd(buf, " <boot dev='hd'/>\n", 21 ); + else if (*boot == 'd') + virBufferAdd(buf, " <boot dev='cdrom'/>\n", 24 ); + else if (*boot == 'n') + virBufferAdd(buf, " <boot dev='network'/>\n", 26 ); + boot++; + } + } + } else if (!bootloader) { virXendError(xend, VIR_ERR_INTERNAL_ERROR, _("domain information incomplete, missing kernel & bootloader")); return(-1); } - if (tmp) - virBufferVSprintf(buf, " <kernel>%s</kernel>\n", tmp); - tmp = sexpr_node(node, "domain/image/linux/ramdisk"); - if ((tmp != NULL) && (tmp[0] != 0)) - virBufferVSprintf(buf, " <initrd>%s</initrd>\n", tmp); - tmp = sexpr_node(node, "domain/image/linux/root"); - if ((tmp != NULL) && (tmp[0] != 0)) - virBufferVSprintf(buf, " <root>%s</root>\n", tmp); - tmp = sexpr_node(node, "domain/image/linux/args"); - if ((tmp != NULL) && (tmp[0] != 0)) - virBufferEscapeString(buf, " <cmdline>%s</cmdline>\n", tmp); } virBufferAdd(buf, " </os>\n", 8); @@ -1367,7 +1386,7 @@ xend_parse_sexp_desc(virConnectPtr conn, const char *tmp; char *tty; virBuffer buf; - int hvm = 0, bootloader = 0; + int hvm = 0, bootloader = 0, vfb = 0; int domid = -1; int max_mem, cur_mem; unsigned char uuid[VIR_UUID_BUFLEN]; @@ -1487,8 +1506,10 @@ xend_parse_sexp_desc(virConnectPtr conn, virBufferAdd(&buf, " <devices>\n", 12); - /* in case of HVM we have devices emulation */ - tmp = sexpr_node(root, "domain/image/hvm/device_model"); + if (hvm) + tmp = sexpr_node(root, "domain/image/hvm/device_model"); + else + tmp = sexpr_node(root, "domain/image/linux/device_model"); if ((tmp != NULL) && (tmp[0] != 0)) virBufferVSprintf(&buf, " <emulator>%s</emulator>\n", tmp); @@ -1681,6 +1702,7 @@ xend_parse_sexp_desc(virConnectPtr conn, tmp = sexpr_node(node, "device/vfb/type"); if (tmp && !strcmp(tmp, "sdl")) { + vfb = 1; virBufferVSprintf(&buf, " <input type='mouse' bus='%s'/>\n", hvm ? "ps2": "xen"); virBufferAdd(&buf, " <graphics type='sdl'/>\n", 27); } else if (tmp && !strcmp(tmp, "vnc")) { @@ -1688,6 +1710,7 @@ xend_parse_sexp_desc(virConnectPtr conn, const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten"); const char *vncPasswd = NULL; const char *keymap = sexpr_node(node, "device/vfb/keymap"); + vfb = 1; virBufferVSprintf(&buf, " <input type='mouse' bus='%s'/>\n", hvm ? "ps2": "xen"); virBufferVSprintf(&buf, " <graphics type='vnc' port='%d'", port); if (listenAddr) @@ -1751,8 +1774,7 @@ xend_parse_sexp_desc(virConnectPtr conn, } /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */ - if ((hvm && xendConfigVersion < 4) || - (!hvm && xendConfigVersion < 3)) { + if (!vfb) { tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux"); if (tmp != NULL) { if (tmp[0] == '1') { Index: src/xml.c =================================================================== RCS file: /data/cvs/libvirt/src/xml.c,v retrieving revision 1.105 diff -u -p -r1.105 xml.c --- src/xml.c 29 Jan 2008 18:23:43 -0000 1.105 +++ src/xml.c 3 Feb 2008 18:37:17 -0000 @@ -839,22 +839,21 @@ virDomainParseXMLGraphicsDescVFB(virConn * @ctxt: a path context representing the XML description * @vcpus: number of virtual CPUs to configure * @xendConfigVersion: xend configuration file format + * @hasKernel: whether the domain is booting from a kernel * - * Parse the OS part of the XML description for an HVM domain and add it to - * the S-Expr in buf. This is a temporary interface as the S-Expr interface - * will be replaced by XML-RPC in the future. However the XML format should - * stay valid over time. + * Parse the OS part of the XML description for a HVM domain + * and add it to the S-Expr in buf. * * Returns 0 in case of success, -1 in case of error. */ static int virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, virBufferPtr buf, xmlXPathContextPtr ctxt, - int vcpus, int xendConfigVersion) + int vcpus, int xendConfigVersion, + int hasKernel) { xmlNodePtr cur, txt; xmlNodePtr *nodes = NULL; - xmlChar *type = NULL; xmlChar *loader = NULL; char bootorder[5]; int nbootorder = 0; @@ -864,14 +863,8 @@ virDomainParseXMLOSDescHVM(virConnectPtr cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((type == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "type"))) { - txt = cur->children; - if ((txt != NULL) && (txt->type == XML_TEXT_NODE) && - (txt->next == NULL)) - type = txt->content; - } else if ((loader == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "loader"))) { + if ((loader == NULL) && + (xmlStrEqual(cur->name, BAD_CAST "loader"))) { txt = cur->children; if ((txt != NULL) && (txt->type == XML_TEXT_NODE) && (txt->next == NULL)) @@ -904,29 +897,31 @@ virDomainParseXMLOSDescHVM(virConnectPtr } cur = cur->next; } + /* + * XenD always needs boot order defined for HVM, even if + * booting off a kernel + initrd, so force to 'c' if nothing + * else is specified + */ + if (nbootorder == 0) + bootorder[nbootorder++] = 'c'; bootorder[nbootorder] = '\0'; - if ((type == NULL) || (!xmlStrEqual(type, BAD_CAST "hvm"))) { - /* VIR_ERR_OS_TYPE */ - virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0); - return (-1); - } - virBufferAdd(buf, "(image (hvm ", 12); + if (loader == NULL) { - virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); - goto error; + virXMLError(conn, VIR_ERR_INTERNAL_ERROR, "no HVM domain loader", 0); + return -1; + } + /* + * Originally XenD abused the 'kernel' parameter for the HVM + * firmware. New XenD allows HVM guests to boot from a kernel + * and if this is enabled, the HVM firmware must use the new + * 'loader' parameter + */ + if (hasKernel) { + virBufferVSprintf(buf, "(loader '%s')", (const char *) loader); } else { virBufferVSprintf(buf, "(kernel '%s')", (const char *) loader); } - /* get the device emulation model */ - str = virXPathString("string(/domain/devices/emulator[1])", ctxt); - if (str == NULL) { - virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); /* TODO: error */ - goto error; - } - virBufferVSprintf(buf, "(device_model '%s')", str); - xmlFree(str); - virBufferVSprintf(buf, "(vcpus %d)", vcpus); if (nbootorder) @@ -1047,27 +1042,12 @@ virDomainParseXMLOSDescHVM(virConnectPtr virBufferAdd(buf, "(serial pty)", 12); } - /* HVM graphics for xen <= 3.0.5 */ - if (xendConfigVersion < 4) { - /* Is a graphics device specified? */ - cur = virXPathNode("/domain/devices/graphics[1]", ctxt); - if (cur != NULL) { - res = virDomainParseXMLGraphicsDescImage(conn, cur, buf, - xendConfigVersion); - if (res != 0) { - goto error; - } - } - } - str = virXPathString("string(/domain/clock/@offset)", ctxt); if (str != NULL && !strcmp(str, "localtime")) { virBufferAdd(buf, "(localtime 1)", 13); } free(str); - virBufferAdd(buf, "))", 2); - return (0); error: @@ -1075,45 +1055,34 @@ virDomainParseXMLOSDescHVM(virConnectPtr return (-1); } + /** - * virDomainParseXMLOSDescPV: + * virDomainParseXMLOSDescKernel: * @conn: pointer to the hypervisor connection * @node: node containing PV OS description * @buf: a buffer for the result S-Expr - * @ctxt: a path context representing the XML description - * @xendConfigVersion: xend configuration file format * - * Parse the OS part of the XML description for a paravirtualized domain - * and add it to the S-Expr in buf. This is a temporary interface as the - * S-Expr interface will be replaced by XML-RPC in the future. However - * the XML format should stay valid over time. + * Parse the OS part of the XML description for a domain using a direct + * kernel and initrd to boot. * * Returns 0 in case of success, -1 in case of error. */ static int -virDomainParseXMLOSDescPV(virConnectPtr conn, xmlNodePtr node, - virBufferPtr buf, xmlXPathContextPtr ctxt, - int xendConfigVersion) +virDomainParseXMLOSDescKernel(virConnectPtr conn ATTRIBUTE_UNUSED, + xmlNodePtr node, + virBufferPtr buf) { xmlNodePtr cur, txt; - const xmlChar *type = NULL; const xmlChar *root = NULL; const xmlChar *kernel = NULL; const xmlChar *initrd = NULL; const xmlChar *cmdline = NULL; - int res; cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if ((type == NULL) - && (xmlStrEqual(cur->name, BAD_CAST "type"))) { - txt = cur->children; - if ((txt != NULL) && (txt->type == XML_TEXT_NODE) && - (txt->next == NULL)) - type = txt->content; - } else if ((kernel == NULL) && - (xmlStrEqual(cur->name, BAD_CAST "kernel"))) { + if ((kernel == NULL) && + (xmlStrEqual(cur->name, BAD_CAST "kernel"))) { txt = cur->children; if ((txt != NULL) && (txt->type == XML_TEXT_NODE) && (txt->next == NULL)) @@ -1140,18 +1109,9 @@ virDomainParseXMLOSDescPV(virConnectPtr } cur = cur->next; } - if ((type != NULL) && (!xmlStrEqual(type, BAD_CAST "linux"))) { - /* VIR_ERR_OS_TYPE */ - virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0); - return (-1); - } - virBufferAdd(buf, "(image (linux ", 14); - if (kernel == NULL) { - virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); - return (-1); - } else { - virBufferVSprintf(buf, "(kernel '%s')", (const char *) kernel); - } + + virBufferVSprintf(buf, "(kernel '%s')", (const char *) kernel); + if (initrd != NULL) virBufferVSprintf(buf, "(ramdisk '%s')", (const char *) initrd); if (root != NULL) @@ -1159,20 +1119,6 @@ virDomainParseXMLOSDescPV(virConnectPtr if (cmdline != NULL) virBufferVSprintf(buf, "(args '%s')", (const char *) cmdline); - /* PV graphics for xen <= 3.0.4 */ - if (xendConfigVersion < 3) { - cur = virXPathNode("/domain/devices/graphics[1]", ctxt); - if (cur != NULL) { - res = virDomainParseXMLGraphicsDescImage(conn, cur, buf, - xendConfigVersion); - if (res != 0) { - goto error; - } - } - } - - error: - virBufferAdd(buf, "))", 2); return (0); } @@ -1706,23 +1652,54 @@ virDomainParseXMLDesc(virConnectPtr conn if (!bootloader) { if ((node = virXPathNode("/domain/os[1]", ctxt)) != NULL) { + int has_kernel = 0; + /* Analyze of the os description, based on HVM or PV. */ str = virXPathString("string(/domain/os/type[1])", ctxt); - - if ((str == NULL) || (strcmp(str, "hvm"))) { - res = virDomainParseXMLOSDescPV(conn, node, - &buf, ctxt, - xendConfigVersion); - } else { + if ((str != NULL) && STREQ(str, "hvm")) hvm = 1; - res = virDomainParseXMLOSDescHVM(conn, node, &buf, ctxt, - vcpus, xendConfigVersion); - } + xmlFree(str); + str = NULL; - free(str); + if (hvm) + virBufferAdd(&buf, "(image (hvm ", 12); + else + virBufferAdd(&buf, "(image (linux ", 14); + + if (virXPathBoolean("count(/domain/os/kernel) > 0", ctxt)) { + if (virDomainParseXMLOSDescKernel(conn, node, + &buf) != 0) + goto error; + has_kernel = 1; + } - if (res != 0) + if (hvm && + virDomainParseXMLOSDescHVM(conn, node, + &buf, ctxt, vcpus, + xendConfigVersion, + has_kernel) != 0) goto error; + + /* get the device emulation model */ + str = virXPathString("string(/domain/devices/emulator[1])", ctxt); + if (str != NULL) { + virBufferVSprintf(&buf, "(device_model '%s')", str); + xmlFree(str); + str = NULL; + } + + /* PV graphics for xen <= 3.0.4, or HVM graphics for xen <= 3.1.0 */ + if ((!hvm && xendConfigVersion < 3) || + (hvm && xendConfigVersion < 4)) { + xmlNodePtr cur; + cur = virXPathNode("/domain/devices/graphics[1]", ctxt); + if (cur != NULL && + virDomainParseXMLGraphicsDescImage(conn, cur, &buf, + xendConfigVersion) != 0) + goto error; + } + + virBufferAdd(&buf, "))", 2); } else { virXMLError(conn, VIR_ERR_NO_OS, nam, 0); goto error; Index: tests/sexpr2xmltest.c =================================================================== RCS file: /data/cvs/libvirt/tests/sexpr2xmltest.c,v retrieving revision 1.22 diff -u -p -r1.22 sexpr2xmltest.c --- tests/sexpr2xmltest.c 29 Jan 2008 18:15:54 -0000 1.22 +++ tests/sexpr2xmltest.c 3 Feb 2008 18:37:17 -0000 @@ -178,6 +178,18 @@ static int testCompareFVclockLocaltime(c 1); } +static int testCompareFVKernel(const void *data ATTRIBUTE_UNUSED) { + return testCompareFiles("sexpr2xmldata/sexpr2xml-fv-kernel.xml", + "sexpr2xmldata/sexpr2xml-fv-kernel.sexpr", + 1); +} + +static int testCompareFVLegacyVFB(const void *data ATTRIBUTE_UNUSED) { + return testCompareFiles("sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml", + "sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr", + 4); +} + int main(int argc, char **argv) @@ -276,6 +288,14 @@ main(int argc, char **argv) 1, testCompareFVclockLocaltime, NULL) != 0) ret = -1; + if (virtTestRun("SEXPR-2-XML FV kernel", + 1, testCompareFVKernel, NULL) != 0) + ret = -1; + + if (virtTestRun("SEXPR-2-XML FV legacy VFB", + 1, testCompareFVLegacyVFB, NULL) != 0) + ret = -1; + exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } #else /* WITHOUT_XEN */ Index: tests/xml2sexprtest.c =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprtest.c,v retrieving revision 1.21 diff -u -p -r1.21 xml2sexprtest.c --- tests/xml2sexprtest.c 29 Jan 2008 18:15:54 -0000 1.21 +++ tests/xml2sexprtest.c 3 Feb 2008 18:37:17 -0000 @@ -235,6 +235,13 @@ static int testCompareFVInputUSBTablet(c 1); } +static int testCompareFVKernel(const void *data ATTRIBUTE_UNUSED) { + return testCompareFiles("xml2sexprdata/xml2sexpr-fv-kernel.xml", + "xml2sexprdata/xml2sexpr-fv-kernel.sexpr", + "fvtest", + 1); +} + int @@ -351,6 +358,10 @@ main(int argc, char **argv) 1, testCompareFVclockLocaltime, NULL) != 0) ret = -1; + if (virtTestRun("XML-2-SEXPR FV kernel", + 1, testCompareFVKernel, NULL) != 0) + ret = -1; + exit(ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); } Index: tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr =================================================================== RCS file: tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr diff -N tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr 3 Feb 2008 18:37:17 -0000 @@ -0,0 +1 @@ +(domain (domid 15)(name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file Index: tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml =================================================================== RCS file: tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml diff -N tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml 3 Feb 2008 18:37:17 -0000 @@ -0,0 +1,26 @@ +<domain type='xen' id='15'> + <name>fvtest</name> + <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel> + <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> + <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… </cmdline> + </os> + <memory>430080</memory> + <vcpu>2</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <features> + </features> + <clock offset='utc'/> + <devices> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/root/some.img'/> + <target dev='xvda'/> + </disk> + </devices> +</domain> Index: tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr =================================================================== RCS file: tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr diff -N tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr 3 Feb 2008 18:37:17 -0000 @@ -0,0 +1,70 @@ +(domain + (domid 1) + (on_crash restart) + (uuid fde0533d-d043-88c6-dfba-4822fa32f309) + (bootloader_args ) + (vcpus 1) + (name s10u4) + (on_poweroff destroy) + (on_reboot restart) + (bootloader ) + (maxmem 1024) + (memory 1024) + (shadow_memory 9) + (cpu_weight 256) + (cpu_cap 0) + (features ) + (on_xend_start ignore) + (on_xend_stop shutdown) + (start_time 1201894394.0) + (cpu_time 17.253230349) + (online_vcpus 1) + (image + (hvm + (kernel /usr/lib/xen/boot/hvmloader) + (boot c) + (device_model /usr/lib/xen/bin/qemu-dm) + (keymap en-us) + (localtime 0) + (pae 1) + (vnc 1) + (vncunused 1) + (notes (SUSPEND_CANCEL 1)) + ) + ) + (status 2) + (state -b----) + (store_mfn 262142) + (device + (vif + (mac 00:16:3e:3b:b9:d7) + (script vif-vnic) + (uuid 33b87cce-c187-4bdd-8301-6411a48be129) + (backend 0) + ) + ) + (device + (vbd + (uname phy:/dev/zvol/dsk/export/s10u4-root) + (uuid b1d5196f-aae7-74bb-43dc-b4aae943b9bd) + (mode w) + (dev hda:disk) + (backend 0) + (bootable 1) + ) + ) + (device + (vfb + (vncunused 1) + (uuid d45dfd90-c0e0-8851-8f14-f16ba9512d2d) + (location localhost:5900) + ) + ) + (device + (console + (protocol vt100) + (location 3) + (uuid 0248d3f7-f3ae-78e8-4829-ad51a6f94efd) + ) + ) +) Index: tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml =================================================================== RCS file: tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml diff -N tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml 3 Feb 2008 18:37:17 -0000 @@ -0,0 +1,33 @@ +<domain type='xen' id='1'> + <name>s10u4</name> + <uuid>fde0533d-d043-88c6-dfba-4822fa32f309</uuid> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <memory>1048576</memory> + <vcpu>1</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <features> + <pae/> + </features> + <clock offset='utc'/> + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <interface type='ethernet'> + <target dev='vif1.0'/> + <mac address='00:16:3e:3b:b9:d7'/> + <script path='vif-vnic'/> + </interface> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/zvol/dsk/export/s10u4-root'/> + <target dev='hda'/> + </disk> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' keymap='en-us'/> + </devices> +</domain> Index: tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr =================================================================== RCS file: tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr diff -N tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr 3 Feb 2008 18:37:17 -0000 @@ -0,0 +1 @@ +(vm (name 'fvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(serial pty)))(device (vbd (dev 'ioemu:xvda')(uname 'file:/root/some.img')(mode 'w')))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-fv-kernel.xml =================================================================== RCS file: tests/xml2sexprdata/xml2sexpr-fv-kernel.xml diff -N tests/xml2sexprdata/xml2sexpr-fv-kernel.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xml2sexprdata/xml2sexpr-fv-kernel.xml 3 Feb 2008 18:37:17 -0000 @@ -0,0 +1,24 @@ +<domain type='xen' id='15'> + <name>fvtest</name> + <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid> + <os> + <type>hvm</type> + <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel> + <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> + <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… </cmdline> + <loader>/usr/lib/xen/boot/hvmloader</loader> + </os> + <memory>430080</memory> + <vcpu>2</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='/root/some.img'/> + <target dev='xvda'/> + </disk> + <console tty='/dev/pts/4'/> + </devices> +</domain> + Index: tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr,v retrieving revision 1.2 diff -u -p -r1.2 xml2sexpr-fv-localtime.sexpr --- tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr 18 Jul 2007 21:08:22 -0000 1.2 +++ tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(vnc 1)(localtime 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(localtime 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr,v retrieving revision 1.1 diff -u -p -r1.1 xml2sexpr-fv-usbmouse.sexpr --- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr 18 Jul 2007 21:08:22 -0000 1.1 +++ tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice mouse)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr,v retrieving revision 1.1 diff -u -p -r1.1 xml2sexpr-fv-usbtablet.sexpr --- tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr 18 Jul 2007 21:08:22 -0000 1.1 +++ tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(usbdevice tablet)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr,v retrieving revision 1.2 diff -u -p -r1.2 xml2sexpr-fv-utc.sexpr --- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr 18 Jul 2007 21:08:22 -0000 1.2 +++ tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr,v retrieving revision 1.6 diff -u -p -r1.6 xml2sexpr-fv-v2.sexpr --- tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr 18 Jul 2007 21:08:22 -0000 1.6 +++ tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(acpi 1)(usb 1)(vnc 1)(vncdisplay 17)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncdisplay 17)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr,v retrieving revision 1.5 diff -u -p -r1.5 xml2sexpr-fv-vncunused.sexpr --- tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr 18 Jul 2007 21:08:22 -0000 1.5 +++ tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(acpi 1)(usb 1)(vnc 1)(vncunused 1)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)(vncunused 1)(keymap ja)))(device (vbd (dev 'hdc:cdrom')(uname 'file:/root/boot.iso')(mode 'r')))(device (vbd (dev 'hda:disk')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-fv.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-fv.sexpr,v retrieving revision 1.3 diff -u -p -r1.3 xml2sexpr-fv.sexpr --- tests/xml2sexprdata/xml2sexpr-fv.sexpr 18 Jul 2007 21:08:22 -0000 1.3 +++ tests/xml2sexprdata/xml2sexpr-fv.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib64/xen/bin/qemu-dm')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file +(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'restart')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(cdrom '/root/boot.iso')(acpi 1)(usb 1)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)))(device (vbd (dev 'ioemu:hda')(uname 'file:/root/foo.img')(mode 'w')))(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')(script 'vif-bridge')(type ioemu)))) \ No newline at end of file Index: tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr =================================================================== RCS file: /data/cvs/libvirt/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr,v retrieving revision 1.2 diff -u -p -r1.2 xml2sexpr-no-source-cdrom.sexpr --- tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr 18 Jul 2007 21:08:22 -0000 1.2 +++ tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr 3 Feb 2008 18:37:17 -0000 @@ -1 +1 @@ -(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)(uuid 'cc2315e7d26a307a438c6d188ec4c09c')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(device_model '/usr/lib/xen/bin/qemu-dm')(vcpus 1)(boot c)(acpi 1)(apic 1)(pae 1)(usb 1)(vnc 1)(vncdisplay 6)))(device (vbd (dev 'hda:disk:disk')(uname 'phy:/dev/sda8')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(mode 'r')))(device (vif (mac '00:16:3e:0a:7b:39')(type ioemu)))) \ No newline at end of file +(vm (name 'test')(memory 350)(maxmem 382)(vcpus 1)(uuid 'cc2315e7d26a307a438c6d188ec4c09c')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(apic 1)(pae 1)(usb 1)(device_model '/usr/lib/xen/bin/qemu-dm')(vnc 1)(vncdisplay 6)))(device (vbd (dev 'hda:disk:disk')(uname 'phy:/dev/sda8')(mode 'w')))(device (vbd (dev 'hdc:cdrom')(mode 'r')))(device (vif (mac '00:16:3e:0a:7b:39')(type ioemu)))) \ No newline at end of file -- |=- 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 -=|

5 8

[Libvir] Not able to access the network.
by Spencer Parker 10 Mar '08

10 Mar '08

I have set up a machine using virsh, but I can't access it over the network. It has valid IP and everything like that. It is all running over eth1 and not eth0. Any idea as to why I can't get network access on it? I have assigned it a valid bridge. I try to ping the IP I gave it and I get nothing.

2 1

[Libvir] [PATCH][Q] tbe ?
by Atsushi SAKAI 07 Mar '08

07 Mar '08

Sorry for sending typo patch again. I want to know the word "tbe". Are my fixes correct? libvir.html | 4 ++-- storage.html | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) c.f. An week ago, I see this word "tbe" in libvir.html But it is difficult to find correct meaning. Today I am reading the storage.html and found the correct meaning. Thanks Atsushi SAKAI

2 1

[Libvir] [PATCH] Have xen fv acknowledge <boot> tag
by Cole Robinson 07 Mar '08

07 Mar '08

https://bugzilla.redhat.com/show_bug.cgi?id=428868 Defining a xen fullvirt guest with a <boot dev="{hd,cdrom,etc.}"> tag currently ignores this tag and forces in a kernel tag. Dan pointed out the fix in the bz, which I verified does the trick. Patch attached. Thanks, Cole

2 3

[Libvir] Trouble getting console
by Spencer Parker 07 Mar '08

07 Mar '08

I have setup a virtual machine, but am not able to connect to the console for it. I type in virsh console <name> and it give me a new line with no output...I hit enter a few time to see it kicks in, but nothing. here is my xml file: <domain type='xen'> <name>test1</name> <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid> <os> <type>hvm</type> <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> <memory>262144</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> <pae/> <acpi/> <apic/> </features> <clock sync="localtime"/> <devices> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <interface type='bridge'> <source bridge='xenbr1'/> <script path='vif-bridge'/> </interface> <disk type='file' device='disk'> <driver name='tap' type='aio'/> <source file='/xen/domains2/spencertest2/disk.img'/> <target dev='hda'/> </disk> <disk type='file' device='disk'> <driver name='tap' type='aio'/> <source file='/xen/domains2/spencertest2/swap.img'/> <target dev='hdb'/> </disk> <graphics type='vnc' port='-1'/> <console tty='/dev/pts/1'/> </devices> </domain>

2 1

[Libvir] Updating to the newest libvirt
by Spencer Parker 07 Mar '08

07 Mar '08

I am running CentOS 5 on a 64 bit system and when I try to install via Yum...the newest version I can get is 0.2.3-9.el5. When I try to install with RPM's it just throws up conflicts. is there a newer version of libvirt that I can install onto CentOS 5...or am I just confusing things. Thanks again for helping this newbie out... spencer parker

2 1

[Libvir] RPM build issue
by Vadim Zaliva 05 Mar '08

05 Mar '08

Hi! I am trying to build libvirt-0.4.1 on Centos 5.1/i386 from SRPM. I am getting following error: RPM build errors: File not found: /var/tmp/libvirt-0.4.1-root/usr/libexec/ libvirt_parthelper Any suggestions? Sincerely, Vadim

2 4

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

05 Mar '08

Hi, I try follow, # virsh vcpupin guest_dom AAA 0,1 [no error messages] # echo $? 1 There is no processing to output an error-message, when vshCommandOptInt become an error. I make the patch to solve this problem. Thanks, Shigeki Sakamoto. Index: src/virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.134 diff -u -p -r1.134 virsh.c --- src/virsh.c 27 Feb 2008 16:14:44 -0000 1.134 +++ src/virsh.c 4 Mar 2008 08:35:47 -0000 @@ -1723,6 +1723,8 @@ cmdVcpupin(vshControl * ctl, vshCmd * cm vcpu = vshCommandOptInt(cmd, "vcpu", &vcpufound); if (!vcpufound) { + vshCmdOpt *arg = vshCommandOpt(cmd, "vcpu"); + vshError(ctl, FALSE, _("vcpu: %s: Invalid virtual CPU number."), arg->data); virDomainFree(dom); return FALSE; }

2 4

[Libvir] [PATCH]: Make iSCSI login actually work
by Chris Lalancette 04 Mar '08

04 Mar '08

Hello, I mentioned this before, but this patch must have been dropped when Dan committed storage stuff to CVS. In order for iSCSI login to work properly, you must properly --sendtargets before trying to login, otherwise your logins will fail. This patch just adds a --sendtargets command right before the login to make sure things succeed. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 3

[Libvir] ANNOUNCE: ocaml libvirt bindings version 0.4.1.0
by Richard W.M. Jones 04 Mar '08

04 Mar '08

I'm pleased to announce the release of version 0.4.1.0 of the ocaml libvirt bindings. You can download them from here: http://libvirt.org/ocaml/ Some highlights from amongst the large number of changes since 0.4.0.3 was released: - libvirt bindings: Complete support for storage API matching libvirt 0.4.1. - virt-df: Finished off a demo of this program. - virt-top: Supports QEMU/KVM hard drive stats. - virt-ctrl: Restructured the interface a great deal so connecting to local and LAN hypervisors is much quicker and easier. Supports Avahi for zeroconf detection of remote libvirt instances. Collects historical data for graphing. - documentation Lots of updates and examples. List of dependencies made simpler to understand. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 0

Re: [Libvir] a couple of questions -Newbie
by Richard W.M. Jones 04 Mar '08

04 Mar '08

On Tue, Mar 04, 2008 at 09:01:22AM -0700, Spencer Parker wrote: > Now when I run virt-top with the script option it just hangs...how long > till it dies? Or is there a way to daemonize it? Which version of virt-top is this? Script mode is designed to run forever. If used in conjunction with --csv then you'll get an ever longer CSV file. But you also add either '-n <iterations>' or '--end-time <time>'[1] to make it stop early (or just kill it instead). For example: virt-top -c test:///default --script --csv /tmp/test.csv -n 10 will run for 30 seconds, produce a 11 line (10 measurements + title) CSV file, and then exit. If it _doesn't_ do that, then please file a bug. The virt-top manpage explains all the options in some detail. Rich. [1] Various <time> formats as explained in the manpage. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 0

[Libvir] many more translatable strings need to be marked
by Jim Meyering 04 Mar '08

04 Mar '08

I've found many more strings that should be marked for translation. The first part of this change is to add to the list of diagnostic-printing function names in Makefile.maint and to make that list more readable. I marked some strings, but am leaving the rest, for now. Running "make sc_unmarked_diagnostics" shows over 300 strings remaining to be marked with _(...). However, while marking them is a big step, it's not all. Once they're all marked, then we'll have to go back and with the help of the right build options (--disable-nls and -Wformat -Wformat-security), or just some judicious grepping through your patch, add "%s" before each _("...") string that contains no "%" directive. Mark many more strings for translation. * Makefile.maint (err_func_re): Add to the list and make it readable. * po/POTFILES.in: Add src/util.c and src/xm_internal.c, and sort. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- Makefile.maint | 32 +++++++- po/POTFILES.in | 10 ++- qemud/remote.c | 197 +++++++++++++++++++++++++------------------------ src/storage_backend.c | 2 +- src/util.c | 2 +- src/xm_internal.c | 16 +++-- 6 files changed, 147 insertions(+), 112 deletions(-) diff --git a/Makefile.maint b/Makefile.maint index 92cdf29..14a2ac5 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -299,8 +299,30 @@ sc_two_space_separator_in_usage: echo "$(ME): an option and its description"; \ 1>&2; exit 1; } || : -err_func_re = \ -(DISABLE_fprintf|qemudLog|(xmlRpc|vir(Xend|XML|Hash|Conf|Test|LibConn|StorageReport))Error) +msg_gen_function = \ + DISABLE_fprintf \ + virXendError \ + virXMLError \ + virHashError \ + virConfError \ + virTestError \ + virLibConnError \ + virStorageReportError \ + virxmlRpcError \ + xenXMError \ + virXenError \ + ReportError \ + testError \ + virLog \ + qemudLog \ + openvzLog \ + virStorageLog \ + qemudReportError \ + remoteDispatchError \ + error + +func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|') +func_re := ($(func_or)) # Look for diagnostics that aren't marked for translation. # This won't find any for which error's format string is on a separate line. @@ -309,12 +331,12 @@ err_func_re = \ # "%s", _("no storage vol w..." sc_unmarked_diagnostics: @grep -nE \ - '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \ + '\<$(func_re) \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \ | grep -v '_''(' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : - @{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(CVS_LIST_EXCEPT)); \ - grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(CVS_LIST_EXCEPT)); } \ + @{ grep -nE '\<$(func_re) *\(.*;$$' $$($(CVS_LIST_EXCEPT)); \ + grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(CVS_LIST_EXCEPT)); } \ | sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \ | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ diff --git a/po/POTFILES.in b/po/POTFILES.in index 0aafd2e..b619aa2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ gnulib/lib/gai_strerror.c -qemud/remote.c qemud/qemud.c +qemud/remote.c src/conf.c src/console.c src/hash.c @@ -10,20 +10,22 @@ src/proxy_internal.c src/qemu_conf.c src/qemu_driver.c src/remote_internal.c +src/sexpr.c src/storage_backend.c +src/storage_backend_disk.c src/storage_backend_fs.c -src/storage_backend_logical.c src/storage_backend_iscsi.c -src/storage_backend_disk.c +src/storage_backend_logical.c src/storage_conf.c src/storage_driver.c -src/sexpr.c src/test.c +src/util.c src/uuid.c src/virsh.c src/virterror.c src/xen_internal.c src/xend_internal.c +src/xm_internal.c src/xml.c src/xmlrpc.c src/xs_internal.c diff --git a/qemud/remote.c b/qemud/remote.c index 014fe65..a8f8eb4 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -102,32 +102,34 @@ remoteDispatchClientRequest (struct qemud_server *server, xdrmem_create (&xdr, client->buffer, client->bufferLength, XDR_DECODE); if (!xdr_remote_message_header (&xdr, &req)) { - remoteDispatchError (client, NULL, "xdr_remote_message_header"); + remoteDispatchError (client, NULL, "%s", _("xdr_remote_message_header")); xdr_destroy (&xdr); return; } /* Check version, etc. */ if (req.prog != REMOTE_PROGRAM) { - remoteDispatchError (client, &req, "program mismatch (actual %x, expected %x)", + remoteDispatchError (client, &req, + _("program mismatch (actual %x, expected %x)"), req.prog, REMOTE_PROGRAM); xdr_destroy (&xdr); return; } if (req.vers != REMOTE_PROTOCOL_VERSION) { - remoteDispatchError (client, &req, "version mismatch (actual %x, expected %x)", + remoteDispatchError (client, &req, + _("version mismatch (actual %x, expected %x)"), req.vers, REMOTE_PROTOCOL_VERSION); xdr_destroy (&xdr); return; } if (req.direction != REMOTE_CALL) { - remoteDispatchError (client, &req, "direction (%d) != REMOTE_CALL", + remoteDispatchError (client, &req, _("direction (%d) != REMOTE_CALL"), (int) req.direction); xdr_destroy (&xdr); return; } if (req.status != REMOTE_OK) { - remoteDispatchError (client, &req, "status (%d) != REMOTE_OK", + remoteDispatchError (client, &req, _("status (%d) != REMOTE_OK"), (int) req.status); xdr_destroy (&xdr); return; @@ -143,7 +145,7 @@ remoteDispatchClientRequest (struct qemud_server *server, req.proc != REMOTE_PROC_AUTH_SASL_STEP && req.proc != REMOTE_PROC_AUTH_POLKIT ) { - remoteDispatchError (client, &req, "authentication required"); + remoteDispatchError (client, &req, "%s", _("authentication required")); xdr_destroy (&xdr); return; } @@ -156,7 +158,7 @@ remoteDispatchClientRequest (struct qemud_server *server, #include "remote_dispatch_proc_switch.h" default: - remoteDispatchError (client, &req, "unknown procedure: %d", + remoteDispatchError (client, &req, _("unknown procedure: %d"), req.proc); xdr_destroy (&xdr); return; @@ -164,7 +166,7 @@ remoteDispatchClientRequest (struct qemud_server *server, /* Parse args. */ if (!(*args_filter) (&xdr, args)) { - remoteDispatchError (client, &req, "parse args failed"); + remoteDispatchError (client, &req, "%s", _("parse args failed")); xdr_destroy (&xdr); return; } @@ -179,7 +181,8 @@ remoteDispatchClientRequest (struct qemud_server *server, * an internal error. */ if (rv < -2 || rv > 0) { - remoteDispatchError (client, &req, "internal error - dispatch function returned invalid code %d", rv); + remoteDispatchError (client, &req, + _("internal error - dispatch function returned invalid code %d"), rv); return; } @@ -201,14 +204,14 @@ remoteDispatchClientRequest (struct qemud_server *server, len = 0; /* We'll come back and write this later. */ if (!xdr_int (&xdr, &len)) { - remoteDispatchError (client, &req, "dummy length"); + remoteDispatchError (client, &req, "%s", _("dummy length")); xdr_destroy (&xdr); if (rv == 0) xdr_free (ret_filter, ret); return; } if (!xdr_remote_message_header (&xdr, &rep)) { - remoteDispatchError (client, &req, "serialise reply header"); + remoteDispatchError (client, &req, "%s", _("serialise reply header")); xdr_destroy (&xdr); if (rv == 0) xdr_free (ret_filter, ret); return; @@ -217,7 +220,7 @@ remoteDispatchClientRequest (struct qemud_server *server, /* If OK, serialise return structure, if error serialise error. */ if (rv == 0) { if (!(*ret_filter) (&xdr, ret)) { - remoteDispatchError (client, &req, "serialise return struct"); + remoteDispatchError (client, &req, "%s", _("serialise return struct")); xdr_destroy (&xdr); return; } @@ -272,7 +275,7 @@ remoteDispatchClientRequest (struct qemud_server *server, } if (!xdr_remote_error (&xdr, &error)) { - remoteDispatchError (client, &req, "serialise return error"); + remoteDispatchError (client, &req, "%s", _("serialise return error")); xdr_destroy (&xdr); return; } @@ -281,13 +284,13 @@ remoteDispatchClientRequest (struct qemud_server *server, /* Write the length word. */ len = xdr_getpos (&xdr); if (xdr_setpos (&xdr, 0) == 0) { - remoteDispatchError (client, &req, "xdr_setpos"); + remoteDispatchError (client, &req, "%s", _("xdr_setpos")); xdr_destroy (&xdr); return; } if (!xdr_int (&xdr, &len)) { - remoteDispatchError (client, &req, "serialise return length"); + remoteDispatchError (client, &req, "%s", _("serialise return length")); xdr_destroy (&xdr); return; } @@ -421,7 +424,7 @@ remoteDispatchOpen (struct qemud_server *server ATTRIBUTE_UNUSED, /* Already opened? */ if (client->conn) { - remoteDispatchError (client, req, "connection already open"); + remoteDispatchError (client, req, "%s", _("connection already open")); return -2; } @@ -447,7 +450,7 @@ remoteDispatchOpen (struct qemud_server *server ATTRIBUTE_UNUSED, #define CHECK_CONN(client) \ if (!client->conn) { \ - remoteDispatchError (client, req, "connection not open"); \ + remoteDispatchError (client, req, "%s", _("connection not open")); \ return -2; \ } @@ -494,7 +497,7 @@ remoteDispatchGetType (struct qemud_server *server ATTRIBUTE_UNUSED, */ ret->type = strdup (type); if (!ret->type) { - remoteDispatchError (client, req, "out of memory in strdup"); + remoteDispatchError (client, req, "%s", _("out of memory in strdup")); return -2; } @@ -608,7 +611,7 @@ remoteDispatchDomainGetSchedulerType (struct qemud_server *server ATTRIBUTE_UNUS dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -639,19 +642,19 @@ remoteDispatchDomainGetSchedulerParameters (struct qemud_server *server ATTRIBUT nparams = args->nparams; if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { - remoteDispatchError (client, req, "nparams too large"); + remoteDispatchError (client, req, "%s", _("nparams too large")); return -2; } params = malloc (sizeof (*params) * nparams); if (params == NULL) { - remoteDispatchError (client, req, "out of memory allocating array"); + remoteDispatchError (client, req, "%s", _("out of memory allocating array")); return -2; } dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { free (params); - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -670,7 +673,7 @@ remoteDispatchDomainGetSchedulerParameters (struct qemud_server *server ATTRIBUT virDomainFree(dom); free (params); remoteDispatchError (client, req, - "out of memory allocating return array"); + "%s", _("out of memory allocating return array")); return -2; } @@ -681,7 +684,7 @@ remoteDispatchDomainGetSchedulerParameters (struct qemud_server *server ATTRIBUT virDomainFree(dom); free (params); remoteDispatchError (client, req, - "out of memory allocating return array"); + "%s", _("out of memory allocating return array")); return -2; } ret->params.params_val[i].value.type = params[i].type; @@ -701,7 +704,7 @@ remoteDispatchDomainGetSchedulerParameters (struct qemud_server *server ATTRIBUT default: virDomainFree(dom); free (params); - remoteDispatchError (client, req, "unknown type"); + remoteDispatchError (client, req, "%s", _("unknown type")); return -2; } } @@ -726,12 +729,12 @@ remoteDispatchDomainSetSchedulerParameters (struct qemud_server *server ATTRIBUT nparams = args->params.params_len; if (nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) { - remoteDispatchError (client, req, "nparams too large"); + remoteDispatchError (client, req, "%s", _("nparams too large")); return -2; } params = malloc (sizeof (*params) * nparams); if (params == NULL) { - remoteDispatchError (client, req, "out of memory allocating array"); + remoteDispatchError (client, req, "%s", _("out of memory allocating array")); return -2; } @@ -760,7 +763,7 @@ remoteDispatchDomainSetSchedulerParameters (struct qemud_server *server ATTRIBUT dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { free (params); - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -786,7 +789,7 @@ remoteDispatchDomainBlockStats (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } path = args->path; @@ -817,7 +820,7 @@ remoteDispatchDomainInterfaceStats (struct qemud_server *server ATTRIBUTE_UNUSED dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } path = args->path; @@ -849,7 +852,7 @@ remoteDispatchDomainAttachDevice (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -873,7 +876,7 @@ remoteDispatchDomainCreate (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -935,7 +938,7 @@ remoteDispatchDomainDestroy (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -957,7 +960,7 @@ remoteDispatchDomainDetachDevice (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -982,7 +985,7 @@ remoteDispatchDomainDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1008,7 +1011,7 @@ remoteDispatchDomainGetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1033,7 +1036,7 @@ remoteDispatchDomainGetInfo (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1065,7 +1068,7 @@ remoteDispatchDomainGetMaxMemory (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1090,7 +1093,7 @@ remoteDispatchDomainGetMaxVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1115,7 +1118,7 @@ remoteDispatchDomainGetOsType (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1144,19 +1147,19 @@ remoteDispatchDomainGetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } if (args->maxinfo > REMOTE_VCPUINFO_MAX) { virDomainFree(dom); - remoteDispatchError (client, req, "maxinfo > REMOTE_VCPUINFO_MAX"); + remoteDispatchError (client, req, "%s", _("maxinfo > REMOTE_VCPUINFO_MAX")); return -2; } if (args->maxinfo * args->maplen > REMOTE_CPUMAPS_MAX) { virDomainFree(dom); - remoteDispatchError (client, req, "maxinfo * maplen > REMOTE_CPUMAPS_MAX"); + remoteDispatchError (client, req, "%s", _("maxinfo * maplen > REMOTE_CPUMAPS_MAX")); return -2; } @@ -1244,7 +1247,7 @@ remoteDispatchDomainMigratePerform (struct qemud_server *server ATTRIBUTE_UNUSED dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1293,7 +1296,7 @@ remoteDispatchListDefinedDomains (struct qemud_server *server ATTRIBUTE_UNUSED, if (args->maxnames > REMOTE_DOMAIN_NAME_LIST_MAX) { remoteDispatchError (client, req, - "maxnames > REMOTE_DOMAIN_NAME_LIST_MAX"); + "%s", _("maxnames > REMOTE_DOMAIN_NAME_LIST_MAX")); return -2; } @@ -1390,13 +1393,13 @@ remoteDispatchDomainPinVcpu (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } if (args->cpumap.cpumap_len > REMOTE_CPUMAP_MAX) { virDomainFree(dom); - remoteDispatchError (client, req, "cpumap_len > REMOTE_CPUMAP_MAX"); + remoteDispatchError (client, req, "%s", _("cpumap_len > REMOTE_CPUMAP_MAX")); return -2; } @@ -1423,7 +1426,7 @@ remoteDispatchDomainReboot (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1462,7 +1465,7 @@ remoteDispatchDomainResume (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1486,7 +1489,7 @@ remoteDispatchDomainSave (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1510,7 +1513,7 @@ remoteDispatchDomainCoreDump (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1534,7 +1537,7 @@ remoteDispatchDomainSetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1558,7 +1561,7 @@ remoteDispatchDomainSetMaxMemory (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1582,7 +1585,7 @@ remoteDispatchDomainSetMemory (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1606,7 +1609,7 @@ remoteDispatchDomainSetVcpus (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1630,7 +1633,7 @@ remoteDispatchDomainShutdown (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1654,7 +1657,7 @@ remoteDispatchDomainSuspend (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1678,7 +1681,7 @@ remoteDispatchDomainUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, dom = get_nonnull_domain (client->conn, args->dom); if (dom == NULL) { - remoteDispatchError (client, req, "domain not found"); + remoteDispatchError (client, req, "%s", _("domain not found")); return -2; } @@ -1701,7 +1704,7 @@ remoteDispatchListDefinedNetworks (struct qemud_server *server ATTRIBUTE_UNUSED, if (args->maxnames > REMOTE_NETWORK_NAME_LIST_MAX) { remoteDispatchError (client, req, - "maxnames > REMOTE_NETWORK_NAME_LIST_MAX"); + "%s", _("maxnames > REMOTE_NETWORK_NAME_LIST_MAX")); return -2; } @@ -1727,7 +1730,7 @@ remoteDispatchListDomains (struct qemud_server *server ATTRIBUTE_UNUSED, if (args->maxids > REMOTE_DOMAIN_ID_LIST_MAX) { remoteDispatchError (client, req, - "maxids > REMOTE_DOMAIN_ID_LIST_MAX"); + "%s", _("maxids > REMOTE_DOMAIN_ID_LIST_MAX")); return -2; } @@ -1752,7 +1755,7 @@ remoteDispatchListNetworks (struct qemud_server *server ATTRIBUTE_UNUSED, if (args->maxnames > REMOTE_NETWORK_NAME_LIST_MAX) { remoteDispatchError (client, req, - "maxnames > REMOTE_NETWORK_NAME_LIST_MAX"); + "%s", _("maxnames > REMOTE_NETWORK_NAME_LIST_MAX")); return -2; } @@ -1779,7 +1782,7 @@ remoteDispatchNetworkCreate (struct qemud_server *server ATTRIBUTE_UNUSED, net = get_nonnull_network (client->conn, args->net); if (net == NULL) { - remoteDispatchError (client, req, "network not found"); + remoteDispatchError (client, req, "%s", _("network not found")); return -2; } @@ -1839,7 +1842,7 @@ remoteDispatchNetworkDestroy (struct qemud_server *server ATTRIBUTE_UNUSED, net = get_nonnull_network (client->conn, args->net); if (net == NULL) { - remoteDispatchError (client, req, "network not found"); + remoteDispatchError (client, req, "%s", _("network not found")); return -2; } @@ -1863,7 +1866,7 @@ remoteDispatchNetworkDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, net = get_nonnull_network (client->conn, args->net); if (net == NULL) { - remoteDispatchError (client, req, "network not found"); + remoteDispatchError (client, req, "%s", _("network not found")); return -2; } @@ -1889,7 +1892,7 @@ remoteDispatchNetworkGetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, net = get_nonnull_network (client->conn, args->net); if (net == NULL) { - remoteDispatchError (client, req, "network not found"); + remoteDispatchError (client, req, "%s", _("network not found")); return -2; } @@ -1913,7 +1916,7 @@ remoteDispatchNetworkGetBridgeName (struct qemud_server *server ATTRIBUTE_UNUSED net = get_nonnull_network (client->conn, args->net); if (net == NULL) { - remoteDispatchError (client, req, "network not found"); + remoteDispatchError (client, req, "%s", _("network not found")); return -2; } @@ -1975,7 +1978,7 @@ remoteDispatchNetworkSetAutostart (struct qemud_server *server ATTRIBUTE_UNUSED, net = get_nonnull_network (client->conn, args->net); if (net == NULL) { - remoteDispatchError (client, req, "network not found"); + remoteDispatchError (client, req, "%s", _("network not found")); return -2; } @@ -1999,7 +2002,7 @@ remoteDispatchNetworkUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, net = get_nonnull_network (client->conn, args->net); if (net == NULL) { - remoteDispatchError (client, req, "network not found"); + remoteDispatchError (client, req, "%s", _("network not found")); return -2; } @@ -2090,13 +2093,14 @@ static char *addrToString(struct qemud_client *client, port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV)) != 0) { remoteDispatchError(client, req, - "Cannot resolve address %d: %s", err, gai_strerror(err)); + _("Cannot resolve address %d: %s"), + err, gai_strerror(err)); return NULL; } addr = malloc(strlen(host) + 1 + strlen(port) + 1); if (!addr) { - remoteDispatchError(client, req, "cannot allocate address"); + remoteDispatchError(client, req, "%s", _("cannot allocate address")); return NULL; } @@ -2138,7 +2142,8 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, /* Get local address in form IPADDR:PORT */ salen = sizeof(sa); if (getsockname(client->fd, (struct sockaddr*)&sa, &salen) < 0) { - remoteDispatchError(client, req, "failed to get sock address %d (%s)", + remoteDispatchError(client, req, + _("failed to get sock address %d (%s)"), errno, strerror(errno)); return -2; } @@ -2149,7 +2154,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, /* Get remote address in form IPADDR:PORT */ salen = sizeof(sa); if (getpeername(client->fd, (struct sockaddr*)&sa, &salen) < 0) { - remoteDispatchError(client, req, "failed to get peer address %d (%s)", + remoteDispatchError(client, req, _("failed to get peer address %d (%s)"), errno, strerror(errno)); free(localAddr); return -2; @@ -2414,7 +2419,8 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, if (serverout) { ret->data.data_val = malloc(serveroutlen); if (!ret->data.data_val) { - remoteDispatchError (client, req, "out of memory allocating array"); + remoteDispatchError (client, req, + "%s", _("out of memory allocating array")); return -2; } memcpy(ret->data.data_val, serverout, serveroutlen); @@ -2494,7 +2500,8 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, if (serverout) { ret->data.data_val = malloc(serveroutlen); if (!ret->data.data_val) { - remoteDispatchError (client, req, "out of memory allocating array"); + remoteDispatchError (client, req, + "%s", _("out of memory allocating array")); return -2; } memcpy(ret->data.data_val, serverout, serveroutlen); @@ -2738,7 +2745,7 @@ remoteDispatchListDefinedStoragePools (struct qemud_server *server ATTRIBUTE_UNU if (args->maxnames > REMOTE_NETWORK_NAME_LIST_MAX) { remoteDispatchError (client, req, - "maxnames > REMOTE_NETWORK_NAME_LIST_MAX"); + "%s", _("maxnames > REMOTE_NETWORK_NAME_LIST_MAX")); return -2; } @@ -2764,7 +2771,7 @@ remoteDispatchListStoragePools (struct qemud_server *server ATTRIBUTE_UNUSED, if (args->maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX) { remoteDispatchError (client, req, - "maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX"); + "%s", _("maxnames > REMOTE_STORAGE_POOL_NAME_LIST_MAX")); return -2; } @@ -2791,7 +2798,7 @@ remoteDispatchStoragePoolCreate (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -2851,7 +2858,7 @@ remoteDispatchStoragePoolBuild (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -2876,7 +2883,7 @@ remoteDispatchStoragePoolDestroy (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -2900,7 +2907,7 @@ remoteDispatchStoragePoolDelete (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -2924,7 +2931,7 @@ remoteDispatchStoragePoolRefresh (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -2949,7 +2956,7 @@ remoteDispatchStoragePoolGetInfo (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -2980,7 +2987,7 @@ remoteDispatchStoragePoolDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -3006,7 +3013,7 @@ remoteDispatchStoragePoolGetAutostart (struct qemud_server *server ATTRIBUTE_UNU pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -3089,7 +3096,7 @@ remoteDispatchStoragePoolSetAutostart (struct qemud_server *server ATTRIBUTE_UNU pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -3113,7 +3120,7 @@ remoteDispatchStoragePoolUndefine (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -3167,13 +3174,13 @@ remoteDispatchStoragePoolListVolumes (struct qemud_server *server ATTRIBUTE_UNUS if (args->maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX) { remoteDispatchError (client, req, - "maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX"); + "%s", _("maxnames > REMOTE_STORAGE_VOL_NAME_LIST_MAX")); return -2; } pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -3202,7 +3209,7 @@ remoteDispatchStoragePoolNumOfVolumes (struct qemud_server *server ATTRIBUTE_UNU pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -3233,7 +3240,7 @@ remoteDispatchStorageVolCreateXml (struct qemud_server *server ATTRIBUTE_UNUSED, pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } @@ -3259,7 +3266,7 @@ remoteDispatchStorageVolDelete (struct qemud_server *server ATTRIBUTE_UNUSED, vol = get_nonnull_storage_vol (client->conn, args->vol); if (vol == NULL) { - remoteDispatchError (client, req, "storage_vol not found"); + remoteDispatchError (client, req, "%s", _("storage_vol not found")); return -2; } @@ -3284,7 +3291,7 @@ remoteDispatchStorageVolGetInfo (struct qemud_server *server ATTRIBUTE_UNUSED, vol = get_nonnull_storage_vol (client->conn, args->vol); if (vol == NULL) { - remoteDispatchError (client, req, "storage_vol not found"); + remoteDispatchError (client, req, "%s", _("storage_vol not found")); return -2; } @@ -3314,7 +3321,7 @@ remoteDispatchStorageVolDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, vol = get_nonnull_storage_vol (client->conn, args->vol); if (vol == NULL) { - remoteDispatchError (client, req, "storage_vol not found"); + remoteDispatchError (client, req, "%s", _("storage_vol not found")); return -2; } @@ -3341,7 +3348,7 @@ remoteDispatchStorageVolGetPath (struct qemud_server *server ATTRIBUTE_UNUSED, vol = get_nonnull_storage_vol (client->conn, args->vol); if (vol == NULL) { - remoteDispatchError (client, req, "storage_vol not found"); + remoteDispatchError (client, req, "%s", _("storage_vol not found")); return -2; } @@ -3369,7 +3376,7 @@ remoteDispatchStorageVolLookupByName (struct qemud_server *server ATTRIBUTE_UNUS pool = get_nonnull_storage_pool (client->conn, args->pool); if (pool == NULL) { - remoteDispatchError (client, req, "storage_pool not found"); + remoteDispatchError (client, req, "%s", _("storage_pool not found")); return -2; } diff --git a/src/storage_backend.c b/src/storage_backend.c index da0f34a..debbce3 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -1,5 +1,5 @@ /* - * storage_backend.h: internal storage driver backend contract + * storage_backend.c: internal storage driver backend contract * * Copyright (C) 2007-2008 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange diff --git a/src/util.c b/src/util.c index 4d61540..8943669 100644 --- a/src/util.c +++ b/src/util.c @@ -458,7 +458,7 @@ int virFileLinkPointsTo (const char *checkLink ATTRIBUTE_UNUSED, const char *checkDest ATTRIBUTE_UNUSED) { - virLog ("%s: not implemented", __FUNCTION__); + virLog (_("%s: not implemented"), __FUNCTION__); return 0; } diff --git a/src/xm_internal.c b/src/xm_internal.c index 6b4b4d7..d50ce46 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -434,7 +434,8 @@ static int xenXMConfigCacheRefresh (virConnectPtr conn) { virHashRemoveEntry(configCache, path, NULL); } free(entry); - xenXMError (conn, VIR_ERR_INTERNAL_ERROR, "xenXMConfigCacheRefresh: name"); + xenXMError (conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("xenXMConfigCacheRefresh: name")); goto cleanup; } @@ -444,7 +445,8 @@ static int xenXMConfigCacheRefresh (virConnectPtr conn) { if (virHashAddEntry(configCache, entry->filename, entry) < 0) { virConfFree(entry->conf); free(entry); - xenXMError (conn, VIR_ERR_INTERNAL_ERROR, "xenXMConfigCacheRefresh: virHashAddEntry"); + xenXMError (conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("xenXMConfigCacheRefresh: virHashAddEntry")); goto cleanup; } } @@ -1254,21 +1256,23 @@ int xenXMDomainPinVcpu(virDomainPtr domain, return -1; } if (domain->conn->flags & VIR_CONNECT_RO) { - xenXMError (domain->conn, VIR_ERR_INVALID_ARG, "read only connection"); + xenXMError (domain->conn, VIR_ERR_INVALID_ARG, + "%s", _("read only connection")); return -1; } if (domain->id != -1) { - xenXMError (domain->conn, VIR_ERR_INVALID_ARG, "not inactive domain"); + xenXMError (domain->conn, VIR_ERR_INVALID_ARG, + "%s", _("not inactive domain")); return -1; } if (!(filename = virHashLookup(nameConfigMap, domain->name))) { - xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR, "virHashLookup"); + xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR, "%s", _("virHashLookup")); return -1; } if (!(entry = virHashLookup(configCache, filename))) { xenXMError (domain->conn, VIR_ERR_INTERNAL_ERROR, - "can't retrieve config file for domain"); + "%s", _("can't retrieve config file for domain")); return -1; } -- 1.5.4.3.326.g7655e3

4 9

Re: [Libvir] a couple of questions -Newbie
by Richard W.M. Jones 04 Mar '08

04 Mar '08

On Mon, Mar 03, 2008 at 03:38:46PM -0700, Spencer Parker wrote: > I actually just saw this and started playing around with it. Should > actually do what I need to do for that part. The next thing I need to > monitor is disk usage. Disk usage is tricky to monitor from the hypervisor. Have a look around for my 'virt-df' tool (which doesn't actually work at the moment -- it needs a bit of loving). Here are a couple of starting points: http://www.redhat.com/archives/libvir-list/2007-September/msg00266.html http://hg.et.redhat.com/virt/applications/virt-top--devel?f=ba4432dc8714;fi… In general terms, if you want to monitor things like disk usage, actual memory usage, process lists and so on, you need to have an agent running inside the guest. Collectd might be a good start. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 1

[Libvir] OS X Compile Issue
by Pat Wendorf 04 Mar '08

04 Mar '08

I followed the large thread posted in January re: building libvirt on OS X, but I seem to have run into a snag near the end of the compile: gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/include/libxml2 -DBINDIR=\"/usr/local/libexec\" -DSBINDIR=\"/usr/local/sbin\" -DSYSCONF_DIR=\"/usr/local/etc\" -DLOCALEBASEDIR=\"/usr/local/share/locale\" -DLOCAL_STATE_DIR=\"/usr/local/var\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_TEST -DWITH_REMOTE -I /opt/local/include -L/opt/local/lib -DIN_LIBVIRT -I /opt/local/include -L/opt/local/lib -MT libvirt_la-storage_backend_fs.lo -MD -MP -MF .deps/libvirt_la-storage_backend_fs.Tpo -c storage_backend_fs.c -fno-common -DPIC -o .libs/libvirt_la-storage_backend_fs.o storage_backend_fs.c:34:20: error: endian.h: No such file or directory storage_backend_fs.c:35:22: error: byteswap.h: No such file or directory storage_backend_fs.c:36:20: error: mntent.h: No such file or directory storage_backend_fs.c:110: error: '__BIG_ENDIAN' undeclared here (not in a function) storage_backend_fs.c:143: error: '__LITTLE_ENDIAN' undeclared here (not in a function) storage_backend_fs.c: In function 'virStorageBackendProbeFile': storage_backend_fs.c:377: warning: comparison between pointer and integer storage_backend_fs.c:394: warning: comparison between pointer and integer storage_backend_fs.c: In function 'virStorageBackendFileSystemIsMounted': storage_backend_fs.c:458: error: '_PATH_MOUNTED' undeclared (first use in this function) storage_backend_fs.c:458: error: (Each undeclared identifier is reported only once storage_backend_fs.c:458: error: for each function it appears in.) storage_backend_fs.c:458: warning: passing argument 1 of 'fopen' from incompatible pointer type storage_backend_fs.c:461: warning: format '%s' expects type 'char *', but argument 4 has type 'struct <anonymous> *' storage_backend_fs.c:465: warning: implicit declaration of function 'getmntent' storage_backend_fs.c:465: warning: nested extern declaration of 'getmntent' storage_backend_fs.c:465: warning: assignment makes pointer from integer without a cast storage_backend_fs.c:466: error: dereferencing pointer to incomplete type storage_backend_fs.c:466: error: request for member 'mnt_dir' in something not a structure or union storage_backend_fs.c:466: warning: passing argument 1 of 'strcmp' from incompatible pointer type make[2]: *** [libvirt_la-storage_backend_fs.lo] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 endian.h does exist on OS X, but under a bits directory, but byteswap.h and mntent.h don't exist at all on the default X-Code install. Any ideas? - Pat

5 6

[Libvir] virsh list
by John Levon 04 Mar '08

04 Mar '08

Am I the only one who finds the default behaviour of virsh list really confusing and annoying? That is, I would like --all to be the default. regards john

3 4

[Libvir] Any API available for renaming the guest OS
by Ajishrao.r 04 Mar '08

04 Mar '08

Hi, I couldn't direct API to rename Guest OS? -- Thanks&Regards Ajeesh

2 4

[Libvir] a couple of questions -Newbie
by Spencer Parker 03 Mar '08

03 Mar '08

I am really excited to start using this, but I have a couple of questions about how to use it exactly. I want to be able to pull a list of stats out of my Xen machines. I need to get something like network i/o. I just need to know how much in and out traffic that a specific machine is doing. I am pretty new to python and to programming in general. I have looked at the APi and stuff like that, but am a little confused still on how to actually do this. Mainly I just need to know how to connect to certain things. Once I have a basic understanding of what is going on then I can take it from there. Thanks for all the help! Spencer Parker

3 2

[Libvir] API Question...
by Spencer Parker 03 Mar '08

03 Mar '08

Okay...so I am still trying to get what this says I can get. But I want to do it with Python. I am looking at this: virDomainInterfaceStatsStruct and wondering if I can grab this info with Python or not. I looked at the libvirt module, but I don't see how I would grab this. Any ideas?

2 1

[Libvir] [PATCH] Avoid segfault upon early libvirtd failure.
by Jim Meyering 03 Mar '08

03 Mar '08

One of today's leak-plugging patches introduced a bug. Fortunately, it can strike only when libvirtd is about to fail anyway. The consequence is that instead of failing in an orderly manner, it would probably segfault. Sorry about that. Here's the fix: Avoid segfault upon early libvirtd failure. * qemud/qemud.c (main): Don't call qemudCleanup on an uninitialized pointer. By the way, even though this evoked a warning from gcc, "make distcheck" passes. Obviously, that means the distcheck rule is inadequate. I'll fix it so that it turns on -Werror for the final build. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 96fdf32..b6b82ed 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2025,7 +2025,7 @@ libvirt management daemon:\n\ #define MAX_LISTEN 5 int main(int argc, char **argv) { - struct qemud_server *server; + struct qemud_server *server = NULL; struct sigaction sig_action; int sigpipe[2]; const char *pid_file = NULL; @@ -2180,7 +2180,8 @@ int main(int argc, char **argv) { unlink (pid_file); error1: - qemudCleanup(server); + if (server) + qemudCleanup(server); return ret; } -- 1.5.4.3.366.g55277

2 1

[Libvir] Need more information on virDomainBlockStats, virDomainInterfaceStats and virNodeGetCellsFreeMemory
by Ajishrao.r 03 Mar '08

03 Mar '08

Hi, I am trying to use libvirt, any one please help more about virDomainBlockStats, virDomainInterfaceStats and virNodeGetCellsFreeMemory any pointer or docs? -- Thanks&Regards Ajeesh

3 3

[Libvir] (no subject)
by Pat Wendorf 03 Mar '08

03 Mar '08

1 0

[Libvir] [PATCH]Change MAC address to case insensitive
by S.Sakamoto 03 Mar '08

03 Mar '08

Hi, xenXMDomainAttachDevice and xenXMDomainDetachDevice treats "case sensitve" for MAC address of stopping domain. This patch changes from case sensitive to case insensitive. Thanks, Shigeki Sakamoto. Index: src/xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.64 diff -u -p -r1.64 xm_internal.c --- src/xm_internal.c 20 Feb 2008 15:29:13 -0000 1.64 +++ src/xm_internal.c 26 Feb 2008 06:40:57 -0000 @@ -2812,7 +2812,7 @@ xenXMAttachInterface(virDomainPtr domain key = nextkey; } - if (!(strcmp(dommac, (const char *) mac))) { + if (!(strcasecmp(dommac, (const char *) mac))) { if (autoassign) { free(mac); mac = NULL; @@ -3087,7 +3087,7 @@ xenXMDomainDetachDevice(virDomainPtr dom mac = nextmac; } - if (!(strcmp(dommac, (const char *) key))) + if (!(strcasecmp(dommac, (const char *) key))) break; } skip:

4 12

[Libvir] [PATCH] Fix capabilities xml for topology info
by Cole Robinson 03 Mar '08

03 Mar '08

The patch below fixes the capabilities xml generated for the hosts topology info. This was causing virt-install to barf when using the test driver (see attached capabilities xml from before this patch). Thanks, Cole diff --git a/src/capabilities.c b/src/capabilities.c index bedd445..01bb308 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -583,7 +583,7 @@ virCapabilitiesFormatXML(virCapsPtr caps) caps->host.numaCell[i]->ncpus) < 0) goto no_memory; for (j = 0 ; j < caps->host.numaCell[i]->ncpus ; j++) - if (virBufferVSprintf(&xml, " <cpu id='%d'>\n", + if (virBufferVSprintf(&xml, " <cpu id='%d'/>\n", caps->host.numaCell[i]->cpus[j]) < 0) goto no_memory; if (virBufferAddLit(&xml, " </cpus>\n") < 0) <capabilities> <host> <cpu> <arch>i686</arch> <features> <pae/> <nonpae/> </features> </cpu> <topology> <cells num='2'> <cell id='0'> <cpus num='8'> <cpu id='0'> <cpu id='2'> <cpu id='4'> <cpu id='6'> <cpu id='8'> <cpu id='10'> <cpu id='12'> <cpu id='14'> </cpus> </cell> <cell id='1'> <cpus num='8'> <cpu id='1'> <cpu id='3'> <cpu id='5'> <cpu id='7'> <cpu id='9'> <cpu id='11'> <cpu id='13'> <cpu id='15'> </cpus> </cell> </cells> </topology> </host> <guest> <os_type>linux</os_type> <arch name='i686'> <wordsize>32</wordsize> <domain type='test'> </domain> </arch> <features> <pae/> <nonpae/> </features> </guest> </capabilities>

2 1

[Libvir] fix another bug exposed by a compiler warning
by Jim Meyering 03 Mar '08

03 Mar '08

Correct a no-op conditional. * src/qemu_conf.c (qemudReportError): Reverse a test, and use the pointer, errorMessage not its first byte, errorMessage[0]. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index eead0bc..3877849 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -68,7 +68,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } - virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); + virerr = __virErrorMsg(code, (!errorMessage[0] ? errorMessage : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } -- 1.5.4.3.366.g55277

2 2

[Libvir] [PATCH] Plug skipped-qemudCleanup leak.
by Jim Meyering 03 Mar '08

03 Mar '08

And another: Plug skipped-qemudCleanup leak. * qemud/qemud.c (main): Call qemudCleanup also upon failure. Otherwise, an error return would skip it and induce leaks. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 6 ++++++ qemud/qemud.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 049f515..81452ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-03 Jim Meyering <meyering(a)redhat.com> + + Plug skipped-qemudCleanup leak. + * qemud/qemud.c (main): Call qemudCleanup also upon failure. + Otherwise, an error return would skip it and induce leaks. + Mon Mar 3 07:16:35 CET 2008 Daniel Veillard <veillard(a)redhat.com> * include/libvirt/libvirt.h include/libvirt/libvirt.h.in: diff --git a/qemud/qemud.c b/qemud/qemud.c index 851e83e..7ccc9ee 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2166,8 +2166,6 @@ int main(int argc, char **argv) { qemudRunLoop(server); - qemudCleanup(server); - close(sigwrite); if (godaemon) @@ -2181,6 +2179,7 @@ int main(int argc, char **argv) { unlink (pid_file); error1: + qemudCleanup(server); return ret; } -- 1.5.4.3.366.g55277

2 2

[Libvir] [PATCH] Plug saslUsernameWhitelist leak.
by Jim Meyering 03 Mar '08

03 Mar '08

Here's the last one: Plug saslUsernameWhitelist leak. * qemud/qemud.c (qemudCleanup): Free the array as well as the strings in it. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 7ccc9ee..96fdf32 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1661,6 +1661,7 @@ static void qemudCleanup(struct qemud_server *server) { free(*list); list++; } + free(server->saslUsernameWhitelist); } #endif -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] Plug remoteReadConfigFile leak.
by Jim Meyering 03 Mar '08

03 Mar '08

Another. This happens only upon reading an invalid config file. Plug remoteReadConfigFile leak. * qemud/qemud.c (remoteReadConfigFile): Be careful to free "conf" after a successful virConfReadFile. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 9ce9edd..851e83e 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1877,7 +1877,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, tcp_port); if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0) - return -1; + goto free_and_fail; #if HAVE_POLKIT /* Change default perms to be wide-open if PolicyKit is enabled. * Admin can always override in config file @@ -1886,11 +1886,11 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) unix_sock_rw_mask = 0777; #endif if (remoteConfigGetAuth(conf, "auth_unix_ro", &auth_unix_ro, filename) < 0) - return -1; + goto free_and_fail; if (remoteConfigGetAuth(conf, "auth_tcp", &auth_tcp, filename) < 0) - return -1; + goto free_and_fail; if (remoteConfigGetAuth(conf, "auth_tls", &auth_tls, filename) < 0) - return -1; + goto free_and_fail; GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] Avoid two more leaks.
by Jim Meyering 03 Mar '08

03 Mar '08

Here are two more: Avoid two more leaks. * src/capabilities.c (virCapabilitiesFree): Free host.migrateTrans. (virCapabilitiesFreeGuest): Free arch.name member. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/capabilities.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 2544bd3..bedd445 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -91,6 +91,7 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest) int i; free(guest->ostype); + free(guest->arch.name); free(guest->arch.defaultInfo.emulator); free(guest->arch.defaultInfo.loader); for (i = 0 ; i < guest->arch.defaultInfo.nmachines ; i++) @@ -130,6 +131,10 @@ virCapabilitiesFree(virCapsPtr caps) { virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]); free(caps->host.numaCell); + for (i = 0 ; i < caps->host.nmigrateTrans ; i++) + free(caps->host.migrateTrans[i]); + free(caps->host.migrateTrans); + free(caps->host.arch); free(caps); } -- 1.5.4.3.366.g55277

2 4

[Libvir] [PATCH] Plug a leak.
by Jim Meyering 03 Mar '08

03 Mar '08

I ran valgrind via "make check" and found some leaks. This fixes the first: Plug a leak. * src/capabilities.c (virCapabilitiesFreeGuestDomain): Free dom->type. (virCapabilitiesAddGuestDomain): Remove duplicate strdup stmt. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/capabilities.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 263935c..2544bd3 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -73,6 +73,7 @@ virCapabilitiesFreeGuestDomain(virCapsGuestDomainPtr dom) for (i = 0 ; i < dom->info.nmachines ; i++) free(dom->info.machines[i]); free(dom->info.machines); + free(dom->type); free(dom); } @@ -328,9 +329,6 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, if ((dom->type = strdup(hvtype)) == NULL) goto no_memory; - if ((dom->type = strdup(hvtype)) == NULL) - goto no_memory; - if (emulator && (dom->info.emulator = strdup(emulator)) == NULL) goto no_memory; -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] fix typos (part3)
by Atsushi SAKAI 29 Feb '08

29 Feb '08

2 1

[Libvir] Snapshots in Libvirt
by Gabriel Kaufmann 28 Feb '08

28 Feb '08

Hi, Can anyone tell me on which version of libvirt, the snapshot functionality is planned to be implemented fos Xen and KVM? By snapshot I mean to be able to save the state of the machine in order to be able to revert to the snapshot. Best Regards, Gabriel Kaufmann Software Engineer Gabriel.Kaufmann(a)ericom.com<mailto:Gabriel.Kaufmann@ericom.com> Ericom Software Tel (Dir): +972 2 591 1700 Ext 754 Tel (Main): +972 2 591 1700 http://www.ericom.com Access Done Right Empower Enterprise-Wide Access to Microsoft(r) Terminal Server, Virtual Desktops and Legacy Applications

4 4

[Libvir] [PATCH] Avoid link errors with "configure --disable-shared".
by Jim Meyering 28 Feb '08

28 Feb '08

I got link errors when building with --disable-shared, and finally fixed it. Here's most of the solution. The patch after this one adjusts the gcov (test-coverage)-related things so that works with the new setup, too. This also fixes what look like accidental omissions in src/libvirt_sym.version. Avoid link errors with "configure --disable-shared". * src/Makefile.am: Create a convenience library, libvirt_test.la, and don't restrict access to *its* symbols. * tests/Makefile.am (LDADDS): Add ../src/libvirt_test.la, so that "configure --disable-shared" no longer provokes link errors. (LIBVIRT): Remove definition. (LDADDS): Remove use. ($(LIBVIRT)): Remove rule. (LDADDS): Use the new convenience library instead. (CLEANFILES): Define. * docs/examples/index.py (dump_Makefile): Append $(COVERAGE_LDFLAGS), to the LDADDS definition, to avoid link error with the combination of --enable-test-coverage and --disable-shared. * docs/examples/Makefile.am: Regenerate. * docs/examples/index.html: Likewise. * qemud/Makefile.am (libvirtd_LDFLAGS): Append $(COVERAGE_LDFLAGS). Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- docs/examples/Makefile.am | 2 +- docs/examples/index.html | 2 +- docs/examples/index.py | 3 ++- qemud/Makefile.am | 26 ++++++++++++++++---------- src/Makefile.am | 19 +++++++++++++++++++ src/libvirt_sym.version | 11 +++++++---- tests/Makefile.am | 13 ++----------- 7 files changed, 48 insertions(+), 28 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 9da4e21..d8e4868 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS=python INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include DEPS = $(top_builddir)/src/libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) rebuild: examples.xml index.html diff --git a/docs/examples/index.html b/docs/examples/index.html [...omitting generated diff containing a couple of 4000+-byte lines...] diff --git a/docs/examples/index.py b/docs/examples/index.py index 8f386ed..6be80c5 100755 --- a/docs/examples/index.py +++ b/docs/examples/index.py @@ -225,7 +225,8 @@ def dump_Makefile(): SUBDIRS=python INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include DEPS = $(top_builddir)/src/libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) rebuild: examples.xml index.html diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1e1f861..b39bc2f 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -47,18 +47,22 @@ libvirtd_SOURCES = \ #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ - -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ - -I$(top_srcdir)/include -I$(top_builddir)/include \ - $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(POLKIT_CFLAGS) \ - $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ - -DSYSCONF_DIR="\"$(sysconfdir)\"" \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ + -I$(top_srcdir)/include -I$(top_builddir)/include \ + $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ + $(POLKIT_CFLAGS) \ + $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ + $(COVERAGE_CFLAGS) \ + -DSYSCONF_DIR="\"$(sysconfdir)\"" \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \ - -DGETTEXT_PACKAGE=\"$(PACKAGE)\" + -DGETTEXT_PACKAGE=\"$(PACKAGE)\" + +libvirtd_LDFLAGS = \ + $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ + $(COVERAGE_LDFLAGS) + $(POLKIT_LIBS) -libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ - $(POLKIT_LIBS) libvirtd_DEPENDENCIES = ../src/libvirt.la libvirtd_LDADD = ../src/libvirt.la ../gnulib/lib/libgnu.la @@ -144,7 +148,6 @@ libvirtd.init: libvirtd.init.in chmod a+x $@-t mv $@-t $@ -CLEANFILES = libvirtd.init else install-init: @@ -153,3 +156,6 @@ uninstall-init: endif # DBUS_INIT_SCRIPTS_RED_HAT endif # WITH_LIBVIRTD + +CLEANFILES = libvirtd.init +CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/src/Makefile.am b/src/Makefile.am index 02be9db..c15de77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,6 +99,25 @@ libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT +# Create an automake "convenience library" version of libvirt_la, +# just for testing, since the test harness requires access to internal +# bits and pieces that we don't want to make publicly accessible. +noinst_LTLIBRARIES = libvirt_test.la + +# Convert libvirt_sym.version +# to libvirt_test_sym.version, and +# remove -version-info X.Y.Z (not needed since this is a convenience library. +test_LDFLAGS = \ + $$(echo '$(libvirt_la_LDFLAGS)' \ + |sed 's!-Wl,--v.*_sym\.version!!' \ + |sed 's!-version-info @LIBVIRT_VERSION_INFO@!!') + +# Just like the above, but with a slightly different set of public symbols. +libvirt_test_la_SOURCES = $(libvirt_la_SOURCES) +libvirt_test_la_LIBADD = $(libvirt_la_LIBADD) +libvirt_test_la_LDFLAGS = $(test_LDFLAGS) +libvirt_test_la_CFLAGS = $(COVERAGE_CFLAGS) + bin_PROGRAMS = virsh virsh_SOURCES = virsh.c console.c console.h util-lib.c diff --git a/src/libvirt_sym.version b/src/libvirt_sym.version index 38b631e..581f380 100644 --- a/src/libvirt_sym.version +++ b/src/libvirt_sym.version @@ -32,6 +32,7 @@ virDomainLookupByName; virDomainLookupByUUID; virDomainLookupByUUIDString; + virDomainParseXMLDesc; virDomainRestore; virDomainResume; virDomainSave; @@ -166,10 +167,10 @@ __virEventRegisterImpl; - __virStateInitialize; - __virStateCleanup; - __virStateReload; - __virStateActive; + __virStateInitialize; + __virStateCleanup; + __virStateReload; + __virStateActive; __virDrvSupportsFeature; @@ -184,6 +185,8 @@ __virBufferVSprintf; __virBufferAdd; __virBufferAddChar; + __virErrorMsg; + __virRaiseError; local: *; }; diff --git a/tests/Makefile.am b/tests/Makefile.am index fb9bcff..644715e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,14 +3,6 @@ SUBDIRS = virshdata confdata sexpr2xmldata \ xml2sexprdata xmconfigdata xencapsdata -# Wierd libtool related juju... -# -# We explicitly want wildcard here instead of just linking -# to the libvirt.a file. This ensures that when coverage -# tests are run, all the output data ends up in the correct -# location. ie, src/ instead of src/.libs. -LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o) - INCLUDES = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ @@ -34,7 +26,7 @@ LDADDS = \ $(SASL_LIBS) \ $(SELINUX_LIBS) \ $(WARN_CFLAGS) \ - $(LIBVIRT) \ + ../src/libvirt_test.la \ ../gnulib/lib/libgnu.la \ $(COVERAGE_LDFLAGS) @@ -132,5 +124,4 @@ reconnect_SOURCES = \ reconnect.c reconnect_LDADD = $(LDADDS) -$(LIBVIRT): - -@(cd $(top_builddir)/src && $(MAKE) MAKEFLAGS+=--silent) +CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -- 1.5.4.3.231.gc0a6

3 4

[Libvir] [Q] gnulib comment
by Atsushi SAKAI 28 Feb '08

28 Feb '08

Hi, Jim I have two questions on gnulib in libvirt. 1)tupe is typo?(I attach a patch.) (I do not guess the correct words, it is jargon?) 2)many NUL appeared on comment. Is the normal comment on gnulib? I think it should be NULL. c.f. I do spell check for my diversion. Thanks Atsushi SAKAI

4 3

[Libvir] PATCH: Set mac address on TUN device to fix Xenner
by Daniel P. Berrange 28 Feb '08

28 Feb '08

The QEMU driver pre-allocates a TAP device and connects it to a bridge when using virtual networking. The FD associated with the tap device is then passed to QEMU. When running Xen guests, Xenner needs to turn this FD back into a TUN device name. It does this by querying the hardware address of each NIC and looking for the one which matches that it expects - ie its TUN device. This obviously requires that the TUN device be configured with a MAC address though. libvirt does not currently do this. This patch fixes this and thus makes Xenner work from the QEMU driver when using virtual networking With this patch applied, and the latest 'virt-install' from upstream and the latest 'xenner' RPM from Fedora 9, it is now possible to create Xen paravirt guests under KVM using virt-install. That said there's a few more pending patch to cleanup various hacks. bridge.c | 14 ++++++++++++++ bridge.h | 1 + qemu_conf.c | 1 + 3 files changed, 16 insertions(+) Dan. Index: bridge.c =================================================================== RCS file: /data/cvs/libvirt/src/bridge.c,v retrieving revision 1.8 diff -u -p -r1.8 bridge.c --- bridge.c 5 Feb 2008 19:27:37 -0000 1.8 +++ bridge.c 27 Feb 2008 21:32:44 -0000 @@ -42,6 +42,7 @@ #include <linux/sockios.h> /* SIOCBRADDBR etc. */ #include <linux/if_bridge.h> /* SYSFS_BRIDGE_ATTR */ #include <linux/if_tun.h> /* IFF_TUN, IFF_NO_PI */ +#include <net/if_arp.h> /* ARPHRD_ETHER */ #include "internal.h" @@ -312,6 +313,7 @@ brDeleteInterface(brControl *ctl ATTRIBU int brAddTap(brControl *ctl, const char *bridge, + unsigned char *macaddr, char *ifname, int maxlen, int *tapfd) @@ -355,6 +357,18 @@ brAddTap(brControl *ctl, } if (ioctl(fd, TUNSETIFF, &try) == 0) { + struct ifreq addr; + memset(&addr, 0, sizeof(addr)); + memcpy(addr.ifr_hwaddr.sa_data, macaddr, 6); + addr.ifr_hwaddr.sa_family = ARPHRD_ETHER; + + /* Device actually starts in 'UP' state, but it + * needs to be down to set the MAC addr + */ + if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 0))) + goto error; + if (ioctl(fd, SIOCSIFHWADDR, &addr) != 0) + goto error; if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) goto error; if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) Index: bridge.h =================================================================== RCS file: /data/cvs/libvirt/src/bridge.h,v retrieving revision 1.4 diff -u -p -r1.4 bridge.h --- bridge.h 29 Jan 2008 18:15:54 -0000 1.4 +++ bridge.h 27 Feb 2008 21:32:44 -0000 @@ -62,6 +62,7 @@ int brDeleteInterface (brContr int brAddTap (brControl *ctl, const char *bridge, + unsigned char *mac, char *ifname, int maxlen, int *tapfd); Index: qemu_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_conf.c,v retrieving revision 1.38 diff -u -p -r1.38 qemu_conf.c --- qemu_conf.c 27 Feb 2008 04:35:08 -0000 1.38 +++ qemu_conf.c 27 Feb 2008 21:32:44 -0000 @@ -1530,6 +1530,7 @@ qemudNetworkIfaceConnect(virConnectPtr c } if ((err = brAddTap(driver->brctl, brname, + net->mac, ifname, BR_IFNAME_MAXLEN, &tapfd))) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "Failed to add tap interface '%s' to bridge '%s' : %s", -- |=- 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 2

[Libvir] [PATCH] Use virErrorMsg in qemudReportError
by Cole Robinson 28 Feb '08

28 Feb '08

Currently the qemu driver doesn't use virErrorMsg when raising error messages. This causes some errors to appear as "libvir: QEMU error: " if a custom string wasn't raised, which isn't all that useful. The patch below fixes this. Thanks, Cole diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e39c7bc..6aed88b 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -58,6 +58,7 @@ void qemudReportError(virConnectPtr conn, int code, const char *fmt, ...) { va_list args; char errorMessage[QEMUD_MAX_ERROR_LEN]; + const char *virerr; if (fmt) { va_start(args, fmt); @@ -66,8 +67,10 @@ void qemudReportError(virConnectPtr conn, } else { errorMessage[0] = '\0'; } + + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, - NULL, NULL, NULL, -1, -1, "%s", errorMessage); + virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } int qemudLoadDriverConfig(struct qemud_driver *driver,

3 3

[Libvir] [PATCH] make qemud/'s rpcgen rules work
by Jim Meyering 27 Feb '08

27 Feb '08

I applied Rich's patch and found that qemud/remote_protocol.c was not automatically rebuilt. Since the Makefile rule is an implicit one using a non-default suffix (.x), you have to tell make about the new suffix. In straight make, you'd have to add ".SUFFIXES: .x" but with automake, it is recommended to use the SUFFIXES variable: Make qemud/'s rpcgen rules work. * qemud/Makefile.am (SUFFIXES): Define to .x before implicit rule. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1e1f861..3094b18 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -14,6 +14,7 @@ EXTRA_DIST = libvirtd.init.in libvirtd.sysconf default-network.xml \ libvirtd.conf if RPCGEN +SUFFIXES = .x .x.c: rm -f $@ rpcgen -c -o $@ $< -- 1.5.4.3.231.gc0a6

2 2

[Libvir] [PATCH] (for discussion) DHCP host mappings using 3 arrays API
by Richard W.M. Jones 27 Feb '08

27 Feb '08

This patch is an evolution of the previous patch for implementing DHCP host mappings. The virNetworkListDHCPHostMappings calls has been changed to take three arrays of strings: int virNetworkListDHCPHostMappings (virNetworkPtr network, char **const hwaddrs, char **const ipaddrs, char **const hostnames, int maxmappings); Also I've fixed a number of bugs throughout, particularly in the way that the hosts file was being parsed. This patch is for discussion only. There is a segfault on the client side of (perhaps ironically) the virNetworkListDHCPHostMappings call. Been looking for about an hour but I can't see it yet ... All the other calls appear to work OK. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

4 8

[Libvir] [PATCH] Rewrite test-coverage rules to accommodate multiple .o files per .c.
by Jim Meyering 27 Feb '08

27 Feb '08

This makes the "make -C src cov" rule work with the addition of the libvirt_test.la convenience library. The trouble is that since there are now two .o files per .c (one for the "real" libvirt library, and another for the convenience library, libvirt_test.la, with no access restrictions, for testing), when you generate test-coverage stats, you have stats for each .c file in two different places, one for each .o file. This solves the problem by running gcov on each pair of .o files. A minor twist: when profiling with --disable-shared, the .o files are in ".", rather than in ".libs/", so configure.in now records the dirname in a new AC_SUBST'd variable, LV_LIBTOOL_OBJDIR, and src/Makefile.am uses that. Thus, profiling works with shared as well as static libraries. Rewrite test-coverage rules to accommodate multiple .o files per .c. * src/Makefile.am (cov): Rewrite rule to merge gcov results corresponding to two .o files: the libvirt_la- one, and the libvirt_test_la- one. (tst): Remove unused rule. * configure.in (LV_LIBTOOL_OBJDIR): Define and AC_SUBST. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- configure.in | 7 +++++++ src/Makefile.am | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/configure.in b/configure.in index c2030c7..6367990 100644 --- a/configure.in +++ b/configure.in @@ -913,6 +913,13 @@ AC_SUBST(MINGW_EXTRA_LDFLAGS) AC_SYS_LARGEFILE +# Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether +# we're building shared libraries. This is the name of the directory +# in which .o files will be created. +test "$enable_shared" = no && lt_cv_objdir=. +LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} +AC_SUBST(LV_LIBTOOL_OBJDIR) + # very annoying rm -f COPYING cp COPYING.LIB COPYING diff --git a/src/Makefile.am b/src/Makefile.am index c15de77..f8f2c4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -137,20 +137,20 @@ else EXTRA_DIST += parthelper.c endif -# -# target to ease building test programs -# -tst: tst.c - $(CC) $(CFLAGS) $(INCLUDES) -I../include -o tst tst.c .libs/libvirt.a $(LIBXML_LIBS) $(VIRSH_LIBS) $(GNUTLS_LIBS) $(LIBS) - -COVERAGE_FILES = $(CLIENT_SOURCES:%.c=libvirt_la-%.cov) - -cov: clean-cov $(COVERAGE_FILES) +cov: clean-cov + for i in $(CLIENT_SOURCES); do \ + case $$i in *.c) ;; *) continue;; esac; \ + b=$$(basename $$i .c); \ + o_files=; \ + for i in '' _test; do \ + o="$(LV_LIBTOOL_OBJDIR)/libvirt$${i}_la-$$b.o"; \ + test -f "$$o" \ + && o_files="$$o_files $$o"; \ + done; \ + gcov -b -f $$o_files > $$b.cov; \ + done clean-cov: rm -f *.cov *.gcov -%.cov: .libs/%.o - gcov -b -f -o .libs $< > $@ - CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -- 1.5.4.3.231.gc0a6

1 0

[Libvir] [PATCH] Avoid "make distcheck" failure.
by Jim Meyering 27 Feb '08

27 Feb '08

Here's another trivial one: util-lib.h wasn't included in the tarball created by "make dist", so "make distcheck" would fail. Avoid "make distcheck" failure. * src/Makefile.am (virsh_SOURCES): Add util-lib.h. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 02be9db..9c4810a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -101,7 +101,7 @@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT bin_PROGRAMS = virsh -virsh_SOURCES = virsh.c console.c console.h util-lib.c +virsh_SOURCES = virsh.c console.c console.h util-lib.c util-lib.h virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) virsh_DEPENDENCIES = $(DEPS) virsh_LDADD = $(LDADDS) $(VIRSH_LIBS) -- 1.5.4.3.231.gc0a6

2 1

[Libvir] [PATCH] Fix a "make syntax-check" failure.
by Jim Meyering 27 Feb '08

27 Feb '08

"make syntax-check" reported this: src/capabilities.c Makefile.maint: the above files do not include <config.h> make: *** [sc_require_config_h] Error 1 The fix is so trivial it's barely worth posting, but just in case... And besides, it's good policy. Fix a "make syntax-check" failure. * src/capabilities.c: Include <config.h> from the .c file, * src/capabilities.h: ... not from the .h file. --- src/capabilities.c | 4 +++- src/capabilities.h | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 94f7d17..263935c 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -21,6 +21,8 @@ * Author: Daniel P. Berrange <berrange(a)redhat.com> */ +#include <config.h> + #include "capabilities.h" #include "buf.h" @@ -30,7 +32,7 @@ * @arch: host machine architecture * @offlineMigrate: non-zero if offline migration is available * @liveMigrate: non-zero if live migration is available - * + * * Allocate a new capabilities object */ virCapsPtr diff --git a/src/capabilities.h b/src/capabilities.h index 97bd06f..b379e51 100644 --- a/src/capabilities.h +++ b/src/capabilities.h @@ -24,9 +24,6 @@ #ifndef __VIR_CAPABILITIES_H #define __VIR_CAPABILITIES_H -#include <config.h> - - typedef struct _virCapsGuestFeature virCapsGuestFeature; typedef virCapsGuestFeature *virCapsGuestFeaturePtr; struct _virCapsGuestFeature { -- 1.5.4.3.231.gc0a6

1 0

[Libvir] [PATCH] fix typo
by Atsushi SAKAI 27 Feb '08

27 Feb '08

2 1

[Libvir] [PATCH 0/2] Re-organize generation / handling of capabilities data
by Daniel P. Berrange 27 Feb '08

27 Feb '08

Earlier today I started the 'simple' task of extending the QEMU driver to support Xenner for running Xen paravirt guests under KVM. This was at first glance easy because it basically looks like QEMU - in fact all we needed was to extend the capabilities XML for the QEMU driver to include data about Xen guests if Xenner is available. Unfortunately this was easier said than done... - The code generating the XML in qemu_driver.c was a mix of string formatting for the XML, and functional logic for determining runtime capabilities (kvm, kqemu, etc). - More runtime logic was in the qemu_conf.c file and stuff that should be runtime logic was static. I attempted to fix up the QEMU code for capabilities but it quickly turned into a horrible mess of spaghetti. Looking at the Xen driver, the situation was pretty much the same, but with the capabilities XML generation spread out over 3 files (xml.c, xen_internal.c and xend_internal.c). So I decided that we needed to have a internal API & structure to allow drivers to formally register & query their capabilities , and also add a central method for serializing it to XML. The following 2 patches implement this idea, and porting the Xen, QEMU and Test drivers to use it. This removes a lot of code duplication in XML formatting and makes the resulting code easier to follow, and should make it much quicker to adding capabilities info to new drivers too. 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 10

[Libvir] [PATCH] Implement virDomainBlockStats for QEMU/KVM
by Richard W.M. Jones 26 Feb '08

26 Feb '08

This little patch just implements the virDomainBlockStats call for qemu & kvm. It does this by using the new 'info blockstats' monitor command which I added to qemu & KVM upstream some months back, and (hopefully) it does the right thing if this command is not available. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

4 5

[Libvir] [PATCH]check NULL of mac
by S.Sakamoto 26 Feb '08

26 Feb '08

Hi, "attach-device" become the segmentation fault, when it uses following xml. (There is no "address='xx'") +----------------------------------------------------+ | <interface type='bridge'> | | <source bridge='xenbr0'/> | | <mac/> | | <script path='/etc/xen/scripts/vif-bridge'/> | | </interface> | +----------------------------------------------------+ Libxml gives back NULL when there is not an attribute. "xenXMAttachInterface" compares it in strcmp as NULL. So, I make the patch which solved this problem. Thanks, Shigeki Sakamoto. Index: src/xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.64 diff -u -p -r1.64 xm_internal.c --- src/xm_internal.c 20 Feb 2008 15:29:13 -0000 1.64 +++ src/xm_internal.c 26 Feb 2008 06:39:05 -0000 @@ -2769,12 +2769,13 @@ xenXMAttachInterface(virDomainPtr domain } source = xmlGetProp(node, BAD_CAST type); - if (!(node = virXPathNode("/interface/mac", ctxt))) { + if ((node = virXPathNode("/interface/mac", ctxt))) + mac = xmlGetProp(node, BAD_CAST "address"); + if (!node || !mac) { if (!(mac = (xmlChar *)xenXMAutoAssignMac())) goto cleanup; autoassign = 1; - } else - mac = xmlGetProp(node, BAD_CAST "address"); + } list_item = virConfGetValue(entry->conf, "vif"); if (list_item && list_item->type == VIR_CONF_LIST) {

4 4

[Libvir] RFC: Supporting serial & parallel ports for QEMU (and improving Xen)
by Daniel P. Berrange 26 Feb '08

26 Feb '08

One user's feature request for our QEMU driver is to support serial ports. Easy you might think... you'd be wrong :-) On Xen we have very simple approach. When creating a guest simply add <console/> And it'll cause a serial port to be setup with an autoallocated pty, so you get back <console pty='/dev/pts/5'/> In retrospect calling it 'console' was dumb, but hey we're stuck with that now and its only a tiny naming issue so I don't mind really. We can do the same thing with QEMU quite easily. QEMU, however, supports many many many more ways to hooking up the serial port to Dom0. Indeed so does Xen fullyvirt, but we don't expose this ability. Parallel ports have identical config syntax to serial ports so we might as well deal with both at once. So, here's a stripped down version of the QEMU docs: [quote http://fabrice.bellard.free.fr/qemu/qemu-doc.html#SEC10] `-serial dev' Redirect the virtual serial port to host character device dev. The default device is vc in graphical mode and stdio in non graphical mode. This option can be used several times to simulate up to 4 serials ports. Use -serial none to disable all serial ports. Available character devices are: vc Virtual console pty [Linux only] Pseudo TTY (a new PTY is automatically allocated) none No device is allocated. null void device /dev/XXX [Linux only] Use host tty, e.g. `/dev/ttyS0'. The host serial port parameters are set according to the emulated ones. /dev/parportN [Linux only, parallel port only] Use host parallel port N. Currently only SPP parallel port features can be used. file:filename Write output to filename. No character can be read. stdio [Unix only] standard input/output pipe:filename name pipe filename COMn [Windows only] Use host serial port n udp:[remote_host]:remote_port[@[src_ip]:src_port] This implements UDP Net Console. tcp:[host]:port[,server][,nowait][,nodelay] The TCP Net Console has two modes of operation. telnet:host:port[,server][,nowait][,nodelay] The telnet protocol is used instead of raw tcp sockets. unix:path[,server][,nowait] A unix domain socket is used instead of a tcp socket. [/quote] I don't see any reason to not support all/most of these options. The things I don't like here is that /dev/XXX, vs /dev/parportN, vs COMn differences for connecting guest <-> host passthrough of the devices. I figure it could be simpler if it was just represented as 'n' and we'd translate that to be /dev/ttyS[n] or /dev/parport[n] or COM[n] as needed. The question as ever is how to represent this in XML. For serial ports we'll stick with '<console>', while parallel ports we might as well use a better named '<parallel>'. Next up, I think should use a 'type' attribute on this element to determine the main way ot connecting the device, and then more type specific attributes or sub-elements as needed. If 'type' was not specified then use a default of 'pty', since that gives compatability with existing practice. As an illustrative example /* * Parse the XML definition for a character device * * Top level node will be <console> or <parallel>, but all attributes * and sub-elements are identical. * * type=vc|pty|null|host|file|pipe|udp|tcp|telnet, default is pty * * <console type='vc'/> * * <console type='pty' pty='/dev/pts/3'/> * * <console type='null'/> * * <console type='host' port='3'/> * * <console type='file' path='/some/file'/> * * <console type='pipe' path='/some/file'/> * * <console type='udp'> * <sendto port='12356'/> * </console> * * <console type='udp'> * <sendto addr='127.0.0.1' port='12356'/> * </console> * * <console type='udp'> * <sendto addr='127.0.0.1' port='12356'/> * <bind port='12356'/> * </console> * * <console type='udp'> * <sendto addr='127.0.0.1' port='12356'/> * <bind addr='127.0.0.1' port='12356'/> * </console> * * <console type='tcp'> * <listen port='12356'/> * </console> * * <console type='tcp'> * <listen addr='127.0.0.1' port='12356'> * <nowait/> * <nodelay/> * </listen> * </console> * * <console type='tcp'> * <connect addr='127.0.0.1' port='12356'> * <nodelay/> * </connect> * </console> * * <console type='telnet'> * <listen addr='127.0.0.1' port='12356'/> * </console> * * <console type='telnet'> * <connect addr='127.0.0.1' port='12356'/> * </console> * */ BTW, the udp, tcp, telnet options are only available on QEMU >= 0.9.0. We already have ability to detect / validate that for both Xen & QEMU drivers. NB, whereever there are IP addresses, hostnames can be used too, hence I call the attriute 'addr' instead of 'ip' 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 -=|

5 8

[Libvir] How to stop 'make install' clobbering /etc/libvirt/libvirtd.conf
by Richard W.M. Jones 26 Feb '08

26 Feb '08

Currently 'make install' clobbers configuration files, in particular /etc/libvirt/libvirtd.conf. It shouldn't. Does anyone know how to persuade automake to stop it from doing this? As far as I can see the only way would be to write a custom install rule. 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

2 1

[Libvir] default hypervisor selection
by Daniel Veillard 26 Feb '08

26 Feb '08

While going though the ovirt installation steps I got annoyed with the need to add "-c qemu:///system" each time we are trying to start a virsh command if using KVM. The dfault setup is basically to assume a Xen hypervisor if the URI is not specified, this is glued in the do_open internal opening routine associated to the opening of connections: -------------------------------------- static virConnectPtr do_open (const char *name, virConnectAuthPtr auth, int flags) { int i, res; virConnectPtr ret = NULL; xmlURIPtr uri; /* Convert NULL or "" to xen:/// for back compat */ if (!name || name[0] == '\0') name = "xen:///"; -------------------------------------- In one hand this is the default behaviour of the library, but in my opinion it's not very smart. We should be able to be smarter than that, for example: - if /proc/xen doesn't exist (on linux, or /dev/xen on Solaris) well we should not do that we are pretty sure we will get an error when trying to connect - if /proc/vz is present, well it's very likely that if the kernel has been compiled with OpenVZ support, it's likely to be used as the default virtualization - if there is a kvm module loaded well we should probably use qemu:///system if running as root or qemu:///session otherwise I guess on Solaris an easy heuristic would allow to pick the right hypervisor by default too. At some point we may have multiple hypervisor support simultaneously on a linux system thanks to pv_ops, but right now it doesn't make too much sense to force a default Xen connection even when we know it won't work. For a virsh specific solution there is the VIRSH_DEFAULT_CONNECT_URI environment variable, but it's not really user friendly and not very generic, What do people think ? I would be tempted to provide a patch to change do_open() behaviour on linux in the case name is NULL or "", and then check what hypervisor might be present and running, 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/

7 16

[Libvir] [Discussion] 0/4 Implement DHCP host mappings for virtual networks
by Richard W.M. Jones 25 Feb '08

25 Feb '08

This is a series of patches to implement DHCP IP & hostname mappings for libvirt virtual networks. ** NOTE: This patch is not to be applied. There is some memory corruption bug which I'm still tracking down. What this patch allows you to do is to create a table of IP address to host (defined by its hardware / MAC address) for each virtual network. Optionally you can also assign a hostname. When a host starts up and requests an IP address through DHCP, if it is in this table then it gets the fixed IP address from the table and, optionally, a fixed hostname. Four new API calls are added. Two are required to list the contents of the mapping table. Two more allow you to add and delete a mapping. The mapping table is semi-permanent. It is stored in /var/lib/libvirt/hosts-<networkname>.conf and survives across libvirtd restarts. The implementation simply uses dnsmasq's --dhcp-hostsfile flag. Refer to the dnsmasq(1) manual page. 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

4 18

[Libvir] [PATCH] Avoid new "make syntax-check" failures.
by Jim Meyering 25 Feb '08

25 Feb '08

With recent changes, I introduced some new "make syntax-check" failures. Also, there were two remaining invalid uses of write(2). This fixes all that. Avoid new "make syntax-check" failures. * .x-sc_avoid_write: Exempt src/util-lib.c, too. * Makefile.maint (sc_unmarked_diagnostics): Filter out false positives. * src/storage_backend_fs.c (virStorageBackendFileSystemVolCreate): Use safewrite, not write. * src/storage_backend_logical.c (virStorageBackendLogicalBuildPool): Likewise. --- .x-sc_avoid_write | 1 + Makefile.maint | 6 +++++- src/storage_backend_fs.c | 2 +- src/storage_backend_logical.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write index 72a196d..fe38d83 100644 --- a/.x-sc_avoid_write +++ b/.x-sc_avoid_write @@ -1,2 +1,3 @@ ^src/util\.c$ ^src/xend_internal\.c$ +^src/util-lib\.c$ diff --git a/Makefile.maint b/Makefile.maint index fe964a5..0c3acf8 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -304,6 +304,9 @@ err_func_re = \ # Look for diagnostics that aren't marked for translation. # This won't find any for which error's format string is on a separate line. +# The sed filters eliminate false-positives like these: +# _("...: " +# "%s", _("no storage vol w..." sc_unmarked_diagnostics: @grep -nE \ '\<(vshError|error) \([^"]*"[^"]*[a-z]{3}' $$($(CVS_LIST_EXCEPT)) \ @@ -312,7 +315,8 @@ sc_unmarked_diagnostics: exit 1; } || : @{ grep -nE '\<$(err_func_re) *\(.*;$$' $$($(CVS_LIST_EXCEPT)); \ grep -A1 -nE '\<$(err_func_re) *\(.*,$$' $$($(CVS_LIST_EXCEPT)); } \ - | grep '[ ]"' && \ + | sed 's/_("[^"][^"]*"//;s/[ ]"%s"//' \ + | grep '[ ]"' && \ { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index 9425cbc..1d540e1 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -854,7 +854,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, int bytes = sizeof(zeros); if (bytes > remain) bytes = remain; - if ((bytes = write(fd, zeros, bytes)) < 0) { + if ((bytes = safewrite(fd, zeros, bytes)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot fill file '%s': %s"), vol->target.path, strerror(errno)); diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index a70c087..f8a075d 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -287,7 +287,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn, strerror(errno)); goto cleanup; } - if (write(fd, zeros, sizeof(zeros)) != sizeof(zeros)) { + if (safewrite(fd, zeros, sizeof(zeros)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot clear device header %s"), strerror(errno)); -- 1.5.4.2.185.gf5f8

2 2

[Libvir] Error - when compiling sample libvirt program - Failed to find libvirt proxy
by Sunil Lingappa 25 Feb '08

25 Feb '08

Hello Everybody I am trying to compile the sample program which is present at the libvirt.org sample program section. I am running the program which is used to retrieve domain information. While i am able to compile it with success, when i run it i get the following error : *" failed to find libvirt_proxy " * But the output is still displayed. Can anybody please help me how to overcome this error message. find below the patch level info : rpm -qa | grep libvirt libvirt-devel-0.2.0-0.16 libvirt-0.2.0-0.16 libvirt-python-0.2.0-0.16 Thanks & Best Regards Sunil

2 1

[Libvir] [PATCH] 1/2: Move safewrite and saferead to a separate file.
by Jim Meyering 25 Feb '08

25 Feb '08

Move safewrite and saferead to a separate file. We currently use safewrite from inside libvirt and don't want to publish any such function name. However, we do want to use it in applications like virsh, libvirtd and libvirt_proxy that link with libvirt. To that end, this change moves that function definition (along with the nearly identical saferead) into a new file, util-lib.c. To avoid maintaining separate copies of even such small functions, we simply include that new file from util.c. Then, the separate applications that need to use safewrite simply compile and link with util-lib.c. Of course, this does mean that each of those applications will containing two copies of these functions. However, the functions are so small that it's not worth worrying about that. * src/util.c (saferead, safewrite): Move function definitions to util-lib.c and include that .c file. * src/util-lib.c (saferead, safewrite): New file. Functions from src/util.c with slight change (s/int r =/ssize_t r =/) to reflect read/write return type. * src/util-lib.h: Declare the two moved functions. * src/util.h: Remove declarations. Include src/util-lib.h. * proxy/Makefile.am (libvirt_proxy_SOURCES): Add src/util-lib.c. * qemud/Makefile.am (libvirtd_SOURCES): Likewise. * src/Makefile.am (virsh_SOURCES): Add util-lib.c. Remove some SP-before-TAB. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- proxy/Makefile.am | 6 +++- proxy/libvirt_proxy.c | 16 ++++---------- qemud/Makefile.am | 3 +- src/Makefile.am | 16 +++++++------- src/util-lib.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ src/util-lib.h | 16 +++++++++++++++ src/util.c | 43 ++------------------------------------- src/util.h | 10 ++++---- 8 files changed, 95 insertions(+), 67 deletions(-) create mode 100644 src/util-lib.c create mode 100644 src/util-lib.h diff --git a/proxy/Makefile.am b/proxy/Makefile.am index ff9a3eb..68e3317 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -12,11 +12,13 @@ libexec_PROGRAMS = libvirt_proxy libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \ @top_srcdir@/src/xen_internal.c @top_srcdir@/src/virterror.c \ @top_srcdir@/src/sexpr.c @top_srcdir@/src/xml.c \ - @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c @top_srcdir@/src/uuid.c + @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c \ + @top_srcdir@/src/util-lib.c \ + @top_srcdir@/src/uuid.c libvirt_proxy_LDFLAGS = $(WARN_CFLAGS) libvirt_proxy_DEPENDENCIES = libvirt_proxy_LDADD = install-exec-hook: chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy -endif \ No newline at end of file +endif diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index d96d3db..a22ba6c 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -2,7 +2,7 @@ * proxy_svr.c: root suid proxy server for Xen access to APIs with no * side effects from unauthenticated clients. * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -26,6 +26,7 @@ #include "internal.h" #include "proxy_internal.h" +#include "util.h" #include "xen_internal.h" #include "xend_internal.h" #include "xs_internal.h" @@ -317,19 +318,12 @@ proxyWriteClientSocket(int nr, virProxyPacketPtr req) { return(-1); } -retry: - ret = write(pollInfos[nr].fd, (char *) req, req->len); + ret = safewrite(pollInfos[nr].fd, (char *) req, req->len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d to client %d interrupted\n", - pollInfos[nr].fd, nr); - goto retry; - } fprintf(stderr, "write %d bytes to socket %d from client %d failed\n", req->len, pollInfos[nr].fd, nr); - proxyCloseClientSocket(nr); - return(-1); + proxyCloseClientSocket(nr); + return(-1); } if (ret == 0) { if (debug) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index db6adb1..1e1f861 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -42,6 +42,7 @@ libvirtd_SOURCES = \ qemud.c internal.h \ remote_protocol.h remote_protocol.c \ remote.c \ + $(srcdir)/../src/util-lib.c \ event.c event.h #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L @@ -151,4 +152,4 @@ uninstall-init: endif # DBUS_INIT_SCRIPTS_RED_HAT -endif # WITH_LIBVIRTD \ No newline at end of file +endif # WITH_LIBVIRTD diff --git a/src/Makefile.am b/src/Makefile.am index 7bbf816..1da0d73 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,21 +51,21 @@ CLIENT_SOURCES = \ conf.c conf.h \ xm_internal.c xm_internal.h \ remote_internal.c remote_internal.h \ - bridge.c bridge.h \ - iptables.c iptables.h \ - uuid.c uuid.h \ - qemu_driver.c qemu_driver.h \ + bridge.c bridge.h \ + iptables.c iptables.h \ + uuid.c uuid.h \ + qemu_driver.c qemu_driver.h \ qemu_conf.c qemu_conf.h \ openvz_conf.c openvz_conf.h \ - openvz_driver.c openvz_driver.h \ + openvz_driver.c openvz_driver.h \ nodeinfo.h nodeinfo.c \ storage_conf.h storage_conf.c \ storage_driver.h storage_driver.c \ storage_backend.h storage_backend.c \ - storage_backend_fs.h storage_backend_fs.c \ + storage_backend_fs.h storage_backend_fs.c \ util.c util.h -SERVER_SOURCES = \ +SERVER_SOURCES = \ ../qemud/remote_protocol.c ../qemud/remote_protocol.h if WITH_STORAGE_LVM @@ -100,7 +100,7 @@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) bin_PROGRAMS = virsh -virsh_SOURCES = virsh.c console.c console.h +virsh_SOURCES = virsh.c console.c console.h util-lib.c virsh_LDFLAGS = $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) virsh_DEPENDENCIES = $(DEPS) virsh_LDADD = $(LDADDS) $(VIRSH_LIBS) diff --git a/src/util-lib.c b/src/util-lib.c new file mode 100644 index 0000000..92496cd --- /dev/null +++ b/src/util-lib.c @@ -0,0 +1,52 @@ +/* + * common, generic utility functions + * + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. + * See COPYING.LIB for the License of this software + */ + +#include <config.h> + +#include <unistd.h> +#include <errno.h> + +#include "util-lib.h" + +/* Like read(), but restarts after EINTR */ +int saferead(int fd, void *buf, size_t count) +{ + size_t nread = 0; + while (count > 0) { + ssize_t r = read(fd, buf, count); + if (r < 0 && errno == EINTR) + continue; + if (r < 0) + return r; + if (r == 0) + return nread; + buf = (char *)buf + r; + count -= r; + nread += r; + } + return nread; +} + +/* Like write(), but restarts after EINTR */ +ssize_t safewrite(int fd, const void *buf, size_t count) +{ + size_t nwritten = 0; + while (count > 0) { + ssize_t r = write(fd, buf, count); + + if (r < 0 && errno == EINTR) + continue; + if (r < 0) + return r; + if (r == 0) + return nwritten; + buf = (const char *)buf + r; + count -= r; + nwritten += r; + } + return nwritten; +} diff --git a/src/util-lib.h b/src/util-lib.h new file mode 100644 index 0000000..4a14810 --- /dev/null +++ b/src/util-lib.h @@ -0,0 +1,16 @@ +/* + * private utility functions + * + * Copyright (C) 2008 Red Hat, Inc. + * See COPYING.LIB for the License of this software + */ + +#ifndef __UTIL_LIB_H__ +#define __UTIL_LIB_H__ + +#include <sys/types.h> + +int saferead(int fd, void *buf, size_t count); +ssize_t safewrite(int fd, const void *buf, size_t count); + +#endif diff --git a/src/util.c b/src/util.c index 19131a7..67cb0b8 100644 --- a/src/util.c +++ b/src/util.c @@ -1,7 +1,7 @@ /* * utils.c: common, generic utility functions * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * Copyright (C) 2006, 2007 Binary Karma * Copyright (C) 2006 Shuveb Hussain @@ -46,6 +46,8 @@ #include "buf.h" #include "util.h" +#include "util-lib.c" + #define MAX_ERROR_LEN 1024 #define virLog(msg...) fprintf(stderr, msg) @@ -276,45 +278,6 @@ virExecNonBlock(virConnectPtr conn, #endif /* __MINGW32__ */ -/* Like read(), but restarts after EINTR */ -int saferead(int fd, void *buf, size_t count) -{ - size_t nread = 0; - while (count > 0) { - int r = read(fd, buf, count); - if (r < 0 && errno == EINTR) - continue; - if (r < 0) - return r; - if (r == 0) - return nread; - buf = (unsigned char *)buf + r; - count -= r; - nread += r; - } - return nread; -} - -/* Like write(), but restarts after EINTR */ -ssize_t safewrite(int fd, const void *buf, size_t count) -{ - size_t nwritten = 0; - while (count > 0) { - int r = write(fd, buf, count); - - if (r < 0 && errno == EINTR) - continue; - if (r < 0) - return r; - if (r == 0) - return nwritten; - buf = (unsigned char *)buf + r; - count -= r; - nwritten += r; - } - return nwritten; -} - int __virFileReadAll(const char *path, int maxlen, diff --git a/src/util.h b/src/util.h index 7080ed0..23a016d 100644 --- a/src/util.h +++ b/src/util.h @@ -25,14 +25,14 @@ #define __VIR_UTIL_H__ #include "internal.h" +#include "util-lib.h" -int virExec(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); -int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); +int virExec(virConnectPtr conn, char **argv, int *retpid, + int infd, int *outfd, int *errfd); +int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid, + int infd, int *outfd, int *errfd); int virRun(virConnectPtr conn, char **argv, int *status); -int saferead(int fd, void *buf, size_t count); -ssize_t safewrite(int fd, const void *buf, size_t count); - int __virFileReadAll(const char *path, int maxlen, char **buf); -- 1.5.4.2.185.gf5f8

3 3

[Libvir] Proposal: More script hooks for <interface type='ethernet'>
by Charles Duffy 25 Feb '08

25 Feb '08

I have a few issues with <interface type='ethernet'>: - The requirement that either (1) the tap device already exists and has a constant name, or (2) the tap device can be created by the current user without privilege escalation doesn't work for places where the user wants to - dynamically generate tap devices - ...but is running kvm without privileges to do so. (this is particularly likely now that write privileges to /dev/net/tap are not enough, and the user needs CAP_NET_ADMIN to create a tap device). Allowing a target script to be specified (which is responsible for gaining any privileges necessary) which runs *before* the tap device is opened and would resolve this. - A qemu-ifup script can be specified, but not a qemu-ifdown replacement. Before looking to use libvirt, I had kvm's invocation wrapped by a script which did appropriate privilege escalation (ifname=$(sudo tunctl -b -u $USER), with sudo configured with the NOPASSWORD flag for this request -- though plenty of other approaches are certainly possible). It would be ideal if more hooks were available... for instance: <interface type='ethernet'>  <target script='/usr/local/bin/make-me-a-tap-device'/>  <script path='/etc/qemu-ifup-mynet'/>  <script-down path='/etc/qemu-ifdown-mynet'/> </interface> Working around this means that I would need to preallocate the tap devices and assign them to specific VMs (boo! hiss!) or that (if I wrapped libvirt's invocation to have the tap device created just ahead of time and its name substituted into interface/@dev) 3rd-party libvirt-based management tools couldn't be used (which would defeat the point of switching to libvirt from my homegrown script collection in the first place). So -- does the proposed syntax extension look reasonable?

3 2

[Libvir] Libparted history contribution
by Matt Davis 24 Feb '08

24 Feb '08

Hello, I am sending this email out to various programs that use libparted for partition table manipulation. If you are on the libparted devel list, you probably have caught word of this. I have implemented some functionality that allows parted to maintain a list of disk changes, allowing for a user to undo/redo changes before they are actually committed, or written, to disk. This "History" is a safety feature, and a library change vs usefulness might not be wanted by you all. I was just querying to see if such functionality, as an addition to libparted, would be welcomed? In any case, it might be useful for me to wrap it up into its own library, possibly something such as libparted-utilities or extras. While the changes I have implemented can exist outside of the library, I figured it might be something other projects might find useful. But making any library changes, especially when many well-known projects use such a library, is a serious decision. If this is a worthy change I would like to hear your feedback. Thanks -Matt

1 0

[Libvir] Why QEMU?
by Anton Protopopov 23 Feb '08

23 Feb '08

Hi, all. When I executing virsh to connect to openvz I get the following: [root@localhost ~]# virsh -c openvz:///system libvir: QEMU error : cannot create bridge 'virbr0' : File exists Failed to autostart network 'default': cannot create bridge 'virbr0' : File existsWelcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # ... But I didn't want to connect to QEMU... Anton

4 5

[Libvir] [RFC][PATCH]: Make the iscsi storage backend mostly use sysfs
by Chris Lalancette 22 Feb '08

22 Feb '08

Hello, The newer version of iscsi-initiator-utils (6.2.0.865-0.2), available in the f8-updates repository, is required as part of the fix for a hang when doing iscsi logout (the other fix is in the 2.6.25 kernel). Unfortunately, this version also changes the output of the iscsiadm -m session -P 3 command; this output was being used to gather the scsi devices available in a pool and present them as volumes. Consequently, when starting an iSCSI pool on a machine with these newer versions of the iscsi tools, the pool will be successfully created but you won't be able to see any of the LUNs presented. The attached patch *lessens* our dependency on the iscsiadm output by using sysfs to gather the /dev devices. Note that this patch is not to be applied; I'm just putting it out there so people can take a look at it. DanB has suggested getting rid of our dependency on the iscsiadm output altogether is the way to go, and I agree with him there; this is mostly just a short-term solution, to possibly base future work on. Chris Lalancette

2 1

[Libvir] Problem using libvirtd on RHEL5.1
by Tiago Cruz 22 Feb '08

22 Feb '08

Hello 8-) I'm using libvirt-0.4.0-1 (re)compiled from libvirt-0.4.0.tar.gz, on Red Hat EL 5.1 x86_64. The problem is: # /etc/init.d/libvirtd start Starting libvirtd daemon: libvir: QEMU error : cannot create bridge 'virbr0' : File exists Failed to autostart network 'default': cannot create bridge[FAILED]' : File exists And I can't destroy the 'virbr0', because I don't know how :^) --- I've tried do compile the libvirt-cvs-snapshot.tar.gz, but I can't too :( In file included from libvirt.c:36: util.h:28:22: error: util-lib.h: No such file or directory RPM build errors: File not found: /var/tmp/libvirt-0.4.0-root/usr/libexec/libvirt_parthelper Maybe you have some tip/ trick for me :) Many thanks -- Tiago Cruz http://everlinux.com Linux User #282636

2 2

[Libvir] tons of format string warnings on rawhide
by Jim Meyering 22 Feb '08

22 Feb '08

Avoid warnings like this: file:nnn:format not a string literal and no format arguments Easy to fix: prepend an "%s" argument. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 68 +++++++++++++++----------- qemud/remote.c | 28 ++++++----- src/iptables.c | 4 +- src/qemu_driver.c | 23 ++++++--- src/storage_backend.c | 22 ++++---- src/storage_backend_fs.c | 29 ++++++------ src/storage_backend_iscsi.c | 18 ++++---- src/storage_backend_logical.c | 20 ++++---- src/storage_conf.c | 77 +++++++++++++++--------------- src/storage_driver.c | 103 +++++++++++++++++++++-------------------- 10 files changed, 207 insertions(+), 185 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index a40dfcb..e01b6dc 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -245,9 +245,9 @@ static void qemudDispatchSignalEvent(int fd ATTRIBUTE_UNUSED, switch (sigc) { case SIGHUP: - qemudLog(QEMUD_INFO, _("Reloading configuration on SIGHUP")); + qemudLog(QEMUD_INFO, "%s", _("Reloading configuration on SIGHUP")); if (virStateReload() < 0) - qemudLog(QEMUD_WARN, _("Error while reloading drivers")); + qemudLog(QEMUD_WARN, "%s", _("Error while reloading drivers")); break; case SIGINT: @@ -274,7 +274,8 @@ static int qemudSetCloseExec(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set close-on-exec file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -288,7 +289,8 @@ static int qemudSetNonBlock(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set non-blocking file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set non-blocking file descriptor flag")); return -1; } @@ -467,7 +469,7 @@ static int qemudListenUnix(struct qemud_server *server, if (!sock) { qemudLog(QEMUD_ERR, - _("Failed to allocate memory for struct qemud_socket")); + "%s", _("Failed to allocate memory for struct qemud_socket")); return -1; } @@ -517,7 +519,7 @@ static int qemudListenUnix(struct qemud_server *server, POLLIN| POLLERR | POLLHUP, qemudDispatchServerEvent, server) < 0) { - qemudLog(QEMUD_ERR, _("Failed to add server event callback")); + qemudLog(QEMUD_ERR, "%s", _("Failed to add server event callback")); goto cleanup; } @@ -647,7 +649,7 @@ remoteListenTCP (struct qemud_server *server, POLLIN| POLLERR | POLLHUP, qemudDispatchServerEvent, server) < 0) { - qemudLog(QEMUD_ERR, _("Failed to add server event callback")); + qemudLog(QEMUD_ERR, "%s", _("Failed to add server event callback")); return -1; } @@ -698,7 +700,7 @@ static int qemudInitPaths(struct qemud_server *server, snprintf_error: qemudLog(QEMUD_ERR, - _("Resulting path to long for buffer in qemudInitPaths()")); + "%s", _("Resulting path to long for buffer in qemudInitPaths()")); return -1; } @@ -706,7 +708,7 @@ static struct qemud_server *qemudInitialize(int sigread) { struct qemud_server *server; if (!(server = calloc(1, sizeof(*server)))) { - qemudLog(QEMUD_ERR, _("Failed to allocate struct qemud_server")); + qemudLog(QEMUD_ERR, "%s", _("Failed to allocate struct qemud_server")); return NULL; } @@ -935,20 +937,23 @@ remoteCheckCertificate (gnutls_session_t session) if (status != 0) { if (status & GNUTLS_CERT_INVALID) - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "the client certificate is not trusted.")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: " + "the client certificate is not trusted.")); if (status & GNUTLS_CERT_SIGNER_NOT_FOUND) - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: the client " - "certificate has unknown issuer.")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: the client " + "certificate has unknown issuer.")); if (status & GNUTLS_CERT_REVOKED) - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "the client certificate has been revoked.")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: " + "the client certificate has been revoked.")); #ifndef GNUTLS_1_0_COMPAT if (status & GNUTLS_CERT_INSECURE_ALGORITHM) - qemudLog (QEMUD_ERR, + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: the client certificate" " uses an insecure algorithm.")); #endif @@ -957,13 +962,13 @@ remoteCheckCertificate (gnutls_session_t session) } if (gnutls_certificate_type_get (session) != GNUTLS_CRT_X509) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "certificate is not X.509")); + qemudLog (QEMUD_ERR, + "%s", _("remoteCheckCertificate: certificate is not X.509")); return -1; } if (!(certs = gnutls_certificate_get_peers(session, &nCerts))) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: no peers")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: no peers")); return -1; } @@ -973,7 +978,7 @@ remoteCheckCertificate (gnutls_session_t session) gnutls_x509_crt_t cert; if (gnutls_x509_crt_init (&cert) < 0) { - qemudLog (QEMUD_ERR, + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: gnutls_x509_crt_init failed")); return -1; } @@ -984,15 +989,15 @@ remoteCheckCertificate (gnutls_session_t session) } if (gnutls_x509_crt_get_expiration_time (cert) < now) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: " - "the client certificate has expired")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: " + "the client certificate has expired")); gnutls_x509_crt_deinit (cert); return -1; } if (gnutls_x509_crt_get_activation_time (cert) > now) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: the client " - "certificate is not yet activated")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: the client " + "certificate is not yet activated")); gnutls_x509_crt_deinit (cert); return -1; } @@ -1000,7 +1005,7 @@ remoteCheckCertificate (gnutls_session_t session) if (i == 0) { if (!remoteCheckDN (cert)) { /* This is the most common error: make it informative. */ - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); + qemudLog (QEMUD_ERR, "%s", _("remoteCheckCertificate: client's Distinguished Name is not on the list of allowed clients (tls_allowed_dn_list). Use 'openssl x509 -in clientcert.pem -text' to view the Distinguished Name field in the client certificate, or run this daemon with --verbose option.")); gnutls_x509_crt_deinit (cert); return -1; } @@ -1016,9 +1021,13 @@ remoteCheckAccess (struct qemud_client *client) { /* Verify client certificate. */ if (remoteCheckCertificate (client->tlssession) == -1) { - qemudLog (QEMUD_ERR, _("remoteCheckCertificate: failed to verify client's certificate")); + qemudLog (QEMUD_ERR, "%s", + _("remoteCheckCertificate: " + "failed to verify client's certificate")); if (!tls_no_verify_certificate) return -1; - else qemudLog (QEMUD_INFO, _("remoteCheckCertificate: tls_no_verify_certificate is set so the bad certificate is ignored")); + else qemudLog (QEMUD_INFO, "%s", + _("remoteCheckCertificate: tls_no_verify_certificate " + "is set so the bad certificate is ignored")); } /* Checks have succeeded. Write a '\1' byte back to the client to @@ -1889,7 +1898,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) if (unix_sock_group) { if (getuid() != 0) { qemudLog (QEMUD_WARN, - _("Cannot set group when not running as root")); + "%s", _("Cannot set group when not running as root")); } else { struct group *grp = getgrnam(unix_sock_group); if (!grp) { @@ -2146,7 +2155,8 @@ int main(int argc, char **argv) { POLLIN, qemudDispatchSignalEvent, server) < 0) { - qemudLog(QEMUD_ERR, _("Failed to register callback for signal pipe")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to register callback for signal pipe")); ret = 3; goto error2; } diff --git a/qemud/remote.c b/qemud/remote.c index f7c9b24..014fe65 100644 --- a/qemud/remote.c +++ b/qemud/remote.c @@ -2130,7 +2130,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Initialize SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn != NULL) { - qemudLog(QEMUD_ERR, _("client tried invalid SASL init request")); + qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL init request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2184,7 +2184,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, cipher = gnutls_cipher_get(client->tlssession); if (!(ssf = (sasl_ssf_t)gnutls_cipher_get_key_size(cipher))) { - qemudLog(QEMUD_ERR, _("cannot TLS get cipher size")); + qemudLog(QEMUD_ERR, "%s", _("cannot TLS get cipher size")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2250,7 +2250,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Available mechanisms for client: '%s'", mechlist); ret->mechlist = strdup(mechlist); if (!ret->mechlist) { - qemudLog(QEMUD_ERR, _("cannot allocate mechlist")); + qemudLog(QEMUD_ERR, "%s", _("cannot allocate mechlist")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2323,7 +2323,7 @@ remoteSASLCheckAccess (struct qemud_server *server, return -1; } if (val == NULL) { - qemudLog(QEMUD_ERR, _("no client username was found")); + qemudLog(QEMUD_ERR, "%s", _("no client username was found")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2333,7 +2333,7 @@ remoteSASLCheckAccess (struct qemud_server *server, client->saslUsername = strdup((const char*)val); if (client->saslUsername == NULL) { - qemudLog(QEMUD_ERR, _("out of memory copying username")); + qemudLog(QEMUD_ERR, "%s", _("out of memory copying username")); remoteDispatchFailAuth(client, req); sasl_dispose(&client->saslconn); client->saslconn = NULL; @@ -2378,7 +2378,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server, REMOTE_DEBUG("Start SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - qemudLog(QEMUD_ERR, _("client tried invalid SASL start request")); + qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL start request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2458,7 +2458,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server, REMOTE_DEBUG("Step SASL auth %d", client->fd); if (client->auth != REMOTE_AUTH_SASL || client->saslconn == NULL) { - qemudLog(QEMUD_ERR, _("client tried invalid SASL start request")); + qemudLog(QEMUD_ERR, "%s", _("client tried invalid SASL start request")); remoteDispatchFailAuth(client, req); return -2; } @@ -2532,7 +2532,7 @@ remoteDispatchAuthSaslInit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported SASL init request")); + qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL init request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2544,7 +2544,7 @@ remoteDispatchAuthSaslStart (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_start_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported SASL start request")); + qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL start request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2556,7 +2556,7 @@ remoteDispatchAuthSaslStep (struct qemud_server *server ATTRIBUTE_UNUSED, remote_auth_sasl_step_args *args ATTRIBUTE_UNUSED, remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported SASL step request")); + qemudLog(QEMUD_ERR, "%s", _("client tried unsupported SASL step request")); remoteDispatchFailAuth(client, req); return -1; } @@ -2597,13 +2597,14 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, REMOTE_DEBUG("Start PolicyKit auth %d", client->fd); if (client->auth != REMOTE_AUTH_POLKIT) { - qemudLog(QEMUD_ERR, _("client tried invalid PolicyKit init request")); + qemudLog(QEMUD_ERR, + "%s", _("client tried invalid PolicyKit init request")); remoteDispatchFailAuth(client, req); return -2; } if (qemudGetSocketIdentity(client->fd, &callerUid, &callerPid) < 0) { - qemudLog(QEMUD_ERR, _("cannot get peer socket identity")); + qemudLog(QEMUD_ERR, "%s", _("cannot get peer socket identity")); remoteDispatchFailAuth(client, req); return -2; } @@ -2713,7 +2714,8 @@ remoteDispatchAuthPolkit (struct qemud_server *server ATTRIBUTE_UNUSED, void *args ATTRIBUTE_UNUSED, remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED) { - qemudLog(QEMUD_ERR, _("client tried unsupported PolicyKit init request")); + qemudLog(QEMUD_ERR, + "%s", _("client tried unsupported PolicyKit init request")); remoteDispatchFailAuth(client, req); return -1; } diff --git a/src/iptables.c b/src/iptables.c index f970701..dda1c24 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -148,8 +148,8 @@ notifyRulesRemoved(const char *table, len = virFileReadAll(SYSCONF_DIR "/sysconfig/system-config-firewall", MAX_FILE_LEN, &content); if (len < 0) { - qemudLog(QEMUD_WARN, _("Failed to read " SYSCONF_DIR - "/sysconfig/system-config-firewall")); + qemudLog(QEMUD_WARN, "%s", _("Failed to read " SYSCONF_DIR + "/sysconfig/system-config-firewall")); return; } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 15cd52c..f5fe504 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -71,7 +71,8 @@ static int qemudSetCloseExec(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set close-on-exec file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set close-on-exec file descriptor flag")); return -1; } @@ -85,7 +86,8 @@ static int qemudSetNonBlock(int fd) { goto error; return 0; error: - qemudLog(QEMUD_ERR, _("Failed to set non-blocking file descriptor flag")); + qemudLog(QEMUD_ERR, + "%s", _("Failed to set non-blocking file descriptor flag")); return -1; } @@ -182,7 +184,8 @@ qemudStartup(void) { goto snprintf_error; if (asprintf (&base, "%s/.libvirt", pw->pw_dir) == -1) { - qemudLog (QEMUD_ERR, _("out of memory in asprintf")); + qemudLog (QEMUD_ERR, + "%s", _("out of memory in asprintf")); goto out_of_memory; } } @@ -224,11 +227,12 @@ qemudStartup(void) { snprintf_error: qemudLog(QEMUD_ERR, - _("Resulting path to long for buffer in qemudInitPaths()")); + "%s", _("Resulting path to long for buffer in qemudInitPaths()")); return -1; out_of_memory: - qemudLog (QEMUD_ERR, _("qemudStartup: out of memory")); + qemudLog (QEMUD_ERR, + "%s", _("qemudStartup: out of memory")); free (base); free(qemu_driver); qemu_driver = NULL; @@ -246,7 +250,8 @@ qemudReload(void) { qemudScanConfigs(qemu_driver); if (qemu_driver->iptables) { - qemudLog(QEMUD_INFO, _("Reloading iptables rules")); + qemudLog(QEMUD_INFO, + "%s", _("Reloading iptables rules")); iptablesReloadRules(qemu_driver->iptables); } @@ -777,7 +782,8 @@ static void qemudShutdownVMDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, if (waitpid(vm->pid, NULL, WNOHANG) != vm->pid) { kill(vm->pid, SIGKILL); if (waitpid(vm->pid, NULL, 0) != vm->pid) { - qemudLog(QEMUD_WARN, _("Got unexpected pid, damn")); + qemudLog(QEMUD_WARN, + "%s", _("Got unexpected pid, damn")); } } @@ -1265,7 +1271,8 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, waitpid(network->dnsmasqPid, NULL, WNOHANG) != network->dnsmasqPid) { kill(network->dnsmasqPid, SIGKILL); if (waitpid(network->dnsmasqPid, NULL, 0) != network->dnsmasqPid) - qemudLog(QEMUD_WARN, _("Got unexpected pid for dnsmasq\n")); + qemudLog(QEMUD_WARN, + "%s", _("Got unexpected pid for dnsmasq\n")); } network->bridge[0] = '\0'; diff --git a/src/storage_backend.c b/src/storage_backend.c index 6f8940f..a13d9a4 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -247,7 +247,7 @@ virStorageBackendUpdateVolInfoFD(virConnectPtr conn, } vol->target.perms.label = strdup(filecon); if (vol->target.perms.label == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("context")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("context")); return -1; } freecon(filecon); @@ -306,7 +306,7 @@ virStorageBackendStablePath(virConnectPtr conn, stablepath = malloc(strlen(pool->def->target.path) + 1 + strlen(dent->d_name) + 1); if (stablepath == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("path")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("path")); closedir(dh); return NULL; } @@ -359,7 +359,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, /* Compile all regular expressions */ if ((reg = calloc(nregex, sizeof(*reg))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("regex")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("regex")); return -1; } @@ -385,12 +385,12 @@ virStorageBackendRunProgRegex(virConnectPtr conn, /* Storage for matched variables */ if ((groups = calloc(totgroups, sizeof(*groups))) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("regex groups")); + "%s", _("regex groups")); goto cleanup; } if ((vars = calloc(maxvars+1, sizeof(*vars))) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("regex groups")); + "%s", _("regex groups")); goto cleanup; } @@ -402,7 +402,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, if ((list = fdopen(fd, "r")) == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot read fd")); + "%s", _("cannot read fd")); goto cleanup; } @@ -426,7 +426,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, if ((groups[ngroup++] = strdup(line + vars[j+1].rm_so)) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("regex groups")); + "%s", _("regex groups")); goto cleanup; } } @@ -489,7 +489,7 @@ virStorageBackendRunProgRegex(virConnectPtr conn, } } else { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("command did not exit cleanly")); + "%s", _("command did not exit cleanly")); return -1; } } @@ -530,7 +530,7 @@ virStorageBackendRunProgNul(virConnectPtr conn, if (n_columns > SIZE_MAX / sizeof *v || (v = malloc (n_columns * sizeof *v)) == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("n_columns too large")); + "%s", _("n_columns too large")); return -1; } for (i = 0; i < n_columns; i++) @@ -543,7 +543,7 @@ virStorageBackendRunProgNul(virConnectPtr conn, if ((fp = fdopen(fd, "r")) == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot read fd")); + "%s", _("cannot read fd")); goto cleanup; } @@ -611,7 +611,7 @@ virStorageBackendRunProgNul(virConnectPtr conn, } } else { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("command did not exit cleanly")); + "%s", _("command did not exit cleanly")); return -1; } } diff --git a/src/storage_backend_fs.c b/src/storage_backend_fs.c index ffb4010..9425cbc 100644 --- a/src/storage_backend_fs.c +++ b/src/storage_backend_fs.c @@ -503,18 +503,18 @@ virStorageBackendFileSystemMount(virConnectPtr conn, if (pool->def->type == VIR_STORAGE_POOL_NETFS) { if (pool->def->source.host.name == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source host")); + "%s", _("missing source host")); return -1; } if (pool->def->source.dir == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source path")); + "%s", _("missing source path")); return -1; } } else { if (pool->def->source.ndevice != 1) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source device")); + "%s", _("missing source device")); return -1; } } @@ -537,7 +537,7 @@ virStorageBackendFileSystemMount(virConnectPtr conn, src = strdup(pool->def->source.devices[0].path); } if (src == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("source")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("source")); return -1; } mntargv[3] = src; @@ -568,18 +568,18 @@ virStorageBackendFileSystemUnmount(virConnectPtr conn, if (pool->def->type == VIR_STORAGE_POOL_NETFS) { if (pool->def->source.host.name == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source host")); + "%s", _("missing source host")); return -1; } if (pool->def->source.dir == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source dir")); + "%s", _("missing source dir")); return -1; } } else { if (pool->def->source.ndevice != 1) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source device")); + "%s", _("missing source device")); return -1; } } @@ -680,7 +680,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, vol = calloc(1, sizeof(virStorageVolDef)); if (vol == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume")); + "%s", _("volume")); goto cleanup; } @@ -688,7 +688,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, if (vol->name == NULL) { free(vol); virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume name")); + "%s", _("volume name")); goto cleanup; } @@ -699,7 +699,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, free(vol->target.path); free(vol); virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume name")); + "%s", _("volume name")); goto cleanup; } strcpy(vol->target.path, pool->def->target.path); @@ -710,7 +710,7 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn, free(vol->target.path); free(vol); virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("volume key")); + "%s", _("volume key")); goto cleanup; } @@ -822,7 +822,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, vol->target.path = malloc(strlen(pool->def->target.path) + 1 + strlen(vol->name) + 1); if (vol->target.path == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("target")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("target")); return -1; } strcpy(vol->target.path, pool->def->target.path); @@ -831,7 +831,7 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, vol->key = strdup(vol->target.path); if (vol->key == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("storage vol key")); + "%s", _("storage vol key")); return -1; } @@ -963,7 +963,8 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn, } #else virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("creation of non-raw images is not supported without qemu-img")); + "%s", _("creation of non-raw images " + "is not supported without qemu-img")); return -1; #endif } diff --git a/src/storage_backend_iscsi.c b/src/storage_backend_iscsi.c index 2f7d746..fc79b46 100644 --- a/src/storage_backend_iscsi.c +++ b/src/storage_backend_iscsi.c @@ -92,7 +92,7 @@ virStorageBackendISCSIExtractSession(virConnectPtr conn, if (STREQ(groups[1], pool->def->source.devices[0].path)) { if ((*session = strdup(groups[0])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("session")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("session")); return -1; } } @@ -133,7 +133,7 @@ virStorageBackendISCSISession(virConnectPtr conn, if (session == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot find session")); + "%s", _("cannot find session")); return NULL; } @@ -174,17 +174,17 @@ virStorageBackendISCSIMakeLUN(virConnectPtr conn, snprintf(lunid, sizeof(lunid)-1, "lun-%s", groups[3]); if ((vol = calloc(1, sizeof(virStorageVolDef))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } if ((vol->name = strdup(lunid)) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("name")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("name")); goto cleanup; } if ((devpath = malloc(5 + strlen(dev) + 1)) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("devpath")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("devpath")); goto cleanup; } strcpy(devpath, "/dev/"); @@ -230,7 +230,7 @@ virStorageBackendISCSIMakeLUN(virConnectPtr conn, /* XXX use unique iSCSI id instead */ vol->key = strdup(vol->target.path); if (vol->key == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("key")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("key")); goto cleanup; } @@ -342,7 +342,7 @@ virStorageBackendISCSIPortal(virConnectPtr conn, portal = malloc(strlen(ipaddr) + 1 + 4 + 2 + 1); if (portal == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("portal")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("portal")); return NULL; } @@ -361,14 +361,14 @@ virStorageBackendISCSIStartPool(virConnectPtr conn, if (pool->def->source.host.name == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source host")); + "%s", _("missing source host")); return -1; } if (pool->def->source.ndevice != 1 || pool->def->source.devices[0].path == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing source device")); + "%s", _("missing source device")); return -1; } diff --git a/src/storage_backend_logical.c b/src/storage_backend_logical.c index c14e788..a70c087 100644 --- a/src/storage_backend_logical.c +++ b/src/storage_backend_logical.c @@ -113,12 +113,12 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, /* Or a completely new volume */ if (vol == NULL) { if ((vol = calloc(1, sizeof(*vol))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } if ((vol->name = strdup(groups[0])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } @@ -130,7 +130,7 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, if (vol->target.path == NULL) { if ((vol->target.path = malloc(strlen(pool->def->target.path) + 1 + strlen(vol->name) + 1)) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } strcpy(vol->target.path, pool->def->target.path); @@ -140,7 +140,7 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, if (vol->key == NULL && (vol->key = strdup(groups[1])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("volume")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("volume")); return -1; } @@ -151,30 +151,30 @@ virStorageBackendLogicalMakeVol(virConnectPtr conn, /* Finally fill in extents information */ if ((tmp = realloc(vol->source.extents, sizeof(*tmp) * (vol->source.nextent + 1))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("extents")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("extents")); return -1; } vol->source.extents = tmp; if ((vol->source.extents[vol->source.nextent].path = strdup(groups[2])) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("extents")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("extents")); return -1; } if (virStrToLong_ull(groups[3], NULL, 10, &offset) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed volume extent offset value")); + "%s", _("malformed volume extent offset value")); return -1; } if (virStrToLong_ull(groups[4], NULL, 10, &length) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed volume extent length value")); + "%s", _("malformed volume extent length value")); return -1; } if (virStrToLong_ull(groups[5], NULL, 10, &size) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed volume extent size value")); + "%s", _("malformed volume extent size value")); return -1; } @@ -266,7 +266,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn, /* XXX multiple pvs */ if ((vgargv = malloc(sizeof(char*) * (1))) == NULL) { - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("command line")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("command line")); return -1; } diff --git a/src/storage_conf.c b/src/storage_conf.c index 8dfcde7..76e141e 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -153,14 +153,14 @@ virStoragePoolDefParseAuthChap(virConnectPtr conn, auth->login = virXPathString("string(/pool/source/auth/@login)", ctxt); if (auth->login == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing auth host attribute")); + "%s", _("missing auth host attribute")); return -1; } auth->passwd = virXPathString("string(/pool/source/auth/@passwd)", ctxt); if (auth->passwd == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing auth passwd attribute")); + "%s", _("missing auth passwd attribute")); return -1; } @@ -183,7 +183,7 @@ virStoragePoolDefParsePerms(virConnectPtr conn, perms->mode = strtol(mode, &end, 8); if (*end || perms->mode < 0 || perms->mode > 0777) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed octal mode")); + "%s", _("malformed octal mode")); return -1; } } @@ -193,7 +193,7 @@ virStoragePoolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/pool/permissions/owner)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed owner element")); + "%s", _("malformed owner element")); return -1; } perms->uid = (int)v; @@ -204,7 +204,7 @@ virStoragePoolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/pool/permissions/group)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed group element")); + "%s", _("malformed group element")); return -1; } perms->gid = (int)v; @@ -232,7 +232,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (STRNEQ((const char *)root->name, "pool")) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("unknown root element")); + "%s", _("unknown root element")); goto cleanup; } @@ -248,7 +248,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if ((ret->name = virXPathString("string(/pool/name)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing name element")); + "%s", _("missing name element")); goto cleanup; } @@ -256,13 +256,13 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (uuid == NULL) { if (virUUIDGenerate(ret->uuid) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("unable to generate uuid")); + "%s", _("unable to generate uuid")); goto cleanup; } } else { if (virUUIDParse(uuid, ret->uuid) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed uuid element")); + "%s", _("malformed uuid element")); goto cleanup; } free(uuid); @@ -281,7 +281,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (options->flags & VIR_STORAGE_BACKEND_POOL_SOURCE_HOST) { if ((ret->source.host.name = virXPathString("string(/pool/source/host/@name)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing source host name")); + "%s", _("missing source host name")); goto cleanup; } } @@ -291,12 +291,12 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if ((nsource = virXPathNodeSet("/pool/source/device", ctxt, &nodeset)) <= 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("cannot extract source devices")); + "%s", _("cannot extract source devices")); goto cleanup; } if ((ret->source.devices = calloc(nsource, sizeof(*ret->source.devices))) == NULL) { free(nodeset); - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("device")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("device")); goto cleanup; } for (i = 0 ; i < nsource ; i++) { @@ -304,7 +304,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (path == NULL) { free(nodeset); virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing source device path")); + "%s", _("missing source device path")); goto cleanup; } ret->source.devices[i].path = (char *)path; @@ -315,7 +315,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if (options->flags & VIR_STORAGE_BACKEND_POOL_SOURCE_DIR) { if ((ret->source.dir = virXPathString("string(/pool/source/dir/@path)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing source path")); + "%s", _("missing source path")); goto cleanup; } } @@ -346,7 +346,7 @@ virStoragePoolDefParseDoc(virConnectPtr conn, if ((ret->target.path = virXPathString("string(/pool/target/path)", ctxt)) == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing target path")); + "%s", _("missing target path")); goto cleanup; } @@ -378,21 +378,21 @@ virStoragePoolDefParse(virConnectPtr conn, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed xml document")); + "%s", _("malformed xml document")); goto cleanup; } ctxt = xmlXPathNewContext(xml); if (ctxt == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("xmlXPathContext")); + "%s", _("xmlXPathContext")); goto cleanup; } node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing root element")); + "%s", _("missing root element")); goto cleanup; } @@ -429,7 +429,7 @@ virStoragePoolDefFormat(virConnectPtr conn, type = virStorageBackendToString(def->type); if (!type) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("unexpected pool type")); + "%s", _("unexpected pool type")); goto cleanup; } if (virBufferVSprintf(buf, "<pool type='%s'>\n", type) < 0) @@ -540,7 +540,7 @@ virStoragePoolDefFormat(virConnectPtr conn, return virBufferContentAndFree(buf); no_memory: - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("xml")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("xml")); cleanup: virBufferFree(buf); return NULL; @@ -562,7 +562,7 @@ virStorageVolDefParsePerms(virConnectPtr conn, perms->mode = strtol(mode, &end, 8); if (*end || perms->mode < 0 || perms->mode > 0777) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed octal mode")); + "%s", _("malformed octal mode")); return -1; } } @@ -572,7 +572,7 @@ virStorageVolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/volume/permissions/owner)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing owner element")); + "%s", _("missing owner element")); return -1; } perms->uid = (int)v; @@ -582,7 +582,7 @@ virStorageVolDefParsePerms(virConnectPtr conn, } else { if (virXPathLong("number(/volume/permissions/group)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing owner element")); + "%s", _("missing owner element")); return -1; } perms->gid = (int)v; @@ -653,12 +653,12 @@ virStorageSize(virConnectPtr conn, if (virStrToLong_ull (val, &end, 10, ret) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed capacity element")); + "%s", _("malformed capacity element")); return -1; } if (*ret > (ULLONG_MAX / mult)) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("capacity element value too large")); + "%s", _("capacity element value too large")); return -1; } @@ -687,14 +687,14 @@ virStorageVolDefParseDoc(virConnectPtr conn, if (STRNEQ((const char *)root->name, "volume")) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("unknown root element")); + "%s", _("unknown root element")); goto cleanup; } ret->name = virXPathString("string(/volume/name)", ctxt); if (ret->name == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing name element")); + "%s", _("missing name element")); goto cleanup; } @@ -705,7 +705,7 @@ virStorageVolDefParseDoc(virConnectPtr conn, unit = virXPathString("string(/volume/capacity/@unit)", ctxt); if (capacity == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing capacity element")); + "%s", _("missing capacity element")); goto cleanup; } if (virStorageSize(conn, unit, capacity, &ret->capacity) < 0) @@ -766,21 +766,21 @@ virStorageVolDefParse(virConnectPtr conn, XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("malformed xml document")); + "%s", _("malformed xml document")); goto cleanup; } ctxt = xmlXPathNewContext(xml); if (ctxt == NULL) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("xmlXPathContext")); + "%s", _("xmlXPathContext")); goto cleanup; } node = xmlDocGetRootElement(xml); if (node == NULL) { virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("missing root element")); + "%s", _("missing root element")); goto cleanup; } @@ -903,7 +903,7 @@ virStorageVolDefFormat(virConnectPtr conn, return virBufferContentAndFree(buf); no_memory: - virStorageReportError(conn, VIR_ERR_NO_MEMORY, _("xml")); + virStorageReportError(conn, VIR_ERR_NO_MEMORY, "%s", _("xml")); cleanup: virBufferFree(buf); return NULL; @@ -1013,7 +1013,7 @@ virStoragePoolObjAssignDef(virConnectPtr conn, if (!(pool = calloc(1, sizeof(virStoragePoolObj)))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("pool")); + "%s", _("pool")); return NULL; } @@ -1150,26 +1150,27 @@ virStoragePoolObjSaveDef(virConnectPtr conn, if (virFileBuildPath(driver->configDir, def->name, ".xml", path, sizeof(path)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot construct config file path")); + "%s", _("cannot construct config file path")); return -1; } if (!(pool->configFile = strdup(path))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("configFile")); + "%s", _("configFile")); return -1; } if (virFileBuildPath(driver->autostartDir, def->name, ".xml", path, sizeof(path)) < 0) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("cannot construct autostart link path")); + "%s", _("cannot construct " + "autostart link path")); free(pool->configFile); pool->configFile = NULL; return -1; } if (!(pool->autostartLink = strdup(path))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("config file")); + "%s", _("config file")); free(pool->configFile); pool->configFile = NULL; return -1; @@ -1178,7 +1179,7 @@ virStoragePoolObjSaveDef(virConnectPtr conn, if (!(xml = virStoragePoolDefFormat(conn, def))) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("failed to generate XML")); + "%s", _("failed to generate XML")); return -1; } diff --git a/src/storage_driver.c b/src/storage_driver.c index f97f706..2fa06af 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -261,7 +261,7 @@ storagePoolLookupByUUID(virConnectPtr conn, if (!pool) { virStorageReportError(conn, VIR_ERR_NO_STORAGE_POOL, - _("no pool with matching uuid")); + "%s", _("no pool with matching uuid")); return NULL; } @@ -279,7 +279,7 @@ storagePoolLookupByName(virConnectPtr conn, if (!pool) { virStorageReportError(conn, VIR_ERR_NO_STORAGE_POOL, - _("no pool with matching name")); + "%s", _("no pool with matching name")); return NULL; } @@ -329,7 +329,7 @@ storageListPools(virConnectPtr conn, if (virStoragePoolObjIsActive(pool)) { if (!(names[got] = strdup(pool->def->name))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("names")); + "%s", _("names")); goto cleanup; } got++; @@ -366,7 +366,7 @@ storageListDefinedPools(virConnectPtr conn, if (!virStoragePoolObjIsActive(pool)) { if (!(names[got] = strdup(pool->def->name))) { virStorageReportError(conn, VIR_ERR_NO_MEMORY, - _("names")); + "%s", _("names")); goto cleanup; } got++; @@ -401,7 +401,7 @@ storagePoolCreate(virConnectPtr conn, if (virStoragePoolObjFindByUUID(driver, def->uuid) || virStoragePoolObjFindByName(driver, def->name)) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool already exists")); + "%s", _("storage pool already exists")); virStoragePoolDefFree(def); return NULL; } @@ -470,13 +470,13 @@ storagePoolUndefine(virStoragePoolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("pool is still active")); + "%s", _("pool is still active")); return -1; } @@ -507,7 +507,7 @@ storagePoolStart(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -517,7 +517,7 @@ storagePoolStart(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("pool already active")); + "%s", _("pool already active")); return -1; } if (backend->startPool && @@ -546,7 +546,7 @@ storagePoolBuild(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -556,7 +556,7 @@ storagePoolBuild(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is already active")); + "%s", _("storage pool is already active")); return -1; } @@ -577,7 +577,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -587,7 +587,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -618,7 +618,7 @@ storagePoolDelete(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -628,13 +628,13 @@ storagePoolDelete(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is still active")); + "%s", _("storage pool is still active")); return -1; } if (!backend->deletePool) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, - _("pool does not support volume delete")); + "%s", _("pool does not support volume delete")); return -1; } if (backend->deletePool(obj->conn, pool, flags) < 0) @@ -655,7 +655,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -665,7 +665,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -696,7 +696,7 @@ storagePoolGetInfo(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } @@ -725,7 +725,7 @@ storagePoolDumpXML(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } @@ -741,7 +741,7 @@ storagePoolGetAutostart(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no pool with matching uuid")); + "%s", _("no pool with matching uuid")); return -1; } @@ -763,13 +763,13 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no pool with matching uuid")); + "%s", _("no pool with matching uuid")); return -1; } if (!pool->configFile) { virStorageReportError(obj->conn, VIR_ERR_INVALID_ARG, - _("pool has no config file")); + "%s", _("pool has no config file")); return -1; } @@ -819,13 +819,13 @@ storagePoolNumVolumes(virStoragePoolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -844,13 +844,13 @@ storagePoolListVolumes(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -859,7 +859,8 @@ storagePoolListVolumes(virStoragePoolPtr obj, while (vol && i < maxnames) { names[i] = strdup(vol->name); if (names[i] == NULL) { - virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, _("name")); + virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, + "%s", _("name")); goto cleanup; } vol = vol->next; @@ -888,13 +889,13 @@ storageVolumeLookupByName(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -902,7 +903,7 @@ storageVolumeLookupByName(virStoragePoolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return NULL; } @@ -931,7 +932,7 @@ storageVolumeLookupByKey(virConnectPtr conn, } virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, - _("no storage vol with matching key")); + "%s", _("no storage vol with matching key")); return NULL; } @@ -956,7 +957,7 @@ storageVolumeLookupByPath(virConnectPtr conn, } virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, - _("no storage vol with matching path")); + "%s", _("no storage vol with matching path")); return NULL; } @@ -972,13 +973,13 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -991,14 +992,14 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (virStorageVolDefFindByName(pool, vol->name)) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("storage vol already exists")); + "%s", _("storage vol already exists")); virStorageVolDefFree(vol); return NULL; } if (!backend->createVol) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, - _("storage pool does not support volume creation")); + "%s", _("storage pool does not support volume creation")); virStorageVolDefFree(vol); return NULL; } @@ -1026,13 +1027,13 @@ storageVolumeDelete(virStorageVolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -1043,13 +1044,13 @@ storageVolumeDelete(virStorageVolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return -1; } if (!backend->deleteVol) { virStorageReportError(obj->conn, VIR_ERR_NO_SUPPORT, - _("storage pool does not support vol deletion")); + "%s", _("storage pool does not support vol deletion")); virStorageVolDefFree(vol); return -1; } @@ -1089,13 +1090,13 @@ storageVolumeGetInfo(virStorageVolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return -1; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return -1; } @@ -1103,7 +1104,7 @@ storageVolumeGetInfo(virStorageVolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return -1; } @@ -1133,13 +1134,13 @@ storageVolumeGetXMLDesc(virStorageVolPtr obj, if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -1147,7 +1148,7 @@ storageVolumeGetXMLDesc(virStorageVolPtr obj, if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return NULL; } @@ -1167,13 +1168,13 @@ storageVolumeGetPath(virStorageVolPtr obj) { if (!pool) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage pool with matching uuid")); + "%s", _("no storage pool with matching uuid")); return NULL; } if (!virStoragePoolObjIsActive(pool)) { virStorageReportError(obj->conn, VIR_ERR_INTERNAL_ERROR, - _("storage pool is not active")); + "%s", _("storage pool is not active")); return NULL; } @@ -1181,13 +1182,13 @@ storageVolumeGetPath(virStorageVolPtr obj) { if (!vol) { virStorageReportError(obj->conn, VIR_ERR_INVALID_STORAGE_POOL, - _("no storage vol with matching name")); + "%s", _("no storage vol with matching name")); return NULL; } ret = strdup(vol->target.path); if (ret == NULL) { - virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, _("path")); + virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, "%s", _("path")); return NULL; } return ret; -- 1.5.4.1.144.gc2249

2 2

[Libvir] [PATCH] 2/2: Use safewrite in place of write, in many cases.
by Jim Meyering 22 Feb '08

22 Feb '08

Use safewrite in place of write, in many cases. Also add "make syntax-check" rules to ensure no new uses sneak in. There are many uses of write like this: if (write (fd, xml, towrite) != towrite) return -1; The problem is that the syscall can succeed, yet write less than the requested number of bytes, so the caller should retry rather than simply failing. This patch changes most of them to use util.c's safewrite wrapper, which encapsulates the process. Also, there were a few cases in which the retry loop was open-coded, and I replaced those, too. Note: the change to libvirt_proxy.c removes a diagnostic that would have warned about an EINTR-interrupted (and retried) write, but that seems ok. * Makefile.maint (sc_avoid_write): New rule, to avoid recurrence. * .x-sc_avoid_write: New file. Record two legitimate exemptions. * qemud/qemud.c (sig_handler, qemudClientWriteBuf): Use safewrite, not write. * src/conf.c (__virConfWriteFile): Likewise. * src/qemu_conf.c (qemudSaveConfig, qemudSaveNetworkConfig): Likewise. * src/qemu_driver.c (qemudWaitForMonitor, qemudStartVMDaemon) (qemudVMData, PROC_IP_FORWARD): Likewise. * proxy/libvirt_proxy.c: Include "util.h". (proxyWriteClientSocket): Use safewrite. * src/test.c (testDomainSave, testDomainCoreDump): Likewise. * src/proxy_internal.c (virProxyWriteClientSocket): Likewise. * src/virsh.c: Include "util-lib.h". (vshOutputLogFile): Use safewrite. * src/console.c: Include "util-lib.h". (vshRunConsole): Use safewrite. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- .x-sc_avoid_write | 2 ++ Makefile.maint | 11 +++++++++++ qemud/qemud.c | 10 ++++------ src/conf.c | 2 +- src/console.c | 6 ++++-- src/proxy_internal.c | 14 ++++---------- src/qemu_conf.c | 4 ++-- src/qemu_driver.c | 19 +++++++------------ src/test.c | 9 +++++---- src/virsh.c | 5 +++-- 10 files changed, 43 insertions(+), 39 deletions(-) create mode 100644 .x-sc_avoid_write diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write new file mode 100644 index 0000000..72a196d --- /dev/null +++ b/.x-sc_avoid_write @@ -0,0 +1,2 @@ +^src/util\.c$ +^src/xend_internal\.c$ diff --git a/Makefile.maint b/Makefile.maint index 39320df..fe964a5 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -46,6 +46,17 @@ sc_avoid_if_before_free: { echo '$(ME): found useless "if" before "free" above' 1>&2; \ exit 1; } || : +# Avoid uses of write(2). Either switch to streams (fwrite), or use +# the safewrite wrapper. +sc_avoid_write: + @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + grep '\<write *(' $$($(CVS_LIST_EXCEPT) | grep '\.c$$') && \ + { echo "$(ME): the above files use write;" \ + " consider using the safewrite wrapper instead" \ + 1>&2; exit 1; } || :; \ + else :; \ + fi + sc_cast_of_argument_to_free: @grep -nE '\<free \(\(' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast free argument' 1>&2; \ diff --git a/qemud/qemud.c b/qemud/qemud.c index a40dfcb..d53a813 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -118,7 +118,7 @@ static void sig_handler(int sig) { return; origerrno = errno; - r = write(sigwrite, &sigc, 1); + r = safewrite(sigwrite, &sigc, 1); if (r == -1) { sig_errors++; sig_lasterrno = errno; @@ -1360,11 +1360,9 @@ static int qemudClientWriteBuf(struct qemud_server *server, const char *data, int len) { int ret; if (!client->tlssession) { - if ((ret = write(client->fd, data, len)) == -1) { - if (errno != EAGAIN) { - qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); - qemudDispatchClientFailure(server, client); - } + if ((ret = safewrite(client->fd, data, len)) == -1) { + qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); + qemudDispatchClientFailure(server, client); return -1; } } else { diff --git a/src/conf.c b/src/conf.c index e0ecdea..53ea993 100644 --- a/src/conf.c +++ b/src/conf.c @@ -904,7 +904,7 @@ __virConfWriteFile(const char *filename, virConfPtr conf) goto error; } - ret = write(fd, buf->content, buf->use); + ret = safewrite(fd, buf->content, buf->use); close(fd); if (ret != (int) buf->use) { virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content"), 0); diff --git a/src/console.c b/src/console.c index 02a9c7f..079d4ef 100644 --- a/src/console.c +++ b/src/console.c @@ -1,7 +1,7 @@ /* * console.c: A dumb serial console client * - * Copyright (C) 2007 Red Hat, Inc. + * Copyright (C) 2007, 2008 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,6 +37,7 @@ #include "console.h" #include "internal.h" +#include "util-lib.h" /* ie Ctrl-] as per telnet */ #define CTRL_CLOSE_BRACKET '\35' @@ -161,7 +162,8 @@ int vshRunConsole(const char *tty) { while (sent < got) { int done; - if ((done = write(destfd, buf + sent, got - sent)) <= 0) { + if ((done = safewrite(destfd, buf + sent, got - sent)) + <= 0) { fprintf(stderr, _("failure writing output: %s\n"), strerror(errno)); goto cleanup; diff --git a/src/proxy_internal.c b/src/proxy_internal.c index bc94763..c3e50c6 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -1,7 +1,7 @@ /* * proxy_client.c: client side of the communication with the libvirt proxy. * - * Copyright (C) 2006 Red Hat, Inc. + * Copyright (C) 2006, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -26,6 +26,7 @@ #include "internal.h" #include "driver.h" #include "proxy_internal.h" +#include "util.h" #include "xen_unified.h" #define STANDALONE @@ -345,17 +346,10 @@ virProxyWriteClientSocket(int fd, const char *data, int len) { if ((fd < 0) || (data == NULL) || (len < 0)) return(-1); -retry: - ret = write(fd, data, len); + ret = safewrite(fd, data, len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d, %d bytes interrupted\n", - fd, len); - goto retry; - } fprintf(stderr, _("Failed to write to socket %d\n"), fd); - return(-1); + return(-1); } if (debug) fprintf(stderr, "wrote %d bytes to socket %d\n", diff --git a/src/qemu_conf.c b/src/qemu_conf.c index ac1cc1e..fc82a6d 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1866,7 +1866,7 @@ static int qemudSaveConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", vm->configFile, strerror(errno)); @@ -2089,7 +2089,7 @@ static int qemudSaveNetworkConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", network->configFile, strerror(errno)); diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 15cd52c..85d042f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -539,11 +539,9 @@ static int qemudWaitForMonitor(virConnectPtr conn, "console"); buf[sizeof(buf)-1] = '\0'; - retry: - if (write(vm->logfile, buf, strlen(buf)) < 0) { + + if (safewrite(vm->logfile, buf, strlen(buf)) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -656,15 +654,15 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = argv; while (*tmp) { - if (write(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); - if (write(vm->logfile, " ", 1) < 0) + if (safewrite(vm->logfile, " ", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); tmp++; } - if (write(vm->logfile, "\n", 1) < 0) + if (safewrite(vm->logfile, "\n", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); @@ -733,11 +731,8 @@ static int qemudVMData(struct qemud_driver *driver ATTRIBUTE_UNUSED, } buf[ret] = '\0'; - retry: - if (write(vm->logfile, buf, ret) < 0) { + if (safewrite(vm->logfile, buf, ret) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -1113,7 +1108,7 @@ qemudEnableIpForwarding(void) if ((fd = open(PROC_IP_FORWARD, O_WRONLY|O_TRUNC)) == -1) return 0; - if (write(fd, "1\n", 2) < 0) + if (safewrite(fd, "1\n", 2) < 0) ret = 0; close (fd); diff --git a/src/test.c b/src/test.c index f860e49..1d064d3 100644 --- a/src/test.c +++ b/src/test.c @@ -42,6 +42,7 @@ #include "test.h" #include "xml.h" #include "buf.h" +#include "util.h" #include "uuid.h" /* Flags that determine the action to take on a shutdown or crash of a domain @@ -1293,19 +1294,19 @@ static int testDomainSave(virDomainPtr domain, return (-1); } len = strlen(xml); - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); return (-1); } - if (write(fd, (char*)&len, sizeof(len)) != sizeof(len)) { + if (safewrite(fd, (char*)&len, sizeof(len)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata length"); close(fd); return (-1); } - if (write(fd, xml, len) != len) { + if (safewrite(fd, xml, len) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata"); free(xml); @@ -1398,7 +1399,7 @@ static int testDomainCoreDump(virDomainPtr domain, "cannot save domain core"); return (-1); } - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); diff --git a/src/virsh.c b/src/virsh.c index 5a5f04e..356c496 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -46,9 +46,10 @@ #include <readline/history.h> #endif +#include "buf.h" #include "console.h" #include "util.h" -#include "buf.h" +#include "util-lib.h" static char *progname; @@ -6170,7 +6171,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, va_list snprintf(msg_buf + strlen(msg_buf), sizeof(msg_buf) - strlen(msg_buf), "\n"); /* write log */ - if (write(ctl->log_fd, msg_buf, strlen(msg_buf)) == -1) { + if (safewrite(ctl->log_fd, msg_buf, strlen(msg_buf)) < 0) { vshCloseLogFile(ctl); vshError(ctl, FALSE, "%s", _("failed to write the log file")); } -- 1.5.4.2.185.gf5f8

2 1

[Libvir] [PATCH] write(2) may write less than the total requested
by Jim Meyering 22 Feb '08

22 Feb '08

Use safewrite in place of write, in many cases. And add "make syntax-check" rules to ensure no new uses sneak in. There are many uses of write like this: if (write (fd, xml, towrite) != towrite) return -1; The problem is that the syscall can succeed, yet write less than the requested number of bytes, so the caller should retry rather than simply failing. This patch changes most of them to use util.c's safewrite wrapper, which encapsulates the process. Also, there were a few cases in which the retry loop was open-coded, and I replaced those, too. However, there remain invalid uses of write in both virsh.c and console.c. I would have replaced those, too, but util.c isn't linked with them, so it would have made this change more involved. xend_internal.c has one use, but it's ok, and not easily replaced. Note: the change to libvirt_proxy.c removes a diagnostic that would have warned about an EINTR-interrupted (and retried) write, but that seems ok. * qemud/qemud.c (sig_handler): * src/conf.c (__virConfWriteFile): * src/proxy_internal.c (virProxyWriteClientSocket): * src/qemu_conf.c (qemudSaveConfig, qemudSaveNetworkConfig): * src/qemu_driver.c (qemudWaitForMonitor, qemudStartVMDaemon) (qemudVMData, PROC_IP_FORWARD): * src/test.c (testDomainSave, testDomainCoreDump): * proxy/libvirt_proxy.c (proxyWriteClientSocket): * proxy/Makefile.am (libvirt_proxy_SOURCES): Add src/util.c. * Makefile.maint (sc_avoid_write): New rule. * .x-sc_avoid_write: New file. Record the two legitimate exemptions, and two that are temporarily grandfathered in. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- .x-sc_avoid_write | 4 ++++ Makefile.maint | 11 +++++++++++ proxy/Makefile.am | 5 +++-- proxy/libvirt_proxy.c | 15 ++++----------- qemud/qemud.c | 10 ++++------ src/conf.c | 2 +- src/proxy_internal.c | 13 +++---------- src/qemu_conf.c | 4 ++-- src/qemu_driver.c | 19 +++++++------------ src/test.c | 8 ++++---- 10 files changed, 43 insertions(+), 48 deletions(-) create mode 100644 .x-sc_avoid_write diff --git a/.x-sc_avoid_write b/.x-sc_avoid_write new file mode 100644 index 0000000..0933e20 --- /dev/null +++ b/.x-sc_avoid_write @@ -0,0 +1,4 @@ +^src/util\.c$ +^src/xend_internal\.c$ +^src/virsh\.c$ +^src/console\.c$ diff --git a/Makefile.maint b/Makefile.maint index 4b54baf..afddddb 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -46,6 +46,17 @@ sc_avoid_if_before_free: { echo '$(ME): found useless "if" before "free" above' 1>&2; \ exit 1; } || : +# Avoid uses of write(2). Either switch to streams (fwrite), or use +# the safewrite wrapper. +sc_avoid_write: + @if $(CVS_LIST_EXCEPT) | grep '\.c$$' > /dev/null; then \ + grep '\<write *(' $$($(CVS_LIST_EXCEPT) | grep '\.c$$') && \ + { echo "$(ME): the above files use write;" \ + " consider using the safewrite wrapper instead" \ + 1>&2; exit 1; } || :; \ + else :; \ + fi + sc_cast_of_argument_to_free: @grep -nE '\<free \(\(' $$($(CVS_LIST_EXCEPT)) && \ { echo '$(ME): don'\''t cast free argument' 1>&2; \ diff --git a/proxy/Makefile.am b/proxy/Makefile.am index ff9a3eb..6827f36 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -12,11 +12,12 @@ libexec_PROGRAMS = libvirt_proxy libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \ @top_srcdir@/src/xen_internal.c @top_srcdir@/src/virterror.c \ @top_srcdir@/src/sexpr.c @top_srcdir@/src/xml.c \ - @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c @top_srcdir@/src/uuid.c + @top_srcdir@/src/xs_internal.c @top_srcdir@/src/buf.c \ + @top_srcdir@/src/util.c @top_srcdir@/src/uuid.c libvirt_proxy_LDFLAGS = $(WARN_CFLAGS) libvirt_proxy_DEPENDENCIES = libvirt_proxy_LDADD = install-exec-hook: chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy -endif \ No newline at end of file +endif diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index d96d3db..12d0f35 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -2,7 +2,7 @@ * proxy_svr.c: root suid proxy server for Xen access to APIs with no * side effects from unauthenticated clients. * - * Copyright (C) 2006, 2007 Red Hat, Inc. + * Copyright (C) 2006, 2007, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -317,19 +317,12 @@ proxyWriteClientSocket(int nr, virProxyPacketPtr req) { return(-1); } -retry: - ret = write(pollInfos[nr].fd, (char *) req, req->len); + ret = safewrite(pollInfos[nr].fd, (char *) req, req->len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d to client %d interrupted\n", - pollInfos[nr].fd, nr); - goto retry; - } fprintf(stderr, "write %d bytes to socket %d from client %d failed\n", req->len, pollInfos[nr].fd, nr); - proxyCloseClientSocket(nr); - return(-1); + proxyCloseClientSocket(nr); + return(-1); } if (ret == 0) { if (debug) diff --git a/qemud/qemud.c b/qemud/qemud.c index 3a5e44c..269e9fe 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -118,7 +118,7 @@ static void sig_handler(int sig) { return; origerrno = errno; - r = write(sigwrite, &sigc, 1); + r = safewrite(sigwrite, &sigc, 1); if (r == -1) { sig_errors++; sig_lasterrno = errno; @@ -1360,11 +1360,9 @@ static int qemudClientWriteBuf(struct qemud_server *server, const char *data, int len) { int ret; if (!client->tlssession) { - if ((ret = write(client->fd, data, len)) == -1) { - if (errno != EAGAIN) { - qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); - qemudDispatchClientFailure(server, client); - } + if ((ret = safewrite(client->fd, data, len)) == -1) { + qemudLog (QEMUD_ERR, _("write: %s"), strerror (errno)); + qemudDispatchClientFailure(server, client); return -1; } } else { diff --git a/src/conf.c b/src/conf.c index e0ecdea..53ea993 100644 --- a/src/conf.c +++ b/src/conf.c @@ -904,7 +904,7 @@ __virConfWriteFile(const char *filename, virConfPtr conf) goto error; } - ret = write(fd, buf->content, buf->use); + ret = safewrite(fd, buf->content, buf->use); close(fd); if (ret != (int) buf->use) { virConfError(NULL, VIR_ERR_WRITE_FAILED, _("failed to save content"), 0); diff --git a/src/proxy_internal.c b/src/proxy_internal.c index bc94763..5a14e54 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -1,7 +1,7 @@ /* * proxy_client.c: client side of the communication with the libvirt proxy. * - * Copyright (C) 2006 Red Hat, Inc. + * Copyright (C) 2006, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * @@ -345,17 +345,10 @@ virProxyWriteClientSocket(int fd, const char *data, int len) { if ((fd < 0) || (data == NULL) || (len < 0)) return(-1); -retry: - ret = write(fd, data, len); + ret = safewrite(fd, data, len); if (ret < 0) { - if (errno == EINTR) { - if (debug > 0) - fprintf(stderr, "write socket %d, %d bytes interrupted\n", - fd, len); - goto retry; - } fprintf(stderr, _("Failed to write to socket %d\n"), fd); - return(-1); + return(-1); } if (debug) fprintf(stderr, "wrote %d bytes to socket %d\n", diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e39c7bc..ff6a92e 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1866,7 +1866,7 @@ static int qemudSaveConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", vm->configFile, strerror(errno)); @@ -2089,7 +2089,7 @@ static int qemudSaveNetworkConfig(virConnectPtr conn, } towrite = strlen(xml); - if (write(fd, xml, towrite) != towrite) { + if (safewrite(fd, xml, towrite) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s: %s", network->configFile, strerror(errno)); diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 15cd52c..85d042f 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -539,11 +539,9 @@ static int qemudWaitForMonitor(virConnectPtr conn, "console"); buf[sizeof(buf)-1] = '\0'; - retry: - if (write(vm->logfile, buf, strlen(buf)) < 0) { + + if (safewrite(vm->logfile, buf, strlen(buf)) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -656,15 +654,15 @@ static int qemudStartVMDaemon(virConnectPtr conn, tmp = argv; while (*tmp) { - if (write(vm->logfile, *tmp, strlen(*tmp)) < 0) + if (safewrite(vm->logfile, *tmp, strlen(*tmp)) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); - if (write(vm->logfile, " ", 1) < 0) + if (safewrite(vm->logfile, " ", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); tmp++; } - if (write(vm->logfile, "\n", 1) < 0) + if (safewrite(vm->logfile, "\n", 1) < 0) qemudLog(QEMUD_WARN, _("Unable to write argv to logfile %d: %s"), errno, strerror(errno)); @@ -733,11 +731,8 @@ static int qemudVMData(struct qemud_driver *driver ATTRIBUTE_UNUSED, } buf[ret] = '\0'; - retry: - if (write(vm->logfile, buf, ret) < 0) { + if (safewrite(vm->logfile, buf, ret) < 0) { /* Log, but ignore failures to write logfile for VM */ - if (errno == EINTR) - goto retry; qemudLog(QEMUD_WARN, _("Unable to log VM console data: %s"), strerror(errno)); } @@ -1113,7 +1108,7 @@ qemudEnableIpForwarding(void) if ((fd = open(PROC_IP_FORWARD, O_WRONLY|O_TRUNC)) == -1) return 0; - if (write(fd, "1\n", 2) < 0) + if (safewrite(fd, "1\n", 2) < 0) ret = 0; close (fd); diff --git a/src/test.c b/src/test.c index 003d6b7..3dd1007 100644 --- a/src/test.c +++ b/src/test.c @@ -1293,19 +1293,19 @@ static int testDomainSave(virDomainPtr domain, return (-1); } len = strlen(xml); - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); return (-1); } - if (write(fd, (char*)&len, sizeof(len)) != sizeof(len)) { + if (safewrite(fd, (char*)&len, sizeof(len)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata length"); close(fd); return (-1); } - if (write(fd, xml, len) != len) { + if (safewrite(fd, xml, len) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write metadata"); free(xml); @@ -1398,7 +1398,7 @@ static int testDomainCoreDump(virDomainPtr domain, "cannot save domain core"); return (-1); } - if (write(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) != sizeof(TEST_SAVE_MAGIC)) { + if (safewrite(fd, TEST_SAVE_MAGIC, sizeof(TEST_SAVE_MAGIC)) < 0) { testError(domain->conn, domain, NULL, VIR_ERR_INTERNAL_ERROR, "cannot write header"); close(fd); -- 1.5.4.2.134.g82883

4 9

[Libvir] avoid new warnings
by Jim Meyering 22 Feb '08

22 Feb '08

Here are two easy ones: With --without-xen, avoid warning about unused function. * tests/statstest.c (testQuietError) [!WITH_XEN]: Don't define. --- tests/statstest.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tests/statstest.c b/tests/statstest.c index 6213da8..2d6fc1d 100644 --- a/tests/statstest.c +++ b/tests/statstest.c @@ -7,10 +7,13 @@ #include "stats_linux.h" #include "internal.h" -static void testQuietError(void *userData ATTRIBUTE_UNUSED, virErrorPtr error ATTRIBUTE_UNUSED) +#if WITH_XEN +static void testQuietError(void *userData ATTRIBUTE_UNUSED, + virErrorPtr error ATTRIBUTE_UNUSED) { /* nada */ } +#endif #if __linux__ && WITH_XEN static int testDevice(const char *path, int expect) -- ============================================================================= With --enable-iptables-lokkit=no, avoid warning about unused parameter. * src/iptables.c (iptRulesSave) [!ENABLE_IPTABLES_LOKKIT]: Mark parameter as used. --- src/iptables.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/iptables.c b/src/iptables.c index 04b1da6..f970701 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -256,6 +256,8 @@ iptRulesSave(iptRules *rules) notifyRulesUpdated(rules->table, rules->path); else notifyRulesRemoved(rules->table, rules->path); +#else + (void) rules; #endif /* ENABLE_IPTABLES_LOKKIT */ } -- 1.5.4.2.185.gf5f8

2 2

[Libvir] Please add RSS for libvirt updates.
by Atsushi SAKAI 22 Feb '08

22 Feb '08

Hi, I have a request about libvirt updates. Currently I am checking software updates by seeing RSS reader. Of course, mercurial(hg) and git creates RSS feeds. But CVS does not create such kind of feeds. I hope some day libvirt adds RSS feeds by using cvs2rss etc. http://laughingmeme.org/cvs2rss/ Thanks Atsushi SAKAI

4 5