- Devel - libvirt List Archives

[libvirt] configuring a disconnected <interface>
by Dan Kenigsberg 23 Aug '13

23 Aug '13

Hi List, Like most of us, I've bought my actual computer with an Ethernet interface card, that I can connect to a wall jack at will. It's quite easy to disconnect the Ethernet cable from the wall, as well. I would like to expose this behavior to virtual computers, too. Via libvirt, of course. That's useful, since an admin may need to disconnect a running VM from a network temporarily, without resorting to hot-unplugging its nic. How should the domxml represent this situation? An interface that is connected to a specific LAN1 bridge is <interface type='bridge'> <source bridge='LAN1'> <target dev='vnet1'/> <model type='virtio'/> </interface> Would the following make sense for an interface with no bridge at the source? <interface type='bridge'> <source/> <target dev='vnet1'/> <model type='virtio'/> </interface> And how about the recommended config for <interface>s, which is type='network'? Would it make sense to predefine <network> <name>null-bridge-network</name> <forward mode='bridge'> <bridge/> </network> so that <interface type='network'> <source network='null-bridge-network'/> </interface> means "keep this interface dangling out there"? Regards, Dan.

5 12

[libvirt] memory leak in snapshot and since at least 1.0.2?
by Serge Hallyn 22 Aug '13

22 Aug '13

