- Devel - libvirt List Archives

[libvirt] [PATCH] vmx: Use VIR_ERR_CONFIG_UNSUPPORTED when appropriated
by Matthias Bolte 22 Jan '11

22 Jan '11

Inspired by Osier Yang's similar patch for the QEMU driver. Matthias

2 2

[libvirt] [PATCH] build: fix 'make check' with older git
by Eric Blake 22 Jan '11

22 Jan '11

* .gnulib: Update to latest, for maintainer-makefile fix. Reported by Matthias Bolte. --- Pushing under the build-breaker rule, as I confirmed the breakage when trying 'make check' on Ubuntu 10.10. * .gnulib 54c0573...2f41af6 (1): > maintainer-makefile: work with older git for submodule check .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index 54c0573..2f41af6 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 54c0573c2f6200b8b9c88a026c7bc8cfe44e0403 +Subproject commit 2f41af65087fb2460779bc4e7fb62453f79ebae3 -- 1.7.3.4

2 1

[libvirt] [PATCH v2] qemu: sound: Support intel 'ich6' model
by Cole Robinson 21 Jan '11

21 Jan '11

In QEMU, the card itself is a PCI device, but it requires a codec (either -device hda-output or -device hda-duplex) to actually output sound. We set up an hda-duplex codec by default: I think it's important that a simple <sound model='ich6'/> sets up a useful codec, to have consistent behavior with all other sound cards. This is basically Dan's proposal of <sound model='ich6'> <codec type='output' slot='0'/> <codec type='duplex' slot='3'/> </sound> without the codec bits implemented. The important thing is to keep a consistent API here, we don't want some <sound> models to require tweaking codecs but not others. Steps I see to accomplishing this when someone gets around to it: - every <sound> device has a <codec type='default'/> (unless codecs are manually specified) - <codec type='none'/> is required to specify 'no codecs' - new audio settings like mic=on|off could then be exposed in <sound> or <codec> in a consistent manner for all sound models Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- docs/formatdomain.html.in | 5 ++- docs/schemas/domain.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 24 ++++++++++++++++--- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-sound.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 1 + 9 files changed, 31 insertions(+), 9 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e9fcea1..b9b83c2 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1663,8 +1663,9 @@ qemu-kvm -net nic,model=? /dev/null The <code>sound</code> element has one mandatory attribute, <code>model</code>, which specifies what real sound device is emulated. Valid values are specific to the underlying hypervisor, though typical - choices are 'es1370', 'sb16', and 'ac97' - (<span class="since">'ac97' only since 0.6.0</span>) + choices are 'es1370', 'sb16', 'ac97', and 'ich6' + (<span class="since"> + 'ac97' only since 0.6.0, 'ich6' only since 0.8.8</span>) </dd> </dl> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index 9c1e9bb..ae0defe 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1496,6 +1496,7 @@ <value>es1370</value> <value>pcspk</value> <value>ac97</value> + <value>ich6</value> </choice> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e5b89a2..3aabdf9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -225,7 +225,8 @@ VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", "es1370", "pcspk", - "ac97") + "ac97", + "ich6") VIR_ENUM_IMPL(virDomainMemballoonModel, VIR_DOMAIN_MEMBALLOON_MODEL_LAST, "virtio", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 81409f8..924ce89 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -458,6 +458,7 @@ enum virDomainSoundModel { VIR_DOMAIN_SOUND_MODEL_ES1370, VIR_DOMAIN_SOUND_MODEL_PCSPK, VIR_DOMAIN_SOUND_MODEL_AC97, + VIR_DOMAIN_SOUND_MODEL_ICH6, VIR_DOMAIN_SOUND_MODEL_LAST }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a0075a4..2024221 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1727,11 +1727,13 @@ qemuBuildSoundDevStr(virDomainSoundDefPtr sound) goto error; } - /* Hack for 2 wierdly unusal devices name in QEMU */ + /* Hack for wierdly unusal devices name in QEMU */ if (STREQ(model, "es1370")) model = "ES1370"; else if (STREQ(model, "ac97")) model = "AC97"; + else if (STREQ(model, "ich6")) + model = "intel-hda"; virBufferVSprintf(&buf, "%s", model); virBufferVSprintf(&buf, ",id=%s", sound->info.alias); @@ -3751,6 +3753,12 @@ qemuBuildCommandLine(virConnectPtr conn, goto error; virCommandAddArg(cmd, str); + + if (sound->model == VIR_DOMAIN_SOUND_MODEL_ICH6) { + virCommandAddArgList(cmd, + "-device", "hda-duplex", NULL); + } + VIR_FREE(str); } } @@ -3762,13 +3770,19 @@ qemuBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < def->nsounds && size > 0 ; i++) { virDomainSoundDefPtr sound = def->sounds[i]; - const char *model = virDomainSoundModelTypeToString(sound->model); - if (!model) { - VIR_FREE(modstr); + const char *model = "hda"; + + if (sound->model != VIR_DOMAIN_SOUND_MODEL_ICH6 && + !(model = virDomainSoundModelTypeToString(sound->model))) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("invalid sound model")); + } + + if (!model) { + VIR_FREE(modstr); goto error; } + strncat(modstr, model, size); size -= strlen(model); if (i < (def->nsounds - 1)) @@ -5530,6 +5544,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, type = VIR_DOMAIN_SOUND_MODEL_ES1370; } else if (STRPREFIX(start, "ac97")) { type = VIR_DOMAIN_SOUND_MODEL_AC97; + } else if (STRPREFIX(start, "hda")) { + type = VIR_DOMAIN_SOUND_MODEL_ICH6; } if (type != -1) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args index 6b2e697..1b20dfc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -usb -soundhw pcspk -device ES1370,id=sound1,bus=pci.0,addr=0x2 -device sb16,id=sound2 -device AC97,id=sound3,bus=pci.0,addr=0x3 -device intel-hda,id=sound4,bus=pci.0,addr=0x4 -device hda-duplex -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml index c725346..fbca4fe 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml @@ -22,6 +22,7 @@ <sound model='es1370'/> <sound model='sb16'/> <sound model='ac97'/> + <sound model='ich6'/> <memballoon model='virtio'/> </devices> </domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.args b/tests/qemuxml2argvdata/qemuxml2argv-sound.args index 8cb2da2..0db62c3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.args @@ -1 +1 @@ -LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -soundhw pcspk,es1370,sb16,ac97 +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -soundhw pcspk,es1370,sb16,ac97,hda diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml index d34e0b3..78bfe3d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml @@ -24,6 +24,7 @@ <sound model='es1370'/> <sound model='sb16'/> <sound model='ac97'/> + <sound model='ich6'/> <memballoon model='virtio'/> </devices> </domain> -- 1.7.3.3

3 8

[libvirt] [PATCH 0/3] Yet another attempt at cleaning libvirtd error logging
by Daniel P. Berrange 21 Jan '11

21 Jan '11

