- Devel - libvirt List Archives

[libvirt] [PATCH] Move libvirt-guests init script and config to tools
by Jiri Denemark 25 Aug '10

25 Aug '10

Since libvirt-guests init script and its configuration do not require libvirtd to be running/installed, it was a bad idea to put them into daemon directory. libvirt.spec even includes these files in libvirt-client subpackage, which may result in build failure for client-only builds when the whole daemon directory is just skipped. --- daemon/Makefile.am | 16 +-- daemon/libvirt-guests.init.in | 341 ----------------------------------------- daemon/libvirt-guests.sysconf | 24 --- tools/Makefile.am | 41 +++++- tools/libvirt-guests.init.in | 341 +++++++++++++++++++++++++++++++++++++++++ tools/libvirt-guests.sysconf | 24 +++ 6 files changed, 409 insertions(+), 378 deletions(-) delete mode 100644 daemon/libvirt-guests.init.in delete mode 100644 daemon/libvirt-guests.sysconf create mode 100644 tools/libvirt-guests.init.in create mode 100644 tools/libvirt-guests.sysconf diff --git a/daemon/Makefile.am b/daemon/Makefile.am index dbf0ac3..53133d2 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -35,8 +35,6 @@ EXTRA_DIST = \ libvirtd.uml.logrotate.in \ test_libvirtd.aug \ THREADING.txt \ - libvirt-guests.init.in \ - libvirt-guests.sysconf \ libvirtd.pod.in \ $(AVAHI_SOURCES) \ $(DAEMON_SOURCES) @@ -258,27 +256,21 @@ install-logrotate: $(LOGROTATE_CONFS) $(INSTALL_DATA) libvirtd.uml.logrotate $(DESTDIR)$(sysconfdir)/logrotate.d/libvirtd.uml if LIBVIRT_INIT_SCRIPT_RED_HAT -install-init: libvirtd.init libvirt-guests.init +install-init: libvirtd.init mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d $(INSTALL_SCRIPT) libvirtd.init \ $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - $(INSTALL_SCRIPT) libvirt-guests.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig $(INSTALL_SCRIPT) $(srcdir)/libvirtd.sysconf \ $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd - $(INSTALL_SCRIPT) $(srcdir)/libvirt-guests.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests uninstall-init: rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests + $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd -BUILT_SOURCES += libvirtd.init libvirt-guests.init +BUILT_SOURCES += libvirtd.init -%.init: %.init.in $(top_builddir)/config.status +libvirtd.init: libvirtd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ -e s!\@localstatedir\@!@localstatedir@!g \ -e s!\@sbindir\@!@sbindir@!g \ diff --git a/daemon/libvirt-guests.init.in b/daemon/libvirt-guests.init.in deleted file mode 100644 index 993c12d..0000000 --- a/daemon/libvirt-guests.init.in +++ /dev/null @@ -1,341 +0,0 @@ -#!/bin/sh - -# the following is the LSB init header -# -### BEGIN INIT INFO -# Provides: libvirt-guests -# Required-Start: libvirtd -# Required-Stop: libvirtd -# Default-Start: 3 4 5 -# Short-Description: suspend/resume libvirt guests on shutdown/boot -# Description: This is a script for suspending active libvirt guests -# on shutdown and resuming them on next boot -# See http://libvirt.org -### END INIT INFO - -# the following is chkconfig init header -# -# libvirt-guests: suspend/resume libvirt guests on shutdown/boot -# -# chkconfig: 345 98 02 -# description: This is a script for suspending active libvirt guests \ -# on shutdown and resuming them on next boot \ -# See http://libvirt.org -# - -sysconfdir=@sysconfdir@ -localstatedir=@localstatedir@ -libvirtd=@sbindir@/libvirtd - -# Source function library. -. "$sysconfdir"/rc.d/init.d/functions - -URIS=default -ON_BOOT=start -ON_SHUTDOWN=suspend -SHUTDOWN_TIMEOUT=0 - -test -f "$sysconfdir"/sysconfig/libvirt-guests && . "$sysconfdir"/sysconfig/libvirt-guests - -LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests -VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests - -RETVAL=0 - -retval() { - "$@" - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - else - return 0 - fi -} - -run_virsh() { - uri=$1 - shift - - if [ "x$uri" = xdefault ]; then - conn= - else - conn="-c $uri" - fi - - virsh $conn "$@" </dev/null -} - -run_virsh_c() { - ( export LC_ALL=C; run_virsh "$@" ) -} - -list_guests() { - uri=$1 - - list=$(run_virsh_c $uri list) - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - uuids= - for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do - uuid=$(run_virsh_c $uri dominfo $id | awk '/^UUID:/{print $2}') - if [ -z "$uuid" ]; then - RETVAL=1 - return 1 - fi - uuids="$uuids $uuid" - done - - echo $uuids -} - -guest_name() { - uri=$1 - uuid=$2 - - name=$(run_virsh_c $uri dominfo $uuid 2>/dev/null | \ - awk '/^Name:/{print $2}') - [ -n "$name" ] || name=$uuid - - echo "$name" -} - -guest_is_on() { - uri=$1 - uuid=$2 - - guest_running=false - info=$(run_virsh_c $uri dominfo $uuid) - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - id=$(echo "$info" | awk '/^Id:/{print $2}') - - [ -n "$id" ] && [ "x$id" != x- ] && guest_running=true - return 0 -} - -started() { - touch "$VAR_SUBSYS_LIBVIRT_GUESTS" -} - -start() { - [ -f "$LISTFILE" ] || { started; return 0; } - - if [ "x$ON_BOOT" != xstart ]; then - echo $"libvirt-guests is configured not to start any guests on boot" - rm -f "$LISTFILE" - started - return 0 - fi - - while read uri list; do - configured=false - for confuri in $URIS; do - if [ $confuri = $uri ]; then - configured=true - break - fi - done - if ! $configured; then - echo $"Ignoring guests on $uri URI" - continue - fi - - echo $"Resuming guests on $uri URI..." - for guest in $list; do - name=$(guest_name $uri $guest) - echo -n $"Resuming guest $name: " - if guest_is_on $uri $guest; then - if $guest_running; then - echo $"already active" - else - retval run_virsh $uri start "$name" >/dev/null && \ - echo $"done" - fi - fi - done - done <"$LISTFILE" - - rm -f "$LISTFILE" - started -} - -suspend_guest() -{ - uri=$1 - guest=$2 - - name=$(guest_name $uri $guest) - label=$"Suspending $name: " - echo -n "$label" - run_virsh $uri managedsave $guest >/dev/null & - virsh_pid=$! - while true; do - sleep 1 - kill -0 $virsh_pid >&/dev/null || break - progress=$(run_virsh_c $uri domjobinfo $guest 2>/dev/null | \ - awk '/^Data processed:/{print $3, $4}') - if [ -n "$progress" ]; then - printf '\r%s%12s ' "$label" "$progress" - else - printf '\r%s%-12s ' "$label" "..." - fi - done - retval wait $virsh_pid && printf '\r%s%-12s\n' "$label" $"done" -} - -shutdown_guest() -{ - uri=$1 - guest=$2 - - name=$(guest_name $uri $guest) - label=$"Shutting down $name: " - echo -n "$label" - retval run_virsh $uri shutdown $guest >/dev/null || return - timeout=$SHUTDOWN_TIMEOUT - while [ $timeout -gt 0 ]; do - sleep 1 - timeout=$[timeout - 1] - guest_is_on $uri $guest || return - $guest_running || break - printf '\r%s%-12d ' "$label" $timeout - done - - if guest_is_on $uri $guest; then - if $guest_running; then - printf '\r%s%-12s\n' "$label" $"failed to shutdown in time" - else - printf '\r%s%-12s\n' "$label" $"done" - fi - fi -} - -stop() { - # last stop was not followed by start - [ -f "$LISTFILE" ] && return 0 - - suspending=true - if [ "x$ON_SHUTDOWN" = xshutdown ]; then - suspending=false - if [ $SHUTDOWN_TIMEOUT -le 0 ]; then - echo $"Shutdown action requested but SHUTDOWN_TIMEOUT was not set" - RETVAL=6 - return - fi - fi - - : >"$LISTFILE" - for uri in $URIS; do - echo -n $"Running guests on $uri URI: " - - if [ "x$uri" = xdefault ] && [ ! -x "$libvirtd" ]; then - echo $"libvirtd not installed; skipping this URI." - continue - fi - - list=$(list_guests $uri) - if [ $? -eq 0 ]; then - empty=true - for uuid in $list; do - $empty || printf ", " - echo -n $(guest_name $uri $uuid) - empty=false - done - if $empty; then - echo $"no running guests." - else - echo - echo $uri $list >>"$LISTFILE" - fi - fi - done - - while read uri list; do - if $suspending; then - echo $"Suspending guests on $uri URI..." - else - echo $"Shutting down guests on $uri URI..." - fi - - for guest in $list; do - if $suspending; then - suspend_guest $uri $guest - else - shutdown_guest $uri $guest - fi - done - done <"$LISTFILE" - - rm -f "$VAR_SUBSYS_LIBVIRT_GUESTS" -} - -gueststatus() { - for uri in $URIS; do - echo "* $uri URI:" - retval run_virsh $uri list || echo - done -} - -# rh_status -# Display current status: whether saved state exists, and whether start -# has been executed. We cannot use status() from the functions library, -# since there is no external daemon process matching this init script. -rh_status() { - if [ -f "$LISTFILE" ]; then - echo $"stopped, with saved guests" - RETVAL=3 - else - if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then - echo $"started" - else - echo $"stopped, with no saved guests" - fi - RETVAL=0 - fi -} - -# usage [val] -# Display usage string, then exit with VAL (defaults to 2). -usage() { - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|gueststatus|shutdown}" - exit ${1-2} -} - -# See how we were called. -if test $# != 1; then - usage -fi -case "$1" in - --help) - usage 0 - ;; - start|stop|gueststatus) - $1 - ;; - restart) - stop && start - ;; - condrestart|try-restart) - [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ] && stop && start - ;; - reload|force-reload) - # Nothing to do; we reread configuration on each invocation - ;; - status) - rh_status - ;; - shutdown) - ON_SHUTDOWN=shutdown - stop - ;; - *) - usage - ;; -esac -exit $RETVAL diff --git a/daemon/libvirt-guests.sysconf b/daemon/libvirt-guests.sysconf deleted file mode 100644 index cd58728..0000000 --- a/daemon/libvirt-guests.sysconf +++ /dev/null @@ -1,24 +0,0 @@ -# URIs to check for running guests -# example: URIS='default xen:/// vbox+tcp://host/system lxc:///' -#URIS=default - -# action taken on host boot -# - start all guests which were running on shutdown are started on boot -# regardless on their autostart settings -# - ignore libvirt-guests init script won't start any guest on boot, however, -# guests marked as autostart will still be automatically started by -# libvirtd -#ON_BOOT=start - -# action taken on host shutdown -# - suspend all running guests are suspended using virsh managedsave -# - shutdown all running guests are asked to shutdown. Please be careful with -# this settings since there is no way to distinguish between a -# guest which is stuck or ignores shutdown requests and a guest -# which just needs a long time to shutdown. When setting -# ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a -# value suitable for your guests. -#ON_SHUTDOWN=suspend - -# number of seconds we're willing to wait for a guest to shut down -#SHUTDOWN_TIMEOUT=0 diff --git a/tools/Makefile.am b/tools/Makefile.am index fd05e8b..ac26cae 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -8,7 +8,13 @@ ICON_FILES = \ libvirt_win_icon_64x64.ico \ virsh_win_icon.rc -EXTRA_DIST = $(ICON_FILES) virt-xml-validate.in virt-pki-validate.in virsh.pod +EXTRA_DIST = \ + $(ICON_FILES) \ + virt-xml-validate.in \ + virt-pki-validate.in \ + virsh.pod \ + libvirt-guests.init.in \ + libvirt-guests.sysconf bin_SCRIPTS = virt-xml-validate virt-pki-validate bin_PROGRAMS = virsh @@ -118,6 +124,39 @@ endif virsh.1: virsh.pod $(AM_V_GEN)$(POD2MAN) $< $@ +install-data-local: install-init + +uninstall-local: uninstall-init + +if LIBVIRT_INIT_SCRIPT_RED_HAT +install-init: libvirt-guests.init + mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d + $(INSTALL_SCRIPT) libvirt-guests.init \ + $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests + mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig + $(INSTALL_SCRIPT) $(srcdir)/libvirt-guests.sysconf \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests + +uninstall-init: + rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests + +BUILT_SOURCES += libvirt-guests.init + +libvirt-guests.init: libvirt-guests.init.in $(top_builddir)/config.status + $(AM_V_GEN)sed \ + -e s!\@localstatedir\@!@localstatedir@!g \ + -e s!\@sbindir\@!@sbindir@!g \ + -e s!\@sysconfdir\@!@sysconfdir@!g \ + < $< > $@-t && \ + chmod a+x $@-t && \ + mv $@-t $@ +else +install-init: +uninstall-init: +libvirt-guests.init: +endif # LIBVIRT_INIT_SCRIPT_RED_HAT + CLEANFILES = $(bin_SCRIPTS) $(man1_MANS) diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in new file mode 100644 index 0000000..993c12d --- /dev/null +++ b/tools/libvirt-guests.init.in @@ -0,0 +1,341 @@ +#!/bin/sh + +# the following is the LSB init header +# +### BEGIN INIT INFO +# Provides: libvirt-guests +# Required-Start: libvirtd +# Required-Stop: libvirtd +# Default-Start: 3 4 5 +# Short-Description: suspend/resume libvirt guests on shutdown/boot +# Description: This is a script for suspending active libvirt guests +# on shutdown and resuming them on next boot +# See http://libvirt.org +### END INIT INFO + +# the following is chkconfig init header +# +# libvirt-guests: suspend/resume libvirt guests on shutdown/boot +# +# chkconfig: 345 98 02 +# description: This is a script for suspending active libvirt guests \ +# on shutdown and resuming them on next boot \ +# See http://libvirt.org +# + +sysconfdir=@sysconfdir@ +localstatedir=@localstatedir@ +libvirtd=@sbindir@/libvirtd + +# Source function library. +. "$sysconfdir"/rc.d/init.d/functions + +URIS=default +ON_BOOT=start +ON_SHUTDOWN=suspend +SHUTDOWN_TIMEOUT=0 + +test -f "$sysconfdir"/sysconfig/libvirt-guests && . "$sysconfdir"/sysconfig/libvirt-guests + +LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests +VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests + +RETVAL=0 + +retval() { + "$@" + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + else + return 0 + fi +} + +run_virsh() { + uri=$1 + shift + + if [ "x$uri" = xdefault ]; then + conn= + else + conn="-c $uri" + fi + + virsh $conn "$@" </dev/null +} + +run_virsh_c() { + ( export LC_ALL=C; run_virsh "$@" ) +} + +list_guests() { + uri=$1 + + list=$(run_virsh_c $uri list) + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + uuids= + for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do + uuid=$(run_virsh_c $uri dominfo $id | awk '/^UUID:/{print $2}') + if [ -z "$uuid" ]; then + RETVAL=1 + return 1 + fi + uuids="$uuids $uuid" + done + + echo $uuids +} + +guest_name() { + uri=$1 + uuid=$2 + + name=$(run_virsh_c $uri dominfo $uuid 2>/dev/null | \ + awk '/^Name:/{print $2}') + [ -n "$name" ] || name=$uuid + + echo "$name" +} + +guest_is_on() { + uri=$1 + uuid=$2 + + guest_running=false + info=$(run_virsh_c $uri dominfo $uuid) + if [ $? -ne 0 ]; then + RETVAL=1 + return 1 + fi + + id=$(echo "$info" | awk '/^Id:/{print $2}') + + [ -n "$id" ] && [ "x$id" != x- ] && guest_running=true + return 0 +} + +started() { + touch "$VAR_SUBSYS_LIBVIRT_GUESTS" +} + +start() { + [ -f "$LISTFILE" ] || { started; return 0; } + + if [ "x$ON_BOOT" != xstart ]; then + echo $"libvirt-guests is configured not to start any guests on boot" + rm -f "$LISTFILE" + started + return 0 + fi + + while read uri list; do + configured=false + for confuri in $URIS; do + if [ $confuri = $uri ]; then + configured=true + break + fi + done + if ! $configured; then + echo $"Ignoring guests on $uri URI" + continue + fi + + echo $"Resuming guests on $uri URI..." + for guest in $list; do + name=$(guest_name $uri $guest) + echo -n $"Resuming guest $name: " + if guest_is_on $uri $guest; then + if $guest_running; then + echo $"already active" + else + retval run_virsh $uri start "$name" >/dev/null && \ + echo $"done" + fi + fi + done + done <"$LISTFILE" + + rm -f "$LISTFILE" + started +} + +suspend_guest() +{ + uri=$1 + guest=$2 + + name=$(guest_name $uri $guest) + label=$"Suspending $name: " + echo -n "$label" + run_virsh $uri managedsave $guest >/dev/null & + virsh_pid=$! + while true; do + sleep 1 + kill -0 $virsh_pid >&/dev/null || break + progress=$(run_virsh_c $uri domjobinfo $guest 2>/dev/null | \ + awk '/^Data processed:/{print $3, $4}') + if [ -n "$progress" ]; then + printf '\r%s%12s ' "$label" "$progress" + else + printf '\r%s%-12s ' "$label" "..." + fi + done + retval wait $virsh_pid && printf '\r%s%-12s\n' "$label" $"done" +} + +shutdown_guest() +{ + uri=$1 + guest=$2 + + name=$(guest_name $uri $guest) + label=$"Shutting down $name: " + echo -n "$label" + retval run_virsh $uri shutdown $guest >/dev/null || return + timeout=$SHUTDOWN_TIMEOUT + while [ $timeout -gt 0 ]; do + sleep 1 + timeout=$[timeout - 1] + guest_is_on $uri $guest || return + $guest_running || break + printf '\r%s%-12d ' "$label" $timeout + done + + if guest_is_on $uri $guest; then + if $guest_running; then + printf '\r%s%-12s\n' "$label" $"failed to shutdown in time" + else + printf '\r%s%-12s\n' "$label" $"done" + fi + fi +} + +stop() { + # last stop was not followed by start + [ -f "$LISTFILE" ] && return 0 + + suspending=true + if [ "x$ON_SHUTDOWN" = xshutdown ]; then + suspending=false + if [ $SHUTDOWN_TIMEOUT -le 0 ]; then + echo $"Shutdown action requested but SHUTDOWN_TIMEOUT was not set" + RETVAL=6 + return + fi + fi + + : >"$LISTFILE" + for uri in $URIS; do + echo -n $"Running guests on $uri URI: " + + if [ "x$uri" = xdefault ] && [ ! -x "$libvirtd" ]; then + echo $"libvirtd not installed; skipping this URI." + continue + fi + + list=$(list_guests $uri) + if [ $? -eq 0 ]; then + empty=true + for uuid in $list; do + $empty || printf ", " + echo -n $(guest_name $uri $uuid) + empty=false + done + if $empty; then + echo $"no running guests." + else + echo + echo $uri $list >>"$LISTFILE" + fi + fi + done + + while read uri list; do + if $suspending; then + echo $"Suspending guests on $uri URI..." + else + echo $"Shutting down guests on $uri URI..." + fi + + for guest in $list; do + if $suspending; then + suspend_guest $uri $guest + else + shutdown_guest $uri $guest + fi + done + done <"$LISTFILE" + + rm -f "$VAR_SUBSYS_LIBVIRT_GUESTS" +} + +gueststatus() { + for uri in $URIS; do + echo "* $uri URI:" + retval run_virsh $uri list || echo + done +} + +# rh_status +# Display current status: whether saved state exists, and whether start +# has been executed. We cannot use status() from the functions library, +# since there is no external daemon process matching this init script. +rh_status() { + if [ -f "$LISTFILE" ]; then + echo $"stopped, with saved guests" + RETVAL=3 + else + if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then + echo $"started" + else + echo $"stopped, with no saved guests" + fi + RETVAL=0 + fi +} + +# usage [val] +# Display usage string, then exit with VAL (defaults to 2). +usage() { + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload|gueststatus|shutdown}" + exit ${1-2} +} + +# See how we were called. +if test $# != 1; then + usage +fi +case "$1" in + --help) + usage 0 + ;; + start|stop|gueststatus) + $1 + ;; + restart) + stop && start + ;; + condrestart|try-restart) + [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ] && stop && start + ;; + reload|force-reload) + # Nothing to do; we reread configuration on each invocation + ;; + status) + rh_status + ;; + shutdown) + ON_SHUTDOWN=shutdown + stop + ;; + *) + usage + ;; +esac +exit $RETVAL diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf new file mode 100644 index 0000000..cd58728 --- /dev/null +++ b/tools/libvirt-guests.sysconf @@ -0,0 +1,24 @@ +# URIs to check for running guests +# example: URIS='default xen:/// vbox+tcp://host/system lxc:///' +#URIS=default + +# action taken on host boot +# - start all guests which were running on shutdown are started on boot +# regardless on their autostart settings +# - ignore libvirt-guests init script won't start any guest on boot, however, +# guests marked as autostart will still be automatically started by +# libvirtd +#ON_BOOT=start + +# action taken on host shutdown +# - suspend all running guests are suspended using virsh managedsave +# - shutdown all running guests are asked to shutdown. Please be careful with +# this settings since there is no way to distinguish between a +# guest which is stuck or ignores shutdown requests and a guest +# which just needs a long time to shutdown. When setting +# ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a +# value suitable for your guests. +#ON_SHUTDOWN=suspend + +# number of seconds we're willing to wait for a guest to shut down +#SHUTDOWN_TIMEOUT=0 -- 1.7.2.2

