- Devel - libvirt List Archives

[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 22 Jan '11

22 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 22 Jan '11

22 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 22 Jan '11

22 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 22 Jan '11

22 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 22 Jan '11

22 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 22 Jan '11

22 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 22 Jan '11

22 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 22 Jan '11

22 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