THe previous changes commit 04bd0360f32ec628ecf7943b3fd1468d6eb2dde5 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Thu Nov 18 13:14:08 2010 +0000 Log all errors at level INFO to stop polluting syslog commit abff683f78ffd01df5005fb7a457c0b38b8eb6e1 Author: Matthias Bolte <matthias.bolte(a)googlemail.com> Date: Tue Nov 30 14:10:42 2010 +0100 Log client errors in libvirtd at debug priority Are both sub-optimal since they result in all errors in libvirtd becoming hidden. THis includes errors that are not related to public APIs a remote client app is invoking. This has made debugging / troubleshooting significantly more difficult. This reverts both those patches, and applies a tightly targetted filter at a couple of error codes we don't want to see

2 6

[libvirt] [PATCH] Add check for poll error events in monitor
by Daniel P. Berrange 21 Jan '11

21 Jan '11

Handle poll errors in the same way as hangup event * src/qemu/qemu_monitor.c: Handle error events --- src/qemu/qemu_monitor.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3026733..0c14277 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -550,7 +550,8 @@ qemuMonitorIO(int watch, int fd, int events, void *opaque) { qemuMonitorUpdateWatch(mon); - if (events & VIR_EVENT_HANDLE_HANGUP) { + if (events & (VIR_EVENT_HANDLE_HANGUP | + VIR_EVENT_HANDLE_ERROR)) { /* If IO process resulted in EOF & we have a message, * then wakeup that waiter */ if (mon->msg && !mon->msg->finished) { -- 1.7.3.4

2 1

[libvirt] [PATCH] Fix setup of lib directory with autogen.sh --system
by Daniel P. Berrange 21 Jan '11

21 Jan '11

On x86_64 hosts, /usr/lib64 must be used instead of /usr/lib Rather than attempt to whitelist architectures, just check for existance of /usr/lib64 * autogen.sh: Fix to use /usr/lib64 if it exists --- autogen.sh | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/autogen.sh b/autogen.sh index 6c2e3bc..4184aa8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,7 +16,14 @@ test -f src/libvirt.c || { EXTRA_ARGS= if test "x$1" = "x--system"; then shift - EXTRA_ARGS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var" + prefix=/usr + libdir=$prefix/lib + sysconfdir=/etc + localstatedir=/var + if [ -d /usr/lib64 ]; then + libdir=$prefix/lib64 + fi + EXTRA_ARGS="--prefix=$prefix --sysconfdir=$sysconfdir --localstatedir=$localstatedir --libdir=$libdir" echo "Running ./configure with $EXTRA_ARGS $@" else if test -z "$*" && test ! -f "$THEDIR/config.status"; then -- 1.7.3.4

2 1

[libvirt] [RFC] libxenlight driver
by Jim Fehlig 21 Jan '11

21 Jan '11

I'm looking into creating a driver for the new Xen xl/libxl toolstack (aka libxenlight [1]), set to become the default in upcoming Xen 4.1.0 release. My first hurdle is deciding whether this should be a new driver or integrated with existing xen-unified driver. Initially I thought a new driver would be a better approach - a clean break from the old code, similar to the xenapi driver. libxenlight is also stateless (no managed domains), which seems like another good argument for a new driver. But libxenlight is really just another interface into the same hypervisor, so in that regard it should be a xen-unified subdriver. There are certainly benefits to the xen-unified subdriver approach, e.g. the existing hypervisor and xenstore subdrivers can be leveraged, the former providing all the capabilities code. But AFAIK, libxenlight and xend should not be used together, so I don't think we would want the xend subdriver activated if libxenlight is detected. Supposedly xl can be used as a direct replacement for xm, allowing unconditional use of that subdriver. BTW, Ian Jackson responded [2] to some of my questions regarding compatibility between old and new toolstack if you are interested. I'd like to hear other's opinions on a new driver vs. a xen-unified subdriver. Regards, Jim [1] http://lists.xensource.com/archives/html/xen-devel/2009-11/msg00436.html [2] http://lists.xensource.com/archives/html/xen-devel/2010-11/msg00344.html

8 13

[libvirt] [PATCH] maint: support --no-git option during autogen.sh
by Eric Blake 21 Jan '11

21 Jan '11

https://bugzilla.redhat.com/show_bug.cgi?id=562743 * .gnulib: Update to latest, for improved bootstrap. * bootstrap: Resync from gnulib. * autogen.sh (bootstrap): Add --bootstrap-sync, to make it easier to keep bootstrap up-to-date. Pass optional --no-git through. Reported by Aleksey Avdeev. --- Sorry for the late response (this was first reported months ago!) I tested this by installing a bogus git at the front of my PATH that always fails will let ./autogen.sh --no-git work without git (well, mostly tested it, to the point where it got past the gnulib-tool invocation, but on Fedora 14, gettext 0.18 also depends on git, so autogen.sh didn't complete; I suspect that it would completely work on cygwin which still has gettext 0.17, but that platform takes a lot longer to run a test on a patch like this). * .gnulib 45d39ca...18bf850 (19): > bootstrap: support --no-git option > update from texinfo > update from texinfo > init.sh: insert space between each function name and "()" > bootstrap: avoid failure when there is no .gitmodules file > update from texinfo > mountlist: clean up code formatting > mountlist: add support for Interix > maint.mk: improve the public-submodule-commit rule > include_next: Fix bug introduced on 2011-01-18. > Allow the user to avoid the GNULIB_TEST_* macros. > bootstrap: avoid failure when there is no .gitmodules file > assume <ctype.h>, ..., <time.h> exist > multiarch: remove AA_APPLE_UNIVERSAL_BUILD > c-stack: assume stack overflow if SA_SIGINFO unsupported > stdbool-tests: accomodate Haiku > binary-io: fix O_TEXT on Haiku > include_next: do not check for standard headers like stddef.h > ansi-c++-opt: skip C++ dependency style if C++ is unused .gnulib | 2 +- autogen.sh | 9 +++++++-- bootstrap | 50 +++++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/.gnulib b/.gnulib index 45d39ca..18bf850 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 45d39ca1cae74fcf58ec9911e771bc8baca63f66 +Subproject commit 18bf8501afc50fcf762c3381ffd7af281731d6f7 diff --git a/autogen.sh b/autogen.sh index 6c2e3bc..323710b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -14,6 +14,11 @@ test -f src/libvirt.c || { EXTRA_ARGS= +no_git= +if test "x$1" = "x--no-git"; then + no_git=" $1" + shift +fi if test "x$1" = "x--system"; then shift EXTRA_ARGS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var" @@ -47,8 +52,8 @@ if test "$t" = "$(cat $curr_status 2>/dev/null)" \ # good, it's up to date, all we need is autoreconf autoreconf -if else - echo running bootstrap... - ./bootstrap && bootstrap_hash > $curr_status \ + echo running bootstrap$no_git... + ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \ || { echo "Failed to bootstrap, please investigate."; exit 1; } fi diff --git a/bootstrap b/bootstrap index 12fec20..0d73ffb 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=2010-11-12.21; # UTC +scriptversion=2011-01-20.18; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2010 Free Software Foundation, Inc. +# Copyright (C) 2003-2011 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 @@ -54,10 +54,19 @@ Options: have gnulib sources on your machine, and do not want to waste your bandwidth downloading them again. Defaults to \$GNULIB_SRCDIR. + --bootstrap-sync If this bootstrap script is not identical to + the version in the local gnulib sources, + update this script, and then restart it with + /bin/sh or the shell \$CONFIG_SHELL if + defined. + --no-bootstrap-sync Do not check whether bootstrap is out of sync. --copy Copy files instead of creating symbolic links. --force Attempt to bootstrap even if the sources seem not to have been checked out. --skip-po Do not download po files. + --no-git Do not update gnulib using git. Requires that + --gnulib-srcdir points to a complete gnulib source + tree If the file $0.conf exists in the same directory as this script, its contents are read as shell variables to configure the bootstrap. @@ -168,6 +177,13 @@ copy=false # on which version control system (if any) is used in the source directory. vc_ignore=auto +# Set this to true in bootstrap.conf to enable --bootstrap-sync by +# default. +bootstrap_sync=false + +# Use git to update gnulib sources +use_git=true + # find_tool ENVVAR NAMES... # ------------------------- # Search for a required program. Use the value of ENVVAR, if set, @@ -239,12 +255,26 @@ do checkout_only_file=;; --copy) copy=true;; + --bootstrap-sync) + bootstrap_sync=true;; + --no-bootstrap-sync) + bootstrap_sync=false;; + --no-git) + use_git=false;; *) echo >&2 "$0: $option: unknown option" exit 1;; esac done +# --no-git requires --gnulib-srcdir +if $use_git || test -d "$GNULIB_SRCDIR"; then + : +else + echo "Error: --no-git requires --gnulib-srcdir" >&2 + exit 1 +fi + if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2 exit 1 @@ -370,6 +400,10 @@ check_versions() { if test "$app" = libtool; then app=libtoolize fi + # only test for git if not using --no-git + if test "$app" = git; then + $use_git || continue + fi # Honor $APP variables ($TAR, $AUTOCONF, etc.) appvar=`echo $app | tr '[a-z]-' '[A-Z]_'` test "$appvar" = TAR && appvar=AMTAR @@ -448,7 +482,7 @@ git_modules_config () { } gnulib_path=`git_modules_config submodule.gnulib.path` -: ${gnulib_path=gnulib} +test -z "$gnulib_path" && gnulib_path=gnulib # Get gnulib files. @@ -501,6 +535,16 @@ case ${GNULIB_SRCDIR--} in ;; esac +if $bootstrap_sync; then + cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || { + echo "$0: updating bootstrap and restarting..." + exec sh -c \ + 'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ + -- "$GNULIB_SRCDIR/build-aux/bootstrap" \ + "$0" "$@" --no-bootstrap-sync + } +fi + gnulib_tool=$GNULIB_SRCDIR/gnulib-tool <$gnulib_tool || exit -- 1.7.3.4

2 2

[libvirt] [PATCH] [v2] qemu: Retry JSON monitor cont cmd on MigrationExpected error
by Jim Fehlig 21 Jan '11

21 Jan '11

When restoring a saved qemu instance via JSON monitor, the vm is left in a paused state. Turns out the 'cont' cmd was failing with "MigrationExpected" error class and "An incoming migration is expected before this command can be executed" error description due to migration (restore) not yet complete. Detect if 'cont' cmd fails with "MigrationExpecte" error class and retry 'cont' cmd. V2: Fix potential double-free noted by Laine Stump --- src/qemu/qemu_monitor_json.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 7387089..35db285 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -702,13 +702,29 @@ qemuMonitorJSONStartCPUs(qemuMonitorPtr mon, int ret; virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("cont", NULL); virJSONValuePtr reply = NULL; + int i = 0, timeout = 3; if (!cmd) return -1; - ret = qemuMonitorJSONCommand(mon, cmd, &reply); + do { + ret = qemuMonitorJSONCommand(mon, cmd, &reply); - if (ret == 0) - ret = qemuMonitorJSONCheckError(cmd, reply); + if (ret != 0) + break; + + /* If no error, we're done */ + if ((ret = qemuMonitorJSONCheckError(cmd, reply)) == 0) + break; + + /* If error class is not MigrationExpected, we're done. + * Otherwise try 'cont' cmd again */ + if (!qemuMonitorJSONHasError(reply, "MigrationExpected")) + break; + + virJSONValueFree(reply); + reply = NULL; + usleep(250000); + } while (++i <= timeout); virJSONValueFree(cmd); virJSONValueFree(reply); -- 1.7.3.1

2 2

[libvirt] [PATCH] qemu: report more proper error for unsupported graphics
by Osier Yang 21 Jan '11

21 Jan '11

Report VIR_ERR_CONFIG_UNSUPPORTED instead of VIR_ERR_INTERNAL_ERROR, as it's valid in our domain schema, just unsupported by hypervisor here. * src/qemu/qemu_command.c --- src/qemu/qemu_command.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 537e537..b969ecc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3702,9 +3702,9 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddEnvString(cmd, "QEMU_AUDIO_DRV=spice"); } else if ((def->ngraphics == 1)) { - qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("unsupported graphics type '%s'"), - virDomainGraphicsTypeToString(def->graphics[0]->type)); + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported graphics type '%s'"), + virDomainGraphicsTypeToString(def->graphics[0]->type)); goto error; } -- 1.7.3.2

3 2

[libvirt] [PATCH] qemu: Fix a possible deadlock in p2p migration
by Jiri Denemark 21 Jan '11

21 Jan '11

Two more calls to remote libvirtd have to be surrounded by qemuDomainObjEnterRemoteWithDriver() and qemuDomainObjExitRemoteWithDriver() to prevent possible deadlock between two communicating libvirt daemons. See commit f0c8e1cb3774d6f09e2681ca1988bf235a343007 for further details. --- src/qemu/qemu_driver.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 54e9dcb..bc506c2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11622,24 +11622,38 @@ static int doPeer2PeerMigrate(virDomainPtr dom, int ret = -1; virConnectPtr dconn = NULL; char *dom_xml; + bool p2p; /* the order of operations is important here; we make sure the * destination side is completely setup before we touch the source */ + qemuDomainObjEnterRemoteWithDriver(driver, vm); dconn = virConnectOpen(uri); + qemuDomainObjExitRemoteWithDriver(driver, vm); if (dconn == NULL) { qemuReportError(VIR_ERR_OPERATION_FAILED, _("Failed to connect to remote libvirt URI %s"), uri); return -1; } - if (!VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, - VIR_DRV_FEATURE_MIGRATION_P2P)) { + + qemuDomainObjEnterRemoteWithDriver(driver, vm); + p2p = VIR_DRV_SUPPORTS_FEATURE(dconn->driver, dconn, + VIR_DRV_FEATURE_MIGRATION_P2P); + qemuDomainObjExitRemoteWithDriver(driver, vm); + if (!p2p) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Destination libvirt does not support peer-to-peer migration protocol")); goto cleanup; } + /* domain may have been stopped while we were talking to remote daemon */ + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("guest unexpectedly quit")); + goto cleanup; + } + dom_xml = qemudVMDumpXML(driver, vm, VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_UPDATE_CPU); -- 1.7.3.2

4 5

[libvirt] [RFD] Add/Modify some API functions about Host Information
by Minoru Usui 21 Jan '11

21 Jan '11

Hi, everyone In an environment with multiple host machines, I want to select a suitable host automatically on which I run a VM depending on machine's load. Libvirt has APIs to get host machine's information, but I think these APIs aren't enough for above purpose. So I suggest below changes. What do you think? * virNodeGetInfo() This API can get "CPU frequency"(mhz member of virNodeInfo) from "cpu MHz" of /proc/cpuinfo. This value isn't constant, because it may be decrease by power saving feature.(cf. cpuspeed on RHEL) This value is very useful for getting *present* cpu frequency, but I want to get Maximum CPU frequency, too. I want to add max_mhz member in struct virNodeInfo from /sys/device/system/cpu/cpuXX/cpufreq/cpuinfo_max_freq. * virNodeGetFreeMemory() This API returns amount of free memory of the host machine's all node, but this value doesn't include host's cache/buffer memory. For above purpose, it would be more suitable to account cache/buffer as free memory, because most of cache/buffer memory are reclaimable. But I think virNodeGetFreeMemory()'s ABI should not change easily. I want to add function virNodeGetCacheBufferMemory(). It returns amount of cache + buffer memory from /proc/meminfo. * virSysinfoRead() This API is completely internal. But DMI type1 information(dmidecode -t1) is useful for above purpose, because it's one of the information which suppose to processing capacity about host machine. I want to export virSysinfoRead() to user. -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

4 7

[libvirt] [PATCH] Add support for multiple serial ports to Xen driver
by Michal Novotny 20 Jan '11

20 Jan '11

Hi, this is the patch for to support multiple serial ports for Xen driver. The definition for Xen has been introduced in BZ #614004 and this is adding support to libvirt-based tools. The patch was originally written for RHEL-5 and libvirt 0.8.2 (RHEL-5.6) where it has been tested using the virsh command and correct device creation has been confirmed in the xend.log to have the same data for serial ports using both `xm create` and `virsh start` commands. Also, domains with both single and multiple serial ports has been tested to confirm it won't introduce any regression and everything was working fine according to my testing. This patch is the forward-port of RHEL-5 version of the patch. Michal Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- src/xen/xend_internal.c | 19 ++++++++++++- src/xen/xm_internal.c | 66 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 73 insertions(+), 14 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 44d5a22..35cdd3c 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -5959,8 +5959,23 @@ xenDaemonFormatSxpr(virConnectPtr conn, } if (def->serials) { virBufferAddLit(&buf, "(serial "); - if (xenDaemonFormatSxprChr(def->serials[0], &buf) < 0) - goto error; + /* + * If domain doesn't have multiple serial ports defined we + * keep the old-style formatting not to fail the sexpr tests + */ + if (def->nserials > 1) { + for (i = 0; i < def->nserials; i++) { + virBufferAddLit(&buf, "("); + if (xenDaemonFormatSxprChr(def->serials[i], &buf) < 0) + goto error; + virBufferAddLit(&buf, ")"); + } + } + else { + if (xenDaemonFormatSxprChr(def->serials[0], &buf) < 0) + goto error; + } + virBufferAddLit(&buf, ")"); } else { virBufferAddLit(&buf, "(serial none)"); diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index bfb6698..1bb62d7 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1432,20 +1432,64 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { chr = NULL; } - if (xenXMConfigGetString(conf, "serial", &str, NULL) < 0) - goto cleanup; - if (str && STRNEQ(str, "none") && - !(chr = xenDaemonParseSxprChar(str, NULL))) - goto cleanup; + /* Try to get the list of values to support multiple serial ports */ + list = virConfGetValue(conf, "serial"); + if (list && list->type == VIR_CONF_LIST) { + list = list->list; + while (list) { + char *port; + + if ((list->type != VIR_CONF_STRING) || (list->str == NULL)) + goto skipport; + + port = list->str; + if (VIR_ALLOC(chr) < 0) + goto no_memory; - if (chr) { - if (VIR_ALLOC_N(def->serials, 1) < 0) { + if (!(chr = xenDaemonParseSxprChar(port, NULL))) + goto skipport; + + if (VIR_REALLOC_N(def->serials, def->nserials+1) < 0) + goto no_memory; + + chr->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_SERIAL; + chr->type = VIR_DOMAIN_CHR_TYPE_PTY; + + /* Implement device type of serial port when appropriate */ + if (STRPREFIX(port, "/dev")) { + chr->type = VIR_DOMAIN_CHR_TYPE_DEV; + chr->target.port = def->nserials; + chr->data.file.path = strdup(port); + + if (!chr->data.file.path) + goto no_memory; + } + + def->serials[def->nserials++] = chr; + chr = NULL; + + skipport: + list = list->next; virDomainChrDefFree(chr); - goto no_memory; } - chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; - def->serials[0] = chr; - def->nserials++; + } + /* If domain is not using multiple serial ports we parse data old way */ + else { + if (xenXMConfigGetString(conf, "serial", &str, NULL) < 0) + goto cleanup; + if (str && STRNEQ(str, "none") && + !(chr = xenDaemonParseSxprChar(str, NULL))) + goto cleanup; + + if (chr) { + if (VIR_ALLOC_N(def->serials, 1) < 0) { + virDomainChrDefFree(chr); + goto no_memory; + } + chr->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_SERIAL; + def->serials[0] = chr; + def->nserials++; + } } } else { if (!(def->console = xenDaemonParseSxprChar("pty", NULL))) -- 1.7.3.2

3 10

[libvirt] How can I improve the performance of libvirt when running many virtual machines on same host
by Diego Dias 20 Jan '11

20 Jan '11

Hi, I am using Xen 4 as hypervisor and using libvirt 0.8.4 to communicate with it. When I run more than 35 virtual machines on the host, Libvirt starts to run extremely slow and I cant even execute a /"virsh list/". The memory usage of libvirtd is around 468288K. Is there any way to improve the performance of libvirt? Is there any maximum number of virtual machines libvirt can manage without having a poor performace? Best Regards, Diego Dias

2 2

[libvirt] [PATCH] docs: document <controller> element
by Eric Blake 20 Jan '11

20 Jan '11

* docs/formatdomain.html.in: Talk about <controller> and <address> throughout. --- Adding a new <controller type='ccid' index='0'/> and use of <smartcard><address/></smartcard> for use by smartcard will be a lot easier if I can compare the changes to existing <controller> and <address> locations. To my surprise, there wasn't any documentation for existing uses. Suggestions for polishing this are welcome, but it's strictly an improvement over the nothingness that was there previously ;) docs/formatdomain.html.in | 99 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 2516c16..8d6b69e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -645,6 +645,7 @@ </source> <target dev="hdb" bus="ide"/> <boot order='1'/> + <address type='drive' controller='0' bus='1' unit='0'/> </disk> </devices> ...</pre> @@ -773,8 +774,69 @@ </tr> </table> </dd> + <dt><code>address</code></dt> + <dd>If present, the <code>address</code> element ties the disk + to a given slot of a controller (the + actual <code><controller></code> device can often be + inferred by libvirt, although it can + be <a href="#elementsControllers">explicitly specified</a>). + The <code>type</code> attribute is mandatory, and is typically + "pci" or "drive". For a "pci" controller, additional + attributes for <code>bus</code>, <code>slot</code>, + and <code>function</code> must be present, as well as an + optional <code>domain</code>. For a "drive" controller, an + additional attribute <code>unit</code> is required, along with + optional <code>controller</code> and <code>bus</code>. + </dd> </dl> + <h4><a name="elementsControllers">Controllers</a></h4> + + <p> + Any device that has an <code><address></code> sub-element + generally requires a bus controller to manage all of the devices + associated with the same bus. Normally, libvirt can + automatically infer such controllers without requiring explicit + XML markup, but sometimes it is necessary to provide an explicit + controller element. + </p> + +<pre> + ... + <devices> + <controller type='ide' index='0'/> + <controller type='virtio-serial' index='0' ports='16' vectors='4'/> + <controller type='virtio-cerial' index='1'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> + </controller> + ... + </devices> + ...</pre> + + <p> + Each controller has a mandatory attribute <code>type</code>, + which must be one of "ide", "fdc", "scsi", "sata", or + "virtio-serial", and a mandatory attribute <code>index</code> + which is the decimal integer describing in which order the bus + controller is encountered (for use in <code>bus</code> + attributes of <code><address></code> elements). The + "virtio-serial" controller has two additional optional + attributes <code>ports</code> and <code>vectors</code>, which + control how many devices can be connected through the + controller. Some controllers have an optional + attribute <code>model</code>, which is one of "auto", + "buslogic", "lsilogic", "lsias1068", or "vmpvscsi". + </p> + + <p> + For controllers that are themselves devices on another bus, an + optional sub-element <code><address></code> can specify + the exact relationship of the controller to its master bus, with + semantics like any other device's <code>address</code> + sub-element. + </p> + + <h4><a name="elementsUSB">USB and PCI devices</a></h4> <p> @@ -857,6 +919,16 @@ </devices> ...</pre> + <p> + There are several possibilities for specifying a network + interface visible to the guest. Each subsection below provides + more details about common setup options. Additionally, + each <code><interface></code> element has an + optional <code><address></code> sub-element that can tie + the interface to a + particular <a href="#elementsControllers">controller</a>. + </p> + <h5><a name="elementsNICSVirtual">Virtual network</a></h5> <p> @@ -1178,6 +1250,12 @@ qemu-kvm -net nic,model=? /dev/null It takes values "xen" (paravirtualized), "ps2" and "usb".</dd> </dl> + <p> + The <code>input</code> element has an optional + sub-element <code><address></code> which can tie the + device to a + particular <a href="#elementsControllers">controller</a>. + </p> <h4><a name="elementsGraphics">Graphical framebuffers</a></h4> @@ -1314,6 +1392,13 @@ qemu-kvm -net nic,model=? /dev/null <code>accel3d</code> and <code>accel2d</code> attributes in the <code>acceleration</code> element. </dd> + + <dt><code>address</code></dt> + <dd> + The optional <code>address</code> sub-element can be used to + tie the video device to a + particular <a href="#elementsControllers">controller</a>. + </dd> </dl> <h4><a name="elementsConsole">Consoles, serial, parallel & channel devices</a></h4> @@ -1358,6 +1443,13 @@ qemu-kvm -net nic,model=? /dev/null configured by the <code>source</code> element. </p> + <p> + Each character device element has an optional + sub-element <code><address></code> which can tie the + device to a + particular <a href="#elementsControllers">controller</a>. + </p> + <h5><a name="elementsCharGuestInterface">Guest interface</a></h5> <p> @@ -1736,6 +1828,13 @@ qemu-kvm -net nic,model=? /dev/null </dd> </dl> + <p> + Each <code>sound</code> element has an optional + sub-element <code><address></code> which can tie the + device to a + particular <a href="#elementsControllers">controller</a>. + </p> + <h4><a name="elementsWatchdog">Watchdog device</a></h4> <p> -- 1.7.3.4

2 6

[libvirt] Fwd: [PATCH] Add support for multiple serial ports to Xen driver
by Michal Novotny 20 Jan '11

20 Jan '11

Hi, I've been posting this patch using git send-email but unfortunately it didn't arrive to the list but I saw some other mails arrive to the list AFAIK so I'm posting this one just to make sure it wasn't my sendmail issue. Michal -------- Original Message -------- Subject: [PATCH] Add support for multiple serial ports to Xen driver Date: Thu, 20 Jan 2011 13:20:50 +0100 From: Michal Novotny <minovotn(a)redhat.com> To: libvir-list(a)redhat.com CC: Michal Novotny <minovotn(a)redhat.com> Hi, this is the patch for to support multiple serial ports for Xen driver. The definition for Xen has been introduced in BZ #614004 and this is adding support to libvirt-based tools. The patch was originally written for RHEL-5 and libvirt 0.8.2 (RHEL-5.6) where it has been tested using the virsh command and correct device creation has been confirmed in the xend.log to have the same data for serial ports using both `xm create` and `virsh start` commands. Also, domains with both single and multiple serial ports has been tested to confirm it won't introduce any regression and everything was working fine according to my testing. This patch is the forward-port of RHEL-5 version of the patch. Michal Signed-off-by: Michal Novotny<minovotn(a)redhat.com> --- src/xen/xend_internal.c | 19 ++++++++++++- src/xen/xm_internal.c | 66 +++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 73 insertions(+), 14 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 44d5a22..35cdd3c 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -5959,8 +5959,23 @@ xenDaemonFormatSxpr(virConnectPtr conn, } if (def->serials) { virBufferAddLit(&buf, "(serial "); - if (xenDaemonFormatSxprChr(def->serials[0],&buf)< 0) - goto error; + /* + * If domain doesn't have multiple serial ports defined we + * keep the old-style formatting not to fail the sexpr tests + */ + if (def->nserials> 1) { + for (i = 0; i< def->nserials; i++) { + virBufferAddLit(&buf, "("); + if (xenDaemonFormatSxprChr(def->serials[i],&buf)< 0) + goto error; + virBufferAddLit(&buf, ")"); + } + } + else { + if (xenDaemonFormatSxprChr(def->serials[0],&buf)< 0) + goto error; + } + virBufferAddLit(&buf, ")"); } else { virBufferAddLit(&buf, "(serial none)"); diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index bfb6698..1bb62d7 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1432,20 +1432,64 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) { chr = NULL; } - if (xenXMConfigGetString(conf, "serial",&str, NULL)< 0) - goto cleanup; - if (str&& STRNEQ(str, "none")&& - !(chr = xenDaemonParseSxprChar(str, NULL))) - goto cleanup; + /* Try to get the list of values to support multiple serial ports */ + list = virConfGetValue(conf, "serial"); + if (list&& list->type == VIR_CONF_LIST) { + list = list->list; + while (list) { + char *port; + + if ((list->type != VIR_CONF_STRING) || (list->str == NULL)) + goto skipport; + + port = list->str; + if (VIR_ALLOC(chr)< 0) + goto no_memory; - if (chr) { - if (VIR_ALLOC_N(def->serials, 1)< 0) { + if (!(chr = xenDaemonParseSxprChar(port, NULL))) + goto skipport; + + if (VIR_REALLOC_N(def->serials, def->nserials+1)< 0) + goto no_memory; + + chr->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_SERIAL; + chr->type = VIR_DOMAIN_CHR_TYPE_PTY; + + /* Implement device type of serial port when appropriate */ + if (STRPREFIX(port, "/dev")) { + chr->type = VIR_DOMAIN_CHR_TYPE_DEV; + chr->target.port = def->nserials; + chr->data.file.path = strdup(port); + + if (!chr->data.file.path) + goto no_memory; + } + + def->serials[def->nserials++] = chr; + chr = NULL; + + skipport: + list = list->next; virDomainChrDefFree(chr); - goto no_memory; } - chr->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL; - def->serials[0] = chr; - def->nserials++; + } + /* If domain is not using multiple serial ports we parse data old way */ + else { + if (xenXMConfigGetString(conf, "serial",&str, NULL)< 0) + goto cleanup; + if (str&& STRNEQ(str, "none")&& + !(chr = xenDaemonParseSxprChar(str, NULL))) + goto cleanup; + + if (chr) { + if (VIR_ALLOC_N(def->serials, 1)< 0) { + virDomainChrDefFree(chr); + goto no_memory; + } + chr->targetType = VIR_DOMAIN_CHR_TARGET_TYPE_SERIAL; + def->serials[0] = chr; + def->nserials++; + } } } else { if (!(def->console = xenDaemonParseSxprChar("pty", NULL))) -- 1.7.3.2

1 0

[libvirt] Installing libvirt 0.8.6 Ubuntu 9.10
by Marcela Castro León 20 Jan '11

20 Jan '11

Hello When installing libvirt 0.8.6, I've passed ./configure, but when I execute make, I've got CCLD libvirtd ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_driver.o): In function `qemudVPAssociatePortProfiles': /home/chubut/libvirt-0.8.6/src/qemu/qemu_driver.c:11881: undefined reference to `vpAssociatePortProfileId' /home/chubut/libvirt-0.8.6/src/qemu/qemu_driver.c:11898: undefined reference to `vpDisassociatePortProfileId' collect2: ld returned 1 exit status make[3]: *** [libvirtd] Error 1 make[3]: Leaving directory `/home/chubut/libvirt-0.8.6/daemon' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/chubut/libvirt-0.8.6/daemon' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/chubut/libvirt-0.8.6' make: *** [all] Error 2 chubut@chubut:~/libvirt-0.8.6$ Do you have any help? Thank you. Marcela

5 12

[libvirt] [PATCH] docs: move the apps page to the top level as its good promo
by Justin Clift 20 Jan '11

20 Jan '11

--- docs/sitemap.html.in | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index 7077038..bcce62f 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -19,6 +19,10 @@ </ul> </li> <li> + <a href="apps.html">Applications</a> + <span>Applications known to use libvirt</span> + </li> + <li> <a href="downloads.html">Downloads</a> <span>Get the latest source releases, binary builds and get access to the source repository</span> <ul> @@ -313,12 +317,6 @@ <li> <a href="relatedlinks.html">Related Links</a> <span>Miscellaneous links of interest related to libvirt</span> - <ul> - <li> - <a href="apps.html">Applications</a> - <span>Overview of applications using the libvirt APIs</span> - </li> - </ul> </li> <li> <a href="sitemap.html">Sitemap</a> -- 1.7.3.5

3 4

[libvirt] [PATCH] Re: Minor php errors in the libvirt search script?
by Daniel Veillard 20 Jan '11

20 Jan '11

[ Cc'ing back the list ] On Sun, Jan 09, 2011 at 03:11:29AM +1100, Justin Clift wrote: > Hi Daniel, > > Noticing these php warning's showing up in the apache libvirt.org error log: > > [Sat Jan 08 17:09:24 2011] [error] [client 64.217.19.104] PHP Notice: Undefined variable: HTTP_GET_VARS in /data/www/libvirt.org/search.php on line 21, referer: http://libvirt.org/formatdomain.html > [Sat Jan 08 17:09:24 2011] [error] [client 64.217.19.104] PHP Notice: Undefined variable: HTTP_GET_VARS in /data/www/libvirt.org/search.php on line 22, referer: http://libvirt.org/formatdomain.html > [Sat Jan 08 17:09:24 2011] [error] [client 64.217.19.104] PHP Notice: Undefined variable: PHP_SELF in /data/www/libvirt.org/search.php on line 37, referer: http://libvirt.org/formatdomain.html > > Any idea if they're something we need to care about? Yup, the search php was designed in php4 time frame and those global variables are not turned off by default for security reasons http://fr.php.net/manual/en/security.registerglobals.php The following patch should fix those, thanks for raising the issue, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [RFC/PATCH v1] Adding entry for cpu tunable shares in xml
by Nikunj A. Dadhania 20 Jan '11

20 Jan '11

From: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> Make cpu share persistent and add support for parsing them. docs/formatdomain.html.in: Document cputune element src/conf/domain_conf.c,src/conf/domain_conf.h: Add cputune element parsing src/lxc/lxc_controller.c: Use the parsed cputune shares value src/qemu/qemu_cgroup.c: Use the parsed cputune shares value Signed-off-by: Nikunj A. Dadhania <nikunj(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 11 +++++++++++ src/conf/domain_conf.c | 14 ++++++++++++++ src/conf/domain_conf.h | 3 +++ src/lxc/lxc_controller.c | 10 ++++++++++ src/qemu/qemu_cgroup.c | 15 +++++++++++++++ 5 files changed, 53 insertions(+), 0 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 55e2cbd..522dc06 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -280,6 +280,9 @@ <swap_hard_limit>2097152</swap_hard_limit> <min_guarantee>65536</min_guarantee> </memtune> + <cputune> + <shares>1024</shares> + </cputune> <vcpu cpuset="1-4,^3,6" current="1">2</vcpu> ...</pre> @@ -317,6 +320,14 @@ <dd> The optional <code>min_guarantee</code> element is the guaranteed minimum memory allocation for the guest. The units for this value are kilobytes (i.e. blocks of 1024 bytes)</dd> + <dt><code>cputune</code></dt> + <dd> The optional <code>cputune</code> element provides details + regarding the cpu tuneable parameters for the domain. If this is + omitted, it defaults to the OS provided defaults.</dd> + <dt><code>shares</code></dt> + <dd> The optional <code>shares</code> element is the proportional + weighted share for the domain. If this is omitted, it defaults to the OS + provided defaults.</dd> <dt><code>vcpu</code></dt> <dd>The content of this element defines the maximum number of virtual CPUs allocated for the guest OS, which must be between 1 and diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 645767e..63c8927 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4904,6 +4904,11 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, &def->mem.swap_hard_limit) < 0) def->mem.swap_hard_limit = 0; + /* Extract cpu tunables */ + if (virXPathULong("string(./cputune/shares[1])", ctxt, + &def->cputune.shares) < 0) + def->cputune.shares = 0; + n = virXPathULong("string(./vcpu[1])", ctxt, &count); if (n == -2) { virDomainReportError(VIR_ERR_XML_ERROR, "%s", @@ -7313,6 +7318,15 @@ char *virDomainDefFormat(virDomainDefPtr def, def->mem.swap_hard_limit) virBufferVSprintf(&buf, " </memtune>\n"); + if (def->cputune.shares) + virBufferVSprintf(&buf, " <cputune>\n"); + if (def->cputune.shares) { + virBufferVSprintf(&buf, " <shares>%lu</shares>\n", + def->cputune.shares); + } + if (def->cputune.shares) + virBufferVSprintf(&buf, " </cputune>\n"); + if (def->mem.hugepage_backed) { virBufferAddLit(&buf, " <memoryBacking>\n"); virBufferAddLit(&buf, " <hugepages/>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cf7bdc0..a2c83d3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -981,6 +981,9 @@ struct _virDomainDef { unsigned short maxvcpus; int cpumasklen; char *cpumask; + struct { + unsigned long shares; /* proportional weight */ + } cputune; /* These 3 are based on virDomainLifeCycleAction enum flags */ int onReboot; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index af0b70c..24edb49 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -144,6 +144,16 @@ static int lxcSetContainerResources(virDomainDefPtr def) } } + if(def->cputune.shares) { + rc = virCgroupSetCpuShares(cgroup, def->cputune.shares); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set cpu shares for domain %s"), + def->name); + goto cleanup; + } + } + rc = virCgroupDenyAllDevices(cgroup); if (rc != 0) { virReportSystemError(-rc, diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e5536c0..d4e73bd 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -304,6 +304,21 @@ int qemuSetupCgroup(struct qemud_driver *driver, vm->def->name); } + if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU))) { + if (vm->def->cputune.shares != 0) { + rc = virCgroupSetCpuShares(cgroup, vm->def->cputune.shares); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set cpu shares for domain %s"), + vm->def->name); + goto cleanup; + } + } + } else { + VIR_WARN("CPU cgroup is disabled in qemu configuration file: %s", + vm->def->name); + } + done: virCgroupFree(&cgroup); return 0;

1 0

[libvirt] virsh fails to define a domain
by Nikunj A. Dadhania 20 Jan '11

20 Jan '11

I am using the git version of libvirt. The domain file was working previously. [nikunj@dhruv ~]$ rpm -q qemu-kvm qemu-kvm-0.12.3-8.fc13.x86_64 Some more debugging suggested that qemuCapsExtractDeviceStr is returning an error. The output of the "pci-assign,?" is not returning any useful information on my system. [nikunj@dhruv ~]$ qemu-kvm -device "pci-assign,?" property "pci-assign.?" not found can't set property "?" to "on" for "pci-assign" [nikunj@dhruv ~]$ This is supposedly related to f892f5a562cbb6e5b914adced1000df20c3174d6 commit. Don't know what could be a valid fix for this tough. Regards Nikunj

2 2

[libvirt] [PATCH] docs: added new entries to apps page, plus adjusted a few existing
by Justin Clift 20 Jan '11

20 Jan '11

Added new entries for Hudson, LCFG, Tivoli Provisioning Manager, virt-what, and Zenoss. Adjusted the existing entries for BuildBot and vmware2libvirt. --- docs/apps.html.in | 94 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 76 insertions(+), 18 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 054e8c2..09a1a7f 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -23,18 +23,6 @@ <img src="madeWith.png" alt="Made with libvirt"/> </p> - <h2><a name="automatedtesting">Automated compile/testing</a></h2> - - <dl> - <dt><a href="http://buildbot.net">BuildBot</a></dt> - <dd> - BuildBot is a system to automate the compile/test cycle required - by most software projects. CVS commits trigger new builds, run on - a variety of client machines. Build status (pass/fail/etc) are - displayed on a web page or through other protocols. - </dd> - </dl> - <h2><a name="clientserver">Client/Server applications</a></h2> <dl> @@ -103,6 +91,56 @@ Watch the CPU, memory, network and disk utilization of all virtual machines running on a host. </dd> + <dt> + <a href="http://people.redhat.com/~rjones/virt-what/">virt-what</a> + </dt> + <dd> + virt-what is a shell script for detecting if the program is running + in a virtual machine. It prints out a list of facts about the + virtual machine, derived from heuristics. + </dd> + </dl> + + <h2><a name="configmgmt">Configuration Management</a></h2> + + <dl> + <dt><a href="https://wiki.lcfg.org/bin/view/LCFG/LcfgLibvirt">LCFG</a></dt> + <dd> + LCFG is a system for automatically installing and managing the + configuration of large numbers of Unix systems. It is particularly + suitable for sites with very diverse and rapidly changing + configurations. + </dd> + <dd> + The lcfg-libvirt package adds support for virtualized systems to + LCFG, with both Xen and KVM known to work. Cloning guests is + supported, as are the bridged, routed, and isolated modes for + Virtual Networking. + </dd> + </dl> + + <h2><a name="continuousintegration">Continuous Integration</a></h2> + + <dl> + <dt><a href="http://buildbot.net/buildbot/docs/current/Libvirt.html">BuildBot</a></dt> + <dd> + BuildBot is a system to automate the compile/test cycle required + by most software projects. CVS commits trigger new builds, run on + a variety of client machines. Build status (pass/fail/etc) are + displayed on a web page or through other protocols. + </dd> + </dl> + + <dl> + <dt><a href="http://wiki.hudson-ci.org/display/HUDSON/Libvirt+Slaves+Plugin">Hudson</a></dt> + <dd> + This plugin for Hudson adds a way to control guest domains hosted + on Xen or QEMU/KVM. You configure a Hudson Slave, + selecting the guest domain and hypervisor. When you need to build a + job on a specific Slave, its guest domain is started, then the job is + run. When the build process is finished, the guest domain is shut + down, ready to be used again as required. + </dd> </dl> <h2><a name="conversion">Conversion</a></h2> @@ -133,9 +171,10 @@ possible. This conversion requires some Microsoft signed pieces, that Red Hat can provide. </dd> - <dt><a href="http://bazaar.launchpad.net/~ubuntu-virt/virt-goodies/trunk/annotate/head:/…">vmware2libvirt</a></dt> + <dt><a href="https://launchpad.net/virt-goodies">vmware2libvirt</a></dt> <dd> - A Python script for migrating a vmware image to libvirt. + Part of the <i>virt-goodies</i> package, vmware2libvirt is a python + script for migrating a vmware image to libvirt. </dd> </dl> @@ -188,9 +227,9 @@ </dd> </dl> - <h2><a name="monitoring">Monitoring plugins</a></h2> + <h2><a name="monitoring">Monitoring</a></h2> <dl> - <dt><a href="http://collectd.org/plugins/libvirt.shtml">for collectd</a></dt> + <dt><a href="http://collectd.org/plugins/libvirt.shtml">collectd</a></dt> <dd> The libvirt-plugin is part of <a href="http://collectd.org/">collectd</a> and gathers statistics about virtualized guests on a system. This @@ -199,13 +238,13 @@ For a full description, please refer to the libvirt section in the collectd.conf(5) manual page. </dd> - <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt> + <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt> <dd> The plugins provided by Guido Günther allow to monitor various things like network and block I/O with <a href="http://munin.projects.linpro.no/">Munin</a>. </dd> - <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">nagios-virt</a></dt> + <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">Nagios-virt</a></dt> <dd> Nagios-virt is a configuration tool to add monitoring of your virtualised domains to <a href="http://www.nagios.org/">Nagios</a>. @@ -213,8 +252,27 @@ your Xen or QEMU/KVM guests, or to integrate with your existing Nagios installation. </dd> + <dt><a href="http://community.zenoss.org/docs/DOC-4687">Zenoss</a></dt> + <dd> + The Zenoss libvirt Zenpack adds support for monitoring virtualization + servers. It has been tested with KVM, QEMU, VMware ESX, and VMware + GSX. + </dd> </dl> + <h2><a name="provisioning">Provisioning</a></h2> + + <dl> + <dt><a href="http://www.ibm.com/software/tivoli/products/prov-mgr/">Tivoli Provisioning Manager</a></dt> + <dd> + Part of the IBM Tivoli family, Tivoli Provisioning Manager (TPM) is + an IT lifecycle automation product. It + <a href="http://publib.boulder.ibm.com/infocenter/tivihelp/v38r1/index.jsp?topic=/co…">uses libvirt</a> + for communication with virtualization hosts and guest domains. + </dd> + </dl> + + <h2><a name="web">Web applications</a></h2> <dl> -- 1.7.3.5

2 2

[libvirt] [PATCH] docs: document <sysinfo> and <symbios> elements
by Eric Blake 20 Jan '11

20 Jan '11

* docs/formatdomain.html.in: Talk about <sysinfo> throughout. --- More in the vein of adding missing documentation. docs/formatdomain.html.in | 79 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8d6b69e..9719346 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -48,7 +48,10 @@ a globally unique identifier for the virtual machine. The format must be RFC 4122 compliant, eg <code>3e3fce45-4f53-4fa7-bb32-11f34168b82b</code>. If omitted when defining/creating a new machine, a random - UUID is generated. <span class="since">Since 0.0.1</span></dd> + UUID is generated. It is also possible to provide the UUID + via a <a href="#elementsSysinfo"><code>sysinfo</code></a> + specification. <span class="since">Since 0.0.1, sysinfo + since 0.8.7</span></dd> <dt><code>description</code></dt> <dd>The content of the <code>description</code> element provides a @@ -81,6 +84,7 @@ <boot dev='hd'/> <boot dev='cdrom'/> <bootmenu enable='yes'/> + <smbios mode='sysinfo'/> </os> ...</pre> @@ -115,6 +119,16 @@ If not specified, the hypervisor default is used. <span class="since"> Since 0.8.3</span> </dd> + <dt><code>smbios</code></dt> + <dd>How to populate SMBIOS information visible in the guest. + The <code>mode</code> attribute must be specified, and is either + "emulate" (let the hypervisor generate all values), "host" (copy + all of Block 0 and Block 1, except for the UUID, from the host's + SMBIOS values), or "sysinfo" (use the values in + the <a href="#elementsSysinfo">sysinfo</a> element). If not + specified, the hypervisor default is used. <span class="since"> + Since 0.8.7</span> + </dd> </dl> <h4><a name="elementsOSBootloader">Host bootloader</a></h4> @@ -188,6 +202,69 @@ installation media source / kickstart file</dd> </dl> + <h3><a name="elementsSysinfo">SMBIOS System Information</a></h3> + + <p> + Some hypervisors allow control over what system information is + presented to the guest (for example, SMBIOS fields can be + populated by a hypervisor and inspected via + the <code>dmidecode</code> command in the guest). The + optional <code>sysinfo</code> element covers all such categories + of information. <span class="since">Since 0.8.7</span> + </p> + +<pre> + ... + <os> + <smbios mode='sysinfo'/> + ... + </os> + <sysinfo type='smbios'> + <bios> + <entry name='vendor'>LENOVO</entry> + </bios> + <system> + <entry name='manufacturer'>Fedora</entry> + <entry name='vendor'>Virt-Manager</entry> + </system> + </sysinfo> + ...</pre> + + <p> + The <code>sysinfo</code> element has a mandatory + attribute <code>type</code> that determine the layout of + sub-elements, with supported values of: + </p> + + <dl> + <dt><code>smbios</code></dt> + <dd>Sub-elements call out specific SMBIOS values, which will + affect the guest if used in conjunction with + the <code>smbios</code> sub-element of + the <a href="#elementsOS"><code>os</code></a> element. Each + sub-element of <code>sysinfo</code> names a SMBIOS block, and + within those elements can be a list of <code>entry</code> + elements that describe a field within the block. The following + blocks and entries are recognized: + <dl> + <dt><code>bios</code></dt> + <dd> + This is block 0 of SMBIOS, with entry names drawn from + "vendor", "version", "date", and "release". + </dd> + <dt><code>system</code></dt> + <dd> + This is block 1 of SMBIOS, with entry names drawn from + "manufacturer", "product", "version", "serial", "uuid", + "sku", and "family". If a "uuid" entry is provided + alongside a + top-level <a href="#elementsMetadata"><code>uuid</code> + element</a>, the two values must match. + </dd> + </dl> + </dd> + </dl> + <h3><a name="elementsResources">Basic resources</a></h3> <pre> -- 1.7.3.4

3 3

[libvirt] [PATCH] qemu: Avoid sending STOPPED event twice
by Jiri Denemark 19 Jan '11

19 Jan '11

In some circumstances, libvirtd would issue two STOPPED events after it stopped a domain. This was because an EOF event can arrive after a qemu process is killed but before qemuMonitorClose() is called. qemuHandleMonitorEOF() should ignore EOF when the domain is not running. I wasn't able to reproduce this bug directly, only after adding an artificial sleep() into qemudShutdownVMDaemon(). --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 22dc272..cff7a43 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -356,6 +356,12 @@ qemuHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjLock(vm); + if (!virDomainObjIsActive(vm)) { + VIR_DEBUG("Domain %p is not active, ignoring EOF", vm); + virDomainObjUnlock(vm); + return; + } + priv = vm->privateData; if (!hasError && priv->monJSON && !priv->gotShutdown) { VIR_DEBUG("Monitor connection to '%s' closed without SHUTDOWN event; " -- 1.7.4.rc2

2 2

[libvirt] [PATCH] qemu: Fail if per-device boot is used but deviceboot is not supported
by Jiri Denemark 19 Jan '11

19 Jan '11

--- src/qemu/qemu_command.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24acc10..537e537 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2949,6 +2949,13 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArgBuffer(cmd, &boot_buf); + } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_BOOTINDEX)) { + /* def->os.nBootDevs is guaranteed to be > 0 unless per-device boot + * configuration is used + */ + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hypervisor lacks deviceboot feature")); + goto error; } if (def->os.kernel) -- 1.7.4.rc2

2 2