2 2

[libvirt] [PATCH] spec: Fix undefined with_libnl
by Jiri Denemark 25 Aug '10

25 Aug '10

When building libvirt RPM without macvtap, with_libnl would be undefined. --- libvirt.spec.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index cc3e8e2..e530b1a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -64,6 +64,7 @@ %define with_nwfilter 0%{!?_without_nwfilter:0} %define with_libpcap 0%{!?_without_libpcap:0} %define with_macvtap 0%{!?_without_macvtap:0} +%define with_libnl 0%{!?_without_libnl:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} -- 1.7.2.2

2 2

Re: [libvirt] KVM doesn't send an arp announce after live migrating a domain
by Avi Kivity 25 Aug '10

25 Aug '10

On 08/25/2010 12:21 PM, Nils Cant wrote: > On 08/25/2010 10:38 AM, Gleb Natapov wrote: >> qemu sends gratuitous ARP after migration. Check forward delay >> setting on your >> bridge interface. It should be set to zero. >> > > Aha! That fixed it. Turns out that debian bridge-utils sets the > default to 15 for bridges. > Manually setting it to 0 with 'brctl setfd br0 0' or setting the > 'bridge_fd' parameter to 0 in /etc/network/interfaces solves the issue. > I think libvirt is doing something about this, copying list for further info. -- I have a truly marvellous patch that fixes the bug which this signature is too narrow to contain.