Hi, https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1201938 documents a memory leak we're seeing in libvirt. I've reproduced it in 1.0.2, 1.0.6, and an hourly snapshot from yesterday morning (which is built at https://launchpad.net/~serge-hallyn/+archive/libvirt-mav) To reproduce it, I define and start one domain and run virt-manager locally (just leaving it running in a vnc server). The RSS as observed by top grows over time, starting at 10M and becoming 87M in about 12 hours. When I stop the running vm, the memleak does seem to stop. Presumably having >1 domain would speed up the memleak (explaining the original bug reporter's woes) thanks, -serge

2 3

[libvirt] [PATCH] qemuagenttest.c: Missing documentation (Timeout)
by nehaljwani 22 Aug '13

22 Aug '13

From: Nehal J Wani <nehaljw.kkd1(a)gmail.com> In tests/qemuagenttest.c, the Timeout test should always be called last. Any additional tests should come before this. --- tests/qemuagenttest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index e338c98..cf32fc4 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -605,7 +605,8 @@ mymain(void) DO_TEST(Shutdown); DO_TEST(CPU); DO_TEST(ArbitraryCommand); - DO_TEST(Timeout); + + DO_TEST(Timeout); /*Timeout should always be called last*/ virObjectUnref(xmlopt); -- 1.7.11.7

2 1

[libvirt] [PATCH V2] Allow a HTTP URL for cdrom ISO image
by Aline Manera 22 Aug '13

22 Aug '13

From: Aline Manera <alinefm(a)br.ibm.com> V1 -> V2: - Use -drive instead of legacy -cdrom option Aline Manera (1): Allow a HTTP URL for cdrom ISO image src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 7 ++++ .../qemuxml2argv-disk-cdrom-network.args | 5 +++ .../qemuxml2argv-disk-cdrom-network.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 6 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.xml -- 1.7.10.4

3 4

[libvirt] [PATCH] HACKING: Introduce basic Signed-off-by politic
by Michal Privoznik 22 Aug '13

22 Aug '13

With the rising number of signed-off patches appearing on the list, we should have policy what signed-off means, and advice (enforce?) contributors to use it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- HACKING | 8 ++++++-- docs/hacking.html.in | 12 ++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/HACKING b/HACKING index f9f8381..e54e584 100644 --- a/HACKING +++ b/HACKING @@ -73,8 +73,12 @@ commit introduced the problem, mentioning that is useful. If the patch resolves a bugzilla report, mentioning the URL of the bug number is useful; but also summarize the issue rather than making all readers follow the link. You can use 'git shortlog -30' to get an idea of typical summary lines. -Libvirt does not currently attach any meaning to Signed-off-by: lines, so it -is up to you if you want to include or omit them in the commit message. +Moreover, you should sign off your patches, meaning you are the original +author(s) of them and you have right to submit them under the open source +license indicated in the file. To add the "Signed-off-by:" line to the commit +message automatically, you can tweak the git configuration: + + git config format.signoff true diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 543c77e..f1a5c59 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -78,10 +78,14 @@ of the bug number is useful; but also summarize the issue rather than making all readers follow the link. You can use 'git shortlog -30' to get an idea of typical summary lines. - Libvirt does not currently attach any meaning to - Signed-off-by: lines, so it is up to you if you want to - include or omit them in the commit message. - + Moreover, you should sign off your patches, meaning you are the + original author(s) of them and you have right to submit them under + the open source license indicated in the file. To add the + <code>Signed-off-by:</code> line to the commit message automatically, + you can tweak the git configuration: +<pre> + git config format.signoff true +</pre> </li> <li>Split large changes into a series of smaller patches, -- 1.8.1.5

3 2

[libvirt] [PATCHv4 0/4]write separate module for hostdev passthrough
by cyliu＠suse.com 22 Aug '13

22 Aug '13

From: Chunyan Liu <cyliu(a)suse.com> These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. Plus, add passthrough to libxl driver, and change qemu driver and lxc driver to use hostdev common library instead of their own hostdev APIs. --- Changes to v3: * fix Jim's comments v3 is here: https://www.redhat.com/archives/libvir-list/2013-August/msg00019.html Changes to v2: * add patches for qemu driver and lxc driver, use common library APIs instead of their own hostdev APIs. * add APIs for nodedev-detach and nodedev-reattach calling. * rename functions to use unified prefix 'virHostdev' * use VIR_ONCE_GLOBAL_INIT() as others instead of previous Init and Cleanup. * use VIR_STRDUP instead of strdup * rebase to latest code v2 is here: https://www.redhat.com/archives/libvir-list/2013-June/msg00263.html root (4): add hostdev passthrough common library add pci passthrough to libxl driver change qemu driver to use hostdev common library change lxc driver to use common library po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/libvirt_private.syms | 22 + src/libxl/libxl_conf.c | 63 ++ src/libxl/libxl_conf.h | 4 + src/libxl/libxl_driver.c | 262 +++++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 45 +- src/lxc/lxc_hostdev.c | 413 ------------ src/lxc/lxc_hostdev.h | 43 -- src/lxc/lxc_process.c | 21 +- src/qemu/qemu_command.c | 1 - src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_driver.c | 72 +-- src/qemu/qemu_hostdev.c | 1289 ----------------------------------- src/qemu/qemu_hostdev.h | 72 -- src/qemu/qemu_hotplug.c | 126 ++-- src/qemu/qemu_process.c | 34 +- src/util/virhostdev.c | 1679 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virhostdev.h | 129 ++++ src/util/virpci.c | 21 +- src/util/virpci.h | 7 +- src/util/virscsi.c | 22 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 23 +- src/util/virusb.h | 8 +- 26 files changed, 2355 insertions(+), 2028 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h

4 10

[libvirt] [PATCH v4 3/3] python: Use RELRO_LDFLAGS and NO_INDIRECT_LDFLAGS
by Guido Günther 22 Aug '13

22 Aug '13

A readonly GOT and detecting indirect linkage is useful here too. --- python/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/python/Makefile.am b/python/Makefile.am index 925e1f4..3f967a9 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -28,6 +28,10 @@ INCLUDES = \ $(GETTEXT_CPPFLAGS) AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = \ + $(RELRO_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ + $(NULL) CLASSES_EXTRA = \ libvirt-override-virConnect.py \ @@ -74,6 +78,7 @@ libvirtmod_la_CFLAGS = $(WARN_CFLAGS) $(WARN_PYTHON_CFLAGS) libvirtmod_la_LDFLAGS = -module -avoid-version -shared \ -L$(top_builddir)/src/.libs \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_la_LIBADD = $(mylibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) @@ -86,6 +91,7 @@ libvirtmod_qemu_la_CFLAGS = $(WARN_PYTHON_CFLAGS) libvirtmod_qemu_la_LDFLAGS = -module -avoid-version -shared \ -L$(top_builddir)/src/.libs \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_qemu_la_LIBADD = $(myqemulibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) @@ -98,6 +104,7 @@ libvirtmod_lxc_la_CFLAGS = $(WARN_PYTHON_CFLAGS) libvirtmod_lxc_la_LDFLAGS = -module -avoid-version -shared \ -L$(top_builddir)/src/.libs \ + $(AM_LDFLAGS) \ $(CYGWIN_EXTRA_LDFLAGS) libvirtmod_lxc_la_LIBADD = $(mylxclibs) \ $(CYGWIN_EXTRA_LIBADD) $(CYGWIN_EXTRA_PYTHON_LIBADD) -- 1.8.4.rc3

2 2

[libvirt] [PATCH v3] BSD: implement virNetDev(Set|Clear)IPv4Address
by Roman Bogorodskiy 22 Aug '13

22 Aug '13

Provide an implementation of virNetDev(Set|Clear)IPv4Address based on BSD ifconfig tool in addition to 'ip' from Linux iproute2 package. --- configure.ac | 15 +++++++++++++++ src/util/virnetdev.c | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/configure.ac b/configure.ac index cc2213d..7667430 100644 --- a/configure.ac +++ b/configure.ac @@ -387,6 +387,10 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then sysconfdir='/etc' fi +dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case +dnl we're working on BSD) +want_ifconfig=no + dnl Make some notes about which OS we're compiling for, as the lxc and qemu dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter dnl are also linux specific. The "network" and storage_fs drivers are known @@ -409,6 +413,8 @@ if test $with_linux = no; then fi if test $with_freebsd = yes; then + want_ifconfig=yes + with_firewalld=no fi @@ -2429,6 +2435,15 @@ AC_CHECK_DECLS([BRDGSFD, BRDGADD, BRDGDEL], #include <net/if_bridgevar.h> ]) +# Check if we need to look for ifconfig +if test "$want_ifconfig" = "yes"; then + AC_PATH_PROG([IFCONFIG_PATH], [ifconfig]) + if test -z "$IFCONFIG_PATH"; then + AC_MSG_ERROR([Failed to find ifconfig.]) + fi + AC_DEFINE_UNQUOTED([IFCONFIG_PATH], "$IFCONFIG_PATH", [path to ifconfig binary]) +fi + # Detect when running under the clang static analyzer's scan-build driver # or Coverity-prevent's cov-build. Define STATIC_ANALYSIS accordingly. AC_CACHE_CHECK([whether this build is done by a static analysis tool], diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 30df7a6..8eb4d4c 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -810,12 +810,25 @@ int virNetDevSetIPv4Address(const char *ifname, !(bcaststr = virSocketAddrFormat(&broadcast)))) { goto cleanup; } +#ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) + virCommandAddArg(cmd, "inet6"); + else + virCommandAddArg(cmd, "inet"); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + if (bcaststr) + virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); + virCommandAddArg(cmd, "alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); if (bcaststr) virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; @@ -895,10 +908,21 @@ int virNetDevClearIPv4Address(const char *ifname, if (!(addrstr = virSocketAddrFormat(addr))) goto cleanup; +#ifdef IFCONFIG_PATH + cmd = virCommandNew(IFCONFIG_PATH); + virCommandAddArg(cmd, ifname); + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6)) + virCommandAddArg(cmd, "inet6"); + else + virCommandAddArg(cmd, "inet"); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArg(cmd, "-alias"); +#else cmd = virCommandNew(IP_PATH); virCommandAddArgList(cmd, "addr", "del", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "dev", ifname, NULL); +#endif if (virCommandRun(cmd, NULL) < 0) goto cleanup; -- 1.8.2.3

2 4

[libvirt] [PATCH v2] tests: Add URI precedence checking
by Martin Kletzander 22 Aug '13

22 Aug '13

Commit a0b6a36f is fixing what commit abfff210 broke, so to avoid having to deal with this issue again, herec comes "virsh-uriprecedence". Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v2: - Changed the name to virsh-uriprecedence - Using $PWD instead of temporary dir tests/Makefile.am | 2 ++ tests/virsh-uriprecedence | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100755 tests/virsh-uriprecedence diff --git a/tests/Makefile.am b/tests/Makefile.am index 09144d6..2fb8f37 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -98,6 +98,7 @@ EXTRA_DIST = \ storagevolxml2xmlout \ sysinfodata \ test-lib.sh \ + virsh-uriprecedence \ vmx2xmldata \ xencapsdata \ xmconfigdata \ @@ -235,6 +236,7 @@ test_scripts += \ read-bufsiz \ read-non-seekable \ start \ + virsh-uriprecedence \ vcpupin \ virsh-all \ virsh-optparse \ diff --git a/tests/virsh-uriprecedence b/tests/virsh-uriprecedence new file mode 100755 index 0000000..f4d84a4 --- /dev/null +++ b/tests/virsh-uriprecedence @@ -0,0 +1,76 @@ +#!/bin/sh + +: ${srcdir=.} +. $srcdir/test-lib.sh + +# This test checks if virsh obeys the proper precedence of different +# URI settings +test_intro "virsh-uriprecedence" + +virsh_bin="$abs_top_builddir/tools/virsh" +counter=1 +ret=0 + +cleanup_() { rm -rf "$tmphome"; } + +# Create all mock files/directories to avoid permission problems +tmphome="$PWD/tmp_home" +export XDG_CONFIG_HOME="$tmphome/.config" +export XDG_CACHE_HOME="$tmphome/.cache" +export XDG_RUNTIME_HOME="XDG_CACHE_HOME" + +mkdir -p "$XDG_CONFIG_HOME/libvirt" "$XDG_CONFIG_HOME/virsh" +mkdir -p "$XDG_CACHE_HOME/libvirt" "$XDG_CACHE_HOME/virsh" +mkdir -p "$XDG_RUNTIME_HOME/libvirt" "$XDG_RUNTIME_HOME/virsh" + +# Main function checking for the proper uri being returned +test_uri() +{ + result=0 + if [ "$($virsh_bin uri)" != "$good_uri" ]; then + result=1 + ret=1 + fi + test_result "$counter" "$1" "$result" + counter="$((counter+1))" +} + +# Precedence is the following (lowest priority first): +# +# 1) if run as root, 'uri_default' from /etc/libvirtd/libvirt.conf, +# otherwise qemu:///session. There is no way to mock this file for +# virsh/libvirt.so and the user may have set anything in there that +# would spoil the test, so we don't test this +# +# 2) 'uri_default' from $XDG_CONFIG_HOME/libvirt/libvirt.conf +# +# 3) LIBVIRT_DEFAULT_URI +# +# 4) VIRSH_DEFAULT_CONNECT_URI +# +# 5) parameter -c (--connect) + +unset LIBVIRT_DEFAULT_URI +unset VIRSH_DEFAULT_CONNECT_URI +bad_uri="test:///default?bad_uri" +good_uri="test:///default?good_uri" + +printf "uri_default=\"%s\"\n" "$good_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +test_uri "User config file" + +printf "uri_default=\"%s\"\n" "$bad_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +export LIBVIRT_DEFAULT_URI="$good_uri" +test_uri "LIBVIRT_DEFAULT_URI" + +export LIBVIRT_DEFAULT_URI="$bad_uri" +export VIRSH_DEFAULT_CONNECT_URI="$good_uri" +test_uri "VIRSH_DEFAULT_CONNECT_URI" + +export VIRSH_DEFAULT_CONNECT_URI="$bad_uri" +virsh_bin="$virsh_bin --connect $good_uri" +test_uri "Parameter" + +# test_uri() increases $counter even for the last test, so we must +# decrement it +test_final "$((counter-1))" "$ret" +(exit "$ret"); exit "$ret" -- 1.8.3.2

4 6

[libvirt] [PATCH] Set security label on FD for virDomainOpenGraphics
by Daniel P. Berrange 22 Aug '13

22 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virDomainOpenGraphics method accepts a UNIX socket FD from the client app. It must set the label on this FD otherwise QEMU will be prevented from receiving it with recvmsg. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5124f27..0a8e518 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14777,6 +14777,10 @@ qemuDomainOpenGraphics(virDomainPtr dom, goto cleanup; } + if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, + fd) < 0) + goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; qemuDomainObjEnterMonitor(driver, vm); -- 1.8.3.1

2 2

[libvirt] [PATCH v2 0/9] virsh: More intelligent auto-completion
by Tomas Meszaros 22 Aug '13

22 Aug '13

Original series + some fixes/improvements. Tomas Meszaros (9): virsh: C99 style for info_domfstrim and opts_lxc_enter_namespace virsh: Add vshCmdCompleter and vshOptCompleter virsh: Improve readline generators and readline completion virsh: Add vshDomainCompleter virsh: Add vshSuspendTargetCompleter virsh: Add vshRebootShutdownModeCompleter virsh: Add completer functions to domManaggementCmds virsh: Add completer functions to snapshotCmds virsh: Add completer functions to domMonitoringCmds tools/virsh-domain-monitor.c | 32 ++- tools/virsh-domain.c | 248 ++++++++++++++++----- tools/virsh-snapshot.c | 45 +++- tools/virsh.c | 504 +++++++++++++++++++++++++++++++++++++++++-- tools/virsh.h | 11 + 5 files changed, 748 insertions(+), 92 deletions(-) -- 1.8.3.1

4 17

[libvirt] [PATCH] vl: allow "cont" from panicked state
by Paolo Bonzini 22 Aug '13

22 Aug '13

After reporting the GUEST_PANICKED monitor event, QEMU stops the VM. The reason for this is that events are edge-triggered, and can be lost if management dies at the wrong time. Stopping a panicked VM lets management know of a panic even if it has crashed; management can learn about the panic when it restarts and queries running QEMU processes. The downside is of course that the VM will be paused while management is not running, but that is acceptable if it only happens with explicit "-device pvpanic". Upon learning of a panic, management (if configured to do so) can pick a variety of behaviors: leave the VM paused, reset it, destroy it. In addition to all of these behaviors, it is possible dumping the VM core from the host. However, right now, the panicked state is irreversible, and can only be exited by resetting the machine. This means that any policy decision is entirely in the hands of the host. In particular there is no way to use the "reboot on panic" option together with pvpanic. This patch makes the panicked state reversible (and removes various workarounds that were there because of the state being irreversible). With this change, management has a wider set of possible policies: it can just log the crash and leave policy to the guest, it can leave the VM paused. In particular, the "log the crash and continue" is implemented simply by sending a "cont" as soon as management learns about the panic. Management could also implement the "irreversible paused state" itself. And again, all such actions can be coupled with dumping the VM core. Unfortunately we cannot change the behavior of 1.6.0. Thus, even if it uses "-device pvpanic", management should check for "cont" failures. If "cont" fails, management can then log that the VM remained paused and urge the administrator to update QEMU. I suggest that this patch be included in an 1.6.1 release as soon as possible, and perhaps in the 1.5 branch too. Cc: qemu-stable(a)nongnu.org Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> --- gdbstub.c | 3 --- vl.c | 6 ++---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 35ca7c2..747e67d 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -372,9 +372,6 @@ static inline void gdb_continue(GDBState *s) #ifdef CONFIG_USER_ONLY s->running_state = 1; #else - if (runstate_check(RUN_STATE_GUEST_PANICKED)) { - runstate_set(RUN_STATE_DEBUG); - } if (!runstate_needs_reset()) { vm_start(); } diff --git a/vl.c b/vl.c index 25b8f2f..818d99e 100644 --- a/vl.c +++ b/vl.c @@ -637,9 +637,8 @@ static const RunStateTransition runstate_transitions_def[] = { { RUN_STATE_WATCHDOG, RUN_STATE_RUNNING }, { RUN_STATE_WATCHDOG, RUN_STATE_FINISH_MIGRATE }, - { RUN_STATE_GUEST_PANICKED, RUN_STATE_PAUSED }, + { RUN_STATE_GUEST_PANICKED, RUN_STATE_RUNNING }, { RUN_STATE_GUEST_PANICKED, RUN_STATE_FINISH_MIGRATE }, - { RUN_STATE_GUEST_PANICKED, RUN_STATE_DEBUG }, { RUN_STATE_MAX, RUN_STATE_MAX }, }; @@ -685,8 +684,7 @@ int runstate_is_running(void) bool runstate_needs_reset(void) { return runstate_check(RUN_STATE_INTERNAL_ERROR) || - runstate_check(RUN_STATE_SHUTDOWN) || - runstate_check(RUN_STATE_GUEST_PANICKED); + runstate_check(RUN_STATE_SHUTDOWN); } StatusInfo *qmp_query_status(Error **errp) -- 1.8.3.1

5 21

[libvirt] [PATCH] docs: Reformat <disk> attribute description in formatdomain
by John Ferlan 22 Aug '13

22 Aug '13

Reformat the description to more cleanly delineate the attributes for a <disk> element. --- Similar to the recently changed <source> attribute. docs/formatdomain.html.in | 121 +++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 50 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0d1a74f..9d12293 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1562,56 +1562,77 @@ <dl> <dt><code>disk</code></dt> <dd>The <code>disk</code> element is the main container for describing - disks. The <code>type</code> attribute is either "file", - "block", "dir", "network", or "volume" - and refers to the underlying source for the disk. The optional - <code>device</code> attribute indicates how the disk is to be exposed - to the guest OS. Possible values for this attribute are - "floppy", "disk", "cdrom", and "lun", defaulting to - "disk". "lun" (since 0.9.10) is only - valid when type is "block" and the target element's "bus" - attribute is "virtio", and behaves identically to "disk", - except that generic SCSI commands from the guest are accepted - and passed through to the physical device - - also note that device='lun' will only be recognized for - actual raw devices, never for individual partitions or LVM - partitions (in those cases, the kernel will reject the generic - SCSI commands, making it identical to device='disk'). - The optional <code>rawio</code> attribute - (since 0.9.10) indicates whether - the disk is needs rawio capability; valid settings are "yes" - or "no" (default is "no"). If any one disk in a domain has - rawio='yes', rawio capability will be enabled for all disks in - the domain (because, in the case of QEMU, this capability can - only be set on a per-process basis). This attribute is only - valid when device is "lun". NB, <code>rawio</code> intends to - confine the capability per-device, however, current QEMU - implementation gives the domain process broader capability - than that (per-process basis, affects all the domain disks). - To confine the capability as much as possible for QEMU driver - as this stage, <code>sgio</code> is recommended, it's more - secure than <code>rawio</code>. - The optional <code>sgio</code> (since 1.0.2) - attribute indicates whether the kernel will filter unprivileged - SG_IO commands for the disk, valid settings are "filtered" or - "unfiltered". Defaults to "filtered". Similar to <code>rawio</code>, - <code>sgio</code> is only valid for device 'lun'. - The optional <code>snapshot</code> attribute indicates the default - behavior of the disk during disk snapshots: "internal" - requires a file format such as qcow2 that can store both the - snapshot and the data changes since the snapshot; - "external" will separate the snapshot from the live data; and - "no" means the disk will not participate in snapshots. - Read-only disks default to "no", while the default for other - disks depends on the hypervisor's capabilities. Some - hypervisors allow a per-snapshot choice as well, - during <a href="formatsnapshot.html">domain snapshot - creation</a>. Not all snapshot modes are supported; - for example, <code>snapshot='yes'</code> with a transient disk - generally does not make sense. Since 0.0.3; - "device" attribute since 0.1.4; - "network" attribute since 0.8.7; "snapshot" since - 0.9.5</dd> + disks (since 0.0.3). + <dl> + <dt><code>type</code> attribute + since 0.0.3</dt> + <dd> + Valid values are "file", "block", + "dir" (since 0.7.5), + "network" (since 0.8.7), or + "volume" (since 1.0.5) + and refer to the underlying source for the disk. + </dd> + <dt><code>device</code> attribute + since 0.1.4</dt> + <dd> + Indicates how the disk is to be exposed to the guest OS. Possible + values for this attribute are "floppy", "disk", "cdrom", and "lun", + defaulting to "disk". + + Using "lun" (since 0.9.10) is only + valid when type is "block" and the target element's "bus" + attribute is "virtio", and behaves identically to "disk", + except that generic SCSI commands from the guest are accepted + and passed through to the physical device. Also note that + device='lun' will only be recognized for actual raw devices, + but never for individual partitions or LVM partitions (in those + cases, the kernel will reject the generic SCSI commands, making + it identical to device='disk'). + + </dd> + <dt><code>rawio</code> attribute + since 0.9.10</dt> + <dd> + Indicates whether the disk is needs rawio capability; valid + settings are "yes" or "no" (default is "no"). If any one disk + in a domain has rawio='yes', rawio capability will be enabled + for all disks in the domain (because, in the case of QEMU, this + capability can only be set on a per-process basis). This attribute + is only valid when device is "lun". NB, <code>rawio</code> intends + to confine the capability per-device, however, current QEMU + implementation gives the domain process broader capability + than that (per-process basis, affects all the domain disks). + To confine the capability as much as possible for QEMU driver + as this stage, <code>sgio</code> is recommended, it's more + secure than <code>rawio</code>. + </dd> + <dt><code>sgio</code> attribute + since 1.0.2</dt> + <dd> + Indicates whether the kernel will filter unprivileged + SG_IO commands for the disk, valid settings are "filtered" or + "unfiltered". Defaults to "filtered". Similar to <code>rawio</code>, + <code>sgio</code> is only valid for device 'lun'. + </dd> + <dt><code>snapshot</code> attribute + since 0.9.5</dt> + <dd> + Indicates the default behavior of the disk during disk snapshots: + "internal" requires a file format such as qcow2 that can store + both the snapshot and the data changes since the snapshot; + "external" will separate the snapshot from the live data; and + "no" means the disk will not participate in snapshots. Read-only + disks default to "no", while the default for other disks depends + on the hypervisor's capabilities. Some hypervisors allow a + per-snapshot choice as well, during + <a href="formatsnapshot.html">domain snapshot creation</a>. + Not all snapshot modes are supported; for example, + <code>snapshot='yes'</code> with a transient disk generally + does not make sense. + </dd> + </dl> + </dd> <dt><code>source</code></dt> <dd>Representation of the disk <code>source</code> depends on the disk <code>type</code> attribute value as follows: -- 1.8.3.1

2 2

[libvirt] [PATCH] tests: Add URI precedence checking
by Martin Kletzander 22 Aug '13

22 Aug '13

Commit a0b6a36f is fixing what commit abfff210 broke, so to avoid having to deal with this issue again, I present you The "uriprecedencetest". Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/Makefile.am | 2 ++ tests/uriprecedencetest | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100755 tests/uriprecedencetest diff --git a/tests/Makefile.am b/tests/Makefile.am index 09144d6..419db8b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -98,6 +98,7 @@ EXTRA_DIST = \ storagevolxml2xmlout \ sysinfodata \ test-lib.sh \ + uriprecedencetest \ vmx2xmldata \ xencapsdata \ xmconfigdata \ @@ -235,6 +236,7 @@ test_scripts += \ read-bufsiz \ read-non-seekable \ start \ + uriprecedencetest \ vcpupin \ virsh-all \ virsh-optparse \ diff --git a/tests/uriprecedencetest b/tests/uriprecedencetest new file mode 100755 index 0000000..9515e63 --- /dev/null +++ b/tests/uriprecedencetest @@ -0,0 +1,77 @@ +#!/bin/sh + +: ${srcdir=.} +. $srcdir/test-lib.sh + +# This test checks if virsh obeys the proper precedence of different +# URI settings +test_intro "uriprecedencetest" + +virsh_bin="$abs_top_builddir/tools/virsh" +counter=1 +ret=0 + +tmpdir="$(mktemp -d)" +cleanup_() { rm -rf "$tmpdir"; } + +# Create all mock files/directories to avoid permission problems +tmphome="$tmpdir/tmp_home" +export XDG_CONFIG_HOME="$tmpdir/.config" +export XDG_CACHE_HOME="$tmpdir/.cache" +export XDG_RUNTIME_HOME="XDG_CACHE_HOME" + +mkdir -p "$XDG_CONFIG_HOME/libvirt" "$XDG_CONFIG_HOME/virsh" +mkdir -p "$XDG_CACHE_HOME/libvirt" "$XDG_CACHE_HOME/virsh" +mkdir -p "$XDG_RUNTIME_HOME/libvirt" "$XDG_RUNTIME_HOME/virsh" + +# Main function checking for the proper uri being returned +test_uri() +{ + result=0 + if [ "$($virsh_bin uri)" != "$good_uri" ]; then + result=1 + ret=1 + fi + test_result "$counter" "$1" "$result" + counter="$((counter+1))" +} + +# Precedence is the following (lowest priority first): +# +# 1) if run as root, 'uri_default' from /etc/libvirtd/libvirt.conf, +# otherwise qemu:///session. There is no way to mock this file for +# virsh/libvirt.so and the user may have set anything in there that +# would spoil the test, so we don't test this +# +# 2) 'uri_default' from $XDG_CONFIG_HOME/libvirt/libvirt.conf +# +# 3) LIBVIRT_DEFAULT_URI +# +# 4) VIRSH_DEFAULT_CONNECT_URI +# +# 5) parameter -c (--connect) + +unset LIBVIRT_DEFAULT_URI +unset VIRSH_DEFAULT_CONNECT_URI +bad_uri="test:///default?bad_uri" +good_uri="test:///default?good_uri" + +printf "uri_default=\"%s\"\n" "$good_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +test_uri "User config file" + +printf "uri_default=\"%s\"\n" "$bad_uri" >"$XDG_CONFIG_HOME/libvirt/libvirt.conf" +export LIBVIRT_DEFAULT_URI="$good_uri" +test_uri "LIBVIRT_DEFAULT_URI" + +export LIBVIRT_DEFAULT_URI="$bad_uri" +export VIRSH_DEFAULT_CONNECT_URI="$good_uri" +test_uri "VIRSH_DEFAULT_CONNECT_URI" + +export VIRSH_DEFAULT_CONNECT_URI="$bad_uri" +virsh_bin="$virsh_bin --connect $good_uri" +test_uri "Parameter" + +# test_uri() increases $counter even for the last test, so we must +# decrement it +test_final "$((counter-1))" "$ret" +(exit "$ret"); exit "$ret" -- 1.8.3.2

2 1

[libvirt] [PATCH] qemuBuildNicDevStr: Add mq=on for multiqueue networking
by Michal Privoznik 22 Aug '13

22 Aug '13

If user requested multiqueue networking, beside multiple /dev/tap and /dev/vhost-net openings, we forgot to pass mq=on onto the -device virtio-net-pci command line. This is advised at: http://www.linux-kvm.org/page/Multiqueue#Enable_MQ_feature --- Notes: Maybe worth backporting to maintainer branches too. The MQ was introduced in the 1.0.6 release. src/qemu/qemu_command.c | 7 ++++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_hotplug.c | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f151173..d73872a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4730,6 +4730,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, + bool multiqueue, virQEMUCapsPtr qemuCaps) { virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -4782,6 +4783,8 @@ qemuBuildNicDevStr(virDomainDefPtr def, virDomainVirtioEventIdxTypeToString(net->driver.virtio.event_idx)); } } + if (usingVirtio && multiqueue) + virBufferAddLit(&buf, ",mq=on"); if (vlan == -1) virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias); else @@ -7275,7 +7278,9 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, qemuCaps))) + bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; + if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, + multiqueue, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); } else { diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 5c5c025..a9854a3 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -102,6 +102,7 @@ char * qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, int bootindex, + bool multiqueue, virQEMUCapsPtr qemuCaps); char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 478f331..b49073b 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -859,7 +859,9 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, priv->qemuCaps))) + bool multiqueue = tapfdSize > 1 || vhostfdSize > 1; + if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, + multiqueue, priv->qemuCaps))) goto try_remove; } else { if (!(nicstr = qemuBuildNicStr(net, NULL, vlan))) -- 1.8.1.5

2 1

[libvirt] [PATCH] LXC: mount a fresh /run directory for container
by Gao feng 22 Aug '13

22 Aug '13

The unix socket file /run/systemd/private is used to send reboot/shutdown messages. and since this type of unix sockets are not per net namespace , they are global resources. systemctl in container can use this unix socket to send shutdown message to the systemd-shutdownd running on host. finally the host will be poweroff. this problem occurs when container shares the same root directory with host. this patch umount host's /run directory and mount the /run directory of container as tmpfs. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8abaea0..aae8e6a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -772,6 +772,10 @@ static int lxcContainerMountBasicFS(void) { "sysfs", "/sys", "sysfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { "securityfs", "/sys/kernel/security", "securityfs", NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, + /* We should mount /run directory as tmpfs, since it contains some + * global files such as /run/systemd/private which can be used to + * send reboot/shutdown message from container to host. */ + { "tmpfs", "/run", "tmpfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, #if WITH_SELINUX { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", NULL, MS_NOSUID|MS_NOEXEC|MS_NODEV }, { SELINUX_MOUNT, SELINUX_MOUNT, NULL, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY }, @@ -1526,6 +1530,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, if (STREQ(root->src, "/") && (lxcContainerUnmountSubtree("/sys", false) < 0 || lxcContainerUnmountSubtree("/dev", false) < 0 || + lxcContainerUnmountSubtree("/run", false) < 0 || lxcContainerUnmountSubtree("/proc", false) < 0)) goto cleanup; -- 1.8.3.1

2 6

[libvirt] [PATCH]LXC: force container to enable network namespace
by Chen Hanxiao 22 Aug '13

22 Aug '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we don't enable network namespace, we could shutdown host inside container by command 'shutdown', which is unacceptable. This patch will force users to enable network namespace before they start container. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c7a22ab..5631ad7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1937,6 +1937,12 @@ int lxcContainerStart(virDomainDefPtr def, if (lxcNeedNetworkNamespace(def)) { VIR_DEBUG("Enable network namespaces"); cflags |= CLONE_NEWNET; + } else { + errno = EINVAL; + + virReportSystemError(errno, "%s", + _("Network namespace needed")); + return -1; } pid = clone(lxcContainerChild, stacktop, cflags, &args); -- 1.7.1

4 4

[libvirt] Is it a problem that "a vm has been shutdown, but its pidfile has not been removed"
by Wangyufei (A) 22 Aug '13

22 Aug '13

Hello, when do steps as follows: 1. start a vm 2. restart libvirtd service 3. shutdown the vm I found the pidfile associated with the vm has not been removed. Analyzing related piece of code, I found when libvirtd service restarted, the vm's _virDomainObj structure(named dom here) in libvirtd will be re-established according to the vm's state-file or config-file, but its member of privateData.pidfile will not be reassigned value. By the way, qemudriver is used in my libvirt. So when the vm is shutdown, its pidfile will not be removed, because the member of privateData.pidfile is NULL. My questions are : 1. Do you think it is a problem when a vm has been shutdown, but its pidfile has not been removed ? 2. Do you think it is expected that the member of privateData.pidfile's value missed after libvirtd restart? If it's a bug then I'll submit the patch to fix it. Also list the related piece of code about removing the vm's pidfile in libvirt for your information: if (priv->pidfile && unlink(priv->pidfile) < 0 && errno != ENOENT) VIR_WARN("Failed to remove PID file for %s: %s", vm->def->name, virStrerror(errno, ebuf, sizeof(ebuf))); Best Regards, -WangYufei

2 1

[libvirt] [PATCHv2] virBitmapParse: Fix behavior in case of error and fix up callers
by Peter Krempa 22 Aug '13

22 Aug '13

Re-arrange the code so that the returned bitmap is always initialized to NULL even on early failures and return an error message as some callers are already expecting it. Fix up the rest not to shadow the error. --- Version 2: - squashed cleanup of callers into this patch po/POTFILES.in | 1 + src/conf/domain_conf.c | 5 +---- src/conf/network_conf.c | 3 --- src/nodeinfo.c | 5 +---- src/qemu/qemu_driver.c | 2 -- src/util/virbitmap.c | 18 +++++++++--------- src/xenxs/xen_sxpr.c | 5 +---- tests/cpuset | 2 +- 8 files changed, 14 insertions(+), 27 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 36d027a..9a83069 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -147,6 +147,7 @@ src/util/viralloc.c src/util/viraudit.c src/util/virauth.c src/util/virauthconfig.c +src/util/virbitmap.c src/util/vircgroup.c src/util/virclosecallbacks.c src/util/vircommand.c diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ea49d2c..8a187a6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10981,11 +10981,8 @@ virDomainDefParseXML(xmlDocPtr xml, tmp = virXPathString("string(./vcpu[1]/@cpuset)", ctxt); if (tmp) { if (virBitmapParse(tmp, 0, &def->cpumask, - VIR_DOMAIN_CPUMASK_LEN) < 0) { - virReportError(VIR_ERR_XML_ERROR, - "%s", _("topology cpuset syntax error")); + VIR_DOMAIN_CPUMASK_LEN) < 0) goto error; - } VIR_FREE(tmp); } } diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index bbc980b..8aef609 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2897,9 +2897,6 @@ virNetworkLoadState(virNetworkObjListPtr nets, if ((class_id = virXPathString("string(./class_id[1]/@bitmap)", ctxt))) { if (virBitmapParse(class_id, 0, &class_id_map, CLASS_ID_BITMAP_SIZE) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Malformed 'class_id' attribute: %s"), - class_id); VIR_FREE(class_id); goto error; } diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 4df4851..33a79b7 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1547,11 +1547,8 @@ virNodeGetSiblingsList(const char *dir, int cpu_id) if (virFileReadAll(path, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, &buf) < 0) goto cleanup; - if (virBitmapParse(buf, 0, &ret, NUMA_MAX_N_CPUS) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to parse thread siblings")); + if (virBitmapParse(buf, 0, &ret, NUMA_MAX_N_CPUS) < 0) goto cleanup; - } cleanup: VIR_FREE(buf); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2ad236e..5124f27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8357,8 +8357,6 @@ qemuDomainSetNumaParameters(virDomainPtr dom, if (virBitmapParse(params[i].value.s, 0, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Failed to parse nodeset")); ret = -1; continue; } diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index 47c678e..289a7b9 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -298,23 +298,21 @@ virBitmapParse(const char *str, size_t bitmapSize) { bool neg = false; - const char *cur; + const char *cur = str; char *tmp; size_t i; int start, last; - if (!str) + if (!(*bitmap = virBitmapNew(bitmapSize))) return -1; - cur = str; - virSkipSpaces(&cur); + if (!str) + goto error; - if (*cur == 0) - return -1; + virSkipSpaces(&cur); - *bitmap = virBitmapNew(bitmapSize); - if (!*bitmap) - return -1; + if (*cur == '\0') + goto error; while (*cur != 0 && *cur != terminator) { /* @@ -384,6 +382,8 @@ virBitmapParse(const char *str, return virBitmapCountBits(*bitmap); error: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to parse bitmap '%s'"), str); virBitmapFree(*bitmap); *bitmap = NULL; return -1; diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index fbbbaa9..6209c68 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -1160,11 +1160,8 @@ xenParseSxpr(const struct sexpr *root, if (cpus != NULL) { if (virBitmapParse(cpus, 0, &def->cpumask, - VIR_DOMAIN_CPUMASK_LEN) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid CPU mask %s"), cpus); + VIR_DOMAIN_CPUMASK_LEN) < 0) goto error; - } } def->maxvcpus = sexpr_int(root, "domain/vcpus"); diff --git a/tests/cpuset b/tests/cpuset index b617d6f..8bcaae9 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -42,7 +42,7 @@ sed "s/vcpu placement='static'>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 $abs_top_builddir/tools/virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 cat <<\EOF > exp || fail=1 error: Failed to define domain from xml-invalid -error: XML error: topology cpuset syntax error +error: internal error: Failed to parse bitmap 'aaa' EOF compare exp out || fail=1 -- 1.8.3.2

2 2

[libvirt] [PATCH] Fix URI connect precedence
by Martin Kletzander 22 Aug '13

22 Aug '13

Commit abfff210 changed the order of vshParseArgv() and vshInit() in order to make fix debugging of parameter parsing. However, vshInit() did a vshReconnect() even though ctl->name wasn't set according to the '-c' parameter yet. In order to keep both issues fixed, I've split the vshInit() into vshInitDebug() and vshInit(). One simple memleak of ctl->name is fixed as a part of this patch, since it is related to the issue it's fixing. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=999323 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 15f529e..2ea44a6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2294,16 +2294,13 @@ vshEventLoop(void *opaque) /* - * Initialize connection. + * Initialize debug settings. */ -static bool -vshInit(vshControl *ctl) +static void +vshInitDebug(vshControl *ctl) { char *debugEnv; - if (ctl->conn) - return false; - if (ctl->debug == VSH_DEBUG_DEFAULT) { /* log level not set from commandline, check env variable */ debugEnv = getenv("VIRSH_DEBUG"); @@ -2328,6 +2325,16 @@ vshInit(vshControl *ctl) } vshOpenLogFile(ctl); +} + +/* + * Initialize connection. + */ +static bool +vshInit(vshControl *ctl) +{ + if (ctl->conn) + return false; /* set up the library error handler */ virSetErrorFunc(NULL, virshErrorHandler); @@ -3017,6 +3024,7 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) ctl->timing = true; break; case 'c': + VIR_FREE(ctl->name); ctl->name = vshStrdup(ctl, optarg); break; case 'v': @@ -3192,12 +3200,10 @@ main(int argc, char **argv) ctl->name = vshStrdup(ctl, defaultConn); } - if (!vshInit(ctl)) { - vshDeinit(ctl); - exit(EXIT_FAILURE); - } + vshInitDebug(ctl); - if (!vshParseArgv(ctl, argc, argv)) { + if (!vshParseArgv(ctl, argc, argv) || + !vshInit(ctl)) { vshDeinit(ctl); exit(EXIT_FAILURE); } -- 1.8.3.2

2 2

[libvirt] [PATCH 0/5] RFC: VMX parsing improvements
by Doug Goldstein 22 Aug '13

22 Aug '13

A user came into #virt the other day and was trying to get libvirtd to work with VMWare Fusion 5, which is basically the Mac OS X version of VMWare Workstation. In helping him out I noticed a few limitations of our VMX parser so I've added support through this patchset. However I came across the fact that we only support 2 types of CD-ROMs instead of the 3 types that VMWare has which leads me to believe we need to extend our XML syntax to define VMWare VMs so I'm asking for feedback and input. CD-ROM types: - cdrom-image = Provides the ISO to the domain - atapi-cdrom = Provides a NEC emulated ATAPI CD-ROM - cdrom-raw = Passthru for a host CD-ROM drive Currently we model 'atapi-cdrom' as (example uses IDE): <disk type='block' device='cdrom'> <source dev='/dev/scd0'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> I was thinking of making that: <disk type='block' device='cdrom'> <driver name='vmware' type='atapi'/> <source dev='/dev/scd0'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> And making 'cdrom-raw' as: <disk type='block' device='cdrom'> <driver name='vmware' type='raw'/> <source dev='/dev/scd0'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> The documentation is a bit ambiguous if I should instead do: <driver name='atapi'/> and <driver name='raw'/> Which is why the request for input. The other reason I'm asking for input is I'm not quite sure what we want to do about CD-ROMs marked as 'auto detect', which is what VMWare Workstation and VMWare Fusion according to their documentation use as the default for 'cdrom-raw' device type. It will either at boot time connect your CD-ROM drive to the VM or dynamically when the user requests it. In this patchset I've modeled it as an opened CD-ROM drive and expect that VMWare will give us a tray closed event or CD-ROM attached event when it gets attached. I unfortunately don't have VMWare and have not used their products in many years so I can't test this myself. Doug Goldstein (5): VMX: Improve disk parse error for unknown values VMX: Add cdrom-raw dev type from VMWare Fusion VMX: Add support for 'auto detect' fileNames VMX: Some serial ports are not actually connected VMX: Add a VMWare Fusion 5 configuration for tests src/vmx/vmx.c | 41 ++++++---- .../vmx2xml-cdrom-ide-raw-auto-detect.vmx | 5 ++ .../vmx2xml-cdrom-ide-raw-auto-detect.xml | 23 ++++++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 5 ++ tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 24 ++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 ++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 38 ++++++++++ tests/vmx2xmltest.c | 4 + 8 files changed, 214 insertions(+), 14 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-auto-detect.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml -- 1.8.1.5

2 7

[libvirt] [PATCH v2] bridge driver: implement networkEnableIpForwarding for BSD
by Roman Bogorodskiy 21 Aug '13

21 Aug '13

Implement networkEnableIpForwarding() using BSD style sysctl. --- configure.ac | 7 ++++--- src/network/bridge_driver.c | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d3219ce..cc2213d 100644 --- a/configure.ac +++ b/configure.ac @@ -207,7 +207,8 @@ dnl Availability of various common functions (non-fatal if missing), dnl and various less common threadsafe functions AC_CHECK_FUNCS_ONCE([cfmakeraw geteuid getgid getgrnam_r getmntent_r \ getpwuid_r getuid kill mmap newlocale posix_fallocate posix_memalign \ - prlimit regexec sched_getaffinity setgroups setns setrlimit symlink]) + prlimit regexec sched_getaffinity setgroups setns setrlimit symlink \ + sysctlbyname]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. @@ -220,8 +221,8 @@ LIBS=$old_libs dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ - sys/un.h sys/syscall.h netinet/tcp.h ifaddrs.h libtasn1.h \ - sys/ucred.h sys/mount.h]) + sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ + libtasn1.h sys/ucred.h sys/mount.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd30244..80a5bc0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -41,6 +41,9 @@ #include <sys/wait.h> #include <sys/ioctl.h> #include <net/if.h> +#if HAVE_SYS_SYSCTL_H +# include <sys/sysctl.h> +#endif #include "virerror.h" #include "datatypes.h" @@ -1537,10 +1540,20 @@ static int networkEnableIpForwarding(bool enableIPv4, bool enableIPv6) { int ret = 0; +#ifdef HAVE_SYSCTLBYNAME + int enabled = 1; + if (enableIPv4) + ret = sysctlbyname("net.inet.ip.forwarding", NULL, 0, + &enabled, sizeof(enabled)); + if (enableIPv6 && ret == 0) + ret = sysctlbyname("net.inet6.ip6.forwarding", NULL, 0, + &enabled, sizeof(enabled)); +#else if (enableIPv4) ret = virFileWriteStr("/proc/sys/net/ipv4/ip_forward", "1\n", 0); if (enableIPv6 && ret == 0) ret = virFileWriteStr("/proc/sys/net/ipv6/conf/all/forwarding", "1\n", 0); +#endif return ret; } -- 1.8.2.3

2 2

[libvirt] [PATCHv2 0/5] Introduce API to query IP addresses for given domain
by nehaljwani 21 Aug '13

21 Aug '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.mail-archive.com/libvir-list@redhat.com/msg51857.html A patch was submitted, using structs: http://www.mail-archive.com/libvir-list@redhat.com/msg57141.html Another patch was submitted, using XML: http://www.mail-archive.com/libvir-list@redhat.com/msg57829.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: http://www.mail-archive.com/libvir-list@redhat.com/msg79793.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfacesAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) nehaljwani (5): domifaddr: Implement the public API domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 122 ++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 +++++++++++++ include/libvirt/libvirt.h.in | 32 +++++++++ python/generator.py | 1 + python/libvirt-override-api.xml | 8 ++- python/libvirt-override.c | 117 +++++++++++++++++++++++++++++++ src/driver.h | 7 ++ src/libvirt.c | 99 ++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 151 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 ++ src/qemu/qemu_driver.c | 56 +++++++++++++++ src/remote/remote_driver.c | 88 +++++++++++++++++++++++ src/remote/remote_protocol.x | 30 +++++++- src/remote_protocol-structs | 24 +++++++ tools/virsh-domain-monitor.c | 102 +++++++++++++++++++++++++++ tools/virsh.pod | 10 +++ 19 files changed, 906 insertions(+), 3 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

4 19

[libvirt] [PATCH 0/2] Support setting the 'removable' flag for USB disks
by Fred A. Kemp 21 Aug '13

21 Aug '13

From: "Fred A. Kemp" <anonym(a)riseup.net> The commit message of patch #2 explains the purpose of this patch set. A review would be greatly appreciated! Note that I've only added the new capability for usb-storage.removable to the qemu help tests of qemu(-kvm) version 1.2.0, since that's what I had easily available to get the output of `-device usb-storage,?` from. I hope that's not an issue, otherwise, is there a way to obtain these outputs without having to hunt down and install all supported versions? Previous submissions of this patch set to this list: http://www.redhat.com/archives/libvir-list/2013-March/msg01051.html http://www.redhat.com/archives/libvir-list/2013-May/msg02039.html https://www.redhat.com/archives/libvir-list/2013-July/msg01635.html Fred A. Kemp (2): qemu: Add capability flag for usb-storage qemu: Support setting the 'removable' flag for USB disks docs/formatdomain.html.in | 8 +++-- docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 31 ++++++++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 23 +++++++++++++-- tests/qemuhelpdata/qemu-1.2.0-device | 11 +++++++ tests/qemuhelpdata/qemu-kvm-1.2.0-device | 11 +++++++ tests/qemuhelptest.c | 20 +++++++++---- .../qemuxml2argv-disk-usb-device-removable.args | 8 +++++ .../qemuxml2argv-disk-usb-device-removable.xml | 27 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++- 13 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml -- 1.7.10.4

4 7

[libvirt] [PATCH] Allow a HTTP URL for cdrom ISO image
by Aline Manera 21 Aug '13

21 Aug '13

From: Aline Manera <alinefm(a)br.ibm.com> Hi all, qemu/KVM has support to iso streaming, allowing a HTTP UTL for cdrom iso image. I just added it to libvirt as well. Aline Manera (1): Allow a HTTP URL for cdrom ISO image src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 20 +++++++++-- .../qemuxml2argv-disk-cdrom-network.args | 5 +++ .../qemuxml2argv-disk-cdrom-network.xml | 37 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 6 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network.xml -- 1.7.10.4

2 3