3 10

[libvirt] Add new API for accessing remote guest text console
by Daniel P. Berrange 25 Aug '10

25 Aug '10

The 'virsh console' command has been an oddity that only works when run locally, as the same UID as the QEMU instance. This is because it directly opens /dev/pty/XXX. This introduces a formal API for accessing consoles that uses the virStreamPtr APIs. Now any app can open consoles anywhere it can connect to libvirt

5 27

[libvirt] [PATCH 1/2] Rename qemudShrinkDisks to virDomainDiskRemove and move to domain_conf.c
by soren＠linux2go.dk 24 Aug '10

24 Aug '10

From: Soren Hansen <soren(a)linux2go.dk> Other drivers will need this same functionality, so move it to up to conf/domain_conf.c and give it a more general name. Signed-off-by: Soren Hansen <soren(a)linux2go.dk> --- src/conf/domain_conf.c | 18 ++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 20 ++------------------ 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ee99cd1..e05d5d7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4064,6 +4064,24 @@ void virDomainDiskInsertPreAlloced(virDomainDefPtr def, } +void virDomainDiskRemove(virDomainDefPtr def, size_t i) +{ + if (def->ndisks > 1) { + memmove(def->disks + i, + def->disks + i + 1, + sizeof(*def->disks) * + (def->ndisks - (i + 1))); + def->ndisks--; + if (VIR_REALLOC_N(def->disks, def->ndisks) < 0) { + /* ignore, harmless */ + } + } else { + VIR_FREE(def->disks); + def->ndisks = 0; + } +} + + int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 92f98bc..7195c04 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1067,6 +1067,8 @@ void virDomainDiskInsertPreAlloced(virDomainDefPtr def, virDomainDiskDefPtr disk); int virDomainDiskDefAssignAddress(virCapsPtr caps, virDomainDiskDefPtr def); +void virDomainDiskRemove(virDomainDefPtr def, size_t i); + int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller); void virDomainControllerInsertPreAlloced(virDomainDefPtr def, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d5a7a73..c2905ba 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -144,6 +144,7 @@ virDomainDiskDefFree; virDomainDiskDeviceTypeToString; virDomainDiskInsert; virDomainDiskInsertPreAlloced; +virDomainDiskRemove; virDomainDiskDefAssignAddress; virDomainControllerInsert; virDomainControllerInsertPreAlloced; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 656a1e4..25695df 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8583,22 +8583,6 @@ static inline int qemudFindDisk(virDomainDefPtr def, const char *dst) return -1; } -static inline void qemudShrinkDisks(virDomainDefPtr def, size_t i) -{ - if (def->ndisks > 1) { - memmove(def->disks + i, - def->disks + i + 1, - sizeof(*def->disks) * - (def->ndisks - (i + 1))); - def->ndisks--; - if (VIR_REALLOC_N(def->disks, def->ndisks) < 0) { - /* ignore, harmless */ - } - } else { - VIR_FREE(def->disks); - def->ndisks = 0; - } -} static int qemudDomainDetachPciDiskDevice(struct qemud_driver *driver, virDomainObjPtr vm, @@ -8655,7 +8639,7 @@ static int qemudDomainDetachPciDiskDevice(struct qemud_driver *driver, qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &detach->info) < 0) VIR_WARN("Unable to release PCI address on %s", dev->data.disk->src); - qemudShrinkDisks(vm->def, i); + virDomainDiskRemove(vm->def, i); virDomainDiskDefFree(detach); @@ -8719,7 +8703,7 @@ static int qemudDomainDetachSCSIDiskDevice(struct qemud_driver *driver, } qemuDomainObjExitMonitorWithDriver(driver, vm); - qemudShrinkDisks(vm->def, i); + virDomainDiskRemove(vm->def, i); virDomainDiskDefFree(detach); -- 1.7.0.4

5 8

[libvirt] Update to libvirt-lxc driver doc page
by Serge Hallyn 24 Aug '10

24 Aug '10

Here is a new drvlxc.html.in file to make the first example work. I'll play with the second example next. thanks, -serge

3 7

[libvirt] [PATCH] Fix dependancies for remote generated files
by Daniel P. Berrange 24 Aug '10

24 Aug '10

Very occasionally during a parallel make, dispatch.c would be compiled before the generated remote headers had been fully written. This would cause it to compile an empty union, and result in really wierd runtime bugs that are near impossible to diagnose. * daemon/Makefile.am: Fix remote build deps --- daemon/Makefile.am | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index dbf0ac3..035c149 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -189,14 +189,17 @@ uninstall-data-polkit:: endif -remote.c: remote_dispatch_prototypes.h \ - remote_dispatch_table.h \ - remote_dispatch_args.h \ - remote_dispatch_ret.h \ - qemu_dispatch_prototypes.h \ - qemu_dispatch_table.h \ - qemu_dispatch_args.h \ - qemu_dispatch_ret.h +remote.c: \ + remote_dispatch_prototypes.h \ + remote_dispatch_table.h \ + qemu_dispatch_prototypes.h \ + qemu_dispatch_table.h + +remote.h: \ + remote_dispatch_args.h \ + remote_dispatch_ret.h \ + qemu_dispatch_args.h \ + qemu_dispatch_ret.h REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x -- 1.7.2.1

2 1

[libvirt] [BUG] Xen x86_64 needs PAE?
by Philipp Hahn 24 Aug '10

24 Aug '10

Hello, I tried to install "Microsoft Windows 2008 Server R2" on an Amd64 host using Xen-3.4.3. The installation aborted with the following error message: > Windows Boot Mager ... > File: \windows\system32\boot\winload.exe > Status: 0xc000035a > Info: Attempting to load a 64-bit application, however this CPU is not compatible with 64-bit mode. For testing I converted the libvirt-XML file to an Xen-Xm file using "virsh domxml-to-native" and started that file with "xm create", which worked. Comparing the output of "xm list -a" of the broken libvirt- and the working xm-configuration I found several differences, especially with "pae": Using "xm create" pae is set to 1, while with libvirt pae is set to 0. After adding the /domain/featues/pae node to libvirts XML domain file, Windows installed fine. Looking at "virsh capabilities" I get the following (abbreviated) output: > <capabilities> > <guest> > <os_type>hvm</os_type> > <arch name='i686'> > <wordsize>32</wordsize> ... > </arch> > <features> > <pae/> > <nonpae/> > <acpi default='on' toggle='yes'/> > <apic default='on' toggle='yes'/> > </features> > </guest> > <guest> > <os_type>hvm</os_type> > <arch name='x86_64'> > <wordsize>64</wordsize> ... > </arch> > <features> > <acpi default='on' toggle='yes'/> > <apic default='on' toggle='yes'/> > </features> > </guest> > </capabilities> As you can see, neither "<pae/>" nor "<nopae/>" is listed for for the 64 bit Xen-Fv domain type, which makes it hard to automatically create a correct _and_ _working_ XML file for Xen-Fv-64 bit domains Looking at "/sys/hypervisor/properties/capabilities" I find the following capabilities reported by Xen > xen-3.0-x86_64 > xen-3.0-x86_32p > hvm-3.0-x86_32 > hvm-3.0-x86_32p > hvm-3.0-x86_64 There's also no "hvm-3.0-x86_64p" which makes me wonder, if "<pae/>" is the default for Xen-64 bit domains. If that is true, should libvirt add "<pae/"> by default to the capabilities report, or should libvirt silently pass "(pae 1)" when pushing the XML domain description to Xend? Lookign at <file:xen-3.4.3/tools/python/xen/xm/create.py>:210 I see that "pae" is enabled by default there, and thus gets enabled for each domain using "xm create": > gopts.var('pae', val='PAE', > fn=set_int, default=1, > use="Disable or enable PAE of HVM domain.") Any feedback is appreciated. BYtE Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 28359 Bremen fax: +49 421 22 232-99 http://www.univention.de

2 2

[libvirt] [PATCH] Ensure remote daemon unions are always non-zero length
by Daniel P. Berrange 24 Aug '10

24 Aug '10

If the remote daemon args/ret unions ever become zero length (due to a build / Makefile bug) then bad stuff happens at runtime. Add a compile time assertion to check for this kind of problem * daemon/remote.h: Ensure non-zero length unions --- daemon/remote.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/daemon/remote.h b/daemon/remote.h index fd8d381..1eb8386 100644 --- a/daemon/remote.h +++ b/daemon/remote.h @@ -30,18 +30,22 @@ typedef union { # include "remote_dispatch_args.h" } dispatch_args; +verify(sizeof(dispatch_args) > 0); typedef union { # include "remote_dispatch_ret.h" } dispatch_ret; +verify(sizeof(dispatch_ret) > 0); typedef union { # include "qemu_dispatch_args.h" } qemu_dispatch_args; +verify(sizeof(qemu_dispatch_args) > 0); typedef union { # include "qemu_dispatch_ret.h" } qemu_dispatch_ret; +verify(sizeof(qemu_dispatch_ret) > 0); -- 1.7.2.1

2 1

[libvirt] [PATCH] Fix off-by-1 in QEMU boot arg array handling
by Daniel P. Berrange 24 Aug '10

24 Aug '10

A QEMU guest can have upto VIR_DOMAIN_BOOT_LAST boot entries defined. When building the QEMU arg, each entry takes a single byte. This means the array must be declared to be VIR_DOMAIN_BOOT_LAST+1 bytes in length to allow for the trailing null * src/qemu/qemu_conf.c: Fix off-by-1 boot arg array size --- src/qemu/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index aa34d63..7a37c70 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3662,7 +3662,7 @@ int qemudBuildCommandLine(virConnectPtr conn, { int i; char memory[50]; - char boot[VIR_DOMAIN_BOOT_LAST]; + char boot[VIR_DOMAIN_BOOT_LAST+1]; struct utsname ut; int disableKQEMU = 0; int enableKQEMU = 0; -- 1.7.2.1

3 3

[libvirt] [PATCH] Allow chardev of type 'file' for UML domains.
by soren＠linux2go.dk 24 Aug '10

24 Aug '10

From: Soren Hansen <soren(a)linux2go.dk> Like that comment suggested, we just open the file and pass the file descriptor to uml. The input "stream" is set to "null", since I couldn't find any useful way to actually use a file for input for a chardev and this also mimics what e.g. QEmu does internally. Signed-off-by: Soren Hansen <soren(a)linux2go.dk> --- src/uml/uml_conf.c | 30 +++++++++++++++++++++++++----- src/uml/uml_conf.h | 1 + src/uml/uml_driver.c | 6 +----- 3 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index bc8cbce..659f881 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -297,7 +297,8 @@ error: static char * umlBuildCommandLineChr(virDomainChrDefPtr def, - const char *dev) + const char *dev, + fd_set *keepfd) { char *ret = NULL; @@ -346,8 +347,26 @@ umlBuildCommandLineChr(virDomainChrDefPtr def, break; case VIR_DOMAIN_CHR_TYPE_FILE: - case VIR_DOMAIN_CHR_TYPE_PIPE: - /* XXX could open the file/pipe & just pass the FDs */ + { + int fd_out; + + if ((fd_out = open(def->data.file.path, + O_WRONLY | O_APPEND | O_CREAT, 0660)) < 0) { + virReportSystemError(errno, + _("failed to open chardev file: %s"), + def->data.file.path); + return NULL; + } + if (virAsprintf(&ret, "%s%d=null,fd:%d", dev, def->target.port, fd_out) < 0) { + virReportOOMError(); + close(fd_out); + return NULL; + } + FD_SET(fd_out, keepfd); + } + break; + case VIR_DOMAIN_CHR_TYPE_PIPE: + /* XXX could open the pipe & just pass the FDs */ case VIR_DOMAIN_CHR_TYPE_VC: case VIR_DOMAIN_CHR_TYPE_UDP: @@ -393,6 +412,7 @@ static char *umlNextArg(char *args) int umlBuildCommandLine(virConnectPtr conn, struct uml_driver *driver ATTRIBUTE_UNUSED, virDomainObjPtr vm, + fd_set *keepfd, const char ***retargv, const char ***retenv) { @@ -515,7 +535,7 @@ int umlBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < UML_MAX_CHAR_DEVICE ; i++) { char *ret; if (i == 0 && vm->def->console) - ret = umlBuildCommandLineChr(vm->def->console, "con"); + ret = umlBuildCommandLineChr(vm->def->console, "con", keepfd); else if (virAsprintf(&ret, "con%d=none", i) < 0) goto no_memory; @@ -529,7 +549,7 @@ int umlBuildCommandLine(virConnectPtr conn, if (vm->def->serials[j]->target.port == i) chr = vm->def->serials[j]; if (chr) - ret = umlBuildCommandLineChr(chr, "ssl"); + ret = umlBuildCommandLineChr(chr, "ssl", keepfd); else if (virAsprintf(&ret, "ssl%d=none", i) < 0) goto no_memory; diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index b33acc8..d8b2349 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -71,6 +71,7 @@ virCapsPtr umlCapsInit (void); int umlBuildCommandLine (virConnectPtr conn, struct uml_driver *driver, virDomainObjPtr dom, + fd_set *keepfd, const char ***retargv, const char ***retenv); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 04493ba..5f73ce2 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -737,10 +737,6 @@ static int umlMonitorCommand(const struct uml_driver *driver, virReportSystemError(errno, _("cannot read reply %s"), cmd); goto error; } - if (nbytes < sizeof res) { - virReportSystemError(0, _("incomplete reply %s"), cmd); - goto error; - } if (sizeof res.data < res.length) { virReportSystemError(0, _("invalid length in reply %s"), cmd); goto error; @@ -871,7 +867,7 @@ static int umlStartVMDaemon(virConnectPtr conn, return -1; } - if (umlBuildCommandLine(conn, driver, vm, + if (umlBuildCommandLine(conn, driver, vm, &keepfd, &argv, &progenv) < 0) { close(logfd); umlCleanupTapDevices(conn, vm); -- 1.7.0.4

5 12

[libvirt] [PATCH] esx: Improve object-by-type lookup performance
by Matthias Bolte 24 Aug '10

24 Aug '10

Instead of using one big traversal spec for lookup use a set of more fine grained traversal specs that are selected based on the actual needs of the lookup. This gives up to 20% speedup for certain operations like domain listing due to less HTTP(S) traffic. --- src/esx/esx_driver.c | 1 - src/esx/esx_vi.c | 223 +++++++++++++++++++++++++------------------------- src/esx/esx_vi.h | 16 ++-- 3 files changed, 121 insertions(+), 119 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c6bd3b8..9fef1df 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3734,7 +3734,6 @@ esxNodeGetFreeMemory(virConnectPtr conn) esxVI_LookupObjectContentByType(priv->primary, priv->primary->computeResource->resourcePool, "ResourcePool", propertyNameList, - esxVI_Boolean_False, &resourcePool) < 0) { goto cleanup; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 3773a5f..b531798 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -104,8 +104,12 @@ ESX_VI__TEMPLATE__FREE(Context, esxVI_Datacenter_Free(&item->datacenter); esxVI_ComputeResource_Free(&item->computeResource); esxVI_HostSystem_Free(&item->hostSystem); - esxVI_SelectionSpec_Free(&item->fullTraversalSpecList); - esxVI_SelectionSpec_Free(&item->fullTraversalSpecList2); + esxVI_SelectionSpec_Free(&item->selectSet_folderToChildEntity); + esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToParent); + esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToVm); + esxVI_SelectionSpec_Free(&item->selectSet_hostSystemToDatastore); + esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToHost); + esxVI_SelectionSpec_Free(&item->selectSet_computeResourceToParentToParent); }); static size_t @@ -450,23 +454,7 @@ esxVI_Context_Connect(esxVI_Context *ctx, const char *url, } if (esxVI_Login(ctx, username, password, NULL, &ctx->session) < 0 || - esxVI_BuildFullTraversalSpecList(&ctx->fullTraversalSpecList) < 0) { - return -1; - } - - /* Folder -> parent (Folder, Datacenter) */ - if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2, - "managedEntityToParent", - "ManagedEntity", "parent", - NULL) < 0) { - return -1; - } - - /* ComputeResource -> parent (Folder) */ - if (esxVI_BuildFullTraversalSpecItem(&ctx->fullTraversalSpecList2, - "computeResourceToParent", - "ComputeResource", "parent", - "managedEntityToParent\0") < 0) { + esxVI_BuildSelectSetCollection(ctx) < 0) { return -1; } @@ -495,7 +483,6 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, "hostFolder\0") < 0 || esxVI_LookupObjectContentByType(ctx, ctx->service->rootFolder, "Datacenter", propertyNameList, - esxVI_Boolean_True, &datacenterList) < 0) { goto cleanup; } @@ -545,7 +532,6 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, "resourcePool\0") < 0 || esxVI_LookupObjectContentByType(ctx, ctx->datacenter->hostFolder, "ComputeResource", propertyNameList, - esxVI_Boolean_True, &computeResourceList) < 0) { goto cleanup; } @@ -607,7 +593,6 @@ esxVI_Context_LookupObjectsByPath(esxVI_Context *ctx, "name\0") < 0 || esxVI_LookupObjectContentByType(ctx, ctx->computeResource->_reference, "HostSystem", propertyNameList, - esxVI_Boolean_True, &hostSystemList) < 0) { goto cleanup; } @@ -684,7 +669,7 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, &managedObjectReference) < 0 || esxVI_LookupObjectContentByType(ctx, managedObjectReference, "HostSystem", propertyNameList, - esxVI_Boolean_False, &hostSystem) < 0) { + &hostSystem) < 0) { goto cleanup; } @@ -708,7 +693,6 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, "resourcePool\0") < 0 || esxVI_LookupObjectContentByType(ctx, hostSystem->obj, "ComputeResource", propertyNameList, - esxVI_Boolean_True, &computeResource) < 0) { goto cleanup; } @@ -733,14 +717,6 @@ esxVI_Context_LookupObjectsByHostSystemIp(esxVI_Context *ctx, "hostFolder\0") < 0 || esxVI_LookupObjectContentByType(ctx, computeResource->obj, "Datacenter", propertyNameList, - /* FIXME: Passing Undefined here is a hack until - * esxVI_LookupObjectContentByType supports more - * fine grained traversal configuration. Looking - * up the Datacenter from the ComputeResource - * requiers an upward search. Putting this in the - * list with the other downward traversal rules - * would result in cyclic searching */ - esxVI_Boolean_Undefined, &datacenter) < 0) { goto cleanup; } @@ -1406,15 +1382,15 @@ esxVI_Alloc(void **ptrptr, size_t size) int -esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, - const char *name, const char *type, - const char *path, const char *selectSetNames) +esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet, + const char *name, const char *type, + const char *path, const char *selectSetNames) { esxVI_TraversalSpec *traversalSpec = NULL; esxVI_SelectionSpec *selectionSpec = NULL; const char *currentSelectSetName = NULL; - if (fullTraversalSpecList == NULL) { + if (selectSet == NULL || *selectSet != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; } @@ -1445,7 +1421,7 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, } } - if (esxVI_SelectionSpec_AppendToList(fullTraversalSpecList, + if (esxVI_SelectionSpec_AppendToList(selectSet, esxVI_SelectionSpec_DynamicCast (traversalSpec)) < 0) { goto failure; @@ -1461,86 +1437,87 @@ esxVI_BuildFullTraversalSpecItem(esxVI_SelectionSpec **fullTraversalSpecList, } - int -esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList) +esxVI_BuildSelectSetCollection(esxVI_Context *ctx) { - if (fullTraversalSpecList == NULL || *fullTraversalSpecList != NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; - } - /* Folder -> childEntity (ManagedEntity) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "folderToChildEntity", - "Folder", "childEntity", - "folderToChildEntity\0") < 0) { - goto failure; + if (esxVI_BuildSelectSet(&ctx->selectSet_folderToChildEntity, + "folderToChildEntity", + "Folder", "childEntity", + "folderToChildEntity\0") < 0) { + return -1; } /* ComputeResource -> host (HostSystem) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "computeResourceToHost", - "ComputeResource", "host", - NULL) < 0) { - goto failure; + if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToHost, + "computeResourceToHost", + "ComputeResource", "host", NULL) < 0) { + return -1; } - /* ComputeResource -> datastore (Datastore) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "computeResourceToDatastore", - "ComputeResource", "datastore", - NULL) < 0) { - goto failure; - } + /* ComputeResource -> datastore (Datastore) *//* + if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToDatastore, + "computeResourceToDatastore", + "ComputeResource", "datastore", NULL) < 0) { + return -1; + }*/ - /* ResourcePool -> resourcePool (ResourcePool) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "resourcePoolToResourcePool", - "ResourcePool", "resourcePool", - "resourcePoolToResourcePool\0" - "resourcePoolToVm\0") < 0) { - goto failure; - } + /* ResourcePool -> resourcePool (ResourcePool) *//* + if (esxVI_BuildSelectSet(&ctx->selectSet_resourcePoolToVm, + "resourcePoolToResourcePool", + "ResourcePool", "resourcePool", + "resourcePoolToResourcePool\0" + "resourcePoolToVm\0") < 0) { + return -1; + }*/ - /* ResourcePool -> vm (VirtualMachine) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "resourcePoolToVm", - "ResourcePool", "vm", NULL) < 0) { - goto failure; - } + /* ResourcePool -> vm (VirtualMachine) *//* + if (esxVI_BuildSelectSet(&ctx->selectSet_resourcePoolToVm, + "resourcePoolToVm", + "ResourcePool", "vm", NULL) < 0) { + return -1; + }*/ /* HostSystem -> parent (ComputeResource) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "hostSystemToParent", - "HostSystem", "parent", NULL) < 0) { - goto failure; + if (esxVI_BuildSelectSet(&ctx->selectSet_hostSystemToParent, + "hostSystemToParent", + "HostSystem", "parent", NULL) < 0) { + return -1; } /* HostSystem -> vm (VirtualMachine) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "hostSystemToVm", - "HostSystem", "vm", NULL) < 0) { - goto failure; + if (esxVI_BuildSelectSet(&ctx->selectSet_hostSystemToVm, + "hostSystemToVm", + "HostSystem", "vm", NULL) < 0) { + return -1; } /* HostSystem -> datastore (Datastore) */ - if (esxVI_BuildFullTraversalSpecItem(fullTraversalSpecList, - "hostSystemToDatastore", - "HostSystem", "datastore", NULL) < 0) { - goto failure; + if (esxVI_BuildSelectSet(&ctx->selectSet_hostSystemToDatastore, + "hostSystemToDatastore", + "HostSystem", "datastore", NULL) < 0) { + return -1; } - return 0; + /* Folder -> parent (Folder, Datacenter) */ + if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToParentToParent, + "managedEntityToParent", + "ManagedEntity", "parent", NULL) < 0) { + return -1; + } - failure: - esxVI_SelectionSpec_Free(fullTraversalSpecList); + /* ComputeResource -> parent (Folder) */ + if (esxVI_BuildSelectSet(&ctx->selectSet_computeResourceToParentToParent, + "computeResourceToParent", + "ComputeResource", "parent", + "managedEntityToParent\0") < 0) { + return -1; + } - return -1; + return 0; } - /* * Can't use the SessionIsActive() function here, because at least * 'ESX Server 3.5.0 build-64607' returns an 'method not implemented' fault if @@ -1591,7 +1568,6 @@ esxVI_EnsureSession(esxVI_Context *ctx) "currentSession") < 0 || esxVI_LookupObjectContentByType(ctx, ctx->service->sessionManager, "SessionManager", propertyNameList, - esxVI_Boolean_False, &sessionManager) < 0) { goto cleanup; } @@ -1642,7 +1618,6 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, esxVI_ManagedObjectReference *root, const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, esxVI_ObjectContent **objectContentList) { int result = -1; @@ -1650,11 +1625,6 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, esxVI_PropertySpec *propertySpec = NULL; esxVI_PropertyFilterSpec *propertyFilterSpec = NULL; - if (ctx->fullTraversalSpecList == NULL) { - ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid call")); - return -1; - } - if (objectContentList == NULL || *objectContentList != NULL) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); return -1; @@ -1667,10 +1637,45 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx, objectSpec->obj = root; objectSpec->skip = esxVI_Boolean_False; - if (recurse == esxVI_Boolean_True) { - objectSpec->selectSet = ctx->fullTraversalSpecList; - } else if (recurse == esxVI_Boolean_Undefined) { - objectSpec->selectSet = ctx->fullTraversalSpecList2; + if (STRNEQ(root->type, type)) { + if (STREQ(root->type, "Folder")) { + if (STREQ(type, "Datacenter") || STREQ(type, "ComputeResource")) { + objectSpec->selectSet = ctx->selectSet_folderToChildEntity; + } else { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Invalid lookup of '%s' from '%s'"), + type, root->type); + goto cleanup; + } + } else if (STREQ(root->type, "ComputeResource")) { + if (STREQ(type, "HostSystem")) { + objectSpec->selectSet = ctx->selectSet_computeResourceToHost; + } else if (STREQ(type, "Datacenter")) { + objectSpec->selectSet = ctx->selectSet_computeResourceToParentToParent; + } else { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Invalid lookup of '%s' from '%s'"), + type, root->type); + goto cleanup; + } + } else if (STREQ(root->type, "HostSystem")) { + if (STREQ(type, "ComputeResource")) { + objectSpec->selectSet = ctx->selectSet_hostSystemToParent; + } else if (STREQ(type, "VirtualMachine")) { + objectSpec->selectSet = ctx->selectSet_hostSystemToVm; + } else if (STREQ(type, "Datastore")) { + objectSpec->selectSet = ctx->selectSet_hostSystemToDatastore; + } else { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Invalid lookup of '%s' from '%s'"), + type, root->type); + goto cleanup; + } + } else { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Invalid lookup from '%s'"), root->type); + goto cleanup; + } } if (esxVI_PropertySpec_Alloc(&propertySpec) < 0) { @@ -2210,7 +2215,7 @@ int esxVI_LookupHostSystemProperties(esxVI_Context *ctx, { return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, "HostSystem", propertyNameList, - esxVI_Boolean_False, hostSystem); + hostSystem); } @@ -2224,7 +2229,6 @@ esxVI_LookupVirtualMachineList(esxVI_Context *ctx, * for cluster support */ return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, "VirtualMachine", propertyNameList, - esxVI_Boolean_True, virtualMachineList); } @@ -2267,7 +2271,6 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid, if (esxVI_LookupObjectContentByType(ctx, managedObjectReference, "VirtualMachine", propertyNameList, - esxVI_Boolean_False, virtualMachine) < 0) { goto cleanup; } @@ -2411,7 +2414,7 @@ esxVI_LookupDatastoreList(esxVI_Context *ctx, esxVI_String *propertyNameList, * support */ return esxVI_LookupObjectContentByType(ctx, ctx->hostSystem->_reference, "Datastore", propertyNameList, - esxVI_Boolean_True, datastoreList); + datastoreList); } @@ -2590,8 +2593,7 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx, if (esxVI_String_AppendValueToList(&propertyNameList, "host") < 0 || esxVI_LookupObjectContentByType(ctx, datastore, "Datastore", - propertyNameList, esxVI_Boolean_False, - &objectContent) < 0) { + propertyNameList, &objectContent) < 0) { goto cleanup; } @@ -2656,7 +2658,6 @@ esxVI_LookupTaskInfoByTask(esxVI_Context *ctx, if (esxVI_String_AppendValueToList(&propertyNameList, "info") < 0 || esxVI_LookupObjectContentByType(ctx, task, "Task", propertyNameList, - esxVI_Boolean_False, &objectContent) < 0) { goto cleanup; } diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index d5dc9d5..1431db2 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -161,8 +161,12 @@ struct _esxVI_Context { esxVI_Datacenter *datacenter; esxVI_ComputeResource *computeResource; esxVI_HostSystem *hostSystem; - esxVI_SelectionSpec *fullTraversalSpecList; - esxVI_SelectionSpec *fullTraversalSpecList2; + esxVI_SelectionSpec *selectSet_folderToChildEntity; + esxVI_SelectionSpec *selectSet_hostSystemToParent; + esxVI_SelectionSpec *selectSet_hostSystemToVm; + esxVI_SelectionSpec *selectSet_hostSystemToDatastore; + esxVI_SelectionSpec *selectSet_computeResourceToHost; + esxVI_SelectionSpec *selectSet_computeResourceToParentToParent; }; int esxVI_Context_Alloc(esxVI_Context **ctx); @@ -266,12 +270,11 @@ int esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list, int esxVI_Alloc(void **ptrptr, size_t size); -int esxVI_BuildFullTraversalSpecItem - (esxVI_SelectionSpec **fullTraversalSpecList, const char *name, +int esxVI_BuildSelectSet + (esxVI_SelectionSpec **selectSet, const char *name, const char *type, const char *path, const char *selectSetNames); -int esxVI_BuildFullTraversalSpecList - (esxVI_SelectionSpec **fullTraversalSpecList); +int esxVI_BuildSelectSetCollection(esxVI_Context *ctx); int esxVI_EnsureSession(esxVI_Context *ctx); @@ -279,7 +282,6 @@ int esxVI_LookupObjectContentByType(esxVI_Context *ctx, esxVI_ManagedObjectReference *root, const char *type, esxVI_String *propertyNameList, - esxVI_Boolean recurse, esxVI_ObjectContent **objectContentList); int esxVI_GetManagedEntityStatus -- 1.7.0.4

2 2

[libvirt] [PATCH] nodeinfotest: Print libvirt error on failure
by Jiri Denemark 24 Aug '10

24 Aug '10

If linuxNodeInfoCPUPopulate() fails, the test would just print "FAILED" which is not very informative. It's better to print the real error. --- tests/nodeinfotest.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index d3c500d..d256c53 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -43,6 +43,12 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile memset(&nodeinfo, 0, sizeof(nodeinfo)); if (linuxNodeInfoCPUPopulate(cpuinfo, &nodeinfo) < 0) { + if (virTestGetDebug()) { + virErrorPtr error = virSaveLastError(); + if (error && error->code != VIR_ERR_OK) + fprintf(stderr, "\n%s\n", error->message); + virFreeError(error); + } fclose(cpuinfo); return -1; } -- 1.7.2

2 2

[libvirt] [PATCH 0/3] Fix make check failures with RHEL-5 xen
by Jiri Denemark 24 Aug '10

24 Aug '10

When libvirt is configured using --with-rhel5-api, make check fails on a bunch of tests for xen driver. All check now pass regardless on rhel5-api. Jiri Denemark (3): xen tests: Fix missing "type ioemu" with rhel5-api xml2sexprtest: Remove graphics from unrelated tests xen tests: Fix PV-VFB tests with RHEL-5 API tests/xmconfigdata/test-escape-paths.cfg | 2 +- tests/xmconfigdata/test-escape-paths.xml | 1 + tests/xmconfigdata/test-fullvirt-localtime.cfg | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 1 + tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 1 + tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 1 + tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-file.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-null.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 1 + .../test-fullvirt-serial-tcp-telnet.cfg | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 1 + tests/xmconfigdata/test-fullvirt-sound.cfg | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 1 + tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 1 + tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 1 + tests/xmconfigdata/test-fullvirt-utc.cfg | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 1 + tests/xmconfigdata/test-no-source-cdrom.cfg | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 1 + tests/xmconfigdata/test-pci-devs.cfg | 2 +- tests/xmconfigdata/test-pci-devs.xml | 1 + tests/xmconfigtest.c | 4 ++-- tests/xml2sexprdata/xml2sexpr-curmem.xml | 1 - .../xml2sexpr-disk-block-shareable.xml | 1 - tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-localtime.xml | 1 + .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml | 1 + .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml | 1 + .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 2 +- .../xml2sexpr-fv-serial-tcp-telnet.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-sound.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-utc.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml | 1 + tests/xml2sexprdata/xml2sexpr-fv.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv.xml | 1 + .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml | 1 + tests/xml2sexprtest.c | 5 +++++ 79 files changed, 82 insertions(+), 42 deletions(-) -- 1.7.2

2 7

[libvirt] XP install: where to ask questions?
by sean darcy 24 Aug '10

24 Aug '10

On Fedora FC14 I'm trying to install XP under KVM/qemu. It works with VBOx. On FC14, kvm/qemu I've used F5 to select i486 C-step, but after the formatting step, I get a message that VNC no longer connects with the hypervisor. Googled, but no help. Is this the list to discuss this sort of issue? If not, where? sean

1 0

[libvirt] [PATCH] xenapi: support xenapi 5.6.0 headers
by Eric Blake 23 Aug '10

23 Aug '10

* src/xenapi/xenapi_driver.c (xenapiDomainGetInfo): Avoid using XEN_VM_POWER_STATE_UNKNOWN, which disappeared in newer xenapi. * src/xenapi/xenapi_utils.c (mapPowerState): Likewise. --- After letting that last build regression slip through, I decided to install libxenserver, at the current 5.6.0-1 release. To my surprise, the compilation still failed; the culprit is that upstream deleted an enum value. I thought about doing a configure check and #defining the old UNKNOWN name to alias the existing UNDEFINED name, but that would only fix one of the two cases; the switch statement would still fail to compile in that case due to a duplicate label. So I think this patch is the right approach. I guess I could fold the default: and UNDEFINED: case labels into one, if that is desirable. src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index fb3c91d..730859b 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -966,7 +966,7 @@ xenapiDomainGetInfo (virDomainPtr dom, virDomainInfoPtr info) vm = vms->contents[0]; xen_vm_get_memory_static_max(session, &maxmem, vm); info->maxMem = (maxmem / 1024); - enum xen_vm_power_state state = XEN_VM_POWER_STATE_UNKNOWN; + enum xen_vm_power_state state = XEN_VM_POWER_STATE_UNDEFINED; xen_vm_get_power_state(session, &state, vm); info->state = mapPowerState(state); xen_vm_get_record(session, &record, vm); diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 23d3fef..e22f6fd 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -336,11 +336,12 @@ mapPowerState(enum xen_vm_power_state state) case XEN_VM_POWER_STATE_RUNNING: virState = VIR_DOMAIN_RUNNING; break; - case XEN_VM_POWER_STATE_UNKNOWN: case XEN_VM_POWER_STATE_UNDEFINED: virState = VIR_DOMAIN_NOSTATE; break; default: + /* Includes XEN_VM_POWER_STATE_UNKNOWN from libxenserver + * 5.5.0, which is gone in 5.6.0. */ virState = VIR_DOMAIN_NOSTATE; break; } -- 1.7.2.1

2 2

[libvirt] using sync_manager with libvirt
by David Teigland 23 Aug '10

23 Aug '10

Hi, We've been working on a program called sync_manager that implements shared-storage-based leases to protect shared resources. One way we'd like to use it is to protect vm images that reside on shared storage, i.e. preventing two vm's on two hosts from using the same image at once. It's functional, and the next big step is using it through libvirt. sync_manager "wraps" a process, i.e. acquires a lease, forks&execs a process, renews the lease wile the process runs, and releases the lease when the process exits. While the process runs, it has exclusive access to whatever resource was named in the lease that was acquired. A command would be something like this: sync_manager daemon -i <host_id> -n <vm_id> -l <lease> -c <command> <args> <host_id> is integer between 1 and 2000 that is statically assigned to each host. <vm_id> is a unique identifer for the process that will be run, e.g. the vm name or uuid. <lease> defines the shared storage area that sync_manager should use for performing the disk-paxos based synchronization. It consists of <resource_name>:<path>:<offset>, where <resource_name> is likely to be the vm name/uuid (or the name of the vm's disk image), and <path>:<offset> is an area of shared storage that has been allocated for sync_manager to use (a separate area for each resource/vm). <command> <args> would be the qemu command line that is currently used. We expect these new config values will need a place to live in the libvirt xml config file, and libvirt will need to fork sync_manager -c qemu rather than qemu directly. At least those are the most obvious things that need doing, there are sure to be other api or functional issues. sync_manager only forks when running the command, and doesn't change any fd's, so any command output should appear unchanged to libvirt. Would there be any problem with sync_manager also printing its own warnings and errors to stderr? While the main point of sync_manager is the disk leases to synchronize access among hosts, it also uses posix locks to synchronize access among local processes. http://git.fedorahosted.org/git/?p=sync_manager.git Thanks, Dave

6 14

Re: [libvirt] virsh question
by Eric Blake 23 Aug '10

23 Aug '10

[again, adding the list] On 08/23/2010 07:35 AM, Matthew Whitehead wrote: > I want to enable gdb debugging for the qemu or qemu-kvm executables. The -s flag tells it to run qemu's gdbserver and -p tells the gdbserver to listen on a non-default (1234) port. Yes, this sounds like a perfect fit for libvirt 0.8.3's qemu monitor support. However, I did not implement that patch, so I'm not the best person to ask on how to modify your XML to inject those options. However, commit a71be01f04e7cac in libvirt.git includes some example XML that uses the new elements, such as: +<domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219200</memory> + <currentMemory>219200</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <qemu:commandline> + <qemu:arg value='-unknown'/> + <qemu:arg value='parameter'/> + </qemu:commandline> +</domain> So, I think it is as simple as passing <qemu:arg value='-p'/> from within your <domain> XML. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

Re: [libvirt] virsh question
by Eric Blake 23 Aug '10

23 Aug '10

[Adding the list] On 08/23/2010 06:26 AM, Matthew Whitehead wrote: > Eric, > I'm trying to get "virsh domxml-from-native " working for the -s and -p flags. Do you know if support for those flags is possible? If not, is there a way I could hand code them into the xml to be passed through to the command line? I'm not sure in which context you are referring to the -s and -p flags. Which command line are you trying to modify so that those flags are added? Also, as of libvirt 0.8.3, you can modify qemu command lines issued by libvirt using appropriate XML, although such modifications go behind libvirt's back and are therefore at your own risk. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] xenapi: Fix compile error in previous commit
by Matthias Bolte 23 Aug '10

23 Aug '10

--- I'm pushing this under the trivial compile error fix rule. src/xenapi/xenapi_utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index c161b22..f61e09d 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -225,7 +225,7 @@ xenapiNormalExitEnum2virDomainLifecycle(enum xen_on_normal_exit action) enum virDomainLifecycleCrashAction xenapiCrashExitEnum2virDomainLifecycle(enum xen_on_crash_behaviour action) { - enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH__RESTART; + enum virDomainLifecycleCrashAction num = VIR_DOMAIN_LIFECYCLE_CRASH_RESTART; if (action == XEN_ON_CRASH_BEHAVIOUR_DESTROY) num = VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY; else if (action == XEN_ON_CRASH_BEHAVIOUR_RESTART) -- 1.7.0.4

4 6

Re: [libvirt] using sync_manager with libvirt
by Andrew Cathrow 22 Aug '10

22 Aug '10

----- "Perry Myers" <pmyers(a)redhat.com> wrote: > From: "Perry Myers" <pmyers(a)redhat.com> > To: "David Teigland" <teigland(a)redhat.com> > Cc: libvir-list(a)redhat.com > Sent: Sunday, August 22, 2010 12:13:16 PM GMT -05:00 US/Canada Eastern > Subject: Re: [libvirt] using sync_manager with libvirt > > On 08/19/2010 01:23 PM, David Teigland wrote: > > On Thu, Aug 19, 2010 at 11:12:25AM -0400, David Teigland wrote: > >> I'm only aware of one goal, and the current plan is to implement it > >> correctly and completely. That goal is to lock vm images so if the vm > >> happens to run on two hosts, only one instance can access the image. > > Ok. So for the first implementation of sync_manager it will still be > possible for someone to corrupt data by configuring two separate vms to > accidentally use the same storage volumes. That's fine for the first > pass, just something to keep in mind for later. Presumably it'll use support the <shareable/> flag for shared disks. > > > (That's slightly misleading; technically, the lock prevents a second qemu > > process from even being started.) > > ack > > Perry > > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list >

1 0

[libvirt] Add spice support
by Songwen Liao 21 Aug '10

21 Aug '10

Hi,everyone, I used the patch file to modify the libvirt,but it seems not to work right. It looks like that libvirt accpet the graphices type of spice,but it's can use "virsh start xp" to start the machine,with the error is: internal error unable to start guest:Supported machines are: pc Standard PC(default) isapc ISA-only PC So,anyone have ideas about that? thanks, PATCH file: This adds an element <graphics type='spice' port='5903' tlsPort='5904' listen='127.0.0.1'/> This is the bare minimum that should be exposed in the guest config for SPICE. Other parameters are better handled as per host level configuration tunables * docs/schemas/domain.rng: Define the SPICE <graphics> schema * src/domain_conf.h, src/domain_conf.c: Add parsing and formatting for SPICE graphics config * src/qemu_conf.c: Complain about unsupported graphics types --- docs/schemas/domain.rng | 30 +++++++++++++++++++++ src/conf/domain_conf.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 8 ++++++ src/qemu/qemu_conf.c | 9 ++++++ 4 files changed, 111 insertions(+), 1 deletions(-) diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index f9d6d7e..8aa2079 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -746,6 +746,36 @@ </group> <group> <attribute name="type"> + <value>spice</value> + </attribute> + <optional> + <attribute name="port"> + <ref name="PortNumber"/> + </attribute> + </optional> + <optional> + <attribute name="tlsPort"> + <ref name="PortNumber"/> + </attribute> + </optional> + <optional> + <attribute name="listen"> + <ref name="addrIP"/> + </attribute> + </optional> + <optional> + <attribute name="passwd"> + <text/> + </attribute> + </optional> + <optional> + <attribute name="keymap"> + <text/> + </attribute> + </optional> + </group> + <group> + <attribute name="type"> <value>rdp</value> </attribute> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4930c38..ca5dfc3 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -165,7 +165,8 @@ VIR_ENUM_IMPL(virDomainGraphics, VIR_DOMAIN_GRAPHICS_TYPE_LAST, "sdl", "vnc", "rdp", - "desktop") + "desktop", + "spice") VIR_ENUM_IMPL(virDomainHostdevMode, VIR_DOMAIN_HOSTDEV_MODE_LAST, "subsystem", @@ -267,6 +268,12 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: VIR_FREE(def->data.desktop.display); break; + + case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + VIR_FREE(def->data.spice.listenAddr); + VIR_FREE(def->data.spice.keymap); + VIR_FREE(def->data.spice.passwd); + break; } VIR_FREE(def); @@ -1692,6 +1699,38 @@ virDomainGraphicsDefParseXML(virConnectPtr conn, def->data.desktop.fullscreen = 0; def->data.desktop.display = virXMLPropString(node, "display"); + } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { + char *port = virXMLPropString(node, "port"); + char *tlsPort; + + if (port) { + if (virStrToLong_i(port, NULL, 10, &def->data.spice.port) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse spice port %s"), port); + VIR_FREE(port); + goto error; + } + VIR_FREE(port); + } else { + def->data.spice.port = 5900; + } + + tlsPort = virXMLPropString(node, "tlsPort"); + if (tlsPort) { + if (virStrToLong_i(tlsPort, NULL, 10, &def->data.spice.tlsPort) < 0) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse spice tlsPort %s"), tlsPort); + VIR_FREE(tlsPort); + goto error; + } + VIR_FREE(tlsPort); + } else { + def->data.spice.tlsPort = 0; + } + + def->data.spice.listenAddr = virXMLPropString(node, "listen"); + def->data.spice.passwd = virXMLPropString(node, "passwd"); + def->data.spice.keymap = virXMLPropString(node, "keymap"); } cleanup: @@ -4100,6 +4139,30 @@ virDomainGraphicsDefFormat(virConnectPtr conn, break; + case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: + if (def->data.spice.port) + virBufferVSprintf(buf, " port='%d'", + def->data.spice.port); + + if (def->data.spice.tlsPort) + virBufferVSprintf(buf, " tlsPort='%d'", + def->data.spice.tlsPort); + + if (def->data.spice.listenAddr) + virBufferVSprintf(buf, " listen='%s'", + def->data.spice.listenAddr); + + if (def->data.spice.keymap) + virBufferEscapeString(buf, " keymap='%s'", + def->data.spice.keymap); + + if (def->data.spice.passwd && + (flags & VIR_DOMAIN_XML_SECURE)) + virBufferEscapeString(buf, " passwd='%s'", + def->data.spice.passwd); + + break; + } virBufferAddLit(buf, "/>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 7ea1152..4cb10d3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -334,6 +334,7 @@ enum virDomainGraphicsType { VIR_DOMAIN_GRAPHICS_TYPE_VNC, VIR_DOMAIN_GRAPHICS_TYPE_RDP, VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP, + VIR_DOMAIN_GRAPHICS_TYPE_SPICE, VIR_DOMAIN_GRAPHICS_TYPE_LAST, }; @@ -366,6 +367,13 @@ struct _virDomainGraphicsDef { char *display; int fullscreen : 1; } desktop; + struct { + int port; + int tlsPort; + char *listenAddr; + char *keymap; + char *passwd; + } spice; } data; }; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 7ba0ac2..ae171bc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2067,6 +2067,12 @@ int qemudBuildCommandLine(virConnectPtr conn, } } + if (def->ngraphics > 1) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("only one graphics output is currently supported")); + goto error; + } + if ((def->ngraphics == 1) && def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { virBuffer opt = VIR_BUFFER_INITIALIZER; @@ -2155,6 +2161,9 @@ int qemudBuildCommandLine(virConnectPtr conn, */ ADD_ENV_COPY("QEMU_AUDIO_DRV"); ADD_ENV_COPY("SDL_AUDIODRIVER"); + } else if (def->ngraphics) { + qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + "%s", _("unsupported graphics output requested")); } if (def->nvideos) { -- -- Name: Ben ------------------------------------------- Msn: liaosongwen(a)live.cn

2 2

[libvirt] [PATCH] esx: Use MD5 sum of mount path as storage pool UUID
by Matthias Bolte 21 Aug '10

21 Aug '10

With the previous storage pool UUID source not all storage pools had a proper UUID, especially GSX storage pools. The mount path is unique per host and cannot change during the lifetime of the datastore. Therefore, its MD5 sum can be used as UUID. Use gnulib's crypto/md5 module to generate the MD5 sum. --- bootstrap.conf | 1 + src/esx/esx_storage_driver.c | 107 +++++++++++------------------------------- 2 files changed, 28 insertions(+), 80 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 5af77a7..ca31a6e 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -26,6 +26,7 @@ canonicalize-lgpl close connect count-one-bits +crypto/md5 dirname-lgpl fcntl-h getaddrinfo diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 644e66c..adbe8c6 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -24,6 +24,7 @@ #include <config.h> +#include "md5.h" #include "internal.h" #include "util.h" #include "memory.h" @@ -197,10 +198,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) esxPrivate *priv = conn->storagePrivateData; esxVI_ObjectContent *datastore = NULL; esxVI_DatastoreHostMount *hostMount = NULL; - char *suffix = NULL; - int suffixLength; - char uuid_string[VIR_UUID_STRING_BUFLEN] = "00000000-00000000-0000-000000000000"; - unsigned char uuid[VIR_UUID_BUFLEN]; + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ virStoragePoolPtr pool = NULL; if (esxVI_EnsureSession(priv->primary) < 0) { @@ -213,53 +211,22 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name) } /* - * Datastores don't have a UUID. We can use the 'host.mountInfo.path' - * property as source for a "UUID" on ESX, because the property value has - * this format: + * Datastores don't have a UUID, but we can use the 'host.mountInfo.path' + * property as source for a UUID. The mount path is unique per host and + * cannot change during the lifetime of the datastore. * - * host.mountInfo.path = /vmfs/volumes/4b0beca7-7fd401f3-1d7f-000ae484a6a3 - * host.mountInfo.path = /vmfs/volumes/b24b7a78-9d82b4f5 (short format) - * - * The 'host.mountInfo.path' property comes in two forms, with a complete - * "UUID" and a short "UUID". - * - * But this trailing "UUID" is not guaranteed to be there. On the other - * hand we already rely on another implementation detail of the ESX server: - * The object name of virtual machine contains an integer, we use that as - * domain ID. + * The MD5 sum of the mount path can be used as UUID, assuming MD5 is + * considered to be collision-free enough for this use case. */ if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, &hostMount) < 0) { goto cleanup; } - if ((suffix = STRSKIP(hostMount->mountInfo->path, "/vmfs/volumes/")) != NULL) { - suffixLength = strlen(suffix); + md5_buffer(hostMount->mountInfo->path, + strlen(hostMount->mountInfo->path), md5); - if ((suffixLength == 35 && /* = strlen("4b0beca7-7fd401f3-1d7f-000ae484a6a3") */ - suffix[8] == '-' && suffix[17] == '-' && suffix[22] == '-') || - (suffixLength == 17 && /* = strlen("b24b7a78-9d82b4f5") */ - suffix[8] == '-')) { - /* - * Intentionally use memcpy here, because we want to be able to - * replace a prefix of the initial Zero-UUID. virStrncpy would - * null-terminate the string in an unwanted place. - */ - memcpy(uuid_string, suffix, suffixLength); - } else { - VIR_WARN("Datastore host mount path suffix '%s' has unexpected " - "format, cannot deduce a UUID from it", suffix); - } - } - - if (virUUIDParse(uuid_string, uuid) < 0) { - ESX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Could not parse UUID from string '%s'"), - uuid_string); - goto cleanup; - } - - pool = virGetStoragePool(conn, name, uuid); + pool = virGetStoragePool(conn, name, md5); cleanup: esxVI_ObjectContent_Free(&datastore); @@ -275,9 +242,11 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) { esxPrivate *priv = conn->storagePrivateData; esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *datastoreList = NULL; esxVI_ObjectContent *datastore = NULL; + esxVI_DatastoreHostMount *hostMount = NULL; + unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */ char uuid_string[VIR_UUID_STRING_BUFLEN] = ""; - char *absolutePath = NULL; char *name = NULL; virStoragePoolPtr pool = NULL; @@ -285,48 +254,26 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) return NULL; } - /* - * Convert UUID to 'host.mountInfo.path' form by stripping the second '-': - * - * <---- 14 ----><-------- 22 --------> <---- 13 ---><-------- 22 --------> - * 4b0beca7-7fd4-01f3-1d7f-000ae484a6a3 -> 4b0beca7-7fd401f3-1d7f-000ae484a6a3 - */ - virUUIDFormat(uuid, uuid_string); - memmove(uuid_string + 13, uuid_string + 14, 22 + 1); - - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s", uuid_string) < 0) { - virReportOOMError(); - goto cleanup; - } - if (esxVI_String_AppendValueToList(&propertyNameList, "summary.name") < 0 || - esxVI_LookupDatastoreByAbsolutePath(priv->primary, absolutePath, - propertyNameList, &datastore, - esxVI_Occurrence_OptionalItem) < 0) { + esxVI_LookupDatastoreList(priv->primary, propertyNameList, + &datastoreList) < 0) { goto cleanup; } - /* - * If the first try didn't succeed and the trailing 16 digits are zero then - * the "UUID" could be a short one. Strip the 16 zeros and try again: - * - * <------ 17 -----> <------ 17 -----> - * b24b7a78-9d82b4f5-0000-000000000000 -> b24b7a78-9d82b4f5 - */ - if (datastore == NULL && STREQ(uuid_string + 17, "-0000-000000000000")) { - uuid_string[17] = '\0'; + for (datastore = datastoreList; datastore != NULL; + datastore = datastore->_next) { + esxVI_DatastoreHostMount_Free(&hostMount); - VIR_FREE(absolutePath); - - if (virAsprintf(&absolutePath, "/vmfs/volumes/%s", uuid_string) < 0) { - virReportOOMError(); + if (esxVI_LookupDatastoreHostMount(priv->primary, datastore->obj, + &hostMount) < 0) { goto cleanup; } - if (esxVI_LookupDatastoreByAbsolutePath(priv->primary, absolutePath, - propertyNameList, &datastore, - esxVI_Occurrence_RequiredItem) < 0) { - goto cleanup; + md5_buffer(hostMount->mountInfo->path, + strlen(hostMount->mountInfo->path), md5); + + if (memcmp(uuid, md5, VIR_UUID_BUFLEN) == 0) { + break; } } @@ -348,9 +295,9 @@ esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid) pool = virGetStoragePool(conn, name, uuid); cleanup: - VIR_FREE(absolutePath); esxVI_String_Free(&propertyNameList); - esxVI_ObjectContent_Free(&datastore); + esxVI_ObjectContent_Free(&datastoreList); + esxVI_DatastoreHostMount_Free(&hostMount); return pool; } -- 1.7.0.4

5 7

[libvirt] [PATCH] esx: Make sure dumpxml outputs proper ID for active domains
by Matthias Bolte 21 Aug '10

21 Aug '10

--- src/esx/esx_driver.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 4fb357b..c6bd3b8 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2624,6 +2624,8 @@ esxDomainDumpXML(virDomainPtr domain, int flags) esxPrivate *priv = domain->conn->privateData; esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *virtualMachine = NULL; + esxVI_VirtualMachinePowerState powerState; + int id; char *vmPathName = NULL; char *datastoreName = NULL; char *directoryName = NULL; @@ -2640,11 +2642,14 @@ esxDomainDumpXML(virDomainPtr domain, int flags) return NULL; } - if (esxVI_String_AppendValueToList(&propertyNameList, - "config.files.vmPathName") < 0 || + if (esxVI_String_AppendValueListToList(&propertyNameList, + "config.files.vmPathName\0" + "runtime.powerState\0") < 0 || esxVI_LookupVirtualMachineByUuid(priv->primary, domain->uuid, propertyNameList, &virtualMachine, esxVI_Occurrence_RequiredItem) < 0 || + esxVI_GetVirtualMachinePowerState(virtualMachine, &powerState) < 0 || + esxVI_GetVirtualMachineIdentity(virtualMachine, &id, NULL, NULL) < 0 || esxVI_GetStringValue(virtualMachine, "config.files.vmPathName", &vmPathName, esxVI_Occurrence_RequiredItem) < 0) { goto cleanup; @@ -2693,6 +2698,10 @@ esxDomainDumpXML(virDomainPtr domain, int flags) priv->primary->productVersion); if (def != NULL) { + if (powerState != esxVI_VirtualMachinePowerState_PoweredOff) { + def->id = id; + } + xml = virDomainDefFormat(def, flags); } -- 1.7.0.4

2 2

[libvirt] [PATCH] Add actions to virDomainLifecycle enum
by Jim Fehlig 20 Aug '10

20 Aug '10

I'm not too fond of the schema change but thus far haven't found a way to condense it. Suggestions welcomed :-). Regards, Jim

3 7