- Devel - libvirt List Archives

[libvirt] [PATCH] fix devhelp rebuild when in separate $(builddir) != $(srcdir)
by Guido Günther 12 Dec '08

12 Dec '08

Hi, look for devhelp.xsl in $(srcdir). Patch attached, -- Guido

3 2

[libvirt] [PATCH] qemu: fix virtual serial/parallel ports via unix/tcp
by Guido Günther 12 Dec '08

12 Dec '08

Hi, as to my understanding we should pass 'server' instead of 'listen' to forward virtual serial ports via unix domain sockets or tcp. See: http://bellard.org/qemu/qemu-doc.html I also added nowait to tcp,unix and telnet since otherwise qemu/kvm would wait for a connection before proceeding which breaks vm startup. I wonder why nowait wasn't added with: 0138ff79f26a5fdaae9b13d6345a84817a144e06 though. Possible patch attached. -- Guido

3 2

[libvirt] [PATCH] libvirtd: plug a nominal leak
by Jim Meyering 12 Dec '08

12 Dec '08

Running make check through valgrind exposed this: 40 bytes in 1 blocks are definitely lost in loss record 9 of 68 at 0x4A05174: calloc (vg_replace_malloc.c:397) by 0x4C422C1: virAllocN (memory.c:128) by 0x412CB1: qemudRunLoop (qemud.c:1846) by 0x41480B: main (qemud.c:2469) Here's the fix: >From a660df67d623184001a74f5fcf88a2f58217ec29 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 11 Dec 2008 19:58:08 +0100 Subject: [PATCH] libvirtd: plug a nominal leak * qemud/qemud.c (qemudRunLoop): Free server->workers. --- qemud/qemud.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index f35d0fd..80b8778 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1919,6 +1919,7 @@ static int qemudRunLoop(struct qemud_server *server) { pthread_mutex_lock(&server->lock); } + free(server->workers); pthread_mutex_unlock(&server->lock); return ret; } -- 1.6.0.4.1044.g77718

2 2

[libvirt] RFC: Removing use of strerror() in favour of strerror_r()
by Daniel P. Berrange 12 Dec '08

12 Dec '08

The man page for 'strerror()' has this to say The strerror() function returns a string describ- ing the error code passed in the argument errnum, possibly using the LC_MESSAGES part of the current locale to select the appropriate language. This string must not be modified by the application, but may be modified by a subsequent call to per- ror(3) or strerror(). No library function will modify this string. ie, strerror is not even remotely safe to use if the application calling libvirt uses threads, regardless of whether libvirt itself is threaded. The replacement is strerror_r(), but it is kind of tedious to use as you can't simply pass its return value straight in as format arg. While looking at this I also noticed that we're rather inconsistent about whether we use VIR_ERR_INTERNAL_ERROR or VIR_ERR_SYSTEM_ERROR code for reporting system errors. So I'm intending to create a convenient function for reporting system errors that hides the sterrror_r horribleness and also standardizes on error code VIR_ERR_SYSTEM_ERROR. At the same time also creating a convenience function for reporting OOM, since we have wildly inconsistent reporting of that too. The API contracts for src/virterror_internal.h are intended to be: void virReportSystemErrorFull(virConnectPtr conn, int domcode, int theerrno, const char *filename, const char *funcname, long long linenr, const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 7, 8); void virReportOOMFull(virConnectPtr conn, int domcode, const char *filename, const char *funcname, long long linenr); And using a macro to automatically set domcode, filename, funcname and linenr, since its tedious to make the caller supply all those #define virReportSystemError(conn, theerrno, fmt,...) \ virReportSystemErrorFull((conn), \ VIR_FROM_THIS, \ (theerrno), \ __FILE__, __FUNCTION__, __LINE__, \ (fmt), __VA_ARGS__) #define virReportOOM(conn) \ virReportOOMFull((conn), VIR_FROM_THIS, \ __FILE__, __FUNCTION__, __LINE__) \ So whereas before you might do xenXMError (conn, VIR_ERR_INTERNAL_ERROR, _("cannot stat %s: %s"), filename, strerror(errno)); xenXMError (conn, VIR_ERR_NO_MEMORY, "%s", strerror(errno)); Now you would do: virReportSystemError(conn, errno, _("cannot stat: %s"), filename); virReportOOM(conn); Before I actually go and start making this change across all 300 uses of strerror(), do people agree with this approach.... Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 3

[libvirt] [PATCH] implement --version for libvirtd
by Dave Allan 12 Dec '08

12 Dec '08

The daemon-conf script, when run in verbose mode, tries to execute libvirtd --version. The attached patch implements --version. Dave diff --git a/qemud/qemud.c b/qemud/qemud.c index f35d0fd..b10d680 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2272,6 +2272,13 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) return -1; } +/* Display version information. */ +static void +version (const char *argv0) +{ + printf ("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); +} + /* Print command-line usage. */ static void usage (const char *argv0) @@ -2287,6 +2294,7 @@ Options:\n\ -l | --listen Listen for TCP/IP connections.\n\ -t | --timeout <secs> Exit after timeout period.\n\ -f | --config <file> Configuration file.\n\ + | --version Display version information.\n\ -p | --pid-file <file> Change name of PID file.\n\ \n\ libvirt management daemon:\n\ @@ -2317,6 +2325,10 @@ libvirt management daemon:\n\ : "(disabled in ./configure)"); } +enum { + OPT_VERSION = 129 +}; + #define MAX_LISTEN 5 int main(int argc, char **argv) { struct qemud_server *server = NULL; @@ -2333,6 +2345,7 @@ int main(int argc, char **argv) { { "config", required_argument, NULL, 'f'}, { "timeout", required_argument, NULL, 't'}, { "pid-file", required_argument, NULL, 'p'}, + { "version", no_argument, NULL, OPT_VERSION }, { "help", no_argument, NULL, '?' }, {0, 0, 0, 0} }; @@ -2378,6 +2391,10 @@ int main(int argc, char **argv) { remote_config_file = optarg; break; + case OPT_VERSION: + version (argv[0]); + return 0; + case '?': usage (argv[0]); return 2;

3 2

[libvirt] [PATCH] fix for Bug 460510
by Dave Allan 12 Dec '08

12 Dec '08

Attached is a patch for bug 460510, which is a bug in the RPM spec file. https://bugzilla.redhat.com/show_bug.cgi?id=460510 Dave diff --git a/libvirt.spec.in b/libvirt.spec.in index cddf5c8..8638377 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -21,7 +21,7 @@ %define with_xen_proxy 0 %endif -%if "%{fedora}" +%if 0%{?fedora} %ifarch ppc64 %define with_qemu 0 %endif

2 1

[libvirt] [PATCH] retry poll() in EINTR case in virPipeReadUntilEOF
by Dave Allan 12 Dec '08

12 Dec '08

I saw a few messages: libvir: error : internal error poll error: Interrupted system call during daemon-conf tests. The messages come from virPipeReadUntilEOF. I think the intention is that this case should be retried. Patch attached. Dave diff --git a/src/util.c b/src/util.c index da26009..31a9702 100644 --- a/src/util.c +++ b/src/util.c @@ -473,7 +473,7 @@ virPipeReadUntilEOF(virConnectPtr conn, int outfd, int errfd, while(!(finished[0] && finished[1])) { if (poll(fds, ARRAY_CARDINALITY(fds), -1) < 0) { - if (errno == EAGAIN) + if (errno == EAGAIN || errno == EINTR) continue; goto pollerr; }

3 2

[libvirt] Deploying latest libvirt in rhel / centos 5.2
by Marco Sinhoreli 11 Dec '08

11 Dec '08

Hello all, I'm wanting to know if I will have some difficulty to package libvirt 0.5.x to rhel / centos 5.2. I'm needing of the latest libvirt release to tests with oVirt. Regards, -- Marco Sinhoreli

4 5

[libvirt] [PATCH] Sanitize qemu monitor output
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch cleans up output we read from the qemu monitor. This is a simplified form of a patch I posted awhile ago. From the patch: /* The monitor doesn't dump clean output after we have written to * it. Every character we write dumps a bunch of useless stuff, * so the result looks like "cXcoXcomXcommXcommaXcommanXcommand" * Try to throw away everything before the first full command * occurence, and inbetween the command and the newline starting * the response */ This extra output makes our qemu log files _huge_ if doing things like polling disk/net stats, and prevents us from returning any useful error message printed from the monitor (say for media/disk eject, disk/net stats, etc). I've been running with this patch for a while and haven't hit any issues. Thanks, Cole

3 5

[libvirt] [PATCH] build: avoid libvirtd link failure with CFLAGS=-g
by Jim Meyering 11 Dec '08

11 Dec '08

Building libvirtd with CFLAGS=-g (and not -O) failed: ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_driver.o): In function `qemudExtractMonitorPath': /home/meyering/w/co/libvirt/src/qemu_driver.c:549: undefined reference to `c_isspace' ../src/.libs/libvirt_driver_qemu.a(libvirt_driver_qemu_la-qemu_driver.o): In function `qemudDetectVcpuPIDs': /home/meyering/w/co/libvirt/src/qemu_driver.c:702: undefined reference to `c_isspace' collect2: ld returned 1 exit status make[2]: *** [libvirtd] Error 1 make[2]: Leaving directory `/home/meyering/w/co/libvirt/qemud' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/meyering/w/co/libvirt' make: *** [all] Error 2 Here's the fix: >From 7b963a92060c4591ce5c89f85301c35655056557 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 11 Dec 2008 18:43:12 +0100 Subject: [PATCH] build: avoid libvirtd link failure with CFLAGS=-g * qemud/Makefile.am (libvirtd_LDADD): Add gnulib's libgnu.la last. Otherwise, building with -g (no inlining) would fail due to a use of c_isspace in libvirt_driver_qemu.a, which used to followed libgnu.a in the link command. --- qemud/Makefile.am | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 8cb0847..ea89d06 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -93,8 +93,7 @@ libvirtd_LDADD = \ $(LIBXML_LIBS) \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ - $(POLKIT_LIBS) \ - ../gnulib/lib/libgnu.la + $(POLKIT_LIBS) if ! WITH_DRIVER_MODULES if WITH_QEMU @@ -244,6 +243,9 @@ uninstall-init: endif # DBUS_INIT_SCRIPTS_RED_HAT +# This must be added last. +libvirtd_LDADD += ../gnulib/lib/libgnu.la + endif # WITH_LIBVIRTD CLEANFILES = libvirtd.init -- 1.6.0.4.1044.g77718

2 2

[libvirt] [PATCH] Fix locking issue in testVolumeLookupByPath
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch fixes a locking issue in the test driver, specifically testStorageVolumeLookupByPath. We were only unlocking the pool object if it was running. This fixed a deadlock I was seeing while adding some new tests to virtinst's test framework. Thanks, Cole

2 2

[libvirt] [PATCH] Fix rpm building with new logrotate file
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch teaches the rpm spec about the new logrotate file, which unbreaks rpm builds. Thanks, Cole

4 5

[libvirt] [PATCH] Fix 'virsh pool-list' locking issue
by Cole Robinson 11 Dec '08

11 Dec '08

Running 'virsh pool-list' seems to deadlock libvirtd. Dan gave me some debugging tips, and I managed to track it down to the poolGetAutostart function. The attached patch fixes the issue. Thanks, Cole

3 5

[libvirt] [PATCH] Fix segfault if virtual network has no bridge listed
by Cole Robinson 11 Dec '08

11 Dec '08

The attached patch fixes a libvirtd segfault if we try to call virNetworkGetBridgeName on a virtual network with no bridge in its xml. This occurs if the network hasn't been started as long as the daemon has been running. This patch also cleans up an error path in qemu_conf which was overwriting the error returned by virNetworkGetBridgeName. Thanks, Cole

2 2

[libvirt] [PATCH] add fullscreen support to qemu sdl xml (via fullscreen='true' attribute for the graphics element)
by Itamar Heim 11 Dec '08

11 Dec '08

diff --git a/src/domain_conf.c b/src/domain_conf.c index 32ed59f..018d07f 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -212,6 +212,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def) case VIR_DOMAIN_GRAPHICS_TYPE_SDL: VIR_FREE(def->data.sdl.display); VIR_FREE(def->data.sdl.xauth); + VIR_FREE(def->data.sdl.fullscreen); break; } @@ -1403,6 +1404,7 @@ virDomainGraphicsDefParseXML(virConnectPtr conn, } else if (def->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { def->data.sdl.xauth = virXMLPropString(node, "xauth"); def->data.sdl.display = virXMLPropString(node, "display"); + def->data.sdl.fullscreen = virXMLPropString(node, "fullscreen"); } cleanup: @@ -2951,6 +2953,10 @@ virDomainGraphicsDefFormat(virConnectPtr conn, if (def->data.sdl.xauth) virBufferEscapeString(buf, " xauth='%s'", def->data.sdl.xauth); + if (def->data.sdl.fullscreen) + virBufferEscapeString(buf, " fullscreen='%s'", + def->data.sdl.fullscreen); + break; } diff --git a/src/domain_conf.h b/src/domain_conf.h index 51cf6d5..436d0b1 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -268,6 +268,7 @@ struct _virDomainGraphicsDef { struct { char *display; char *xauth; + char *fullscreen; } sdl; } data; }; diff --git a/src/qemu_conf.c b/src/qemu_conf.c index e6c378f..e53f5f0 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -35,6 +35,7 @@ #include <sys/wait.h> #include <arpa/inet.h> #include <sys/utsname.h> +#include <stdbool.h> #if HAVE_NUMACTL #define NUMA_VERSION1_COMPATIBILITY 1 @@ -1213,6 +1214,7 @@ int qemudBuildCommandLine(virConnectPtr conn, vm->def->graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *xauth = NULL; char *display = NULL; + bool fullscreen = false; if (vm->def->graphics->data.sdl.xauth && asprintf(&xauth, "XAUTHORITY=%s", @@ -1225,10 +1227,17 @@ int qemudBuildCommandLine(virConnectPtr conn, goto no_memory; } + if (vm->def->graphics->data.sdl.fullscreen && + STREQ(vm->def->graphics->data.sdl.fullscreen, "true")) { + fullscreen=true; + } + if (xauth) ADD_ENV(xauth); if (display) ADD_ENV(display); + if (fullscreen) + ADD_ARG_LIT("-full-screen"); } /* Add sound hardware */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args new file mode 100644 index 0000000..da2adc0 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args @@ -0,0 +1 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test XAUTHORITY=/root/.Xauthority DISPLAY=:0.1 /usr/bin/qemu -S -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -usb -full-screen diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml new file mode 100644 index 0000000..007677a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -0,0 +1,24 @@ +<domain type='qemu'> + <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> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + </disk> + <input type='mouse' bus='ps2'/> + <graphics type='sdl' display=':0.1' xauth='/root/.Xauthority' fullscreen='true'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 6e5355a..a04d508 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -195,6 +195,7 @@ mymain(int argc, char **argv) DO_TEST("disk-usb", 0); DO_TEST("graphics-vnc", 0); DO_TEST("graphics-sdl", 0); + DO_TEST("graphics-sdl-fullscreen", 0); DO_TEST("input-usbmouse", 0); DO_TEST("input-usbtablet", 0); DO_TEST("input-xen", 0); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c810f78..613926a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -98,6 +98,7 @@ mymain(int argc, char **argv) DO_TEST("disk-usb"); DO_TEST("graphics-vnc"); DO_TEST("graphics-sdl"); + DO_TEST("graphics-sdl-fullscreen"); DO_TEST("input-usbmouse"); DO_TEST("input-usbtablet"); DO_TEST("input-xen");

4 13

[libvirt] [PATCH] avoid a new "make distcheck" failure
by Jim Meyering 10 Dec '08

10 Dec '08

I noticed that "make distcheck" was failing. This fixes it: >From b80b724feb30ba46c5481e5b1198bbdfc2bfe428 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 10 Dec 2008 17:45:32 +0100 Subject: [PATCH] avoid a new "make distcheck" failure Distribute the new file, libvirtd.logrotate.in, and make distclean remove the build product, libvirtd.logrotate. * qemud/Makefile.am (EXTRA_DIST): Add libvirtd.logrotate.in. (DISTCLEANFILES): Initialize, and append libvirtd.logrotate.in. --- qemud/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/qemud/Makefile.am b/qemud/Makefile.am index df1e100..8cb0847 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -13,6 +13,7 @@ DAEMON_SOURCES = \ AVAHI_SOURCES = \ mdns.c mdns.h +DISTCLEANFILES = EXTRA_DIST = \ default-network.xml \ remote_generate_stubs.pl rpcgen_fix.pl \ @@ -24,6 +25,7 @@ EXTRA_DIST = \ libvirtd.sysconf \ libvirtd.aug \ libvirtd_qemu.aug \ + libvirtd.logrotate.in \ test_libvirtd.aug \ test_libvirtd_qemu.aug \ $(AVAHI_SOURCES) \ @@ -198,7 +200,7 @@ remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x perl -w $(srcdir)/remote_generate_stubs.pl -r $(srcdir)/remote_protocol.x > $@ - +DISTCLEANFILES += libvirtd.logrotate libvirtd.logrotate: libvirtd.logrotate.in sed \ -e s!\@localstatedir\@!@localstatedir@!g \ -- 1.6.0.4.1044.g77718

2 2

[libvirt] [PATCH] avoid format string warnings
by Jim Meyering 10 Dec '08

10 Dec '08

* src/openvz_conf.c (openvzGetNodeCPUs): Add "%s" arg before _(...). * src/uml_driver.c (umlDomainBlockPeek): Likewise. --- src/openvz_conf.c | 2 +- src/uml_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvz_conf.c b/src/openvz_conf.c index fc4ef20..1361c53 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -466,7 +466,7 @@ openvzGetNodeCPUs(void) if (virNodeInfoPopulate(NULL, &nodeinfo) < 0) { openvzError(NULL, VIR_ERR_INTERNAL_ERROR, - _("Cound not read nodeinfo")); + "%s", _("Cound not read nodeinfo")); return 0; } diff --git a/src/uml_driver.c b/src/uml_driver.c index 9c0d9c4..408096e 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -1764,13 +1764,13 @@ umlDomainBlockPeek (virDomainPtr dom, if (!vm) { umlReportError (dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching uuid")); + "%s", _("no domain with matching uuid")); goto cleanup; } if (!path || path[0] == '\0') { umlReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, - _("NULL or empty path")); + "%s", _("NULL or empty path")); goto cleanup; } @@ -1807,7 +1807,7 @@ umlDomainBlockPeek (virDomainPtr dom, ret = 0; } else { umlReportError (dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, - _("invalid path")); + "%s", _("invalid path")); } cleanup: -- 1.6.0.4.1044.g77718

2 2

[libvirt] PATCH 0/5: connection cloning support (WIP)
by Daniel P. Berrange 10 Dec '08

10 Dec '08

This series is a work-in-progress set of patches implementing connection cloning. The idea is that if you want to use a connection form multiple threads, you could do virConnectPtr copy = virConnectClone(conn) and use 'copy' from the other thread. This avoids the problem of having to make all the virError handling stuff thread-local whic is the blocker for allowing real mutlti-thread access to a single virConnectPtr object. I believe this cloning support should be sufficient for the Java bindings need to use a thread for its event loop. The idea being that if you wanted to use an event loop in a background thread, you'd create a cloned object for use event loop triggered callbacks like domain events notifications. I'd still like to do some experiments later making the single virConnectPtr fully thread safe, but that'll take a little more time. I'm hoping this cloning will address the Java needs right now... Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 7

[libvirt] F10 rpm problems
by Ben Guthro 09 Dec '08

09 Dec '08

So...I decided to make the leap, and upgraded to F10 (from F9) After my upgrade, I decided to build the libvirt rpm from source, and install it. So far, so good...everything built, and installs nicely. However, when I run virsh, I get the following error: virsh: error while loading shared libraries: libgnutls.so.13: cannot open shared object file: No such file or directory Fedora 10 has /usr/lib/libgnutls.so.26, so I'm not real sure why it is looking for the old F9 versions. I have tried a make clean, make distclean, even re-cloning the repo...without effect. Does anyone have any thoughts as to why it is choosing this version of gnutls?

5 6

[libvirt] [PATCH] fix just-broken "virsh start" and "virsh pool-start" commands
by Jim Meyering 09 Dec '08

09 Dec '08

* src/virsh.c (cmdPoolStart, cmdStart): Change hard-coded vshCommandOptDomainBy string argument to match just-changed option name. Cole Robinson reported that "virsh start" was broken and provided that part of the fix. Bug introduced by yesterday's "virsh.c: tweak options to produce more accurate help". * tests/start: New file. Test for the above fix. * tests/Makefile.am (test_scripts): Add start. --- Without this change, "virsh start" and "virsh pool-start" would always fail. I'm fixing this in two steps: first is this patch: make the tiny string-changing fixes (along with the new test). Second will be a more invasive change to make it so the duplicate strings are removed altogether, so they'll never get out of sync again. src/virsh.c | 4 ++-- tests/Makefile.am | 1 + tests/start | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100755 tests/start diff --git a/src/virsh.c b/src/virsh.c index bb81f25..1a5b42f 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -1021,7 +1021,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, VSH_BYNAME))) return FALSE; if (virDomainGetID(dom) != (unsigned int)-1) { @@ -3693,7 +3693,7 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(pool = vshCommandOptPoolBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, VSH_BYNAME))) return FALSE; if (virStoragePoolCreate(pool, 0) == 0) { diff --git a/tests/Makefile.am b/tests/Makefile.am index fd319e1..9e794c5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -64,6 +64,7 @@ test_scripts += \ int-overflow \ read-bufsiz \ read-non-seekable \ + start \ undefine \ vcpupin virsh-all diff --git a/tests/start b/tests/start new file mode 100755 index 0000000..a436f9b --- /dev/null +++ b/tests/start @@ -0,0 +1,42 @@ +#!/bin/sh +# ensure that virsh start works properly + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if test "$VERBOSE" = yes; then + set -x + virsh --version +fi + +test -z "$srcdir" && srcdir=$(pwd) +test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/.. +. "$srcdir/test-lib.sh" + +fail=0 + +test_url=test:///default + +# expect this to fail +virsh -c $test_url start test > out 2> err && fail=1 + +# stdout gets a newline +echo > exp || fail=1 +compare out exp || fail=1 + +echo 'error: Domain is already active' > exp || fail=1 +compare err exp || fail=1 + +(exit $fail); exit $fail -- 1.6.0.4.1044.g77718

2 2

[libvirt] [Python] libvirt.libvirtError output
by Ivan Vovk 09 Dec '08

09 Dec '08

Hello, i have the following piece of pyhton test code: try: dom = conn.createXML(xmldata, 0) except libvirt.libvirtError, le: sys.stderr.write(le.message) as a result in case of exception i get 2 outputs in stderr: libvir: OpenVZ error : operation failed: Already an OPENVZ VM defined with the id '3005' operation failed: Already an OPENVZ VM defined with the id '3005' Actually, i just need only second string, which is generated by sys.stderr.write(le.message). Can an exception be raised without "uncontrolled" direction to stderr (fisrt string)? ________________________________ This message (including attachments) is private and confidential. If you have received this message in error, please notify us and remove it from your system.

2 1

[libvirt] Open monitor logs O_APPEND
by Guido Günther 09 Dec '08

09 Dec '08

Hi, attached patch is from Debian Bug #507553: The logfile is opened with O_APPEND (to make logrotate work with copytruncate) and without O_TRUNC (to not lose log information e.g. with stop and start of a VM). Using collectd or munin to monitor VMs creates quiet a bit of qemu monitor output so the ability to use logrotate makes a lot of sense to me. O.k. to apply? -- Guido diff -ur libvirt-0.4.4.orig/src/qemu_driver.c libvirt-0.4.4/src/qemu_driver.c --- libvirt-0.4.4.orig/src/qemu_driver.c 2008-06-12 16:52:53.000000000 +0200 +++ libvirt-0.4.4/src/qemu_driver.c 2008-12-02 12:48:32.271881000 +0100 @@ -844,7 +844,7 @@ return -1; } - if ((vm->logfile = open(logfile, O_CREAT | O_TRUNC | O_WRONLY, + if ((vm->logfile = open(logfile, O_CREAT | O_APPEND | O_WRONLY, S_IRUSR | S_IWUSR)) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("failed to create logfile %s: %s"),

3 4

[libvirt] how to get started with libvirt & central access control
by Juan Miscaro 08 Dec '08

08 Dec '08

Quite new to libvirt (and kvm). I played with a few vm's with libvirt/kvm and vnc/virsh/virt-manager. I would now like to implement access control for my vm's (of any format: xen, kvm, etc) to a remote backend (mysql/ldap/other). Where does one begin? I would later want to do the same but in the context of a cluster of hosts (each running multiple vm's). Thanks in advance for any advice. /juan

3 2

[libvirt] libvirt 0.5.1 tag missing in git repo: just applied manually
by Jim Meyering 08 Dec '08

08 Dec '08

FYI, Itamar Heim noticed that the LIBVIRT_0_5_1 tag, while in CVS, was not in the git repository (thanks, Itamar). I have a vague recollection that git cvsimport creates certain tags lazily (like only once there is something on a branch) but I have manually applied and pushed this particular tag, nonetheless.

1 0

[libvirt] [PATCH 0/4] generate SYNTAX section of "virsh help CMD" output
by Jim Meyering 08 Dec '08

08 Dec '08

This started when I noticed that a lot of virsh help output was out of date. Dan Berrange suggested to generate the SYNTAX line automatically based on existing option descriptions, since they tell us what arguments/types each command accepts and can (usually) tell us when options or arguments are optional. Doing this exposed several inaccurate SYNTAX lines, as well as some inaccurate option descriptions. But since the option description structs are currently used only to generate the text of ./virsh help's OPTIONS section, it's not terribly important. Other than changes to help output, this change induces some minor user-visible changes: It is currently undocumented that virsh accepts "-h C1 C2 C3..." and treats it like "virsh help C1", ignoring C2 C3... This change disables that feature (to clean up a few interfaces and to make automatic help SYNTAX generation simpler) and makes virsh diagnose any unused arguments with --help (-h), so now, this command fails rather than trying to interpret "A" as a command: $ virsh -h -c test:///default A virsh: error: extra argument 'A'. See --help. To view the other changes induced by this patch, I've run the following commands: v='virsh -c test:///default' cmd=$(eval $v help|sed -n 's/^ $[^ ][^ ]*$ .*/\1/p') for i in $(echo $cmd); do diff -ubBw -L $i.orig -L $i.new <(eval $v help $i) <(eval ./$v help $i) done They use diff to compare e.g., the output of my just-built ./virsh and the installed-in-PATH "virsh" program. Note that there is currently no way via options to indicate that one of two or more options must be selected, so the automatically generated syntax string list both as independent options. Here are the induced help changes: [code diffs coming in separate messages] --- attach-disk.orig +++ attach-disk.new @@ -2,7 +2,7 @@ attach-disk - attach disk device SYNOPSIS - attach-disk <domain> <source> <target> [--driver <driver>] [--subdriver <subdriver>] [--type <type>] [--mode <mode>] + attach-disk <domain> <source> <target> [--driver <string>] [--subdriver <string>] [--type <string>] [--mode <string>] DESCRIPTION Attach new disk device. @@ -11,9 +11,9 @@ <domain> domain name, id or uuid <source> source of disk device <target> target of disk device - <driver> driver of disk device - <subdriver> subdriver of disk device - <type> target device type - <mode> mode of device reading and writing + --driver <string> driver of disk device + --subdriver <string> subdriver of disk device + --type <string> target device type + --mode <string> mode of device reading and writing --- attach-interface.orig +++ attach-interface.new @@ -2,7 +2,7 @@ attach-interface - attach network interface SYNOPSIS - attach-interface <domain> <type> <source> [--target <target>] [--mac <mac>] [--script <script>] + attach-interface <domain> <type> <source> [<target>] [<mac>] [<script>] DESCRIPTION Attach new network interface. --- autostart.orig +++ autostart.new @@ -2,7 +2,7 @@ autostart - autostart a domain SYNOPSIS - autostart [--disable] <domain> + autostart <domain> [--disable] DESCRIPTION Configure a domain to be automatically started at boot. --- connect.orig +++ connect.new @@ -2,7 +2,7 @@ connect - (re)connect to hypervisor SYNOPSIS - connect [name] [--readonly] + connect [<name>] [--readonly] DESCRIPTION Connect to local hypervisor. This is built-in command after shell start up. --- create.orig +++ create.new @@ -2,7 +2,7 @@ create - create a domain from an XML file SYNOPSIS - create a domain from an XML <file> + create <file> DESCRIPTION Create a domain. --- start.orig +++ start.new @@ -8,6 +8,6 @@ Start a domain. OPTIONS - <name> name of the inactive domain + <domain> name of the inactive domain --- detach-interface.orig +++ detach-interface.new @@ -2,7 +2,7 @@ detach-interface - detach network interface SYNOPSIS - detach-interface <domain> <type> [--mac <mac>] + detach-interface <domain> <type> [--mac <string>] DESCRIPTION Detach network interface. @@ -10,6 +10,6 @@ OPTIONS <domain> domain name, id or uuid <type> network interface type - <mac> MAC address + --mac <string> MAC address --- define.orig +++ define.new @@ -2,7 +2,7 @@ define - define (but don't start) a domain from an XML file SYNOPSIS - define a domain from an XML <file> + define <file> DESCRIPTION Define a domain. --- domblkstat.orig +++ domblkstat.new @@ -2,7 +2,7 @@ domblkstat - get device block stats for a domain SYNOPSIS - domblkstat <domain> <dev> + domblkstat <domain> <device> DESCRIPTION Get device block stats for a running domain. --- domifstat.orig +++ domifstat.new @@ -2,7 +2,7 @@ domifstat - get network interface stats for a domain SYNOPSIS - domifstat <domain> <dev> + domifstat <domain> <interface> DESCRIPTION Get network interface stats for a running domain. --- find-storage-pool-sources.orig +++ find-storage-pool-sources.new @@ -2,7 +2,7 @@ find-storage-pool-sources - discover potential storage pool sources SYNOPSIS - find-storage-pool-sources <type> [srcSpec] + find-storage-pool-sources <type> [<srcSpec>] DESCRIPTION Returns XML <sources> document. --- find-storage-pool-sources-as.orig +++ find-storage-pool-sources-as.new @@ -2,7 +2,7 @@ find-storage-pool-sources-as - find potential storage pool sources SYNOPSIS - find-storage-pool-sources-as <type> [options] + find-storage-pool-sources-as <type> [<host>] [<port>] DESCRIPTION Returns XML <sources> document. --- list.orig +++ list.new @@ -2,7 +2,7 @@ list - list domains SYNOPSIS - list [--inactive | --all] + list [--inactive] [--all] DESCRIPTION Returns list of domains. --- migrate.orig +++ migrate.new @@ -2,7 +2,7 @@ migrate - migrate domain to another host SYNOPSIS - migrate [--live] <domain> <desturi> [<migrateuri>] + migrate [--live] <domain> <desturi> [<migrateuri>] [<dname>] DESCRIPTION Migrate domain to another host. Add --live for live migration. --- net-autostart.orig +++ net-autostart.new @@ -2,7 +2,7 @@ net-autostart - autostart a network SYNOPSIS - net-autostart [--disable] <network> + net-autostart <network> [--disable] DESCRIPTION Configure a network to be automatically started at boot. --- net-list.orig +++ net-list.new @@ -2,7 +2,7 @@ net-list - list networks SYNOPSIS - net-list [ --inactive | --all ] + net-list [--inactive] [--all] DESCRIPTION Returns list of networks. --- net-start.orig +++ net-start.new @@ -2,7 +2,7 @@ net-start - start a (previously defined) inactive network SYNOPSIS - net-start <network> + net-start <name> DESCRIPTION Start a network. --- nodedev-list.orig +++ nodedev-list.new @@ -2,7 +2,7 @@ nodedev-list - enumerate devices on this host SYNOPSIS - nodedev-list [--cap <capability>] + nodedev-list [--cap <string>] OPTIONS --cap <string> capability name --- pool-autostart.orig +++ pool-autostart.new @@ -2,7 +2,7 @@ pool-autostart - autostart a pool SYNOPSIS - pool-autostart [--disable] <pool> + pool-autostart <pool> [--disable] DESCRIPTION Configure a pool to be automatically started at boot. --- pool-create-as.orig +++ pool-create-as.new @@ -2,7 +2,7 @@ pool-create-as - create a pool from a set of args SYNOPSIS - pool-create-as <name> <type> + pool-create-as <name> <type> [<source-host>] [<source-path>] [<source-dev>] [<target>] DESCRIPTION Create a pool. --- pool-define-as.orig +++ pool-define-as.new @@ -2,7 +2,7 @@ pool-define-as - define a pool from a set of args SYNOPSIS - pool-define-as <name> <type> + pool-define-as <name> <type> [<source-host>] [<source-path>] [<source-dev>] [<source-name>] [<target>] DESCRIPTION Define a pool. --- pool-edit.orig +++ pool-edit.new @@ -2,7 +2,7 @@ pool-edit - edit XML configuration for a storage pool SYNOPSIS - pool-edit <domain> + pool-edit <pool> DESCRIPTION Edit the XML configuration for a storage pool. --- pool-list.orig +++ pool-list.new @@ -2,7 +2,7 @@ pool-list - list pools SYNOPSIS - pool-list [ --inactive | --all ] + pool-list [--inactive] [--all] DESCRIPTION Returns list of pools. --- pool-start.orig +++ pool-start.new @@ -8,6 +8,6 @@ Start a pool. OPTIONS - <name> name of the inactive pool + <pool> name of the inactive pool --- restore.orig +++ restore.new @@ -2,7 +2,7 @@ restore - restore a domain from a saved state in a file SYNOPSIS - restore a domain from <file> + restore <file> DESCRIPTION Restore a domain. --- schedinfo.orig +++ schedinfo.new @@ -2,7 +2,7 @@ schedinfo - show/set scheduler parameters SYNOPSIS - schedinfo <domain> + schedinfo <domain> [--set <string>] [--weight <number>] [--cap <number>] DESCRIPTION Show/Set scheduler parameters. --- vol-create.orig +++ vol-create.new @@ -2,7 +2,7 @@ vol-create - create a vol from an XML file SYNOPSIS - vol-create <file> + vol-create <pool> <file> DESCRIPTION Create a vol. --- vol-create-as.orig +++ vol-create-as.new @@ -2,7 +2,7 @@ vol-create-as - create a volume from a set of args SYNOPSIS - vol-create-as <pool> <name> <capacity> + vol-create-as <pool> <name> <capacity> [--allocation <string>] [--format <string>] DESCRIPTION Create a vol. @@ -11,7 +11,7 @@ <pool> pool name <name> name of the volume <capacity> size of the vol with optional k,M,G,T suffix - <allocation> initial allocation size with optional k,M,G,T suffix - <format> file format type raw,bochs,qcow,qcow2,vmdk + --allocation <string> initial allocation size with optional k,M,G,T suffix + --format <string> file format type raw,bochs,qcow,qcow2,vmdk --- vol-delete.orig +++ vol-delete.new @@ -2,7 +2,7 @@ vol-delete - delete a vol SYNOPSIS - vol-delete <vol> + vol-delete [--pool <string>] <vol> DESCRIPTION Delete a given vol. --- vol-dumpxml.orig +++ vol-dumpxml.new @@ -2,7 +2,7 @@ vol-dumpxml - vol information in XML SYNOPSIS - vol-dumpxml <vol> + vol-dumpxml [--pool <string>] <vol> DESCRIPTION Output the vol information as an XML dump to stdout. --- vol-info.orig +++ vol-info.new @@ -2,7 +2,7 @@ vol-info - storage vol information SYNOPSIS - vol-info <vol> + vol-info [--pool <string>] <vol> DESCRIPTION Returns basic information about the storage vol. --- vol-path.orig +++ vol-path.new @@ -2,7 +2,7 @@ vol-path - convert a vol UUID to vol path SYNOPSIS - vol-path <pool> <vol> + vol-path [--pool <string>] <vol> OPTIONS --pool <string> pool name or uuid

3 4

[libvirt] Bridged network (shared physical device) and libvirt
by Henrik Persson E 08 Dec '08

08 Dec '08

Hi, Are there any plans to include possibility to configure bridged networks in libvirt? I see the need to be able to actually be able create vlans on physical devices and the bridge the vlan, which I guess is a very normal case for isolating network traffic between different guests. I would be great if it would be possible to both create vlans on physical devices and then also create bridged network connected to any available network (physical/bonded/vlan) /Henrik

4 3

[libvirt] [PATCH 3/4] virsh.c: remove all "syntax" vshCmdInfo entries.
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: ... now that it's generated. --- FYI, I made this change with the following one-liner: perl -ni -e '/"syntax",/ or print' src/virsh.c src/virsh.c | 89 ----------------------------------------------------------- 1 files changed, 0 insertions(+), 89 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index d96a7d4..230a128 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -335,7 +335,6 @@ static int namesorter(const void *a, const void *b) { * "help" command */ static const vshCmdInfo info_help[] = { - {"syntax", "help [<command>]"}, {"help", gettext_noop("print help")}, {"desc", gettext_noop("Prints global help or command specific help.")}, @@ -368,7 +367,6 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) * "autostart" command */ static const vshCmdInfo info_autostart[] = { - {"syntax", "autostart [--disable] <domain>"}, {"help", gettext_noop("autostart a domain")}, {"desc", gettext_noop("Configure a domain to be automatically started at boot.")}, @@ -420,7 +418,6 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) * "connect" command */ static const vshCmdInfo info_connect[] = { - {"syntax", "connect [name] [--readonly]"}, {"help", gettext_noop("(re)connect to hypervisor")}, {"desc", gettext_noop("Connect to local hypervisor. This is built-in command after shell start up.")}, @@ -468,7 +465,6 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) * "console" command */ static const vshCmdInfo info_console[] = { - {"syntax", "console <domain>"}, {"help", gettext_noop("connect to the guest console")}, {"desc", gettext_noop("Connect the virtual serial console for the guest")}, @@ -545,7 +541,6 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "list" command */ static const vshCmdInfo info_list[] = { - {"syntax", "list [--inactive | --all]"}, {"help", gettext_noop("list domains")}, {"desc", gettext_noop("Returns list of domains.")}, {NULL, NULL} @@ -663,7 +658,6 @@ cmdList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "domstate" command */ static const vshCmdInfo info_domstate[] = { - {"syntax", "domstate <domain>"}, {"help", gettext_noop("domain state")}, {"desc", gettext_noop("Returns state about a domain.")}, {NULL, NULL} @@ -700,7 +694,6 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) /* "domblkstat" command */ static const vshCmdInfo info_domblkstat[] = { - {"syntax", "domblkstat <domain> <dev>"}, {"help", gettext_noop("get device block stats for a domain")}, {"desc", gettext_noop("Get device block stats for a running domain.")}, {NULL,NULL} @@ -757,7 +750,6 @@ cmdDomblkstat (vshControl *ctl, const vshCmd *cmd) /* "domifstat" command */ static const vshCmdInfo info_domifstat[] = { - {"syntax", "domifstat <domain> <dev>"}, {"help", gettext_noop("get network interface stats for a domain")}, {"desc", gettext_noop("Get network interface stats for a running domain.")}, {NULL,NULL} @@ -824,7 +816,6 @@ cmdDomIfstat (vshControl *ctl, const vshCmd *cmd) * "suspend" command */ static const vshCmdInfo info_suspend[] = { - {"syntax", "suspend <domain>"}, {"help", gettext_noop("suspend a domain")}, {"desc", gettext_noop("Suspend a running domain.")}, {NULL, NULL} @@ -863,7 +854,6 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) * "create" command */ static const vshCmdInfo info_create[] = { - {"syntax", "create a domain from an XML <file>"}, {"help", gettext_noop("create a domain from an XML file")}, {"desc", gettext_noop("Create a domain.")}, {NULL, NULL} @@ -911,7 +901,6 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) * "define" command */ static const vshCmdInfo info_define[] = { - {"syntax", "define a domain from an XML <file>"}, {"help", gettext_noop("define (but don't start) a domain from an XML file")}, {"desc", gettext_noop("Define a domain.")}, {NULL, NULL} @@ -959,7 +948,6 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) * "undefine" command */ static const vshCmdInfo info_undefine[] = { - {"syntax", "undefine <domain>"}, {"help", gettext_noop("undefine an inactive domain")}, {"desc", gettext_noop("Undefine the configuration for an inactive domain.")}, {NULL, NULL} @@ -1014,7 +1002,6 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) * "start" command */ static const vshCmdInfo info_start[] = { - {"syntax", "start <domain>"}, {"help", gettext_noop("start a (previously defined) inactive domain")}, {"desc", gettext_noop("Start a domain.")}, {NULL, NULL} @@ -1059,7 +1046,6 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) * "save" command */ static const vshCmdInfo info_save[] = { - {"syntax", "save <domain> <file>"}, {"help", gettext_noop("save a domain state to a file")}, {"desc", gettext_noop("Save a running domain.")}, {NULL, NULL} @@ -1103,7 +1089,6 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) * "schedinfo" command */ static const vshCmdInfo info_schedinfo[] = { - {"syntax", "schedinfo <domain>"}, {"help", gettext_noop("show/set scheduler parameters")}, {"desc", gettext_noop("Show/Set scheduler parameters.")}, {NULL, NULL} @@ -1286,7 +1271,6 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) * "restore" command */ static const vshCmdInfo info_restore[] = { - {"syntax", "restore a domain from <file>"}, {"help", gettext_noop("restore a domain from a saved state in a file")}, {"desc", gettext_noop("Restore a domain.")}, {NULL, NULL} @@ -1324,7 +1308,6 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd) * "dump" command */ static const vshCmdInfo info_dump[] = { - {"syntax", "dump <domain> <file>"}, {"help", gettext_noop("dump the core of a domain to a file for analysis")}, {"desc", gettext_noop("Core dump a domain.")}, {NULL, NULL} @@ -1369,7 +1352,6 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) * "resume" command */ static const vshCmdInfo info_resume[] = { - {"syntax", "resume <domain>"}, {"help", gettext_noop("resume a domain")}, {"desc", gettext_noop("Resume a previously suspended domain.")}, {NULL, NULL} @@ -1408,7 +1390,6 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) * "shutdown" command */ static const vshCmdInfo info_shutdown[] = { - {"syntax", "shutdown <domain>"}, {"help", gettext_noop("gracefully shutdown a domain")}, {"desc", gettext_noop("Run shutdown in the target domain.")}, {NULL, NULL} @@ -1447,7 +1428,6 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) * "reboot" command */ static const vshCmdInfo info_reboot[] = { - {"syntax", "reboot <domain>"}, {"help", gettext_noop("reboot a domain")}, {"desc", gettext_noop("Run a reboot command in the target domain.")}, {NULL, NULL} @@ -1486,7 +1466,6 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) * "destroy" command */ static const vshCmdInfo info_destroy[] = { - {"syntax", "destroy <domain>"}, {"help", gettext_noop("destroy a domain")}, {"desc", gettext_noop("Destroy a given domain.")}, {NULL, NULL} @@ -1525,7 +1504,6 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) * "dominfo" command */ static const vshCmdInfo info_dominfo[] = { - {"syntax", "dominfo <domain>"}, {"help", gettext_noop("domain information")}, {"desc", gettext_noop("Returns basic information about the domain.")}, {NULL, NULL} @@ -1607,7 +1585,6 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) * "freecell" command */ static const vshCmdInfo info_freecell[] = { - {"syntax", "freecell [<cellno>]"}, {"help", gettext_noop("NUMA free memory")}, {"desc", gettext_noop("display available free memory for the NUMA cell.")}, {NULL, NULL} @@ -1649,7 +1626,6 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) * "vcpuinfo" command */ static const vshCmdInfo info_vcpuinfo[] = { - {"syntax", "vcpuinfo <domain>"}, {"help", gettext_noop("domain vcpu information")}, {"desc", gettext_noop("Returns basic information about the domain virtual CPUs.")}, {NULL, NULL} @@ -1736,7 +1712,6 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) * "vcpupin" command */ static const vshCmdInfo info_vcpupin[] = { - {"syntax", "vcpupin <domain> <vcpu> <cpulist>"}, {"help", gettext_noop("control domain vcpu affinity")}, {"desc", gettext_noop("Pin domain VCPUs to host physical CPUs.")}, {NULL, NULL} @@ -1870,7 +1845,6 @@ cmdVcpupin(vshControl *ctl, const vshCmd *cmd) * "setvcpus" command */ static const vshCmdInfo info_setvcpus[] = { - {"syntax", "setvcpus <domain> <count>"}, {"help", gettext_noop("change number of virtual CPUs")}, {"desc", gettext_noop("Change the number of virtual CPUs in the guest domain.")}, {NULL, NULL} @@ -1927,7 +1901,6 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) * "setmemory" command */ static const vshCmdInfo info_setmem[] = { - {"syntax", "setmem <domain> <kilobytes>"}, {"help", gettext_noop("change memory allocation")}, {"desc", gettext_noop("Change the current memory allocation in the guest domain.")}, {NULL, NULL} @@ -1984,7 +1957,6 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) * "setmaxmem" command */ static const vshCmdInfo info_setmaxmem[] = { - {"syntax", "setmaxmem <domain> <kilobytes>"}, {"help", gettext_noop("change maximum memory limit")}, {"desc", gettext_noop("Change the maximum memory allocation limit in the guest domain.")}, {NULL, NULL} @@ -2044,7 +2016,6 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) * "nodeinfo" command */ static const vshCmdInfo info_nodeinfo[] = { - {"syntax", "nodeinfo"}, {"help", gettext_noop("node information")}, {"desc", gettext_noop("Returns basic information about the node.")}, {NULL, NULL} @@ -2078,7 +2049,6 @@ cmdNodeinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "capabilities" command */ static const vshCmdInfo info_capabilities[] = { - {"syntax", "capabilities"}, {"help", gettext_noop("capabilities")}, {"desc", gettext_noop("Returns capabilities of hypervisor/driver.")}, {NULL, NULL} @@ -2106,7 +2076,6 @@ cmdCapabilities (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "dumpxml" command */ static const vshCmdInfo info_dumpxml[] = { - {"syntax", "dumpxml <domain>"}, {"help", gettext_noop("domain information in XML")}, {"desc", gettext_noop("Output the domain information as an XML dump to stdout.")}, {NULL, NULL} @@ -2146,7 +2115,6 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) * "domname" command */ static const vshCmdInfo info_domname[] = { - {"syntax", "domname <domain>"}, {"help", gettext_noop("convert a domain id or UUID to domain name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2177,7 +2145,6 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) * "domid" command */ static const vshCmdInfo info_domid[] = { - {"syntax", "domid <domain>"}, {"help", gettext_noop("convert a domain name or UUID to domain id")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2213,7 +2180,6 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) * "domuuid" command */ static const vshCmdInfo info_domuuid[] = { - {"syntax", "domuuid <domain>"}, {"help", gettext_noop("convert a domain name or id to domain UUID")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2249,7 +2215,6 @@ cmdDomuuid(vshControl *ctl, const vshCmd *cmd) * "migrate" command */ static const vshCmdInfo info_migrate[] = { - {"syntax", "migrate [--live] <domain> <desturi> [<migrateuri>]"}, {"help", gettext_noop("migrate domain to another host")}, {"desc", gettext_noop("Migrate domain to another host. Add --live for live migration.")}, {NULL, NULL} @@ -2317,7 +2282,6 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) * "net-autostart" command */ static const vshCmdInfo info_network_autostart[] = { - {"syntax", "net-autostart [--disable] <network>"}, {"help", gettext_noop("autostart a network")}, {"desc", gettext_noop("Configure a network to be automatically started at boot.")}, @@ -2368,7 +2332,6 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) * "net-create" command */ static const vshCmdInfo info_network_create[] = { - {"syntax", "net-create <file>"}, {"help", gettext_noop("create a network from an XML file")}, {"desc", gettext_noop("Create a network.")}, {NULL, NULL} @@ -2416,7 +2379,6 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) * "net-define" command */ static const vshCmdInfo info_network_define[] = { - {"syntax", "net-define <file>"}, {"help", gettext_noop("define (but don't start) a network from an XML file")}, {"desc", gettext_noop("Define a network.")}, {NULL, NULL} @@ -2464,7 +2426,6 @@ cmdNetworkDefine(vshControl *ctl, const vshCmd *cmd) * "net-destroy" command */ static const vshCmdInfo info_network_destroy[] = { - {"syntax", "net-destroy <network>"}, {"help", gettext_noop("destroy a network")}, {"desc", gettext_noop("Destroy a given network.")}, {NULL, NULL} @@ -2504,7 +2465,6 @@ cmdNetworkDestroy(vshControl *ctl, const vshCmd *cmd) * "net-dumpxml" command */ static const vshCmdInfo info_network_dumpxml[] = { - {"syntax", "net-dumpxml <network>"}, {"help", gettext_noop("network information in XML")}, {"desc", gettext_noop("Output the network information as an XML dump to stdout.")}, {NULL, NULL} @@ -2545,7 +2505,6 @@ cmdNetworkDumpXML(vshControl *ctl, const vshCmd *cmd) * "net-list" command */ static const vshCmdInfo info_network_list[] = { - {"syntax", "net-list [ --inactive | --all ]"}, {"help", gettext_noop("list networks")}, {"desc", gettext_noop("Returns list of networks.")}, {NULL, NULL} @@ -2669,7 +2628,6 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "net-name" command */ static const vshCmdInfo info_network_name[] = { - {"syntax", "net-name <network>"}, {"help", gettext_noop("convert a network UUID to network name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2701,7 +2659,6 @@ cmdNetworkName(vshControl *ctl, const vshCmd *cmd) * "net-start" command */ static const vshCmdInfo info_network_start[] = { - {"syntax", "net-start <network>"}, {"help", gettext_noop("start a (previously defined) inactive network")}, {"desc", gettext_noop("Start a network.")}, {NULL, NULL} @@ -2740,7 +2697,6 @@ cmdNetworkStart(vshControl *ctl, const vshCmd *cmd) * "net-undefine" command */ static const vshCmdInfo info_network_undefine[] = { - {"syntax", "net-undefine <network>"}, {"help", gettext_noop("undefine an inactive network")}, {"desc", gettext_noop("Undefine the configuration for an inactive network.")}, {NULL, NULL} @@ -2779,7 +2735,6 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) * "net-uuid" command */ static const vshCmdInfo info_network_uuid[] = { - {"syntax", "net-uuid <network>"}, {"help", gettext_noop("convert a network name to network UUID")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -2816,7 +2771,6 @@ cmdNetworkUuid(vshControl *ctl, const vshCmd *cmd) * "pool-autostart" command */ static const vshCmdInfo info_pool_autostart[] = { - {"syntax", "pool-autostart [--disable] <pool>"}, {"help", gettext_noop("autostart a pool")}, {"desc", gettext_noop("Configure a pool to be automatically started at boot.")}, @@ -2867,7 +2821,6 @@ cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd) * "pool-create" command */ static const vshCmdInfo info_pool_create[] = { - {"syntax", "pool-create <file>"}, {"help", gettext_noop("create a pool from an XML file")}, {"desc", gettext_noop("Create a pool.")}, {NULL, NULL} @@ -2915,7 +2868,6 @@ cmdPoolCreate(vshControl *ctl, const vshCmd *cmd) * "pool-create-as" command */ static const vshCmdInfo info_pool_create_as[] = { - {"syntax", "pool-create-as <name> <type>"}, {"help", gettext_noop("create a pool from a set of args")}, {"desc", gettext_noop("Create a pool.")}, {NULL, NULL} @@ -3006,7 +2958,6 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) * "pool-define" command */ static const vshCmdInfo info_pool_define[] = { - {"syntax", "pool-define <file>"}, {"help", gettext_noop("define (but don't start) a pool from an XML file")}, {"desc", gettext_noop("Define a pool.")}, {NULL, NULL} @@ -3054,7 +3005,6 @@ cmdPoolDefine(vshControl *ctl, const vshCmd *cmd) * "pool-define-as" command */ static const vshCmdInfo info_pool_define_as[] = { - {"syntax", "pool-define-as <name> <type>"}, {"help", gettext_noop("define a pool from a set of args")}, {"desc", gettext_noop("Define a pool.")}, {NULL, NULL} @@ -3148,7 +3098,6 @@ cmdPoolDefineAs(vshControl *ctl, const vshCmd *cmd) * "pool-build" command */ static const vshCmdInfo info_pool_build[] = { - {"syntax", "pool-build <pool>"}, {"help", gettext_noop("build a pool")}, {"desc", gettext_noop("Build a given pool.")}, {NULL, NULL} @@ -3188,7 +3137,6 @@ cmdPoolBuild(vshControl *ctl, const vshCmd *cmd) * "pool-destroy" command */ static const vshCmdInfo info_pool_destroy[] = { - {"syntax", "pool-destroy <pool>"}, {"help", gettext_noop("destroy a pool")}, {"desc", gettext_noop("Destroy a given pool.")}, {NULL, NULL} @@ -3228,7 +3176,6 @@ cmdPoolDestroy(vshControl *ctl, const vshCmd *cmd) * "pool-delete" command */ static const vshCmdInfo info_pool_delete[] = { - {"syntax", "pool-delete <pool>"}, {"help", gettext_noop("delete a pool")}, {"desc", gettext_noop("Delete a given pool.")}, {NULL, NULL} @@ -3268,7 +3215,6 @@ cmdPoolDelete(vshControl *ctl, const vshCmd *cmd) * "pool-refresh" command */ static const vshCmdInfo info_pool_refresh[] = { - {"syntax", "pool-refresh <pool>"}, {"help", gettext_noop("refresh a pool")}, {"desc", gettext_noop("Refresh a given pool.")}, {NULL, NULL} @@ -3308,7 +3254,6 @@ cmdPoolRefresh(vshControl *ctl, const vshCmd *cmd) * "pool-dumpxml" command */ static const vshCmdInfo info_pool_dumpxml[] = { - {"syntax", "pool-dumpxml <pool>"}, {"help", gettext_noop("pool information in XML")}, {"desc", gettext_noop("Output the pool information as an XML dump to stdout.")}, {NULL, NULL} @@ -3349,7 +3294,6 @@ cmdPoolDumpXML(vshControl *ctl, const vshCmd *cmd) * "pool-list" command */ static const vshCmdInfo info_pool_list[] = { - {"syntax", "pool-list [ --inactive | --all ]"}, {"help", gettext_noop("list pools")}, {"desc", gettext_noop("Returns list of pools.")}, {NULL, NULL} @@ -3472,7 +3416,6 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "find-storage-pool-sources-as" command */ static const vshCmdInfo info_find_storage_pool_sources_as[] = { - {"syntax", "find-storage-pool-sources-as <type> [options]"}, {"help", gettext_noop("find potential storage pool sources")}, {"desc", gettext_noop("Returns XML <sources> document.")}, {NULL, NULL} @@ -3553,7 +3496,6 @@ cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUSED) * "find-storage-pool-sources" command */ static const vshCmdInfo info_find_storage_pool_sources[] = { - {"syntax", "find-storage-pool-sources <type> [srcSpec]"}, {"help", gettext_noop("discover potential storage pool sources")}, {"desc", gettext_noop("Returns XML <sources> document.")}, {NULL, NULL} @@ -3626,7 +3568,6 @@ prettyCapacity(unsigned long long val, * "pool-info" command */ static const vshCmdInfo info_pool_info[] = { - {"syntax", "pool-info <pool>"}, {"help", gettext_noop("storage pool information")}, {"desc", gettext_noop("Returns basic information about the storage pool.")}, {NULL, NULL} @@ -3702,7 +3643,6 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) * "pool-name" command */ static const vshCmdInfo info_pool_name[] = { - {"syntax", "pool-name <pool>"}, {"help", gettext_noop("convert a pool UUID to pool name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -3734,7 +3674,6 @@ cmdPoolName(vshControl *ctl, const vshCmd *cmd) * "pool-start" command */ static const vshCmdInfo info_pool_start[] = { - {"syntax", "pool-start <pool>"}, {"help", gettext_noop("start a (previously defined) inactive pool")}, {"desc", gettext_noop("Start a pool.")}, {NULL, NULL} @@ -3773,7 +3712,6 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd) * "vol-create-as" command */ static const vshCmdInfo info_vol_create_as[] = { - {"syntax", "vol-create-as <pool> <name> <capacity>"}, {"help", gettext_noop("create a volume from a set of args")}, {"desc", gettext_noop("Create a vol.")}, {NULL, NULL} @@ -3895,7 +3833,6 @@ cmdVolCreateAs(vshControl *ctl, const vshCmd *cmd) * "pool-undefine" command */ static const vshCmdInfo info_pool_undefine[] = { - {"syntax", "pool-undefine <pool>"}, {"help", gettext_noop("undefine an inactive pool")}, {"desc", gettext_noop("Undefine the configuration for an inactive pool.")}, {NULL, NULL} @@ -3934,7 +3871,6 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) * "pool-uuid" command */ static const vshCmdInfo info_pool_uuid[] = { - {"syntax", "pool-uuid <pool>"}, {"help", gettext_noop("convert a pool name to pool UUID")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -3973,7 +3909,6 @@ cmdPoolUuid(vshControl *ctl, const vshCmd *cmd) * "vol-create" command */ static const vshCmdInfo info_vol_create[] = { - {"syntax", "vol-create <file>"}, {"help", gettext_noop("create a vol from an XML file")}, {"desc", gettext_noop("Create a vol.")}, {NULL, NULL} @@ -4032,7 +3967,6 @@ cmdVolCreate(vshControl *ctl, const vshCmd *cmd) * "vol-delete" command */ static const vshCmdInfo info_vol_delete[] = { - {"syntax", "vol-delete <vol>"}, {"help", gettext_noop("delete a vol")}, {"desc", gettext_noop("Delete a given vol.")}, {NULL, NULL} @@ -4074,7 +4008,6 @@ cmdVolDelete(vshControl *ctl, const vshCmd *cmd) * "vol-info" command */ static const vshCmdInfo info_vol_info[] = { - {"syntax", "vol-info <vol>"}, {"help", gettext_noop("storage vol information")}, {"desc", gettext_noop("Returns basic information about the storage vol.")}, {NULL, NULL} @@ -4126,7 +4059,6 @@ cmdVolInfo(vshControl *ctl, const vshCmd *cmd) * "vol-dumpxml" command */ static const vshCmdInfo info_vol_dumpxml[] = { - {"syntax", "vol-dumpxml <vol>"}, {"help", gettext_noop("vol information in XML")}, {"desc", gettext_noop("Output the vol information as an XML dump to stdout.")}, {NULL, NULL} @@ -4168,7 +4100,6 @@ cmdVolDumpXML(vshControl *ctl, const vshCmd *cmd) * "vol-list" command */ static const vshCmdInfo info_vol_list[] = { - {"syntax", "vol-list <pool>"}, {"help", gettext_noop("list vols")}, {"desc", gettext_noop("Returns list of vols by pool.")}, {NULL, NULL} @@ -4247,7 +4178,6 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "vol-name" command */ static const vshCmdInfo info_vol_name[] = { - {"syntax", "vol-name <vol>"}, {"help", gettext_noop("convert a vol UUID to vol name")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4281,7 +4211,6 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) * "vol-key" command */ static const vshCmdInfo info_vol_key[] = { - {"syntax", "vol-key <vol>"}, {"help", gettext_noop("convert a vol UUID to vol key")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4315,7 +4244,6 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd) * "vol-path" command */ static const vshCmdInfo info_vol_path[] = { - {"syntax", "vol-path <pool> <vol>"}, {"help", gettext_noop("convert a vol UUID to vol path")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4353,7 +4281,6 @@ cmdVolPath(vshControl *ctl, const vshCmd *cmd) * "version" command */ static const vshCmdInfo info_version[] = { - {"syntax", "version"}, {"help", gettext_noop("show version")}, {"desc", gettext_noop("Display the system version information.")}, {NULL, NULL} @@ -4433,7 +4360,6 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "nodedev-list" command */ static const vshCmdInfo info_node_list_devices[] = { - {"syntax", "nodedev-list [--cap <capability>]"}, {"help", gettext_noop("enumerate devices on this host")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4487,7 +4413,6 @@ cmdNodeListDevices (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "nodedev-dumpxml" command */ static const vshCmdInfo info_node_device_dumpxml[] = { - {"syntax", "nodedev-dumpxml <device>"}, {"help", gettext_noop("node device details in XML")}, {"desc", gettext_noop("Output the node device details as an XML dump to stdout.")}, {NULL, NULL} @@ -4523,7 +4448,6 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) * "hostkey" command */ static const vshCmdInfo info_hostname[] = { - {"syntax", "hostname"}, {"help", gettext_noop("print the hypervisor hostname")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4553,7 +4477,6 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "uri" command */ static const vshCmdInfo info_uri[] = { - {"syntax", "uri"}, {"help", gettext_noop("print the hypervisor canonical URI")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} @@ -4583,7 +4506,6 @@ cmdURI (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * "vncdisplay" command */ static const vshCmdInfo info_vncdisplay[] = { - {"syntax", "vncdisplay <domain>"}, {"help", gettext_noop("vnc display")}, {"desc", gettext_noop("Output the IP address and port number for the VNC display.")}, {NULL, NULL} @@ -4659,7 +4581,6 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) * "ttyconsole" command */ static const vshCmdInfo info_ttyconsole[] = { - {"syntax", "ttyconsole <domain>"}, {"help", gettext_noop("tty console")}, {"desc", gettext_noop("Output the device for the TTY console.")}, {NULL, NULL} @@ -4720,7 +4641,6 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) * "attach-device" command */ static const vshCmdInfo info_attach_device[] = { - {"syntax", "attach-device <domain> <file> "}, {"help", gettext_noop("attach device from an XML file")}, {"desc", gettext_noop("Attach device from an XML <file>.")}, {NULL, NULL} @@ -4779,7 +4699,6 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) * "detach-device" command */ static const vshCmdInfo info_detach_device[] = { - {"syntax", "detach-device <domain> <file> "}, {"help", gettext_noop("detach device from an XML file")}, {"desc", gettext_noop("Detach device from an XML <file>")}, {NULL, NULL} @@ -4838,7 +4757,6 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) * "attach-interface" command */ static const vshCmdInfo info_attach_interface[] = { - {"syntax", "attach-interface <domain> <type> <source> [--target <target>] [--mac <mac>] [--script <script>] "}, {"help", gettext_noop("attach network interface")}, {"desc", gettext_noop("Attach new network interface.")}, {NULL, NULL} @@ -4955,7 +4873,6 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) * "detach-interface" command */ static const vshCmdInfo info_detach_interface[] = { - {"syntax", "detach-interface <domain> <type> [--mac <mac>] "}, {"help", gettext_noop("detach network interface")}, {"desc", gettext_noop("Detach network interface.")}, {NULL, NULL} @@ -5076,7 +4993,6 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) * "attach-disk" command */ static const vshCmdInfo info_attach_disk[] = { - {"syntax", "attach-disk <domain> <source> <target> [--driver <driver>] [--subdriver <subdriver>] [--type <type>] [--mode <mode>] "}, {"help", gettext_noop("attach disk device")}, {"desc", gettext_noop("Attach new disk device.")}, {NULL, NULL} @@ -5241,7 +5157,6 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) * "detach-disk" command */ static const vshCmdInfo info_detach_disk[] = { - {"syntax", "detach-disk <domain> <target> "}, {"help", gettext_noop("detach disk device")}, {"desc", gettext_noop("Detach disk device.")}, {NULL, NULL} @@ -5472,7 +5387,6 @@ editReadBackFile (vshControl *ctl, const char *filename) * "edit" command */ static const vshCmdInfo info_edit[] = { - {"syntax", "edit <domain>"}, {"help", gettext_noop("edit XML configuration for a domain")}, {"desc", gettext_noop("Edit the XML configuration for a domain.")}, {NULL, NULL} @@ -5575,7 +5489,6 @@ cmdEdit (vshControl *ctl, const vshCmd *cmd) * "net-edit" command */ static const vshCmdInfo info_network_edit[] = { - {"syntax", "net-edit <network>"}, {"help", gettext_noop("edit XML configuration for a network")}, {"desc", gettext_noop("Edit the XML configuration for a network.")}, {NULL, NULL} @@ -5593,7 +5506,6 @@ static const vshCmdOptDef opts_network_edit[] = { * "pool-edit" command */ static const vshCmdInfo info_pool_edit[] = { - {"syntax", "pool-edit <domain>"}, {"help", gettext_noop("edit XML configuration for a storage pool")}, {"desc", gettext_noop("Edit the XML configuration for a storage pool.")}, {NULL, NULL} @@ -5611,7 +5523,6 @@ static const vshCmdOptDef opts_pool_edit[] = { * "quit" command */ static const vshCmdInfo info_quit[] = { - {"syntax", "quit"}, {"help", gettext_noop("quit this interactive terminal")}, {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} -- 1.6.0.4.1101.g642f8

3 2

[libvirt] [PATCH 4/4] virsh.c: tweak options to produce more accurate help
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: Adjust some vshCmdOptDef command option flags to improve auto-generated help command syntax. --- src/virsh.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 230a128..bb81f25 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -1008,7 +1008,7 @@ static const vshCmdInfo info_start[] = { }; static const vshCmdOptDef opts_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive domain")}, {NULL, 0, 0, NULL} }; @@ -3680,7 +3680,7 @@ static const vshCmdInfo info_pool_start[] = { }; static const vshCmdOptDef opts_pool_start[] = { - {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive pool")}, + {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive pool")}, {NULL, 0, 0, NULL} }; @@ -3721,8 +3721,8 @@ static const vshCmdOptDef opts_vol_create_as[] = { {"pool", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("pool name")}, {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the volume")}, {"capacity", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("size of the vol with optional k,M,G,T suffix")}, - {"allocation", VSH_OT_DATA, 0, gettext_noop("initial allocation size with optional k,M,G,T suffix")}, - {"format", VSH_OT_DATA, 0, gettext_noop("file format type raw,bochs,qcow,qcow2,vmdk")}, + {"allocation", VSH_OT_STRING, 0, gettext_noop("initial allocation size with optional k,M,G,T suffix")}, + {"format", VSH_OT_STRING, 0, gettext_noop("file format type raw,bochs,qcow,qcow2,vmdk")}, {NULL, 0, 0, NULL} }; @@ -4881,7 +4881,7 @@ static const vshCmdInfo info_detach_interface[] = { static const vshCmdOptDef opts_detach_interface[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"type", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network interface type")}, - {"mac", VSH_OT_DATA, 0, gettext_noop("MAC address")}, + {"mac", VSH_OT_STRING, 0, gettext_noop("MAC address")}, {NULL, 0, 0, NULL} }; @@ -5002,10 +5002,10 @@ static const vshCmdOptDef opts_attach_disk[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"source", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("source of disk device")}, {"target", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("target of disk device")}, - {"driver", VSH_OT_DATA, 0, gettext_noop("driver of disk device")}, - {"subdriver", VSH_OT_DATA, 0, gettext_noop("subdriver of disk device")}, - {"type", VSH_OT_DATA, 0, gettext_noop("target device type")}, - {"mode", VSH_OT_DATA, 0, gettext_noop("mode of device reading and writing")}, + {"driver", VSH_OT_STRING, 0, gettext_noop("driver of disk device")}, + {"subdriver", VSH_OT_STRING, 0, gettext_noop("subdriver of disk device")}, + {"type", VSH_OT_STRING, 0, gettext_noop("target device type")}, + {"mode", VSH_OT_STRING, 0, gettext_noop("mode of device reading and writing")}, {NULL, 0, 0, NULL} }; -- 1.6.0.4.1101.g642f8

2 1

[libvirt] [PATCH 2/4] virsh.c: add missing (yet empty) "desc" strings
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: Now, every command must have a "desc" string, even if it has zero length. Mark these, so they'll be filled in. --- src/virsh.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index 96a7132..d96a7d4 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -2148,6 +2148,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_domname[] = { {"syntax", "domname <domain>"}, {"help", gettext_noop("convert a domain id or UUID to domain name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2178,6 +2179,7 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_domid[] = { {"syntax", "domid <domain>"}, {"help", gettext_noop("convert a domain name or UUID to domain id")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2213,6 +2215,7 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_domuuid[] = { {"syntax", "domuuid <domain>"}, {"help", gettext_noop("convert a domain name or id to domain UUID")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2668,6 +2671,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_network_name[] = { {"syntax", "net-name <network>"}, {"help", gettext_noop("convert a network UUID to network name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -2777,6 +2781,7 @@ cmdNetworkUndefine(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_network_uuid[] = { {"syntax", "net-uuid <network>"}, {"help", gettext_noop("convert a network name to network UUID")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -3699,6 +3704,7 @@ cmdPoolInfo(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_pool_name[] = { {"syntax", "pool-name <pool>"}, {"help", gettext_noop("convert a pool UUID to pool name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -3930,6 +3936,7 @@ cmdPoolUndefine(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_pool_uuid[] = { {"syntax", "pool-uuid <pool>"}, {"help", gettext_noop("convert a pool name to pool UUID")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4242,6 +4249,7 @@ cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_vol_name[] = { {"syntax", "vol-name <vol>"}, {"help", gettext_noop("convert a vol UUID to vol name")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4275,6 +4283,7 @@ cmdVolName(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_vol_key[] = { {"syntax", "vol-key <vol>"}, {"help", gettext_noop("convert a vol UUID to vol key")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4308,6 +4317,7 @@ cmdVolKey(vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_vol_path[] = { {"syntax", "vol-path <pool> <vol>"}, {"help", gettext_noop("convert a vol UUID to vol path")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4425,6 +4435,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_node_list_devices[] = { {"syntax", "nodedev-list [--cap <capability>]"}, {"help", gettext_noop("enumerate devices on this host")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4514,6 +4525,7 @@ cmdNodeDeviceDumpXML (vshControl *ctl, const vshCmd *cmd) static const vshCmdInfo info_hostname[] = { {"syntax", "hostname"}, {"help", gettext_noop("print the hypervisor hostname")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -4543,6 +4555,7 @@ cmdHostname (vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) static const vshCmdInfo info_uri[] = { {"syntax", "uri"}, {"help", gettext_noop("print the hypervisor canonical URI")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; @@ -5600,6 +5613,7 @@ static const vshCmdOptDef opts_pool_edit[] = { static const vshCmdInfo info_quit[] = { {"syntax", "quit"}, {"help", gettext_noop("quit this interactive terminal")}, + {"desc", gettext_noop("")}, /* FIXME: describe */ {NULL, NULL} }; -- 1.6.0.4.1101.g642f8

2 1

[libvirt] [PATCH 1/4] virsh.c: generate each "virsh help COMMAND"s synopsis
by Jim Meyering 08 Dec '08

08 Dec '08

* src/virsh.c: Also, diagnose extra arguments after --help (-h). --- src/virsh.c | 102 +++++++++++++++++++++++++++++++++------------------------- 1 files changed, 58 insertions(+), 44 deletions(-) diff --git a/src/virsh.c b/src/virsh.c index df12b8b..96a7132 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -224,7 +224,7 @@ static void vshError(vshControl *ctl, int doexit, const char *format, ...) ATTRIBUTE_FORMAT(printf, 3, 4); static int vshInit(vshControl *ctl); static int vshDeinit(vshControl *ctl); -static void vshUsage(vshControl *ctl, const char *cmdname); +static void vshUsage(void); static void vshOpenLogFile(vshControl *ctl); static void vshOutputLogFile(vshControl *ctl, int log_level, const char *format, va_list ap); static void vshCloseLogFile(vshControl *ctl); @@ -233,7 +233,7 @@ static int vshParseArgv(vshControl *ctl, int argc, char **argv); static const char *vshCmddefGetInfo(const vshCmdDef *cmd, const char *info); static const vshCmdDef *vshCmddefSearch(const char *cmdname); -static int vshCmddefHelp(vshControl *ctl, const char *name, int withprog); +static int vshCmddefHelp(vshControl *ctl, const char *name); static vshCmdOpt *vshCommandOpt(const vshCmd *cmd, const char *name); static int vshCommandOptInt(const vshCmd *cmd, const char *name, int *found); @@ -361,7 +361,7 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) N_(vshCmddefGetInfo(def, "help"))); return TRUE; } - return vshCmddefHelp(ctl, cmdname, FALSE); + return vshCmddefHelp(ctl, cmdname); } /* @@ -5803,7 +5803,7 @@ vshCmddefSearch(const char *cmdname) } static int -vshCmddefHelp(vshControl *ctl, const char *cmdname, int withprog) +vshCmddefHelp(vshControl *ctl, const char *cmdname) { const vshCmdDef *def = vshCmddefSearch(cmdname); @@ -5811,30 +5811,46 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname, int withprog) vshError(ctl, FALSE, _("command '%s' doesn't exist"), cmdname); return FALSE; } else { - const vshCmdOptDef *opt; const char *desc = N_(vshCmddefGetInfo(def, "desc")); const char *help = N_(vshCmddefGetInfo(def, "help")); - const char *syntax = vshCmddefGetInfo(def, "syntax"); + char buf[256]; fputs(_(" NAME\n"), stdout); fprintf(stdout, " %s - %s\n", def->name, help); - if (syntax) { - fputs(_("\n SYNOPSIS\n"), stdout); - if (!withprog) - fprintf(stdout, " %s\n", syntax); - else - fprintf(stdout, " %s %s\n", progname, syntax); + fputs(_("\n SYNOPSIS\n"), stdout); + fprintf(stdout, " %s", def->name); + if (def->opts) { + const vshCmdOptDef *opt; + for (opt = def->opts; opt->name; opt++) { + const char *fmt; + if (opt->type == VSH_OT_BOOL) + fmt = "[--%s]"; + else if (opt->type == VSH_OT_INT) + fmt = N_("[--%s <number>]"); + else if (opt->type == VSH_OT_STRING) + fmt = N_("[--%s <string>]"); + else if (opt->type == VSH_OT_DATA) + fmt = ((opt->flag & VSH_OFLAG_REQ) ? "<%s>" : "[<%s>]"); + else + assert(0); + fputc(' ', stdout); + fprintf(stdout, _(fmt), opt->name); + } } - if (desc) { + fputc('\n', stdout); + + if (desc[0]) { + /* FIXME: remove this test once all of the empty descriptions + have been removed; see `FIXME: describe' lines. */ fputs(_("\n DESCRIPTION\n"), stdout); fprintf(stdout, " %s\n", desc); } + if (def->opts) { + const vshCmdOptDef *opt; fputs(_("\n OPTIONS\n"), stdout); for (opt = def->opts; opt->name; opt++) { - char buf[256]; - if (opt->type == VSH_OT_BOOL) snprintf(buf, sizeof(buf), "--%s", opt->name); else if (opt->type == VSH_OT_INT) @@ -6912,35 +6928,29 @@ vshDeinit(vshControl *ctl) * Print usage */ static void -vshUsage(vshControl *ctl, const char *cmdname) +vshUsage(void) { const vshCmdDef *cmd; - - /* global help */ - if (!cmdname) { - fprintf(stdout, _("\n%s [options] [commands]\n\n" - " options:\n" - " -c | --connect <uri> hypervisor connection URI\n" - " -r | --readonly connect readonly\n" - " -d | --debug <num> debug level [0-5]\n" - " -h | --help this help\n" - " -q | --quiet quiet mode\n" - " -t | --timing print timing information\n" - " -l | --log <file> output logging to file\n" - " -v | --version program version\n\n" - " commands (non interactive mode):\n"), progname); - - for (cmd = commands; cmd->name; cmd++) - fprintf(stdout, - " %-15s %s\n", cmd->name, N_(vshCmddefGetInfo(cmd, - "help"))); - - fprintf(stdout, "%s", - _("\n (specify help <command> for details about the command)\n\n")); - return; - } - if (!vshCmddefHelp(ctl, cmdname, TRUE)) - exit(EXIT_FAILURE); + fprintf(stdout, _("\n%s [options] [commands]\n\n" + " options:\n" + " -c | --connect <uri> hypervisor connection URI\n" + " -r | --readonly connect readonly\n" + " -d | --debug <num> debug level [0-5]\n" + " -h | --help this help\n" + " -q | --quiet quiet mode\n" + " -t | --timing print timing information\n" + " -l | --log <file> output logging to file\n" + " -v | --version program version\n\n" + " commands (non interactive mode):\n"), progname); + + for (cmd = commands; cmd->name; cmd++) + fprintf(stdout, + " %-15s %s\n", cmd->name, N_(vshCmddefGetInfo(cmd, + "help"))); + + fprintf(stdout, "%s", + _("\n (specify help <command> for details about the command)\n\n")); + return; } /* @@ -7038,8 +7048,12 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) } if (help) { - /* global or command specific help */ - vshUsage(ctl, argc > end ? argv[end] : NULL); + if (end < argc) + vshError(ctl, TRUE, + _("extra argument '%s'. See --help."), argv[end]); + + /* list all command */ + vshUsage(); exit(EXIT_SUCCESS); } -- 1.6.0.4.1101.g642f8

2 1

[libvirt] [PATCH] small compilation problem with old dbus versions
by Daniel Veillard 08 Dec '08

08 Dec '08

dbus_watch_get_unix_fd() was added in dbus >= 1.1.1, it deprecate dbus_watch_get_fd(), so we should use the later if compiling against the old stuff, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 4

[libvirt] broken pipe?
by Itamar Heim 08 Dec '08

08 Dec '08

Hi, I have a problem with a small python script (using fedora 10 with its shipped rpm's - libvirt-0.4.6-3.fc10.x86_64, libvirt-python-0.4.6-3.fc10.x86_64) I'm running a simple stupid libvirt python script. I happen to want to use SDL, and it fails on "Could not initialize SDL - exiting". While I need to solve this error (i.e., find out in which version this patch was included to allow me to specify the DISPLAY http://www.mail-archive.com/libvir-list@redhat.com/msg08764.html) I am more troubled by the fact that running the script again gives a socket/pipe error until I restart libvirtd: Run #1: ./test_libvirt.py libvir: QEMU error : internal error QEMU quit during console startup Could not initialize SDL - exiting Traceback (most recent call last): File "./test_libvirt.py", line 37, in <module> vm = c.createLinux(x, 0) File "/usr/lib64/python2.5/site-packages/libvirt.py", line 892, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirt.libvirtError: internal error QEMU quit during console startup Run #2: ./test_libvirt.py libvir: Remote error : socket closed unexpectedly Traceback (most recent call last): File "./test_libvirt.py", line 37, in <module> vm = c.createLinux(x, 0) # what a lousy function name File "/usr/lib64/python2.5/site-packages/libvirt.py", line 892, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirt.libvirtError: socket closed unexpectedly libvir: Remote error : Broken pipe Code: #!/usr/bin/env python import libvirt c = libvirt.open('qemu:///system') x = """<domain type='kvm'> <name>yossi2</name> <memory>512000</memory> <currentMemory>512000</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> </features> <clock offset='utc'/> <devices> <emulator>/usr/bin/qemu-kvm</emulator> <disk type='file' device='disk'> <source file='/mnt/sda2/images/winxp-acpi.vmdk'/> <target dev='hda' bus='ide'/> </disk> <input type='tablet' bus='usb'/> <input type='mouse' bus='ps2'/> <graphics type='sdl'/> </devices> </domain>""" vm = c.createLinux(x, 0) Thanks, Itamar

4 10

[libvirt] FYI: Fixed multiple test driver crashes/flaws
by Daniel P. Berrange 07 Dec '08

07 Dec '08

The virt-install test suite exposed a number of bugs in the test driver storage APIs, partly due to my threading changes. There was one deadlock (calling unneccessary PoolRefresh op), one crash (deferencing a variable we just set to NULL), and integer long long overflow on 32-bit, and missing return value I've committed the following patch which fixes these and makes virt=install test suite work again Daniel diff -u -p -r1.103 -r1.106 --- src/test.c 4 Dec 2008 21:00:50 -0000 1.103 +++ src/test.c 7 Dec 2008 20:45:28 -0000 1.106 @@ -191,7 +191,7 @@ static const char *defaultPoolXML = " </target>" "</pool>"; -static const unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ul); +static const unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ull); static const unsigned long long defaultPoolAlloc = 0; static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool); @@ -2323,9 +2323,6 @@ no_memory: return -1; } -static int -testStoragePoolRefresh(virStoragePoolPtr obj, - unsigned int flags ATTRIBUTE_UNUSED); static int testStoragePoolStart(virStoragePoolPtr pool, @@ -2350,8 +2347,6 @@ testStoragePoolStart(virStoragePoolPtr p goto cleanup; } - if (testStoragePoolRefresh(pool, 0) == 0) - goto cleanup; privpool->active = 1; ret = 0; @@ -2506,6 +2501,7 @@ testStoragePoolBuild(virStoragePoolPtr p _("storage pool '%s' is already active"), pool->name); goto cleanup; } + ret = 0; cleanup: if (privpool) @@ -3001,10 +2997,10 @@ testStorageVolumeCreateXML(virStoragePoo privpool->def->allocation); privpool->volumes.objs[privpool->volumes.count++] = privvol; - privvol = NULL; ret = virGetStorageVol(pool->conn, privpool->def->name, privvol->name, privvol->key); + privvol = NULL; cleanup: virStorageVolDefFree(privvol); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

1 0

[libvirt] PATCH: Workaround limits.h bug on Debian
by Daniel P. Berrange 05 Dec '08

05 Dec '08

The Debian Etch /usr/include/limits.h has an #endif in the wrong place, making it fail to define ULLONG_MAX. This works around the brokenness Daniel diff -u -r1.32 storage_conf.c --- storage_conf.c 4 Dec 2008 22:00:14 -0000 1.32 +++ storage_conf.c 5 Dec 2008 14:17:23 -0000 @@ -43,6 +43,11 @@ #include "util.h" #include "memory.h" +/* Work around broken limits.h on debian etch */ +#if defined __GNUC__ && defined _GCC_LIMITS_H_ && ! defined ULLONG_MAX +# define ULLONG_MAX ULONG_LONG_MAX +#endif + #define virStorageLog(msg...) fprintf(stderr, msg) VIR_ENUM_IMPL(virStoragePool, -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 1

[libvirt] [PATCH] Makefile.am compile fix
by Paolo Borelli 05 Dec '08

05 Dec '08

Hi, also filed as https://bugzilla.redhat.com/show_bug.cgi?id=474211 but I have been asked to send it to the list. The attached patches fixes Makefile.am and let's me compile libvirt. Ciao Paolo

1 0

[libvirt] how to install updated python bindings
by ente linux 05 Dec '08

05 Dec '08

hi i was trying to install libvirt 0.5 on my centos 5 machine which by default have libvirt 0.4. But after installing from the source of libvirt, still the output of i get from python remains that of 0.4 >>>import libvirt >>> libvirt.getVersion() 4006 how could i install the new version... Do i need to give any option while configuring or making. thanks and regards visco

5 4

[libvirt] [RFC PATCH] Let network bridge MTU to be configured on XML
by Eduardo Habkost 04 Dec '08

04 Dec '08

Hi, Below is an incomplete patch for letting the MTU of a libvirt virtual network to be configured on XML. This implementation has an issue: it works when trying to set the MTU below 1500, but the kernel bridge code doesn't let us to set the bridge MTU above 1500 if there is no interface attached to the bridge yet. To allow setting the bridge MTU higher than 1500, we need to save the configured value somewhere and set it only when attaching tap interface to it. To solve that, I propose changing the way the network driver interface expose things for the domain network code. Today we do the following (src/qemu_conf.c): virNetworkPtr network; virDomainNetDefPtr net; char *brname; int tapfd; brname = virNetworkGetBridgeName(network); brAddTap(brctl, brname, &net->ifname, &tapfd))) With this code, the only information that can flow between the network driver and the bridge code is the bridge name. I was going to suggest having something like this: virNetworkAddTap(network, &net->ifname, &tapfd); However, we wouldn't be able to return an FD when using the 'remote' network driver. But we can split the creation of the tap interface and attaching it to the network bridge, like this: brNewTap(brctl, &net->ifname, &tapfd); virNetworkAttachInterface(network, net->ifname); This way, the network driver code can do anything needed to attach the new tap interface to the virtual network, including but not limited to MTU setting. Another alternative could be creating a virNetworkGetBridgeMtu() function. That would solve our problem for the MTU settings, but in my opinion, attaching interfaces to the network is a task for the network driver. Having the qemu code calling brAddTap() directly was just a shortcut we won't be able to use anymore. What do you think? --- src/bridge.c | 19 +++++++++++++++++++ src/bridge.h | 4 ++++ src/libvirt_sym.version.in | 1 + src/network_conf.c | 5 +++++ src/network_conf.h | 2 ++ src/network_driver.c | 10 ++++++++++ 6 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/bridge.c b/src/bridge.c index 13d81bc..ed9023b 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -452,6 +452,25 @@ brAddTap(brControl *ctl, return errno; } + +/** + * brSetMtu + * @ctl: bridge control pointer + * @bridge: the bridge name + * @mtu: the MTU value to be set + * + * Sets the MTU of a bridge. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +int +brSetMtu(brControl *ctl, + const char *bridge, + int mtu) +{ + return ifSetMtu(ctl, bridge, mtu); +} + /** * brSetInterfaceUp: * @ctl: bridge control pointer diff --git a/src/bridge.h b/src/bridge.h index 7eb6166..194e96f 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -58,6 +58,10 @@ int brDeleteInterface (brControl *ctl, const char *bridge, const char *iface); +int brSetMtu (brControl *ctl, + const char *bridge, + int mtu); + int brAddTap (brControl *ctl, const char *bridge, char **ifname, diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index ec9ff3d..668b902 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -274,6 +274,7 @@ LIBVIRT_PRIVATE_@VERSION@ { global: /* bridge.h */ brAddBridge; + brSetMtu; brAddInterface; brAddTap; brDeleteBridge; diff --git a/src/network_conf.c b/src/network_conf.c index 5add62e..b7ec87e 100644 --- a/src/network_conf.c +++ b/src/network_conf.c @@ -295,6 +295,7 @@ virNetworkDefParseXML(virConnectPtr conn, { virNetworkDefPtr def; char *tmp; + long mtu; if (VIR_ALLOC(def) < 0) { virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); @@ -332,6 +333,8 @@ virNetworkDefParseXML(virConnectPtr conn, /* Parse bridge information */ def->bridge = virXPathString(conn, "string(./bridge[1]/@name)", ctxt); + if (virXPathLong(conn, "number(./bridge[1]/@mtu)", ctxt, &mtu) == 0) + def->bridgeMtu = mtu; tmp = virXPathString(conn, "string(./bridge[1]/@stp)", ctxt); def->stp = (tmp && STREQ(tmp, "off")) ? 0 : 1; VIR_FREE(tmp); @@ -570,6 +573,8 @@ char *virNetworkDefFormat(virConnectPtr conn, virBufferAddLit(&buf, " <bridge"); if (def->bridge) virBufferEscapeString(&buf, " name='%s'", def->bridge); + if (def->bridgeMtu > 0) + virBufferVSprintf(&buf, " mtu='%d'", def->bridgeMtu); virBufferVSprintf(&buf, " stp='%s' forwardDelay='%ld' />\n", def->stp ? "on" : "off", def->delay); diff --git a/src/network_conf.h b/src/network_conf.h index 2614e47..a30cc8d 100644 --- a/src/network_conf.h +++ b/src/network_conf.h @@ -61,6 +61,8 @@ struct _virNetworkDef { char *name; char *bridge; /* Name of bridge device */ + int bridgeMtu; /* MTU of the bridge */ + char *domain; unsigned long delay; /* Bridge forward delay (ms) */ int stp : 1; /* Spanning tree protocol */ diff --git a/src/network_driver.c b/src/network_driver.c index 96d3ddf..10bdd10 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -684,6 +684,16 @@ static int networkStartNetworkDaemon(virConnectPtr conn, return -1; } + if (network->def->bridgeMtu> 0) { + if ((err = brSetMtu(driver->brctl, network->def->bridge, network->def->bridgeMtu))) { + networkReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + _("cannot set MTU of bridge '%s' to %d: %s"), + network->def->bridge, network->def->bridgeMtu, + strerror(err)); + goto err_delbr; + } + } + if (brSetForwardDelay(driver->brctl, network->def->bridge, network->def->delay) < 0) goto err_delbr; -- 1.5.5.GIT -- Eduardo

3 6

[libvirt] Release of libvirt-0.5.1
by Daniel Veillard 04 Dec '08

04 Dec '08

Mostly a bug fix one, as promised when 0.5.0 came out :-) Available as usual from: ftp://libvirt.org/libvirt/ Some bug fixes and local improvements: + Portability: - fix missing dep in spec file - fix compilation with new NUMA libraries (Daniel Berrange) - udev compatibility for RHEL (Chris Lalancette) - + Documentation: - documentation copy and paste errors and typo (Cole Robinson) + Bug fixes: - add a delay in storage backend for disks to show up (Chris Lalancette) - fix parsing for CDRom device with no source (Daniel Berrange) - use xenstore to list domains to avoid some bugs (Guido Gunther) - remove a leak in xen inotify code (Daniel Berrange) - UML driver freeing of uninitialialized variable (Ron Yorston) - fix UML inotify code (Daniel Berrange) - crash when adding storage without a format (Cole Robinson) + Improvements: - use xend preferably to hypervisor call to set Xen max memory (Jim Fehlig) - allow remote://hostname/ URI for automatic probe of hypervisors (Daniel Berrange) - fix daemon configuration regression testing (Jim Meyering ) - check /usr/bin/kvm for QEmu driver init (Guido Gunther) - proper active vs. inactive differentiation (Guido Gunther) - improve MTU setting on tap interfaces (Eduardo Habkost) - increase timeout for initial QEmu monitor poll (Cole Robinson) + Cleanups: - fix improper initialisations (Jim Meyering) thanks everybody for the contributions, whatever the way ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Add default format info for storage volumes
by Cole Robinson 04 Dec '08

04 Dec '08

The attached patch adds default format info for storage volumes. This fixes a regression in the latest release, where defining a storage volume without a format crashed libvirtd: https://bugzilla.redhat.com/show_bug.cgi?id=473071 This is similar to how we handle things with storage pools as well. This fixes the crash for me. Thanks, Cole

3 2

[libvirt] [PATCH] Increase initial qemu monitor read timeout
by Cole Robinson 04 Dec '08

04 Dec '08

See https://bugzilla.redhat.com/show_bug.cgi?id=453491 We've been getting bug reports like the above against virt-manager for a while now: installing new VMs consistently throws an error 'Timed out while reading monitor startup output'. The user can then just retry the install and it will go off without a hitch. I only just realized that the common thread between the reports is physical install media: apparently the qemu monitor isn't too responsive while it's waiting for a cold cd drive to spin up. The attached patch jacks up the timeout from 3 seconds to 10 seconds when doing the initial monitor read. I verified that this fixes the issue. Thanks, Cole

2 2

[libvirt] [PATCH] Fix a few docs errors
by Cole Robinson 04 Dec '08

04 Dec '08

The attached patch fixes a few cut and paste docs errors I've stumbled upon, and a spelling error in a virsh command output. Thanks, Cole

2 2

[libvirt] [PATCH] bridge: set MTU of tap iface to the same value of the bridge
by Eduardo Habkost 04 Dec '08

04 Dec '08

Hi, This is a follow-up to the RFC patch sent by Chris Wright, at: https://www.redhat.com/archives/libvir-list/2008-November/msg00225.html With this patch, instead of hardcoding the MTU to an high value, we set the MTU of the tap interface to the same MTU value set on the bridge interface. The current code uses the default tap MTU value and lowers the bridge interface MTU without any need, killing performance. I will send another patch later for allowing the tap MTU to be configured on the XML, but the behavior added by this patch will be kept as the default. The default behavior should be enough for most use cases where a larger MTU is wanted for the bridged interfaces. Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com> --- src/bridge.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/src/bridge.c b/src/bridge.c index 4090163..60334b6 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -276,6 +276,98 @@ brDeleteInterface(brControl *ctl ATTRIBUTE_UNUSED, #endif /** + * ifGetMtu + * @ctl: bridge control pointer + * @ifname: interface name get MTU for + * + * This function gets the @mtu value set for a given interface @ifname. + * + * Returns the MTU value in case of success. + * On error, returns -1 and sets errno accordingly + */ +static int ifGetMtu(brControl *ctl, const char *ifname) +{ + struct ifreq ifr; + int len; + + if (!ctl || !ifname) { + errno = EINVAL; + return -1; + } + + if ((len = strlen(ifname)) >= BR_IFNAME_MAXLEN) { + errno = EINVAL; + return -1; + } + + memset(&ifr, 0, sizeof(struct ifreq)); + + strncpy(ifr.ifr_name, ifname, len); + ifr.ifr_name[len] = '\0'; + + if (ioctl(ctl->fd, SIOCGIFMTU, &ifr)) + return -1; + + return ifr.ifr_mtu; + +} + +/** + * ifSetMtu: + * @ctl: bridge control pointer + * @ifname: interface name to set MTU for + * @mtu: MTU value + * + * This function sets the @mtu for a given interface @ifname. Typically + * used on a tap device to set up for Jumbo Frames. + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int ifSetMtu(brControl *ctl, const char *ifname, int mtu) +{ + struct ifreq ifr; + int len; + + if (!ctl || !ifname) + return EINVAL; + + if ((len = strlen(ifname)) >= BR_IFNAME_MAXLEN) + return EINVAL; + + memset(&ifr, 0, sizeof(struct ifreq)); + + strncpy(ifr.ifr_name, ifname, len); + ifr.ifr_name[len] = '\0'; + ifr.ifr_mtu = mtu; + + return ioctl(ctl->fd, SIOCSIFMTU, &ifr) == 0 ? 0 : errno; +} + +/** + * brSetInterfaceMtu + * @ctl: bridge control pointer + * @bridge: name of the bridge interface + * @ifname: name of the interface whose MTU we want to set + * + * Sets the interface mtu to the same MTU of the bridge + * + * Returns 0 in case of success or an errno code in case of failure. + */ +static int brSetInterfaceMtu(brControl *ctl, + const char *bridge, + const char *ifname) +{ + int mtu = ifGetMtu(ctl, bridge); + + fprintf(stderr, "mtu: %d\n", mtu); + + if (mtu < 0) + return errno; + + return ifSetMtu(ctl, ifname, mtu); +} + +/** * brAddTap: * @ctl: bridge control pointer * @bridge: the bridge name @@ -334,6 +426,12 @@ brAddTap(brControl *ctl, } if (ioctl(fd, TUNSETIFF, &try) == 0) { + /* We need to set the interface MTU before adding it + * to the bridge, because the bridge will have its + * MTU adjusted automatically when we add the new interface. + */ + if ((errno = brSetInterfaceMtu(ctl, bridge, try.ifr_name))) + goto error; if ((errno = brAddInterface(ctl, bridge, try.ifr_name))) goto error; if ((errno = brSetInterfaceUp(ctl, try.ifr_name, 1))) -- 1.5.5.GIT

5 8

[libvirt] [PATCH] also look for /usr/bin/kvm
by Guido Günther 04 Dec '08

04 Dec '08

We do so in qemudCapsInitGuest() but not in qemudProbe(). O.k. to apply? -- Guido

3 3

[libvirt] is libvirt-python default in libvirt compilation from source?
by Shanmuga Rajan 03 Dec '08

03 Dec '08

I was trying to install libvirt 0.5.0 from source.. It seems it went well. but when i tried to import libvirt module in python i got error no module named libvirt then i searched entire system for libvirt.py then i came to know that python bindings for libvirt is not installed. is it that python bindings for libvirt not default in compilation....? if i have to install python bindings then what option should i use? i tried to find option from ./configure --help from libvirt source directory but i didnt get anything. Can any one help me in this. Thanks and Regards, Shan

2 1

[libvirt] Allowing <interface type="none"> for network interface definition
by Gihan Munasinghe 03 Dec '08

03 Dec '08

Hi I am writing a management stack for our platform using libvirt. We have many DomU images which all have PV drivers loaded for network.I want to start these DomU guests with only the PV network device being visible from within the DomU. This is a requirement in the platform and hopefully, I presume there are other people with the same requirement.. But when creating a server, libvirt sends (type ioemu) tag to xend. Which make all of our vm's to have 2 network cards. Using the normal xm command I can send type=none ( vif = [ "mac=00:16:3e:00:a5:57,bridge=eth0,script=vif-bridge,type=none"]) to xend. Which will send qeum-dm "-net none" switch which solves the problem. After doing some investigation, I did some code change in libvirt0.5.0 to support a attribute called "none" with in <interface type="">, that will send xend the tag (type none). Allowing qeum-dm to be configured with "-net none" switch. ;-) So you can define your network tag as <interface type='none'>   <mac address='00:16:3e:00:a5:57'/> <source bridge='eth0'/> <target dev='vif47.0'/> </interface> I this the proper way of doing it? :-\ Would this be a general functionality that libvirt community will be interested in (I think this add bit more flexibility to libvirt of the way user want to write their own management stack). If so could I contribute the patch to the mailing list. Looking forward to hearing from you all, I am new to libvirt therefore any comments will be greatly appreciated :-) Thanks Gihan -- Gihan Munasinghe R&D Team Leader XCalibre Communications Ltd. www.flexiscale.com

2 2

[libvirt] [PATCH 1/2] Java bindings for domain events
by David Lively 02 Dec '08

02 Dec '08

The attached patch (against libvirt-java) implements Java bindings for libvirt domain events. This version provides a libvirt EventImpl running in its own Java Thread, and provides per-Connect synchronization that makes using the bindings thread-safe. (Note the Domain, Network, StoragePool, and StorageVol methods also synchronize on their Connect object, as required by libvirt. I have similar changes for NodeDevice.java that need to be made when that code is checked in.) This version of the patch also implements and uses an enum class (DomainEvent.Type), as suggested by Tóth István. IMPORTANT: THIS PATCH WILL BREAK THINGS UNLESS THE NEXT [PATCH 2/2] IS APPLIED TO libvirt FIRST. Also, libvirt must be compiled WITH_PTHREADS for Java events to work. Dave

3 12

[libvirt] [PATCH] post-release patch for symbols
by Daniel Veillard 02 Dec '08

02 Dec '08

Assuming we release a 0.5.1 soon. Maybe the code with threading should be on a 0.6.0 considering the amount of changes though. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] review fallout: short memset
by Jim Meyering 02 Dec '08

02 Dec '08

While reviewing unrelated changes, I spotted a short memset: char **names; ... memset(names, 0, maxnames); That zeros out 1/4 or 1/8 of the memory than it should. It should be doing this: memset(names, 0, maxnames * sizeof (*names)); I checked all memset uses and found a total of 6 uses like that. This fixes them: >From 614b0064eadc3ecef0690d5c65bb531844a3091d Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 2 Dec 2008 14:49:03 +0100 Subject: [PATCH] fix inadequate initialization in storage and test drivers * src/storage_driver.c (storageListPools): Set all "names" entries to 0. (storageListDefinedPools, storagePoolListVolumes): Likewise. * src/test.c (testStoragePoolListVolumes): Likewise. --- src/storage_driver.c | 8 ++++---- src/test.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/storage_driver.c b/src/storage_driver.c index 366820b..53388f1 100644 --- a/src/storage_driver.c +++ b/src/storage_driver.c @@ -347,7 +347,7 @@ storageListPools(virConnectPtr conn, free(names[i]); names[i] = NULL; } - memset(names, 0, nnames); + memset(names, 0, nnames * sizeof(*names)); return -1; } @@ -389,7 +389,7 @@ storageListDefinedPools(virConnectPtr conn, free(names[i]); names[i] = NULL; } - memset(names, 0, nnames); + memset(names, 0, nnames * sizeof(*names)); return -1; } @@ -880,7 +880,7 @@ storagePoolListVolumes(virStoragePoolPtr obj, return -1; } - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); for (i = 0 ; i < pool->volumes.count && n < maxnames ; i++) { if ((names[n++] = strdup(pool->volumes.objs[i]->name)) == NULL) { virStorageReportError(obj->conn, VIR_ERR_NO_MEMORY, @@ -895,7 +895,7 @@ storagePoolListVolumes(virStoragePoolPtr obj, for (n = 0 ; n < maxnames ; n++) VIR_FREE(names[i]); - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); return -1; } diff --git a/src/test.c b/src/test.c index 7998886..3e942da 100644 --- a/src/test.c +++ b/src/test.c @@ -1951,7 +1951,7 @@ testStoragePoolListVolumes(virStoragePoolPtr obj, POOL_IS_ACTIVE(privpool, -1); int i = 0, n = 0; - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); for (i = 0 ; i < privpool->volumes.count && n < maxnames ; i++) { if ((names[n++] = strdup(privpool->volumes.objs[i]->name)) == NULL) { testError(obj->conn, VIR_ERR_NO_MEMORY, "%s", _("name")); @@ -1965,7 +1965,7 @@ testStoragePoolListVolumes(virStoragePoolPtr obj, for (n = 0 ; n < maxnames ; n++) VIR_FREE(names[i]); - memset(names, 0, maxnames); + memset(names, 0, maxnames * sizeof(*names)); return -1; } -- 1.6.0.4.1044.g77718

3 2

[libvirt] [PATCH 2/2]: Call udevsettle in the appropriate places
by Chris Lalancette 02 Dec '08

02 Dec '08

Instead of relying solely on polling for /dev devices to appear in libvirt, we really should be synchronizing against udev. This is generally done by a call to udevsettle, which is exactly what this patch implements for the storage backends that are likely to create new /dev nodes. I believe I've read that even after udevsettle, you are not guaranteed that devices are all the way created, so we still need the polling in the rest of the sources, but this should give us a much better chance of things existing as we expect. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> Index: src/storage_backend.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend.c,v retrieving revision 1.29 diff -u -r1.29 storage_backend.c --- a/src/storage_backend.c 17 Nov 2008 11:19:33 -0000 1.29 +++ b/src/storage_backend.c 26 Nov 2008 12:40:19 -0000 @@ -270,6 +270,20 @@ return 0; } +void virStorageBackendWaitForDevices(virConnectPtr conn) +{ + const char *const settleprog[] = { UDEVSETTLE, NULL }; + int exitstatus; + + /* + * NOTE: we ignore errors here; this is just to make sure that any device + * nodes that are being created finish before we try to + * scan them. If this fails (udevsettle exits badly, or doesn't exist + * at all), then we still have a fallback mechanism anyway. + */ + virRun(conn, settleprog, &exitstatus); +} + /* * Given a volume path directly in /dev/XXX, iterate over the * entries in the directory pool->def->target.path and find the Index: src/storage_backend.h =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend.h,v retrieving revision 1.13 diff -u -r1.13 storage_backend.h --- a/src/storage_backend.h 17 Nov 2008 11:19:33 -0000 1.13 +++ b/src/storage_backend.h 26 Nov 2008 12:40:19 -0000 @@ -69,6 +69,8 @@ int fd, int withCapacity); +void virStorageBackendWaitForDevices(virConnectPtr conn); + char *virStorageBackendStablePath(virConnectPtr conn, virStoragePoolObjPtr pool, const char *devpath); Index: src/storage_backend_logical.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend_logical.c,v retrieving revision 1.26 diff -u -r1.26 storage_backend_logical.c --- a/src/storage_backend_logical.c 17 Nov 2008 11:19:33 -0000 1.26 +++ b/src/storage_backend_logical.c 26 Nov 2008 12:40:19 -0000 @@ -470,6 +470,8 @@ }; int exitstatus; + virStorageBackendWaitForDevices(conn); + /* Get list of all logical volumes */ if (virStorageBackendLogicalFindLVs(conn, pool, NULL) < 0) { virStoragePoolObjClearVols(pool); Index: src/storage_backend_disk.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend_disk.c,v retrieving revision 1.20 diff -u -r1.20 storage_backend_disk.c --- a/src/storage_backend_disk.c 17 Nov 2008 11:19:33 -0000 1.20 +++ b/src/storage_backend_disk.c 26 Nov 2008 12:40:19 -0000 @@ -262,6 +262,8 @@ VIR_FREE(pool->def->source.devices[0].freeExtents); pool->def->source.devices[0].nfreeExtent = 0; + virStorageBackendWaitForDevices(conn); + return virStorageBackendDiskReadPartitions(conn, pool, NULL); } Index: src/storage_backend_iscsi.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend_iscsi.c,v retrieving revision 1.18 diff -u -r1.18 storage_backend_iscsi.c --- a/src/storage_backend_iscsi.c 17 Nov 2008 11:19:33 -0000 1.18 +++ b/src/storage_backend_iscsi.c 26 Nov 2008 12:40:19 -0000 @@ -603,6 +603,8 @@ pool->def->allocation = pool->def->capacity = pool->def->available = 0; + virStorageBackendWaitForDevices(conn); + if ((session = virStorageBackendISCSISession(conn, pool)) == NULL) goto cleanup; if (virStorageBackendISCSIRescanLUNs(conn, pool, session) < 0) Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.187 diff -u -r1.187 configure.in --- a/configure.in 25 Nov 2008 15:48:11 -0000 1.187 +++ b/configure.in 26 Nov 2008 12:40:19 -0000 @@ -115,11 +115,15 @@ [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([BRCTL], [brctl], [brctl], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_PATH_PROG([UDEVSETTLE], [udevsettle], [udevsettle], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) AC_DEFINE_UNQUOTED([BRCTL],["$BRCTL"], [Location or name of the brctl program (see bridge-utils)]) +AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"], + [Location or name of the udevsettle program (see udev)]) dnl Specific dir for HTML output ? AC_ARG_WITH([html-dir], [AC_HELP_STRING([--with-html-dir=path],

5 13

[libvirt] Concerning umlInotifyEvent
by Ron Yorston 02 Dec '08

02 Dec '08

At the top of umlInotifyEvent in uml_driver.c there is this test: if (watch != driver->inotifyWatch) return; This doesn't seem to be correct. I have to comment out the test to get libvirtd to work with UML. Ron

2 3

[libvirt] libvirt 0.5.0 and KVM migration
by Mickaël Canévet 02 Dec '08

02 Dec '08

Hi, I just installed libvirt 0.5.0 on Debian Lenny with KVM 0.72 to try KVM migration support. When I try to migrate a VM from one node to the other one, I have this error message: libvir: error : this function is not supported by the hypervisor: virDomainMigrate Is it really supposed to work ? Do I have to upgrade KVM to a newer version ? Thank you for your answers and congratulation for your precious work. -- _______________________________________________________________________ Mickaël Canévet. European Molecular Biology Laboratory (EMBL) Grenoble Outstation. FRANCE _______________________________________________________________________

3 6

[libvirt] Doubt over Kvm migration support in libvirt 0.5.0
by Shanmuga Rajan 02 Dec '08

02 Dec '08

I am using libvirt(python) to develop a small application which will manage my nodes which running in KVM. But when i tried migration i got this error. >>> vs.migrate(conn, libvirt.VIR_MIGRATE_LIVE,'testtt','192.168.1.82',0) libvir: error : this function is not supported by the hypervisor: virDomainMigrate Traceback (most recent call last): File "<stdin>", line 1, in ? File "/usr/lib64/python2.4/site-packages/libvirt.py", line 301, in migrate if ret is None:raise libvirtError('virDomainMigrate() failed', dom=self) libvirt.libvirtError: virDomainMigrate() failed this function is not supported by the hypervisor: virDomainMigrate i am running kvm-66 taken from Centos-5 Testing repositary and libvirt 0.5.0( 0.5.0: Nov 25 2008 release note says that support for kvm migration included) i am bit confused after reading this... Please any one help me in this. Thanks and Regards, -Shan

3 2

[libvirt] [PATCH] qemud/qemud.c (qemudCleanup): Plug a leak.
by Jim Meyering 01 Dec '08

01 Dec '08

Hi Dan, With your patches, "make check" hits one new leak: 40 bytes in 1 blocks are definitely lost in loss record 9 of 65 at 0x4A05174: calloc (vg_replace_malloc.c:397) by 0x447F29: virAllocN (memory.c:128) by 0x40CD82: qemudRunLoop (qemud.c:1839) by 0x40E713: main (qemud.c:2462) This fixes it: >From 9230c41d3deb00b4a0bb6800126e5cd41a350a54 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 1 Dec 2008 15:07:40 +0100 Subject: [PATCH] * qemud/qemud.c (qemudCleanup): Plug a leak. --- qemud/qemud.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 94f5918..8518bd5 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1942,6 +1942,7 @@ static void qemudCleanup(struct qemud_server *server) { virStateCleanup(); + VIR_FREE(server->workers); free(server); } -- 1.6.0.4.1044.g77718

1 0

[libvirt] avoid "make check" hang on daemon-conf
by Jim Meyering 01 Dec '08

01 Dec '08

Hi Dan, With your 28-part patch, I was getting a daemon-conf failure in "make check". This fixes it: Unless you tell me otherwise, I will apply most of this right away, (and let you remove the space-before-max_clients in your patch) since no other part of this change conflicts with your series. >From 57842865f8845c788408e18033f739cf02987ca3 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 1 Dec 2008 14:12:44 +0100 Subject: [PATCH] tests: daemon-conf: accommodate new numeric-valued config params: This test would hang when failing to perturb the new numeric (and non-boolean) valued parameters, max_clients, max_workers, min_workers. * tests/daemon-conf: Require that all commented out settings in libvirtd.conf have the same form. Before, two parameters were not being tested, since a space had snuck between the leading "#" and the "param = value" parts. Apply each RHS-value-perturbing transformation separately, not in series. Let VERBOSE=yes turn on debugging. Be more verbose by default, since this is a relatively long-running test. * qemud/libvirtd.conf: Normalize the spacing around each setting that is to be perturbed by tests/daemon-conf. --- qemud/libvirtd.conf | 10 ++++++---- tests/daemon-conf | 32 ++++++++++++++++++++++++++------ 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/qemud/libvirtd.conf b/qemud/libvirtd.conf index f269766..b0962f2 100644 --- a/qemud/libvirtd.conf +++ b/qemud/libvirtd.conf @@ -1,7 +1,10 @@ # Master libvirt daemon configuration file # # For further information consult http://libvirt.org/format.html - +# +# NOTE: the tests/daemon-conf regression test script requires +# that each "PARAMETER = VALUE" line in this file have the parameter +# name just after a leading "#". ################################################################# # @@ -45,7 +48,7 @@ # Override the default configuration which binds to all network # interfaces. This can be a numeric IPv4/6 address, or hostname # -# listen_addr = "192.168.0.1" +#listen_addr = "192.168.0.1" # Flag toggling mDNS advertizement of the libvirt service. @@ -233,7 +236,7 @@ # The maximum number of concurrent client connections to allow # over all sockets combined. -# max_clients = 20 +#max_clients = 20 # The minimum limit sets the number of workers to start up @@ -243,4 +246,3 @@ # of clients allowed #min_workers = 5 #max_workers = 20 - diff --git a/tests/daemon-conf b/tests/daemon-conf index db1f0d3..03189d5 100755 --- a/tests/daemon-conf +++ b/tests/daemon-conf @@ -1,6 +1,11 @@ #!/bin/sh # Get coverage of libvirtd's config-parsing code. +if test "$VERBOSE" = yes; then + set -x + libvirtd --version +fi + # Boilerplate code to set up a test directory, cd into it, # and to ensure we remove it upon completion. this_test_() { echo "./$0" | sed 's,.*/,,'; } @@ -12,8 +17,14 @@ trap '(exit $?); exit $?' 1 2 13 15 mkdir "$t_" || fail=1 cd "$t_" || fail=1 +conf="$abs_top_srcdir/qemud/libvirtd.conf" + +# Ensure that each commented out PARAMETER = VALUE line has the expected form. +grep '[a-z_] *= *[^ ]' "$conf" | grep -vE '^#[a-z_]+ = ' \ + && { echo "$0: found unexpected lines (above) in $conf" 1>&2; exit 1; } + # Start with the sample libvirtd.conf file, uncommenting all real directives. -sed -n 's/^#$[^ #]$/\1/p' $abs_top_srcdir/qemud/libvirtd.conf > tmp.conf +sed -n 's/^#$[^ #]$/\1/p' "$conf" > tmp.conf # Iterate through that list of directives, corrupting one RHS at a # time and running libvirtd with the resulting config. Each libvirtd @@ -22,16 +33,23 @@ n=$(wc -l < tmp.conf) i=1 while :; do param_name=$(sed -n "$i"'s/ = .*//p' tmp.conf) + printf "testing with corrupted config: $param_name\n" 1>&2 rhs=$(sed -n "$i"'s/.* = $.*$/\1/p' tmp.conf) f=in$i.conf - # Change an RHS that starts with '"' or '[' to "3". - # Change an RHS that starts with 0 or 1 to the string '"foo"'. - sed "$i"'s/ = [["].*/ = 3/;'"$i"'s/ = [01].*/ = "foo"/' tmp.conf > $f + case $rhs in + # Change an RHS that starts with '"' or '[' to "3". + [[\"]*) sed "$i"'s/ = [["].*/ = 3/' tmp.conf > $f;; + # Change an RHS that starts with a digit to the string '"foo"'. + [0-9]*) sed "$i"'s/ = [0-9].*/ = "foo"/' tmp.conf > $f;; + esac + + # Run libvirtd, expecting it to fail. libvirtd --config=$f 2> err && fail=1 + case $rhs in # '"'*) msg='should be a string';; '"'*) msg='invalid type: got long; expected string';; - [01]*) msg='invalid type: got string; expected long';; + [0-9]*) msg='invalid type: got string; expected long';; '['*) msg='must be a string or list of strings';; *) echo "unexpected RHS: $rhs" 1>&2; fail=1;; esac @@ -48,8 +66,10 @@ while :; do done # Run with the unmodified config file. +sleep_secs=2 +printf "running libvirtd with a valid config file ($sleep_secs seconds)\n" 1>&2 libvirtd --config=tmp.conf > log 2>&1 & pid=$! -sleep 2 +sleep $sleep_secs kill $pid # Expect an orderly shut-down and successful exit. -- 1.6.0.4.1044.g77718

1 0

[libvirt] KVM/qemu: problems with autostart of vms with non-bridged nets
by Gerd von Egidy 01 Dec '08

01 Dec '08

Hi, I'm using libvirt 0.5.0 to manage my kvm domains. Everything works fine except autostarting vms which use a network device not directly bridged to hw. I have the following net defined (and set to autostart): <network> <name>local</name> <uuid>7ec7a457-0b8e-4670-3b4a-2d0914288daa</uuid> <bridge stp='on' forwardDelay='0' /> <ip address='192.168.100.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.100.128' end='192.168.100.254' /> </dhcp> </ip> </network> When a vm using this net is autostarted I get the following error: libvir: error : invalid connection pointer in virNetworkLookupByName libvir: QEMU error : internal error Network 'local' not found Failed to autostart VM 'testlocalnet': internal error Network 'local' not found I took a dive into the code and found two problems causing this: 1. initialization order: qemuStateDriver is registered (and thus initialized) before networkStateDriver. This means the network is not up yet when qemu does it's autostart. I could fix this with the attached patch. 2. missing virConnectPtr during autostart of the vm: in src/qemu_driver.c:145, qemudAutostartConfigs() you can find this call: int ret = qemudStartVMDaemon(NULL, driver, vm, NULL); This means virConnectPtr conn is NULL within qemudStartVMDaemon(). Following the calls: qemudStartVMDaemon() -> qemudBuildCommandLine() -> qemudNetworkIfaceConnect() -> virNetworkLookupByName() virNetworkLookupByName bails out if called with invalid virConnectPtr. This means starting this vm fails. Currently I'm not familiar enough with the libvirt structures to come up with an idea how to fix this. Could anybody with a deeper knowledge of the code take a look at this? Thank you very much. Kind regards, Gerd diff -r -u libvirt-0.5.0.orig/qemud/qemud.c libvirt-0.5.0/qemud/qemud.c --- libvirt-0.5.0.orig/qemud/qemud.c 2008-11-21 13:47:32.000000000 +0100 +++ libvirt-0.5.0/qemud/qemud.c 2008-11-30 21:27:06.000000000 +0100 @@ -761,22 +761,13 @@ * If they try to use a open a connection for a module that * is not loaded they'll get a suitable error at that point */ - virDriverLoadModule("qemu"); - virDriverLoadModule("lxc"); - virDriverLoadModule("uml"); virDriverLoadModule("network"); virDriverLoadModule("storage"); virDriverLoadModule("nodedev"); + virDriverLoadModule("qemu"); + virDriverLoadModule("lxc"); + virDriverLoadModule("uml"); #else -#ifdef WITH_QEMU - qemuRegister(); -#endif -#ifdef WITH_LXC - lxcRegister(); -#endif -#ifdef WITH_UML - umlRegister(); -#endif #ifdef WITH_NETWORK networkRegister(); #endif @@ -786,6 +777,15 @@ #if defined(HAVE_HAL) || defined(HAVE_DEVKIT) nodedevRegister(); #endif +#ifdef WITH_QEMU + qemuRegister(); +#endif +#ifdef WITH_LXC + lxcRegister(); +#endif +#ifdef WITH_UML + umlRegister(); +#endif #endif virEventRegisterImpl(virEventAddHandleImpl, -- Address (better: trap) for people I really don't want to get mail from: james(a)cactusamerica.com

2 2

[libvirt] [PATCH] avoid format string warnings
by Jim Meyering 01 Dec '08

01 Dec '08

Hi Dan, I've just applied all of your changes, built, and saw some new warnings: uml_driver.c:1742: warning: format not a string literal and no format arguments uml_driver.c:1748: warning: format not a string literal and no format arguments uml_driver.c:1785: warning: format not a string literal and no format arguments openvz_conf.c:468: warning: format not a string literal and no format arguments But they were introduced before your changes. Here's the patch, on top of your changes. Note that as is, the patch does not apply to the latest in CVS, so my checking it in there would induce merge conflicts for you. So I'll hold off until after your 28-part series is committed. Jim >From fb32deb5dfb2a3c6b598de619f25c0bae4314a05 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 1 Dec 2008 11:17:08 +0100 Subject: [PATCH] avoid format string warnings * src/uml_driver.c (umlDomainBlockPeek): Put "%s" before each literal format string with no % directive. * src/openvz_conf.c (openvzGetNodeCPUs): Likewise. --- src/openvz_conf.c | 2 +- src/uml_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvz_conf.c b/src/openvz_conf.c index fc4ef20..1361c53 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -466,7 +466,7 @@ openvzGetNodeCPUs(void) if (virNodeInfoPopulate(NULL, &nodeinfo) < 0) { openvzError(NULL, VIR_ERR_INTERNAL_ERROR, - _("Cound not read nodeinfo")); + "%s", _("Cound not read nodeinfo")); return 0; } diff --git a/src/uml_driver.c b/src/uml_driver.c index d2f2c7b..8d33c70 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -1740,13 +1740,13 @@ umlDomainBlockPeek (virDomainPtr dom, if (!vm) { umlReportError (dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching uuid")); + "%s", _("no domain with matching uuid")); goto cleanup; } if (!path || path[0] == '\0') { umlReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, - _("NULL or empty path")); + "%s", _("NULL or empty path")); goto cleanup; } @@ -1783,7 +1783,7 @@ umlDomainBlockPeek (virDomainPtr dom, ret = 0; } else { umlReportError (dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, - _("invalid path")); + "%s", _("invalid path")); } cleanup: -- 1.6.0.4.1044.g77718

1 0

[libvirt] Memory leak in xen_inotify.c
by Niraj Tolia 30 Nov '08

30 Nov '08

Hi, It looks like xenInotifyOpen() in xen_inotify.c has an opendir() call. However, as there is no corresponding closedir() and opendir() uses malloc internally, valgrind reports this as a memory leak. Adding a closedir() to the end of this function should fix this. Cheers, Niraj

2 1

[libvirt] libvirt + xen 3.2.1 oddities
by Guido Günther 28 Nov '08

28 Nov '08

Hi, I just ran across these oddities when using a bit more libvirt+xen: 1.) virsh setmaxmem: On a running domain: # virsh setmaxmem domain 256000 completes but virsh dumpxml as well as the config.sxp still shows the old amount of memory. Looks as the set_maxmem hypercall simply gets ignored. xm mem-max works as expected. Smells like a bug in the ioctl? 2.) virsh list: Sometimes (didn't find a pattern yet) when shutting down a running domains and restarting it I'm seeing: Id Name State ---------------------------------- 0 Domain-0 running 2 foo idle libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: 7 bar idle Note that the number of errors the corresponds to the number of shutdowns. VirXen_getdomaininfolist returns 7 in the above case. virDomainLookupByID later on fails for these "additional" domains. 3.) virsh list: Duplicate domains: Id Name State ---------------------------------- 0 Domain-0 running libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: 14 bar no state libvir: Xen Daemon error : GET operation failed: xend_get: error from xen daemon: 16 bar idle Domain 14 can't be shut down (xm list only lists domain 16). Could be a similar problem as the above. This is all libvirt 0.4.6 (but the code looks very similar in gurrent CVS) and xen-3.2.1 on Debian. The detected ABI is hypervisor call v2, sys ver6 dom ver5. And from a quick glance at the libxen-dev package the structs seem to match. Cheers, -- Guido

3 7

[libvirt] PATCH: Fix XM driver handling of disks without source file
by Daniel P. Berrange 28 Nov '08

28 Nov '08

It is possible for disks to be listed without a source file against them, eg a CDROM device with no media loaded. The XenD driver handles this, but the XM driver incorrectly generates XML with a <source file=''/> element instead of omitting the element entirely. This causes a bogus SXEXPR to be sent to XenD when starting the domain. This patch does three things - Makes the generic domain_conf.c XML parser accept XML docs with a bogus <source file=''/> and convert the source to NULL, instead of passing along the empty string "". This protects against broken apps - Makes the XM driver correctly generate XML in the first place, so omitting the <source> tag entirely. This is the root cause fix - Adds a test case for the XM driver to validate handling of devices with a source file src/domain_conf.c | 8 +++ src/xm_internal.c | 70 ++++++++++++++++------------ tests/xmconfigdata/test-no-source-cdrom.cfg | 23 +++++++++ tests/xmconfigdata/test-no-source-cdrom.xml | 46 ++++++++++++++++++ tests/xmconfigtest.c | 1 5 files changed, 120 insertions(+), 28 deletions(-) Daniel Index: src/xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.102 diff -u -p -r1.102 xm_internal.c --- src/xm_internal.c 25 Nov 2008 11:18:08 -0000 1.102 +++ src/xm_internal.c 27 Nov 2008 12:14:57 -0000 @@ -828,7 +828,7 @@ xenXMDomainConfigParse(virConnectPtr con while (list) { char *head; char *offset; - char *tmp, *tmp1; + char *tmp; if ((list->type != VIR_CONF_STRING) || (list->str == NULL)) goto skipdisk; @@ -850,10 +850,15 @@ xenXMDomainConfigParse(virConnectPtr con goto skipdisk; if ((offset - head) >= (PATH_MAX-1)) goto skipdisk; - if (VIR_ALLOC_N(disk->src, (offset - head) + 1) < 0) - goto no_memory; - strncpy(disk->src, head, (offset - head)); - disk->src[(offset-head)] = '\0'; + + if (offset == head) { + disk->src = NULL; /* No source file given, eg CDROM with no media */ + } else { + if (VIR_ALLOC_N(disk->src, (offset - head) + 1) < 0) + goto no_memory; + strncpy(disk->src, head, (offset - head)); + disk->src[(offset-head)] = '\0'; + } head = offset + 1; /* Remove legacy ioemu: junk */ @@ -871,32 +876,41 @@ xenXMDomainConfigParse(virConnectPtr con /* Extract source driver type */ - if (disk->src && - (tmp = strchr(disk->src, ':')) != NULL) { - if (VIR_ALLOC_N(disk->driverName, (tmp - disk->src) + 1) < 0) - goto no_memory; - strncpy(disk->driverName, disk->src, (tmp - disk->src)); - disk->driverName[tmp - disk->src] = '\0'; - } else { - if (!(disk->driverName = strdup("phy"))) - goto no_memory; - tmp = disk->src; - } + if (disk->src) { + /* The main type phy:, file:, tap: ... */ + if ((tmp = strchr(disk->src, ':')) != NULL) { + if (VIR_ALLOC_N(disk->driverName, (tmp - disk->src) + 1) < 0) + goto no_memory; + strncpy(disk->driverName, disk->src, (tmp - disk->src)); + disk->driverName[tmp - disk->src] = '\0'; - /* And the source driver sub-type */ - if (STRPREFIX(disk->driverName, "tap")) { - if (!(tmp1 = strchr(tmp+1, ':')) || !tmp1[0]) - goto skipdisk; - if (VIR_ALLOC_N(disk->driverType, (tmp1-(tmp+1))) < 0) - goto no_memory; - strncpy(disk->driverType, tmp+1, (tmp1-(tmp+1))); - memmove(disk->src, disk->src+(tmp1-disk->src)+1, strlen(disk->src)-(tmp1-disk->src)); - } else { - disk->driverType = NULL; - if (disk->src[0] && tmp) - memmove(disk->src, disk->src+(tmp-disk->src)+1, strlen(disk->src)-(tmp-disk->src)); + /* Strip the prefix we found off the source file name */ + memmove(disk->src, disk->src+(tmp-disk->src)+1, + strlen(disk->src)-(tmp-disk->src)); + } + + /* And the sub-type for tap:XXX: type */ + if (disk->driverName && + STREQ(disk->driverName, "tap")) { + if (!(tmp = strchr(disk->src, ':'))) + goto skipdisk; + if (VIR_ALLOC_N(disk->driverType, (tmp - disk->src) + 1) < 0) + goto no_memory; + strncpy(disk->driverType, disk->src, (tmp - disk->src)); + disk->driverType[tmp - disk->src] = '\0'; + + /* Strip the prefix we found off the source file name */ + memmove(disk->src, disk->src+(tmp-disk->src)+1, + strlen(disk->src)-(tmp-disk->src)); + } } + /* No source, or driver name, so fix to phy: */ + if (!disk->driverName && + !(disk->driverName = strdup("phy"))) + goto no_memory; + + /* phy: type indicates a block device */ disk->type = STREQ(disk->driverName, "phy") ? VIR_DOMAIN_DISK_TYPE_BLOCK : VIR_DOMAIN_DISK_TYPE_FILE; Index: src/domain_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/domain_conf.c,v retrieving revision 1.39 diff -u -p -r1.39 domain_conf.c --- src/domain_conf.c 21 Nov 2008 11:42:51 -0000 1.39 +++ src/domain_conf.c 27 Nov 2008 12:15:06 -0000 @@ -546,6 +546,14 @@ virDomainDiskDefParseXML(virConnectPtr c source = virXMLPropString(cur, "file"); else source = virXMLPropString(cur, "dev"); + + /* People sometimes pass a bogus '' source path + when they mean to omit the source element + completely. eg CDROM without media. This is + just a little compatability check to help + those broken apps */ + if (source && STREQ(source, "")) + VIR_FREE(source); } else if ((target == NULL) && (xmlStrEqual(cur->name, BAD_CAST "target"))) { target = virXMLPropString(cur, "dev"); Index: tests/xmconfigtest.c =================================================================== RCS file: /data/cvs/libvirt/tests/xmconfigtest.c,v retrieving revision 1.24 diff -u -p -r1.24 xmconfigtest.c --- tests/xmconfigtest.c 24 Nov 2008 19:23:39 -0000 1.24 +++ tests/xmconfigtest.c 27 Nov 2008 12:15:13 -0000 @@ -229,6 +229,7 @@ mymain(int argc, char **argv) DO_TEST("fullvirt-sound", 2); DO_TEST("escape-paths", 2); + DO_TEST("no-source-cdrom", 2); virCapabilitiesFree(caps); Index: tests/xmconfigdata/test-no-source-cdrom.cfg =================================================================== RCS file: tests/xmconfigdata/test-no-source-cdrom.cfg diff -N tests/xmconfigdata/test-no-source-cdrom.cfg --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xmconfigdata/test-no-source-cdrom.cfg 27 Nov 2008 12:15:27 -0000 @@ -0,0 +1,23 @@ +name = "test" +uuid = "cc2315e7-d26a-307a-438c-6d188ec4c09c" +maxmem = 382 +memory = 350 +vcpus = 1 +builder = "hvm" +kernel = "/usr/lib/xen/boot/hvmloader" +boot = "c" +pae = 1 +acpi = 1 +apic = 1 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "destroy" +on_crash = "destroy" +device_model = "/usr/lib/xen/bin/qemu-dm" +sdl = 0 +vnc = 1 +vncunused = 1 +disk = [ "phy:/dev/sda8,hda,w", ",hdc:cdrom,r" ] +vif = [ "mac=00:16:3e:0a:7b:39,bridge=xenbr0,type=ioemu" ] +parallel = "none" +serial = "pty" Index: tests/xmconfigdata/test-no-source-cdrom.xml =================================================================== RCS file: tests/xmconfigdata/test-no-source-cdrom.xml diff -N tests/xmconfigdata/test-no-source-cdrom.xml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/xmconfigdata/test-no-source-cdrom.xml 27 Nov 2008 12:15:27 -0000 @@ -0,0 +1,46 @@ +<domain type='xen'> + <name>test</name> + <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid> + <memory>391168</memory> + <currentMemory>358400</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='xenfv'>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/sda8'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='block' device='cdrom'> + <driver name='phy'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:0a:7b:39'/> + <source bridge='xenbr0'/> + </interface> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target port='0'/> + </console> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='-1' autoport='yes'/> + </devices> +</domain> -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] PATCH: Fix QEMU/UML use of libnuma
by Daniel P. Berrange 28 Nov '08

28 Nov '08

The 2.x series of numactl releases changed the ABI/API for certain libnuma.so functions we use. Fortunately it turns out that they provide back-compatability of both ABI and API with a combo of linker script magic, and header file inline compat functions. So, all we need todo is #define NUMA_VERSION1_COMPATIBILITY before include numa.h in our code. This new code did, however, expose a bug in our use of the existing API. We were calculating size in bytes, instead of size in longs, so were passing a buffer that was 8 times to large. Harmless, but the new libnuma validates that the buffer is expected size. So this patch also fixes us to pass & allocate correct buffer size. Finally, also add a missing BuildRequire on numactl-devel, and fixes the libvirtd automake build dependancy Daniel Index: libvirt.spec.in =================================================================== RCS file: /data/cvs/libvirt/libvirt.spec.in,v retrieving revision 1.103 diff -u -p -r1.103 libvirt.spec.in --- libvirt.spec.in 26 Nov 2008 14:46:49 -0000 1.103 +++ libvirt.spec.in 27 Nov 2008 13:20:24 -0000 @@ -124,6 +124,8 @@ BuildRequires: lvm2 BuildRequires: iscsi-initiator-utils # For disk driver BuildRequires: parted-devel +# For QEMU/LXC numa info +BuildRequires: numactl-devel Obsoletes: libvir # Fedora build root suckage Index: qemud/Makefile.am =================================================================== RCS file: /data/cvs/libvirt/qemud/Makefile.am,v retrieving revision 1.61 diff -u -p -r1.61 Makefile.am --- qemud/Makefile.am 21 Nov 2008 12:27:11 -0000 1.61 +++ qemud/Makefile.am 27 Nov 2008 13:20:24 -0000 @@ -87,7 +87,6 @@ libvirtd_LDFLAGS = \ $(COVERAGE_LDFLAGS) \ $(POLKIT_LIBS) -libvirtd_DEPENDENCIES = ../src/libvirt.la libvirtd_LDADD = \ ../gnulib/lib/libgnu.la @@ -129,6 +128,9 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS) libvirtd_LDADD += $(AVAHI_LIBS) endif +libvirtd_DEPENDENCIES = $(libvirtd_LDADD) + + default_xml_dest = libvirt/qemu/networks/default.xml install-data-local: install-init install-data-sasl install-data-polkit mkdir -p $(DESTDIR)$(sysconfdir)/libvirt/qemu/networks/autostart Index: src/qemu_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_conf.c,v retrieving revision 1.108 diff -u -p -r1.108 qemu_conf.c --- src/qemu_conf.c 19 Nov 2008 16:58:23 -0000 1.108 +++ src/qemu_conf.c 27 Nov 2008 13:20:24 -0000 @@ -37,6 +37,7 @@ #include <sys/utsname.h> #if HAVE_NUMACTL +#define NUMA_VERSION1_COMPATIBILITY 1 #include <numa.h> #endif @@ -300,11 +301,11 @@ qemudCapsInitGuest(virCapsPtr caps, #if HAVE_NUMACTL #define MAX_CPUS 4096 #define MAX_CPUS_MASK_SIZE (sizeof(unsigned long)) -#define MAX_CPUS_MASK_LEN (MAX_CPUS / MAX_CPUS_MASK_SIZE) -#define MAX_CPUS_MASK_BYTES (MAX_CPUS / 8) +#define MAX_CPUS_MASK_BITS (MAX_CPUS_MASK_SIZE * 8) +#define MAX_CPUS_MASK_LEN (MAX_CPUS / (MAX_CPUS_MASK_BITS)) #define MASK_CPU_ISSET(mask, cpu) \ - (((mask)[((cpu) / MAX_CPUS_MASK_SIZE)] >> ((cpu) % MAX_CPUS_MASK_SIZE)) & 1) + (((mask)[((cpu) / MAX_CPUS_MASK_BITS)] >> ((cpu) % MAX_CPUS_MASK_BITS)) & 1) static int qemudCapsInitNUMA(virCapsPtr caps) @@ -322,7 +323,8 @@ qemudCapsInitNUMA(virCapsPtr caps) goto cleanup; for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_BYTES) < 0) + + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) Index: src/qemu_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_driver.c,v retrieving revision 1.160 diff -u -p -r1.160 qemu_driver.c --- src/qemu_driver.c 21 Nov 2008 12:16:08 -0000 1.160 +++ src/qemu_driver.c 27 Nov 2008 13:20:25 -0000 @@ -45,6 +45,7 @@ #include <sys/ioctl.h> #if HAVE_NUMACTL +#define NUMA_VERSION1_COMPATIBILITY 1 #include <numa.h> #endif Index: src/uml_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/uml_conf.c,v retrieving revision 1.1 diff -u -p -r1.1 uml_conf.c --- src/uml_conf.c 19 Nov 2008 16:58:23 -0000 1.1 +++ src/uml_conf.c 27 Nov 2008 13:20:25 -0000 @@ -37,6 +37,7 @@ #include <sys/utsname.h> #if HAVE_NUMACTL +#define NUMA_VERSION1_COMPATIBILITY 1 #include <numa.h> #endif @@ -56,11 +57,11 @@ #if HAVE_NUMACTL #define MAX_CPUS 4096 #define MAX_CPUS_MASK_SIZE (sizeof(unsigned long)) -#define MAX_CPUS_MASK_LEN (MAX_CPUS / MAX_CPUS_MASK_SIZE) -#define MAX_CPUS_MASK_BYTES (MAX_CPUS / 8) +#define MAX_CPUS_MASK_BITS (MAX_CPUS_MASK_SIZE * 8) +#define MAX_CPUS_MASK_LEN (MAX_CPUS / (MAX_CPUS_MASK_BITS)) #define MASK_CPU_ISSET(mask, cpu) \ - (((mask)[((cpu) / MAX_CPUS_MASK_SIZE)] >> ((cpu) % MAX_CPUS_MASK_SIZE)) & 1) + (((mask)[((cpu) / MAX_CPUS_MASK_BITS)] >> ((cpu) % MAX_CPUS_MASK_BITS)) & 1) static int umlCapsInitNUMA(virCapsPtr caps) @@ -78,7 +79,8 @@ umlCapsInitNUMA(virCapsPtr caps) goto cleanup; for (n = 0 ; n <= numa_max_node() ; n++) { - if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_BYTES) < 0) + + if (numa_node_to_cpus(n, mask, MAX_CPUS_MASK_LEN) < 0) goto cleanup; for (ncpus = 0, i = 0 ; i < MAX_CPUS ; i++) Index: src/uml_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/uml_driver.c,v retrieving revision 1.2 diff -u -p -r1.2 uml_driver.c --- src/uml_driver.c 21 Nov 2008 10:06:28 -0000 1.2 +++ src/uml_driver.c 27 Nov 2008 13:20:25 -0000 @@ -46,6 +46,7 @@ #include <sys/inotify.h> #if HAVE_NUMACTL +#define NUMA_VERSION1_COMPATIBILITY 1 #include <numa.h> #endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] Hide fully-virtualized network devices to domU with PV drivers
by Iain Watson 28 Nov '08

28 Nov '08

Hello, I have a problem with libvirt which I hope someone on this list might be able to help with. I have many DomU images which all have PV drivers loaded for network. I want to start these DomU guests with only the PV network device being visible from within the DomU. In testing I have been able to create the required system with the 'xm' command. The important part of the network line is "type=none". The complete line looks like: vif = [ "mac=00:16:3e:00:a5:57,bridge=eth0,script=vif-bridge,type=none" ] With libvirt I have tried adding "<model type='none'/>" into the interface section but this errors with "qemu: Unsupported NIC: none" so I'm obviously missing something obvious. The complete interface section looks like: <interface type='bridge'> <mac address='00:16:3e:00:a5:57'/> <source bridge='eth0'/> <target dev='vif9.0'/> <model type='none'/> </interface> I have been able to achieve the required configuration if I completely omit an 'interface' section and once the DomU has booted I use virsh to add an interface to the domain. Unfortunately if I then reboot the DomU the guest comes back up with two network interfaces visible to it and the qemu-dm line has added a "-net ...,model=rtl8139" option. Having hunted around I am yet to find a way to configure a domU in libvirt so the networking available to the guest is the way I require. As I can do this with xm, I'm hoping someone on this list can point me in the right direction to also do this with libvirt. Thanks in advance, Iain Watson

1 0

[libvirt] [PATCH 1/2]: Give /dev/disk/by-{id, path} a chance to exist
by Chris Lalancette 28 Nov '08

28 Nov '08

This patch is the same idea as my previous patch for giving /dev/disk/by-{id,path} a chance to exist. Currently libvirt can race with udev creation of /dev/disk/by-{id,path}, so if we fail to open the directory, retry up to 5 seconds. This is only likely to happen on hosts that are: 1) diskless (so /dev/disk/by-{id,path} doesn't exist already), and 2) slow, and/or heavily loaded (meaning that udev can take some time to create the /dev nodes). Based on the feedback from Dan and Jim, I updated the patch to look more like what is elsewhere in libvirt. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> Index: src/storage_backend.c =================================================================== RCS file: /data/cvs/libvirt/src/storage_backend.c,v retrieving revision 1.29 diff -u -r1.29 storage_backend.c --- a/src/storage_backend.c 17 Nov 2008 11:19:33 -0000 1.29 +++ b/src/storage_backend.c 26 Nov 2008 12:09:36 -0000 @@ -291,6 +291,7 @@ DIR *dh; struct dirent *dent; char *stablepath; + int opentries = 0; /* Short circuit if pool has no target, or if its /dev */ if (pool->def->target.path == NULL || @@ -304,12 +305,17 @@ if (!STRPREFIX(pool->def->target.path, "/dev")) goto ret_strdup; - /* The pool is pointing somewhere like /dev/disk/by-path - * or /dev/disk/by-id, so we need to check all symlinks in - * the target directory and figure out which one points - * to this device node + /* We loop here because /dev/disk/by-{id,path} may not have existed + * before we started this operation, so we have to give it some time to + * get created. */ + reopen: if ((dh = opendir(pool->def->target.path)) == NULL) { + opentries++; + if (errno == ENOENT && opentries < 50) { + usleep(100 * 1000); + goto reopen; + } virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot read dir %s: %s"), pool->def->target.path, @@ -317,6 +323,11 @@ return NULL; } + /* The pool is pointing somewhere like /dev/disk/by-path + * or /dev/disk/by-id, so we need to check all symlinks in + * the target directory and figure out which one points + * to this device node + */ while ((dent = readdir(dh)) != NULL) { if (dent->d_name[0] == '.') continue;

2 2

[libvirt] PATCH: Allow automatic driver probe for remote TCP connections
by Daniel P. Berrange 27 Nov '08

27 Nov '08

When connecting to a local libvirt you can let it automatically probe the hypervisor URI if you don't know it ahead of time. This doesn't work with remote URIs because you need to have something to put in the URI scheme before the hostname qemu+ssh://somehost/system xen+tcp://somehost/system This is then translated into the URI qemu:///system xen:/// It occurred to me that we can trivially enable probing with all existing libvirtd daemon releases, simply by fixing the client side. All we need todo is invent a new generic URI scheme, and convert that to empty string This patch adds a 'remote' URI scheme, usable like this remote+ssh://somehost/ remote+tcp://somehost/ remote://somehost/ remote+tls://somehost/ remote+ext://somehost/ In all these styles, the URI passed to the remote daemon is "", causing it to probe. As a demonstration, here's an example using virsh and two hosts I have, one running Xen, the other QEMU See it automatically choosing QEMU.... $ virsh --connect remote+ssh://root@lettuce/ version Compiled against library: libvir 0.5.0 Using library: libvir 0.5.0 Running hypervisor: QEMU 0.9.1 And choosing Xen.... $ virsh --connect remote+ssh://root@pumpkin/ version Compiled against library: libvir 0.5.0 Using library: libvir 0.5.0 Running hypervisor: Xen 3.1.0 This finally makes the Avahi broadcasts useful - they only include info on the hostname + data transport (SSH, TCP, TLS), not the HV type. So letting us use auto-probing remotely is the missing link. NB. we've got a small problem with the virGetVersion() API - it does not take a connection URI - just a hypervisor type. It then directly checks the statically declared 'version' field in the virDriverPtr struct. This no longer works now that some drivers are linked directly into the libvirt daemon. I'm thinking that perhaps we can just change the virGetVersion() apis so that instead of looking in virDriverPtr struct, we just include the version numbers directly in virGetVersion as a static const lookup table. Meanwhile, this patch also includes a change to virsh to stop it calling virGetVersion(), though this hunk instead intended to apply to CVS. Daniel Index: remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.108 diff -u -p -r1.108 remote_internal.c --- remote_internal.c 21 Nov 2008 12:31:04 -0000 1.108 +++ remote_internal.c 26 Nov 2008 21:58:47 -0000 @@ -430,28 +430,40 @@ doRemoteOpen (virConnectPtr conn, /* Construct the original name. */ if (!name) { - xmlURI tmpuri = { - .scheme = conn->uri->scheme, + if (STREQ(conn->uri->scheme, "remote") || + STRPREFIX(conn->uri->scheme, "remote+")) { + /* Allow remote serve to probe */ + name = strdup(""); + } else { + xmlURI tmpuri = { + .scheme = conn->uri->scheme, #ifdef HAVE_XMLURI_QUERY_RAW - .query_raw = qparam_get_query (vars), + .query_raw = qparam_get_query (vars), #else - .query = qparam_get_query (vars), + .query = qparam_get_query (vars), #endif - .path = conn->uri->path, - .fragment = conn->uri->fragment, - }; - - /* Evil, blank out transport scheme temporarily */ - if (transport_str) { - assert (transport_str[-1] == '+'); - transport_str[-1] = '\0'; - } + .path = conn->uri->path, + .fragment = conn->uri->fragment, + }; + + /* Evil, blank out transport scheme temporarily */ + if (transport_str) { + assert (transport_str[-1] == '+'); + transport_str[-1] = '\0'; + } + + name = (char *) xmlSaveUri (&tmpuri); - name = (char *) xmlSaveUri (&tmpuri); +#ifdef HAVE_XMLURI_QUERY_RAW + VIR_FREE(tmpuri.query_raw); +#else + VIR_FREE(tmpuri.query); +#endif - /* Restore transport scheme */ - if (transport_str) - transport_str[-1] = '+'; + /* Restore transport scheme */ + if (transport_str) + transport_str[-1] = '+'; + } } free_qparam_set (vars); Index: virsh.c =================================================================== RCS file: /data/cvs/libvirt/src/virsh.c,v retrieving revision 1.175 diff -u -p -r1.175 virsh.c --- virsh.c 24 Nov 2008 07:13:30 -0000 1.175 +++ virsh.c 26 Nov 2008 21:58:51 -0000 @@ -4357,7 +4357,6 @@ cmdVersion(vshControl *ctl, const vshCmd const char *hvType; unsigned long libVersion; unsigned long includeVersion; - unsigned long apiVersion; int ret; unsigned int major; unsigned int minor; @@ -4380,7 +4379,8 @@ cmdVersion(vshControl *ctl, const vshCmd vshPrint(ctl, _("Compiled against library: libvir %d.%d.%d\n"), major, minor, rel); - ret = virGetVersion(&libVersion, hvType, &apiVersion); + + ret = virGetVersion(&libVersion, NULL, NULL); if (ret < 0) { vshError(ctl, FALSE, "%s", _("failed to get the library version")); return FALSE; @@ -4392,13 +4392,6 @@ cmdVersion(vshControl *ctl, const vshCmd vshPrint(ctl, _("Using library: libvir %d.%d.%d\n"), major, minor, rel); - major = apiVersion / 1000000; - apiVersion %= 1000000; - minor = apiVersion / 1000; - rel = apiVersion % 1000; - vshPrint(ctl, _("Using API: %s %d.%d.%d\n"), hvType, - major, minor, rel); - ret = virConnectGetVersion(ctl->conn, &hvVersion); if (ret < 0) { vshError(ctl, FALSE, "%s", _("failed to get the hypervisor version")); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] [PATCH] Prefer xend setmaxmem interface
by Jim Fehlig 27 Nov '08

27 Nov '08

As discussed in [1], prefer xend interface for setting max memory. Regards, Jim [1] https://www.redhat.com/archives/libvir-list/2008-November/msg00339.html

3 3

[libvirt] [PATCH 0/2]: Make storage_backend device scanning more reliable
by Chris Lalancette 26 Nov '08

26 Nov '08

All, This is a 2 part patch series to make libvirt backend device scanning more reliable. In particular, this is important for things that can create/destroy udev /dev nodes, since at present we can race with the udev creation. Note that this takes over the previous patch that I posted to retry /dev/disk/by-{id,path} scanning. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

2 1

[libvirt] make not invoking rpcgen remote_protocol.x
by Kenneth Nagin 26 Nov '08

26 Nov '08

I am attempting to add some new libvirt functions that I intend to submit for your approval. I have made changes to remote_protocol.x. Initially it generated the expected files. However, after making a few changes the make no causes it to generate files. Manually invoke rpcgen -c remote_protocol.x > remote_protocol.c seems to get around the compile problem. But now I'm getting a "Remote error : marshaling args" I 'm think there is a problem in the make. Kenneth Nagin

3 4

[libvirt] libvirt_low_level_storage_api
by shahar＠compal1.qumranet.com 26 Nov '08

26 Nov '08

Hi All, here is an initial version of the operations required for SolidICE and the proposed high level interface. I would like to discuss how to map it to libvirt calls and what libvirt calls are missing. Thanks, Shahar Frank HostLevel --------- enumarateLuns(): return: returns all luns visible by the host. In case multipathing is enabled then only the multipath device should be in the return list. enumerateISCSILuns(target): params: target - ISCSI target Description: enumerate all ISCSI luns on a specific target return: list of getBlockInfo(name or UUID): return: at least uuid & size enumerateVGs(): return: VG UUID list open issues - should we assume ISCSI auto connect or FC login? StoragePool level ----------------- createVolumeGroup(name, devices): params: name = name devices - a list of UUIDs description: Should create a volume group out of the UUID list In case multipathing is enabled then only the multipath device should be used In case it is not a PV yet then a PV is to be created. Return: Uuid of the VG removeVolumeGroup(VG): params: VG - uuid of the Volume group Description: Remove all remains for the VolumeGroup (LVs, PVs ...) Return: Sucsess/failure mountNFS(server, remotePath, localPath, params) params: server - the NFS server name or IP temotePath - remote server export path localPath - local path to mount on params - nfs mount params description: mounts the remote export onto the local path using the mount params return: success/failure unmount(localPath, forceFlag) params: localPath - the local path to unmount forceFlag - a flag indicating whether to force unmount description: unmounts local path (trivial) return: success/failure Open issues: 1. NFS configuration persistency? 2. What happens in case the libvirt is restarted should it be reconfigured? VolumeGroup level ----------------- listPV(VG): params: VG - Volume group UUID Description: Lists all PV in a specific volume group Return: A list of PV UUIDs infoPV(VG, PV) params: VG - Volume group UUID PV - Physical volume UUID description: trivial return: returns the PV information (at least size & path) extendVolumeGroup(VG, devices): params: VG - Volume Group UUID devices - a list of UUIDs description: This function adds Phisical Volume to the VolumeGroup. Each UUID device is checked, In case multipathing is enabled then only the multipath device should be used (PV create in case it's not) and added to the volume group return: success/fauilure removePV(VG, PV): params: VG - Volume Group UUID PV - Physical volume's UUID to be removed description: removes the physical volume return: success failure LV operations -------------- listLVs(VG): params: VG - Volume Group UUID description: trivial return: list of all LV UUIDs infoLV(VG, LV): params: VG - Volume Group UUID LV - Logical Volume UUID description: trivial return: returns LV information (at least size and path) createLV(VG, LvName, size): params: VG - Volume Group UUID LvName - name of the logical volume Size - size of logical volume description: creates a logical volume with name LvName and the requested size return: LV UUID extendLV(VG, LV, size): params: VG - Volume Group UUID LV - Logical Volume UUID description: extends LV with additional size return: success/failure removeLV(VG,LV): params: VG - Volume Group UUID LV - Logical Volume UUID description: return: snapshotLV(VG, LV, size): params: VG - Volume Group UUID LV - Logical Volume UUID size - Initial size of snapshot volume description: creeates a snapshot of LV return: UUID of snapshot

2 1

[libvirt] serial console runs out of buffer and console messages soft lock the CPU
by Bryan McLellan 26 Nov '08

26 Nov '08

I recently started configuring guests to use both a serial console and a graphics element. One of the nodes with this configuration kept locking up after running for some time. Trying to access the guest through virt-manager would leave virt-viewer hung at the connecting to screen. The guest would not respond to any network traffic including icmp. The user would destroy the domain and restart it to recover. Eventually the problem came to me and I found that immediately upon running 'virsh console domain' the guest would recover. The console contained: BUG: soft lockup - CPU#0 stuck for 94393s! [postgresql-8.3:4975] I discovered a bug in a puppet recipe caused postgres to reload regularly, printing a message to the console each time. Running puppet in a loop to continue producing these messages to the console caused another lockup that was recoverable by accessing the serial console in the same manner. I have since fixed that recipe, but I'm uncomfortable about the possibility of this happening again. Is there a way to configure libvirt to cache the serial console on the host so the buffer on the guest does not fill up when you aren't connected to the console, or should I disable the serial console? Bryan https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/301897

3 2

[libvirt] Packages in the path to getting a Windows binary of libvirt, built from Fedora
by Richard W.M. Jones 26 Nov '08

26 Nov '08

It seems like we should have the base MinGW (Windows cross-compiler) packages in Fedora 11 by the end of this week. This email is to document the additional packages we need to get approved, in order to get the cross-compiled libvirt and virt tools into (or buildable by) Fedora 11. If you want to help out, please start reviewing by following the Bugzilla links, and looking at the approved packaging guidelines at http://fedoraproject.org/wiki/Packaging/MinGW. ** For libvirt itself: mingw32-libgpg-error https://bugzilla.redhat.com/show_bug.cgi?id=467403 mingw32-libgcrypt https://bugzilla.redhat.com/show_bug.cgi?id=467410 mingw32-gnutls https://bugzilla.redhat.com/show_bug.cgi?id=467414 mingw32-gettext https://bugzilla.redhat.com/show_bug.cgi?id=467398 mingw32-libxml2 https://bugzilla.redhat.com/show_bug.cgi?id=467405 mingw32-portablexdr https://bugzilla.redhat.com/show_bug.cgi?id=467324 mingw32-readline https://bugzilla.redhat.com/show_bug.cgi?id=467399 mingw32-termcap https://bugzilla.redhat.com/show_bug.cgi?id=467329 OR a very brave person can try porting ncurses to Windows. mingw32-iconv https://bugzilla.redhat.com/show_bug.cgi?id=467325 mingw32-zlib https://bugzilla.redhat.com/show_bug.cgi?id=454416 mingw32-libvirt https://bugzilla.redhat.com/show_bug.cgi?id=467418 ** For the C based tools (gtk-vnc, virt-viewer, ovirt-viewer, vinagre): All of the above plus: mingw32-gtk2 https://bugzilla.redhat.com/show_bug.cgi?id=467420 mingw32-glib2 https://bugzilla.redhat.com/show_bug.cgi?id=467402 mingw32-cairo https://bugzilla.redhat.com/show_bug.cgi?id=467416 mingw32-jasper https://bugzilla.redhat.com/show_bug.cgi?id=467408 mingw32-libpng https://bugzilla.redhat.com/show_bug.cgi?id=467397 mingw32-libjpeg https://bugzilla.redhat.com/show_bug.cgi?id=467401 mingw32-libtiff (?) Optional dependency for GTK2, but not yet packaged. mingw32-pango https://bugzilla.redhat.com/show_bug.cgi?id=467419 mingw32-atk https://bugzilla.redhat.com/show_bug.cgi?id=467409 mingw32-pixman https://bugzilla.redhat.com/show_bug.cgi?id=467376 mingw32-freetype https://bugzilla.redhat.com/show_bug.cgi?id=467396 mingw32-fontconfig https://bugzilla.redhat.com/show_bug.cgi?id=467413 mingw32-libidn No Bugzilla Review Request yet, see the mercurial repository. http://hg.et.redhat.com/misc/fedora-mingw--devel mingw32-openssl https://bugzilla.redhat.com/show_bug.cgi?id=467395 mingw32-libssh2 No Bugzilla Review Request yet, see the mercurial repository. http://hg.et.redhat.com/misc/fedora-mingw--devel mingw32-gtk-vnc https://bugzilla.redhat.com/show_bug.cgi?id=467421 mingw32-curl No Bugzilla Review Request yet, see the mercurial repository. http://hg.et.redhat.com/misc/fedora-mingw--devel ** For the Python based tools (virt-install, virt-manager etc), we're hoping to go straight to Python 3 on the basis that it will be easier to contribute patches upstream, and it seems the build system for Python 3 will be a bit saner than for Python 2.x. You can help by making sure that all Python software is "Python 3 clean". If you have python 2.6, then just add the '-3' flag to the command line in order to warn about features which are deprecated and will be removed in Python 3. ** For the OCaml based tools (virt-df, virt-top): mingw32-ocaml mingw32-ocaml-calendar mingw32-ocaml-csv mingw32-ocaml-curses mingw32-ocaml-extlib mingw32-ocaml-findlib mingw32-ocaml-lablgl mingw32-ocaml-lablgtk mingw32-ocaml-libvirt mingw32-ocaml-xml-light (None of these are in Bugzilla yet, and for good reason because I may just do them as subpackages of the OCaml packages already in Fedora). ** I haven't had any particular requests for Ruby tools yet. OVirt itself is a standalone appliance and it doesn't need porting to Windows. ovirt-viewer is a C application and is being written concurrently on Linux and Windows anyway. I'm not sure if there are other standalone bits of ovirt which would make sense being ported to Windows. Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into Xen guests. http://et.redhat.com/~rjones/virt-p2v

1 0

[libvirt] Are there interfaces to change IP address of given domain before it runn
by Ian jonhson 26 Nov '08

26 Nov '08

Dear all, I has created a image file in local filesystem. And now, I wrote a program based on libvirt to run two instances of given image file. But I found they are using the same IP address which make them cut off the network. So, I wonder there are any solution to guarantee that both VM instances would be given different IP address after they are started. Thanks in advance, Ian

3 5

[libvirt] [PATCH] small fixes for the spec file
by Daniel Veillard 26 Nov '08

26 Nov '08

While sarting to build the RPMs for Fedora I noticed that there were a couple of cleanup patches missing about the handling of configuration files, and we forgot to add the dependancy on hal/hal-devel. We should also probably list hal and devkit support as modular options in the spec too. But this patch is just to harmonize with Fedora, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

3 2

[libvirt] [PATCH]: Give /dev/disk/by-{id,path} a chance to exist
by Chris Lalancette 26 Nov '08

26 Nov '08

All, When refreshing a storage pool (say, an iSCSI pool), one of the things it does is to generate the stable path for each of the LUNs via virStorageBackendStablePath. That, in turn, has the following code: /* The pool is pointing somewhere like /dev/disk/by-path * or /dev/disk/by-id, so we need to check all symlinks in * the target directory and figure out which one points * to this device node */ if ((dh = opendir(pool->def->target.path)) == NULL) { virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot read dir %s: %s"), pool->def->target.path, strerror(errno)); return NULL; } For a normal machine, that code is totally legit; /dev/disk/by-{id,path} almost certainly exists because of your hard drive, etc. However, this may not be the case in the stateless ovirt environment, since /dev/disk/by-{id,path} is created on-demand by udev. It's basically a race between udev creating the directory and libvirt scanning the directory. The following patch just adds a retry to the code above so that if it doesn't exist when we first get there, we give it time to come into being. If it still hasn't shown up 5 seconds after we started, we give up and throw the error. Signed-off-by: Chris Lalancette <clalance(a)redhat.com>

3 2

[libvirt] Release of libvirt-0.5.0
by Daniel Veillard 26 Nov '08

26 Nov '08

This is a long expected release, with a lot of new features, as a result the small version number is increased. The release was actually done yesterday evening, and the tarballs and signed RPMs are at: ftp://libvirt.org/libvirt/ As stated there is a huge amount of new features and improvement in this release, as well as a lot of bug fixes, the list is quite long : New features: - CPU and scheduler support for LXC (Dan Smith) - SDL display configuration (Daniel Berrange) - domain lifecycle event support for QEmu and Xen with python bindings (Ben Guthro and Daniel Berrange) - KVM/QEmu migration support (Rich Jones and Chris Lalancette) - User Mode Linux driver (Daniel Berrange) - API for node device enumeration using HAL and DeviceKit with python bindings (David Lively) Portability: - RHEL build fixes - VPATH build (Guido Gunther) - many MinGW related cleanups and fixes (Richard Jones) - compilation without libvirtd (Richard Jones) - Add a Windows icon (Richard Jones) - sys/poll.h portability fixes (Daniel Berrange) - gnulib and mingw cleanups (Jim Meyering) Documentation: - virsh man page cleanups (Mark McLoughlin) - doc for NIC model selection (Richard Jones) - monitoring section - link to AMQP bindings - new APIs - UML driver docs (Daniel Berrange) Bug fixes: - Xen interfaces ordering (Jim Fehlig) - startup timeout with multiple pty (Cole Robinson) - segfault if QEmu without active virtual network (Cole Robinson) - qemu small leak (Eduardo Habkost) - index creation for more than 26 disks (Sanjay Rao and Chris Wright) - virRealloc handling of 0 (Daniel Berrange) - missing pointer initialization (Chris Lalancette) - bus device index bug (Guido Gunther) - avoid crash in some error patch (Chris Lalancette) - fix a problem in storage back-end (Chris Lalancette) - minimum domain memory size check for Xen (Shigeki Sakamoto) - switch off QEmu cache if device is shared (Charles Duffy) - logical volume definition before scan bug (Chris Lalancette) - a couple of memory leaks on QEmu vnc (Jim Meyering) - lvs parsing fixes (Cole Robinson) Improvements: - LXC resources control and internal cgroup API (Dan Smith) - virDomainCreateLinux renamed virDomainDefineXML - network driver modularization (Daniel Berrange) - change the way domain and net are reported in errors (Jim Meyering) - partition table scan on iSCSI (Chris Lalancette) - qemudDiskDeviceName to handle normal disks (Guido Gunther) - qemudDomainBlockStats improvement (Guido Gunther) - scsi/virtio hotplug support for KVM (Guido Gunther) - USB hot addition in QEmu (Guido Gunther) - logical pool and storage backend XML dump improvement (Chris Lalancette) - MAC addresses prefix per driver (Daniel Berrange) - OpenVZ getVersion support (Daniel Berrange) - hot removal of scsi/virtio disks for KVM (Guido Gunther) - test storage driver (Cole Robinson) - iSCSI and disk storage driver improvement on path handling (Chris Lalancette) - UUID and ID support for Xenner (Daniel Berrange) - better logging when when executing commands (Cole Robinson) - bridged network for OpenVZ (Daniel Berrange) - OpenVZ config file params (Evgeniy Sokolov) - allow to build drivers as libtool convenience libs (Daniel Berrange) - fully versioned linker script for exported ABI (Daniel Berrange) - Push URI probing down into drivers open (Daniel Berrange) - move all stateful drivers into the daemon binary (Daniel Berrange) - improve domain event with a detail field (Daniel Berrange) - domain events for QEMU driver (Daniel Berrange) - event unregister callback crash (David Lively) - plug a few leaks (Daniel Berrange) - internal APIs for handling node device XML config (David Lively) - tweaks to node device implementation (Daniel Berrange) - OpenVZ vCPUs values init (Evgeniy Sokolov) Cleanups: - C99 initializers (Guido Gunther) - test output (Cole Robinson) - debug macro centralization (Cole Robinson) - various error handling (Guido Gunther) - safewrite use cleanup (Jim Meyering) - centralize error reporting logic (Cole Robinson) - avoid printf warnings (Daniel Berrange) - use arrays instead of list for internal APIs (Daniel Berrange) - remove many format string warnings Jim Meyering) - avoid syntax check warnings (Chris Lalancette) - improve po-check and list generation (Jim Meyering) - .gitignore generation and handling (Jim Meyering) - use ARRAY_CARDINALITY (Jim Meyering) - gnulib updates and switch to use netdb.h (Jim Meyering) - drop usage of socket_errno (Jim Meyering) - remove socketcompat.h (Jim Meyering) - more tests (Jim Meyering) - drop virStringList (Daniel Berrange) - reformatting and isolation of the error APIs (Daniel Berrange) - cleanup internal.h and move internal APIs in specific headers (Daniel Berrange) - move domain events helpers into domain_events.c (Daniel Berrange) - cleanup the way optional modules are compiled (Daniel Berrange) - add new logging module - optional dlopen of drivers (Daniel Berrange) - various new tests (Jim Meyering) - cleanups when Xen is not configured in (Daniel Berrange) - add some missing functions comments (Jim Meyering) With the amount of new feature and code I would not be surprized if a new release was needed within the next couple of weeks, still people are invited to upgrade and submit reports in case of troubles. Thanks a lot to everybody who contributed to this release, it is really great to see new people providing significant patches, and the amount of feedback received on the list. Again, thanks to everybody, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] Fedora 10 Release and Virtualization News
by Dale Bewley 25 Nov '08

25 Nov '08

Sorry for the annoying cross post. The next Fedora Weekly News[1] will be published Monday, one day before the release of Fedora 10. I would like dedicate a special section of the Virtualization Beat[2] to touting the advances and new features in F10. As with the release notes[3], I am seeking your input. (A little late, I know.) I'm interested not only in the new virtualization features and breakthroughs found in the F10 release, but also any updates that might be right around the corner in f10-updates. Perhaps you have some special insight into the upstream progress of pv_ops, or maybe you know about a almost complete implementation of a libvirt API feature into virt-manager or... I'm sorry if this is a little scattershot. For sometime, I've considered trying to present questions in interview style to each of these lists, but I just haven't gotten that together. The publication deadline is Sunday night, but I'll be able to use anything in the next edition of FWN. Please contribute, even if you read this on Monday. [1] http://fedoraproject.org/wiki/FWN [2] http://fedoraproject.org/wiki/FWN/Beats/Virtualization [3] http://fedoraproject.org/wiki/Docs/Beats/Virtualization -- Dale Bewley - Unix Administrator - Shields Library - UC Davis GPG: 0xB098A0F3 0D5A 9AEB 43F4 F84C 7EFD 1753 064D 2583 B098 A0F3

3 2

[libvirt] doc nits
by Jim Meyering 25 Nov '08

25 Nov '08

I noticed the following go by yesterday, but won't have time to address them: Function comment for virConnectDomainEventRegister lacks description of arg freecb Function comment for virNodeDeviceGetName lacks description of the function Function comment for virNodeDeviceGetParent lacks description of the function Function comment for virNodeDeviceNumOfCaps lacks description of the function Function comment for virNodeDeviceNumOfCaps lacks description of the function Missing * in function comment for virDomainMigrateFinish Missing * in function comment for virDomainMigrateFinish2 Missing * in function comment for virDomainMigratePerform Missing * in function comment for virDomainMigratePrepare Missing * in function comment for virDomainMigratePrepare2 Missing * in function comment for virDrvSupportsFeature

2 2

[libvirt] build nits
by Jim Meyering 25 Nov '08

25 Nov '08

When running ../configure (note the leading ".."), I saw these diagnostics go by: cp: cannot stat `COPYING.LIB': No such file or directory ... find: `/t/libvirt-0.4.6/tests/domainschemadata': No such file or directory each indicated a small problem. Here are fixes: >From f5164f771c83fa85310d78a3cb137e4cb6f51e12 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 25 Nov 2008 13:28:04 +0100 Subject: [PATCH 1/2] don't silently skip a test * tests/Makefile.am (EXTRA_DIST): Distribute domainschemadata/. * tests/domainschematest: Fail the test if find invocation fails. --- tests/Makefile.am | 3 ++- tests/domainschematest | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9752cbf..fd319e1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,7 +41,8 @@ EXTRA_DIST = \ xmlrpcserver.py \ qemuxml2argvdata \ nodeinfodata \ - domainschematest + domainschematest \ + domainschemadata noinst_PROGRAMS = xmlrpctest virshtest conftest \ nodeinfotest statstest qparamtest diff --git a/tests/domainschematest b/tests/domainschematest index c841c86..d85d463 100755 --- a/tests/domainschematest +++ b/tests/domainschematest @@ -8,7 +8,7 @@ n=0 f=0 for dir in $DOMAINDIRS do - XML=`find $abs_srcdir/$dir -name '*.xml'` + XML=`find $abs_srcdir/$dir -name '*.xml'` || exit 1 for xml in $XML do -- 1.6.0.4.1044.g77718 >From 7af1784b7cddab292b087031cc409609c27db263 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Tue, 25 Nov 2008 13:20:38 +0100 Subject: [PATCH 2/2] configure.in: avoid the following diagnostic when running ../configure ... cp: cannot stat `COPYING.LIB': No such file or directory --- configure.in | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.in b/configure.in index a603c10..4db7204 100644 --- a/configure.in +++ b/configure.in @@ -1222,10 +1222,12 @@ then fi AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) - -# very annoying -rm -f COPYING -cp COPYING.LIB COPYING +# Only COPYING.LIB is under version control, yet COPYING +# is included as part of the distribution tarball. +# Copy one to the other, but only if this is a srcdir-build. +# You are unlikely to be doing distribution-related things in a non-srcdir build +test "x$srcdir" = x. && ! test -f COPYING && +cp -f COPYING.LIB COPYING AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \ docs/examples/Makefile docs/devhelp/Makefile \ -- 1.6.0.4.1044.g77718

2 2

[libvirt] PATCH: Autostart for Xen domains < 3.0.4
by Daniel P. Berrange 25 Nov '08

25 Nov '08

The old 'xm' driver does not currently implement the autostart feature for domains managed via /etc/xen. This patche addresses that limitation by making it create the symlinks in /etc/xen/auto as expected by the existing 'xendomains' init script for autostart. Daniel diff -r dddbb717add4 src/xen_unified.c --- a/src/xen_unified.c Mon Nov 24 10:45:05 2008 -0500 +++ b/src/xen_unified.c Mon Nov 24 11:00:24 2008 -0500 @@ -1159,13 +1159,16 @@ xenUnifiedDomainGetAutostart (virDomainP xenUnifiedDomainGetAutostart (virDomainPtr dom, int *autostart) { GET_PRIVATE(dom->conn); - int i; - - for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) - if (priv->opened[i] && drivers[i]->domainGetAutostart && - drivers[i]->domainGetAutostart (dom, autostart) == 0) - return 0; - + + if (priv->xendConfigVersion < 3) { + if (priv->opened[XEN_UNIFIED_XM_OFFSET]) + return xenXMDomainGetAutostart(dom, autostart); + } else { + if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) + return xenDaemonDomainGetAutostart(dom, autostart); + } + + xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } @@ -1173,13 +1176,16 @@ xenUnifiedDomainSetAutostart (virDomainP xenUnifiedDomainSetAutostart (virDomainPtr dom, int autostart) { GET_PRIVATE(dom->conn); - int i; - - for (i = 0; i < XEN_UNIFIED_NR_DRIVERS; ++i) - if (priv->opened[i] && drivers[i]->domainSetAutostart && - drivers[i]->domainSetAutostart (dom, autostart) == 0) - return 0; - + + if (priv->xendConfigVersion < 3) { + if (priv->opened[XEN_UNIFIED_XM_OFFSET]) + return xenXMDomainSetAutostart(dom, autostart); + } else { + if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) + return xenDaemonDomainSetAutostart(dom, autostart); + } + + xenUnifiedError (dom->conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); return -1; } diff -r dddbb717add4 src/xm_internal.c --- a/src/xm_internal.c Mon Nov 24 10:45:05 2008 -0500 +++ b/src/xm_internal.c Mon Nov 24 11:02:16 2008 -0500 @@ -2669,3 +2669,84 @@ xenXMDomainBlockPeek (virDomainPtr dom, return -1; } + +static char *xenXMAutostartLinkName(virDomainPtr dom) +{ + char *ret; + if (asprintf(&ret, "/etc/xen/auto/%s", dom->name) < 0) + return NULL; + return ret; +} + +static char *xenXMDomainConfigName(virDomainPtr dom) +{ + char *ret; + if (asprintf(&ret, "/etc/xen/%s", dom->name) < 0) + return NULL; + return ret; +} + +int xenXMDomainGetAutostart(virDomainPtr dom, int *autostart) +{ + char *linkname = xenXMAutostartLinkName(dom); + char *config = xenXMDomainConfigName(dom); + int ret = -1; + + if (!linkname || !config) { + xenXMError(dom->conn, VIR_ERR_NO_MEMORY, NULL); + goto cleanup; + } + + *autostart = virFileLinkPointsTo(linkname, config); + if (*autostart < 0) { + xenXMError(dom->conn, VIR_ERR_INTERNAL_ERROR, + _("failed to check autostart link %s: %s"), + linkname, strerror(errno)); + goto cleanup; + } + + ret = 0; + +cleanup: + VIR_FREE(linkname); + VIR_FREE(config); + return ret; +} + + +int xenXMDomainSetAutostart(virDomainPtr dom, int autostart) +{ + char *linkname = xenXMAutostartLinkName(dom); + char *config = xenXMDomainConfigName(dom); + int ret = -1; + + if (!linkname || !config) { + xenXMError(dom->conn, VIR_ERR_NO_MEMORY, NULL); + goto cleanup; + } + + if (autostart) { + if (symlink(config, linkname) < 0 && + errno != EEXIST) { + xenXMError(dom->conn, VIR_ERR_INTERNAL_ERROR, + "failed to create link %s: %s", + linkname, strerror(errno)); + goto cleanup; + } + } else { + if (unlink(linkname) < 0 && + errno != ENOENT) { + xenXMError(dom->conn, VIR_ERR_INTERNAL_ERROR, + "failed to remove link %s: %s", + linkname, strerror(errno)); + goto cleanup; + } + } + ret = 0; + +cleanup: + VIR_FREE(linkname); + VIR_FREE(config); + + return ret; +} diff -r dddbb717add4 src/xm_internal.h --- a/src/xm_internal.h Mon Nov 24 10:45:05 2008 -0500 +++ b/src/xm_internal.h Mon Nov 24 10:59:24 2008 -0500 @@ -65,4 +65,7 @@ virDomainDefPtr xenXMDomainConfigParse(v int xenXMDomainBlockPeek (virDomainPtr dom, const char *path, unsigned long long offset, size_t size, void *buffer); +int xenXMDomainGetAutostart(virDomainPtr dom, int *autostart); +int xenXMDomainSetAutostart(virDomainPtr dom, int autostart); + #endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] PATCH: Fix node device build on mingw32
by Daniel P. Berrange 25 Nov '08

25 Nov '08

The node device XML configuration handling routines contain a struct member called 'interface'. This seems to clash with a some typedef or function in the Win32 header files, causing horrific compile failure. This patch simply renames 'interface' to 'ifname'. Index: src/node_device_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/node_device_conf.c,v retrieving revision 1.2 diff -r1.2 node_device_conf.c 272c272 < data->net.interface); --- > data->net.ifname); 377c377 < VIR_FREE(data->net.interface); --- > VIR_FREE(data->net.ifname); Index: src/node_device_conf.h =================================================================== RCS file: /data/cvs/libvirt/src/node_device_conf.h,v retrieving revision 1.3 diff -r1.3 node_device_conf.h 105c105 < char *interface; --- > char *ifname; Index: src/node_device_devkit.c =================================================================== RCS file: /data/cvs/libvirt/src/node_device_devkit.c,v retrieving revision 1.2 diff -r1.2 node_device_devkit.c 121c121 < const char *interface; --- > const char *ifname; 125,126c125,126 < interface = strrchr(sysfs_path, '/'); < if (!interface || !*interface || !*(++interface)) --- > ifname = strrchr(sysfs_path, '/'); > if (!ifname || !*ifname || !*(++ifname)) 128c128 < if ((d->net.interface = strdup(interface)) == NULL) --- > if ((d->net.ifname = strdup(ifname)) == NULL) Index: src/node_device_hal.c =================================================================== RCS file: /data/cvs/libvirt/src/node_device_hal.c,v retrieving revision 1.2 diff -r1.2 node_device_hal.c 199c199 < (void)get_str_prop(ctx, udi, "net.interface", &d->net.interface); --- > (void)get_str_prop(ctx, udi, "net.interface", &d->net.ifname); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

2 2

[libvirt] [PATCH] fix build for srcdir != builddir
by Guido Günther 25 Nov '08

25 Nov '08

Hi, libvirt_sym.version is looked for at the wrong location. O.k. to apply? Cheers, -- Guido

2 3

[libvirt] [PATCH] Xen Events Updated
by Ben Guthro 25 Nov '08

25 Nov '08

This version of the Xen-Events patch goes a step further than the last version, and now emits the following domain events: STARTED STOPPED ADDED REMOVED This is accomplished by monitoring /etc/xen, and taking advantage of what seemed to be dormant code in the XM driver. By re-enabling the "config cache", we can properly track domains when files come, and go into this directory. configure.in | 13 + include/libvirt/virterror.h | 1 po/POTFILES.in | 1 src/Makefile.am | 3 src/virterror.c | 3 src/xen_inotify.c | 270 +++++++++++++++++++++++++++ src/xen_inotify.h | 32 +++ src/xen_unified.c | 190 +++++++++++++++++++ src/xen_unified.h | 61 ++++++ src/xm_internal.c | 24 +- src/xs_internal.c | 430 +++++++++++++++++++++++++++++++++++++++++++- src/xs_internal.h | 51 +++++ 12 files changed, 1069 insertions(+), 10 deletions(-)

3 15

[libvirt] PATCH: allow to set nvcpus = 0
by Evgeniy Sokolov 24 Nov '08

24 Nov '08

OpenVZ uses all CPUs available in system - by default (number of CPUs did not set) - number of CPUs = 0 Currenty, libvirt don't allow to set nvcpus = 0. Attached patch removes limitation in libvirt set nvcpu = 0, but add it to each driver which allow to set number of virtual CPU. For OpenVZ set default number of CPUs = 0.

2 3

[libvirt] [PATCH] fix python events
by David Lively 24 Nov '08

24 Nov '08

This patch gets python events working again after upstream changes, and make the test implementation properly clean up after itself and implement the new EventImpl API properly. Note that the Python RemoveHandle and RemoveTimeout implementations should return the opaque object registered by the corresponding AddHandle/Timeout calls, in lieu of calling the (C) freefunc. (The binding code will then call freefunc if it's not NULL.) Ignoring this means you'll leak memory in the same way that C RemoveHandle/Timeout leak if they don't (now) call the freefunc. I also moved around some of the error checking code to unclutter (and speed up) the common code paths. For instance, we now check that the virRegisterEventImpl arguments are callable just once (and return failure if they're not), rather than checking them before every call and blithely ignoring them if they're not callable. Dave examples/domain-events/events-python/event-test.py | 29 +-- python/libvir.c | 200+++++++++++++++---- python/libvir.py | 4 python/libvirt_wrap.h | 8 python/types.c | 1 python/virConnect.py | 4 6 files changed, 194 insertions(+), 52 deletions(-)

3 10

[libvirt] [PATCH] libvirt.c: fix virStateActive return value; document ...
by Jim Meyering 24 Nov '08

24 Nov '08

The s/1/-1/ fix induces no semantic change, since the sole use of virStateActive tests solely for nonzero. >From 4bc9713207a2ed6b101e2067f7bba82d1df45987 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 24 Nov 2008 15:52:55 +0100 Subject: [PATCH] libvirt.c: fix virStateActive return value; document some new functions * src/libvirt.c (virStateActive): Return -1 upon error, not 1, to be consistent with the other virState* functions. (virStateActive, virStateCleanup, virStateReload, virStateActive): Add per-function comments. --- src/libvirt.c | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index f445333..10835b9 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -636,6 +636,13 @@ virRegisterStateDriver(virStateDriverPtr driver) return virStateDriverTabCount++; } +/** + * virStateInitialize: + * + * Initialize all virtualization drivers. + * + * Return 0 if successful, -1 upon error. + */ int virStateInitialize(void) { int i, ret = 0; @@ -650,6 +657,13 @@ int virStateInitialize(void) { return ret; } +/** + * virStateCleanup: + * + * Run each virtualization driver's cleanup method. + * + * Return 0 if successful, -1 upon error. + */ int virStateCleanup(void) { int i, ret = 0; @@ -661,6 +675,13 @@ int virStateCleanup(void) { return ret; } +/** + * virStateReload + * + * Run each virtualization driver's reload method. + * + * Return 0 if successful, -1 upon error. + */ int virStateReload(void) { int i, ret = 0; @@ -672,13 +693,20 @@ int virStateReload(void) { return ret; } +/** + * virStateActive + * + * Run each virtualization driver's "active" method. + * + * Return 0 if successful, -1 upon error. + */ int virStateActive(void) { int i, ret = 0; for (i = 0 ; i < virStateDriverTabCount ; i++) { if (virStateDriverTab[i]->active && virStateDriverTab[i]->active()) - ret = 1; + ret = -1; } return ret; } -- 1.6.0.4.1021.g4320

3 5

[libvirt] [PATCH] fix --without-xen build
by David Lively 24 Nov '08

24 Nov '08

The last change to tests/Makefile.am broke the build when --without-xen is specified. This patch fixes it ... Dave tests/Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+)

3 5

[libvirt] [PATCH] * src/virterror.c (virReportErrorHelper): Sync doc to code.
by Jim Meyering 24 Nov '08

24 Nov '08

The dom and net parameters are long gone. Reflect s/msg/fmt/ renaming: >From 8b87344dbe31fe478ac4a679005835e03a329ace Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Mon, 24 Nov 2008 15:55:24 +0100 Subject: [PATCH] * src/virterror.c (virReportErrorHelper): Sync doc to code. --- src/virterror.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/virterror.c b/src/virterror.c index 0723db8..112a19e 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -747,17 +747,15 @@ virErrorMsg(virErrorNumber error, const char *info) } /** - * virReportErrorHelper + * virReportErrorHelper: * * @conn: the connection to the hypervisor if available - * @dom: the domain if available - * @net: the network if available * @domcode: the virErrorDomain indicating where it's coming from * @errcode: the virErrorNumber code for the error * @filename: Source file error is dispatched from * @funcname: Function error is dispatched from * @linenr: Line number error is dispatched from - * @msg: the message to display/transmit + * @fmt: the format string * @...: extra parameters for the message display * * Helper function to do most of the grunt work for individual driver -- 1.6.0.4.1021.g4320

2 1

[libvirt] [PATCH] tests: virsh-all: new script
by Jim Meyering 21 Nov '08

21 Nov '08

Actually, this was the first step. This tiny script merely invokes all commands blindly, solely to get test coverage, even if they (as most do) fail. Additional tests will be smarter about providing sensible arguments. >From 058681eab07936f4ecbb1ff514528eb921d27074 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 21 Nov 2008 10:18:43 +0100 Subject: [PATCH] tests: virsh-all: new script * tests/virsh-all: New script. * tests/Makefile.am (test_scripts): Add virsh-all. --- tests/Makefile.am | 1 + tests/virsh-all | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 0 deletions(-) create mode 100755 tests/virsh-all diff --git a/tests/Makefile.am b/tests/Makefile.am index bdbf927..0b4eebd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -57,6 +57,7 @@ test_scripts += \ read-non-seekable \ undefine \ vcpupin + virsh-all endif EXTRA_DIST += $(test_scripts) diff --git a/tests/virsh-all b/tests/virsh-all new file mode 100755 index 0000000..af7e09d --- /dev/null +++ b/tests/virsh-all @@ -0,0 +1,39 @@ +#!/bin/sh +# blindly run each and every command listed by "virsh help" + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if test "$VERBOSE" = yes; then + set -x + virsh --version +fi + +. $srcdir/test-lib.sh + +fail=0 + +test_url=test:///default + +virsh -c $test_url help > cmds || framework_failure +cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure +test -n "$cmds" || framework_failure + +for i in $cmds; do + echo testing $i... 1>&2 + virsh -c $test_url $i < /dev/null +done + +(exit $fail); exit $fail -- 1.6.0.4.1021.g4320

2 2

[libvirt] [PATCH] * gnulib/tests/test-EOVERFLOW: Remove.
by Jim Meyering 21 Nov '08

21 Nov '08

Back on October 28, I mistakenly added a binary. This adds the requisite .cvsignore entry and updates the corresponding .gitignore file as well as two stale ones. >From 30a853d37fc2102a7e4009b93867209e318014a1 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 21 Nov 2008 14:15:15 +0100 Subject: [PATCH] * gnulib/tests/test-EOVERFLOW: Remove. * gnulib/tests/.cvsignore: Add test-EOVERFLOW, then... Run "make sync-vcs-ignore-files" to Update .gitignore files. --- examples/domain-events/events-c/.gitignore | 2 ++ gnulib/tests/.cvsignore | 1 + gnulib/tests/.gitignore | 1 + gnulib/tests/test-EOVERFLOW | Bin 6680 -> 0 bytes src/.gitignore | 1 + 5 files changed, 5 insertions(+), 0 deletions(-) delete mode 100755 gnulib/tests/test-EOVERFLOW diff --git a/examples/domain-events/events-c/.gitignore b/examples/domain-events/events-c/.gitignore index 7b8079b..ed9ac4d 100644 --- a/examples/domain-events/events-c/.gitignore +++ b/examples/domain-events/events-c/.gitignore @@ -1,3 +1,5 @@ +Makefile +Makefile.in *.exe .deps .libs diff --git a/gnulib/tests/.cvsignore b/gnulib/tests/.cvsignore index 6ac20bc..04eb4a0 100644 --- a/gnulib/tests/.cvsignore +++ b/gnulib/tests/.cvsignore @@ -3,6 +3,7 @@ Makefile Makefile.in sys +test-EOVERFLOW test-alloca-opt test-arpa_inet test-c-ctype diff --git a/gnulib/tests/.gitignore b/gnulib/tests/.gitignore index 6ac20bc..04eb4a0 100644 --- a/gnulib/tests/.gitignore +++ b/gnulib/tests/.gitignore @@ -3,6 +3,7 @@ Makefile Makefile.in sys +test-EOVERFLOW test-alloca-opt test-arpa_inet test-c-ctype diff --git a/gnulib/tests/test-EOVERFLOW b/gnulib/tests/test-EOVERFLOW deleted file mode 100755 index ea3a8a27290fea9dd71beab276a9180b71a4847b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6680 zcmcIoU2Ggz6+Zjp*eP!8n3%YUQAX-Ua*#aT7{_sdz}SxM*|3d`<3ON=*^PH>Z?)dF zcE(`?MYV7XTDfkGctPT!72*K|4|zdU0*OQ>MBym~ghCNeg+!SCpj3cr9@^!cJLlLl ... zau)bXmrZ?BcK<8j@D;CN`0sM9)EIV@%NMN$$IfAtfv$5-$(qd;a|K&wUuHtx8&go~ Q6T0rYn6Ht&D`jQ!Z=>`m&;S4c diff --git a/src/.gitignore b/src/.gitignore index 4aff461..cef59e0 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -15,3 +15,4 @@ libvirt_parthelper libvirt_lxc virsh-net-edit.c virsh-pool-edit.c +libvirt_sym.version -- 1.6.0.4.1021.g4320

2 1

[libvirt] --with-xen=foo
by Ben Guthro 21 Nov '08

21 Nov '08

So, when I merged my changes up yesterday to some of the developments going on, it would seem that one of the changesets I pulled in had a bit of a reduction in configure flexibility. I'm not yet sure what changeset caused it...but I used to be able to specify an external xen tree with the following line in a Makefile... ./autogen.sh --prefix=/usr --with-xen=$(XEN_SRC)/dist/install/usr This now seems to fail to find that xen tree, as I error out with: gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/include/libxml2 -DBINDIR=\"/usr/libexec\" -DSBINDIR=\"/usr/sbin\" -DSYSCONF_DIR=\"/etc\" -DLOCALEBASEDIR=\"/usr/share/locale\" -DLOCAL_STATE_DIR=\"/var\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -g -O2 -MT stats_linux.lo -MD -MP -MF .deps/stats_linux.Tpo -c stats_linux.c -fPIC -DPIC -o .libs/stats_linux.o stats_linux.c:24:16: error: xs.h: No such file or directory stats_linux.c: In function 'check_bd_connected': stats_linux.c:154: warning: implicit declaration of function 'xs_read' stats_linux.c:154: warning: nested extern declaration of 'xs_read' stats_linux.c:154: warning: assignment makes pointer from integer without a cast I assume this has something to do with Daniel B's changes to configure scripts recently. Could you give me a pointer as to where I should be looking? Ben

2 7

[libvirt] [PATCH] Move the expected output data from virshdata/*.txt into virshtest.c.
by Jim Meyering 21 Nov '08

21 Nov '08

This is mainly just reorganization and factorization, with an eye towards making it easier to add more tests in virshtest.c later. >From 21352a07b073d52bcd3c442c76d7fb985aeef845 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Thu, 20 Nov 2008 20:35:57 +0100 Subject: [PATCH] Move the expected output data from virshdata/*.txt into virshtest.c. * tests/virshtest.c: Embed literal, expected output here, rather than using virshdata/*.txt file names. Factor out some common constructs. (testCompareOutputLit): New function. (testCompareOutput): #ifdef-out, not that it's unused. * tests/Makefile.am (SUBDIRS): Remove virshdata/ and all files in it. * docs/testnode.xml: Fix typo in a comment. --- docs/testnode.xml | 2 +- tests/Makefile.am | 2 +- tests/virshdata/.cvsignore | 2 - tests/virshdata/.gitignore | 2 - tests/virshdata/Makefile.am | 2 - tests/virshdata/domid-fc4.txt | 2 - tests/virshdata/dominfo-fc4.txt | 10 -- tests/virshdata/domname-fc4.txt | 2 - tests/virshdata/domstate-fc4.txt | 2 - tests/virshdata/domuuid-fc4.txt | 2 - tests/virshdata/list-custom.txt | 5 - tests/virshdata/list-default.txt | 4 - tests/virshdata/nodeinfo-custom.txt | 9 -- tests/virshdata/nodeinfo-default.txt | 9 -- tests/virshtest.c | 264 ++++++++++++++-------------------- 15 files changed, 111 insertions(+), 208 deletions(-) delete mode 100644 tests/virshdata/.cvsignore delete mode 100644 tests/virshdata/.gitignore delete mode 100644 tests/virshdata/Makefile.am delete mode 100644 tests/virshdata/domid-fc4.txt delete mode 100644 tests/virshdata/dominfo-fc4.txt delete mode 100644 tests/virshdata/domname-fc4.txt delete mode 100644 tests/virshdata/domstate-fc4.txt delete mode 100644 tests/virshdata/domuuid-fc4.txt delete mode 100644 tests/virshdata/list-custom.txt delete mode 100644 tests/virshdata/list-default.txt delete mode 100644 tests/virshdata/nodeinfo-custom.txt delete mode 100644 tests/virshdata/nodeinfo-default.txt diff --git a/docs/testnode.xml b/docs/testnode.xml index 7df10b0..be7121d 100644 --- a/docs/testnode.xml +++ b/docs/testnode.xml @@ -1,6 +1,6 @@ <node> <!-- This file gives an example config for the mock 'test' backend - driver to libvirt. This is intended to allow relible unit testing + driver to libvirt. This is intended to allow reliable unit testing of applications using libvirt. To use this with virsh, run something like: diff --git a/tests/Makefile.am b/tests/Makefile.am index 3b4f0dc..bdbf927 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ SHELL = $(PREFERABLY_POSIX_SHELL) -SUBDIRS = virshdata confdata sexpr2xmldata \ +SUBDIRS = confdata sexpr2xmldata \ xml2sexprdata xmconfigdata xencapsdata INCLUDES = \ diff --git a/tests/virshdata/.cvsignore b/tests/virshdata/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/tests/virshdata/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/tests/virshdata/.gitignore b/tests/virshdata/.gitignore deleted file mode 100644 index 282522d..0000000 --- a/tests/virshdata/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/tests/virshdata/Makefile.am b/tests/virshdata/Makefile.am deleted file mode 100644 index c46fc93..0000000 --- a/tests/virshdata/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -EXTRA_DIST = $(wildcard *.txt) diff --git a/tests/virshdata/domid-fc4.txt b/tests/virshdata/domid-fc4.txt deleted file mode 100644 index 9a7456b..0000000 --- a/tests/virshdata/domid-fc4.txt +++ /dev/null @@ -1,2 +0,0 @@ -2 - diff --git a/tests/virshdata/dominfo-fc4.txt b/tests/virshdata/dominfo-fc4.txt deleted file mode 100644 index 0cce9be..0000000 --- a/tests/virshdata/dominfo-fc4.txt +++ /dev/null @@ -1,10 +0,0 @@ -Id: 2 -Name: fc4 -UUID: ef861801-45b9-11cb-88e3-afbfe5370493 -OS Type: linux -State: running -CPU(s): 1 -Max memory: 261072 kB -Used memory: 131072 kB -Autostart: disable - diff --git a/tests/virshdata/domname-fc4.txt b/tests/virshdata/domname-fc4.txt deleted file mode 100644 index fd55058..0000000 --- a/tests/virshdata/domname-fc4.txt +++ /dev/null @@ -1,2 +0,0 @@ -fc4 - diff --git a/tests/virshdata/domstate-fc4.txt b/tests/virshdata/domstate-fc4.txt deleted file mode 100644 index 9c724a4..0000000 --- a/tests/virshdata/domstate-fc4.txt +++ /dev/null @@ -1,2 +0,0 @@ -running - diff --git a/tests/virshdata/domuuid-fc4.txt b/tests/virshdata/domuuid-fc4.txt deleted file mode 100644 index face70e..0000000 --- a/tests/virshdata/domuuid-fc4.txt +++ /dev/null @@ -1,2 +0,0 @@ -ef861801-45b9-11cb-88e3-afbfe5370493 - diff --git a/tests/virshdata/list-custom.txt b/tests/virshdata/list-custom.txt deleted file mode 100644 index 2b48b26..0000000 --- a/tests/virshdata/list-custom.txt +++ /dev/null @@ -1,5 +0,0 @@ - Id Name State ----------------------------------- - 1 fv0 running - 2 fc4 running - diff --git a/tests/virshdata/list-default.txt b/tests/virshdata/list-default.txt deleted file mode 100644 index d05095c..0000000 --- a/tests/virshdata/list-default.txt +++ /dev/null @@ -1,4 +0,0 @@ - Id Name State ----------------------------------- - 1 test running - diff --git a/tests/virshdata/nodeinfo-custom.txt b/tests/virshdata/nodeinfo-custom.txt deleted file mode 100644 index 1e98d63..0000000 --- a/tests/virshdata/nodeinfo-custom.txt +++ /dev/null @@ -1,9 +0,0 @@ -CPU model: i986 -CPU(s): 50 -CPU frequency: 6000 MHz -CPU socket(s): 4 -Core(s) per socket: 4 -Thread(s) per core: 2 -NUMA cell(s): 4 -Memory size: 8192000 kB - diff --git a/tests/virshdata/nodeinfo-default.txt b/tests/virshdata/nodeinfo-default.txt deleted file mode 100644 index 99d9754..0000000 --- a/tests/virshdata/nodeinfo-default.txt +++ /dev/null @@ -1,9 +0,0 @@ -CPU model: i686 -CPU(s): 16 -CPU frequency: 1400 MHz -CPU socket(s): 2 -Core(s) per socket: 2 -Thread(s) per core: 2 -NUMA cell(s): 2 -Memory size: 3145728 kB - diff --git a/tests/virshtest.c b/tests/virshtest.c index c9ba6b2..2745df1 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -12,6 +12,24 @@ static char *progname; static char *abs_srcdir; #define MAX_FILE 4096 +#define DOM_UUID "ef861801-45b9-11cb-88e3-afbfe5370493" + +static const char *dominfo_fc4 = "\ +Id: 2\n\ +Name: fc4\n\ +UUID: " DOM_UUID "\n\ +OS Type: linux\n\ +State: running\n\ +CPU(s): 1\n\ +Max memory: 261072 kB\n\ +Used memory: 131072 kB\n\ +Autostart: disable\n\ +\n"; +static const char *domuuid_fc4 = DOM_UUID "\n\n"; +static const char *domid_fc4 = "2\n\n"; +static const char *domname_fc4 = "fc4\n\n"; +static const char *domstate_fc4 = "running\n\n"; + static int testFilterLine(char *buffer, const char *toRemove) { char *start; @@ -28,18 +46,10 @@ static int testFilterLine(char *buffer, return 0; } -static int testCompareOutput(const char *expect_rel, const char *filter, - const char *const argv[]) { - char expectData[MAX_FILE]; +static int testCompareOutputLit(const char *expectData, + const char *filter, const char *const argv[]) { char actualData[MAX_FILE]; - char *expectPtr = &(expectData[0]); char *actualPtr = &(actualData[0]); - char expect[PATH_MAX]; - - snprintf(expect, sizeof expect - 1, "%s/%s", abs_srcdir, expect_rel); - - if (virtTestLoadFile(expect, &expectPtr, MAX_FILE) < 0) - return -1; if (virtTestCaptureProgramOutput(argv, &actualPtr, MAX_FILE) < 0) return -1; @@ -56,6 +66,21 @@ static int testCompareOutput(const char *expect_rel, const char *filter, return 0; } +#if unused +static int testCompareOutput(const char *expect_rel, const char *filter, + const char *const argv[]) { + char expectData[MAX_FILE]; + char *expectPtr = &(expectData[0]); + char expect[PATH_MAX]; + + snprintf(expect, sizeof expect - 1, "%s/%s", abs_srcdir, expect_rel); + + if (virtTestLoadFile(expect, &expectPtr, MAX_FILE) < 0) + return -1; + + return testCompareOutputLit(expectData, filter, argv); +} +#endif #define VIRSH_DEFAULT "../src/virsh", \ "--connect", \ @@ -67,40 +92,40 @@ static char *custom_uri; "--connect", \ custom_uri - - static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_DEFAULT, - "list", - NULL - }; - return testCompareOutput("virshdata/list-default.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_DEFAULT, "list", NULL }; + const char *exp = "\ + Id Name State\n\ +----------------------------------\n\ + 1 test running\n\ +\n"; + return testCompareOutputLit(exp, NULL, argv); } static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "list", - NULL - }; - return testCompareOutput("virshdata/list-custom.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "list", NULL }; + const char *exp = "\ + Id Name State\n\ +----------------------------------\n\ + 1 fv0 running\n\ + 2 fc4 running\n\ +\n"; + return testCompareOutputLit(exp, NULL, argv); } - static int testCompareNodeinfoDefault(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_DEFAULT, - "nodeinfo", - NULL - }; - return testCompareOutput("virshdata/nodeinfo-default.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_DEFAULT, "nodeinfo", NULL }; + const char *exp = "\ +CPU model: i686\n\ +CPU(s): 16\n\ +CPU frequency: 1400 MHz\n\ +CPU socket(s): 2\n\ +Core(s) per socket: 2\n\ +Thread(s) per core: 2\n\ +NUMA cell(s): 2\n\ +Memory size: 3145728 kB\n\ +\n"; + return testCompareOutputLit(exp, NULL, argv); } static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED) { @@ -109,160 +134,89 @@ static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED) { "nodeinfo", NULL }; - return testCompareOutput("virshdata/nodeinfo-custom.txt", - NULL, - argv); + const char *exp = "\ +CPU model: i986\n\ +CPU(s): 50\n\ +CPU frequency: 6000 MHz\n\ +CPU socket(s): 4\n\ +Core(s) per socket: 4\n\ +Thread(s) per core: 2\n\ +NUMA cell(s): 4\n\ +Memory size: 8192000 kB\n\ +\n"; + return testCompareOutputLit(exp, NULL, argv); } static int testCompareDominfoByID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "dominfo", - "2", - NULL - }; - return testCompareOutput("virshdata/dominfo-fc4.txt", - "\nCPU time:", - argv); + const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "2", NULL }; + const char *exp = dominfo_fc4; + return testCompareOutputLit(exp, "\nCPU time:", argv); } - static int testCompareDominfoByUUID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "dominfo", - "ef861801-45b9-11cb-88e3-afbfe5370493", - NULL - }; - return testCompareOutput("virshdata/dominfo-fc4.txt", - "\nCPU time:", - argv); + const char *const argv[] = { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL }; + const char *exp = dominfo_fc4; + return testCompareOutputLit(exp, "\nCPU time:", argv); } - static int testCompareDominfoByName(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "dominfo", - "fc4", - NULL - }; - return testCompareOutput("virshdata/dominfo-fc4.txt", - "\nCPU time:", - argv); + const char *const argv[] = { VIRSH_CUSTOM, "dominfo", "fc4", NULL }; + const char *exp = dominfo_fc4; + return testCompareOutputLit(exp, "\nCPU time:", argv); } - static int testCompareDomuuidByID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domuuid", - "2", - NULL - }; - return testCompareOutput("virshdata/domuuid-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "2", NULL }; + const char *exp = domuuid_fc4; + return testCompareOutputLit(exp, NULL, argv); } static int testCompareDomuuidByName(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domuuid", - "fc4", - NULL - }; - return testCompareOutput("virshdata/domuuid-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domuuid", "fc4", NULL }; + const char *exp = domuuid_fc4; + return testCompareOutputLit(exp, NULL, argv); } static int testCompareDomidByName(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domid", - "fc4", - NULL - }; - return testCompareOutput("virshdata/domid-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domid", "fc4", NULL }; + const char *exp = domid_fc4; + return testCompareOutputLit(exp, NULL, argv); } - static int testCompareDomidByUUID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domid", - "ef861801-45b9-11cb-88e3-afbfe5370493", - NULL - }; - return testCompareOutput("virshdata/domid-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domid", DOM_UUID, NULL }; + const char *exp = domid_fc4; + return testCompareOutputLit(exp, NULL, argv); } - static int testCompareDomnameByID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domname", - "2", - NULL - }; - return testCompareOutput("virshdata/domname-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domname", "2", NULL }; + const char *exp = domname_fc4; + return testCompareOutputLit(exp, NULL, argv); } - static int testCompareDomnameByUUID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domname", - "ef861801-45b9-11cb-88e3-afbfe5370493", - NULL - }; - return testCompareOutput("virshdata/domname-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domname", DOM_UUID, NULL }; + const char *exp = domname_fc4; + return testCompareOutputLit(exp, NULL, argv); } static int testCompareDomstateByID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domstate", - "2", - NULL - }; - return testCompareOutput("virshdata/domstate-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domstate", "2", NULL }; + const char *exp = domstate_fc4; + return testCompareOutputLit(exp, NULL, argv); } - static int testCompareDomstateByUUID(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domstate", - "ef861801-45b9-11cb-88e3-afbfe5370493", - NULL - }; - return testCompareOutput("virshdata/domstate-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domstate", DOM_UUID, NULL }; + const char *exp = domstate_fc4; + return testCompareOutputLit(exp, NULL, argv); } static int testCompareDomstateByName(const void *data ATTRIBUTE_UNUSED) { - const char *const argv[] = { - VIRSH_CUSTOM, - "domstate", - "fc4", - NULL - }; - return testCompareOutput("virshdata/domstate-fc4.txt", - NULL, - argv); + const char *const argv[] = { VIRSH_CUSTOM, "domstate", "fc4", NULL }; + const char *exp = domstate_fc4; + return testCompareOutputLit(exp, NULL, argv); } static int -- 1.6.0.4.911.gc990

2 3

[libvirt] PATCH: 0/7: Final node device patches to be committed
by Daniel P. Berrange 21 Nov '08

21 Nov '08

FYI, this is a repost of the final node device patches I intend to commit tomorrow. There's a few changes based on Mark's feedback which I'll note against each patch... Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 17

[libvirt] [PATCH] tests: new test: virsh-synopsis
by Jim Meyering 21 Nov '08

21 Nov '08

I wanted help SYNOPSIS output that was regular enough to parse. Enforcing/correcting the following is the first step: >From fa58b801ea80f52a10d48ab75a359ffe06c4be40 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Fri, 21 Nov 2008 10:58:36 +0100 Subject: [PATCH] tests: new test: virsh-synopsis * tests/virsh-synopsis: new file * tests/Makefile.am (test_scripts): Add virsh-synopsis. * src/virsh.c: Correct help SYNOPSIS for each of seven commands. When I first ran this script, "make check" failed like this: ... invalid help SYNOPSIS for net-create: create a network from an XML <file> invalid help SYNOPSIS for net-define: define a network from an XML <file> invalid help SYNOPSIS for net-start: start <network> invalid help SYNOPSIS for pool-create: create a pool from an XML <file> invalid help SYNOPSIS for pool-define: define a pool from an XML <file> invalid help SYNOPSIS for pool-start: start <pool> invalid help SYNOPSIS for vol-create: create <file> FAIL: virsh-synopsis --- src/virsh.c | 17 +++++++++-------- tests/Makefile.am | 1 + tests/virsh-synopsis | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 53 insertions(+), 8 deletions(-) create mode 100755 tests/virsh-synopsis diff --git a/src/virsh.c b/src/virsh.c index 4195781..78c536e 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -2365,7 +2365,7 @@ cmdNetworkAutostart(vshControl *ctl, const vshCmd *cmd) * "net-create" command */ static const vshCmdInfo info_network_create[] = { - {"syntax", "create a network from an XML <file>"}, + {"syntax", "net-create <file>"}, {"help", gettext_noop("create a network from an XML file")}, {"desc", gettext_noop("Create a network.")}, {NULL, NULL} @@ -2413,7 +2413,7 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) * "net-define" command */ static const vshCmdInfo info_network_define[] = { - {"syntax", "define a network from an XML <file>"}, + {"syntax", "net-define <file>"}, {"help", gettext_noop("define (but don't start) a network from an XML file")}, {"desc", gettext_noop("Define a network.")}, {NULL, NULL} @@ -2697,7 +2697,7 @@ cmdNetworkName(vshControl *ctl, const vshCmd *cmd) * "net-start" command */ static const vshCmdInfo info_network_start[] = { - {"syntax", "start <network>"}, + {"syntax", "net-start <network>"}, {"help", gettext_noop("start a (previously defined) inactive network")}, {"desc", gettext_noop("Start a network.")}, {NULL, NULL} @@ -2862,14 +2862,15 @@ cmdPoolAutostart(vshControl *ctl, const vshCmd *cmd) * "pool-create" command */ static const vshCmdInfo info_pool_create[] = { - {"syntax", "create a pool from an XML <file>"}, + {"syntax", "pool-create <file>"}, {"help", gettext_noop("create a pool from an XML file")}, {"desc", gettext_noop("Create a pool.")}, {NULL, NULL} }; static const vshCmdOptDef opts_pool_create[] = { - {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML pool description")}, + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, + gettext_noop("file containing an XML pool description")}, {NULL, 0, 0, NULL} }; @@ -3000,7 +3001,7 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) * "pool-define" command */ static const vshCmdInfo info_pool_define[] = { - {"syntax", "define a pool from an XML <file>"}, + {"syntax", "pool-define <file>"}, {"help", gettext_noop("define (but don't start) a pool from an XML file")}, {"desc", gettext_noop("Define a pool.")}, {NULL, NULL} @@ -3727,7 +3728,7 @@ cmdPoolName(vshControl *ctl, const vshCmd *cmd) * "pool-start" command */ static const vshCmdInfo info_pool_start[] = { - {"syntax", "start <pool>"}, + {"syntax", "pool-start <pool>"}, {"help", gettext_noop("start a (previously defined) inactive pool")}, {"desc", gettext_noop("Start a pool.")}, {NULL, NULL} @@ -3965,7 +3966,7 @@ cmdPoolUuid(vshControl *ctl, const vshCmd *cmd) * "vol-create" command */ static const vshCmdInfo info_vol_create[] = { - {"syntax", "create <file>"}, + {"syntax", "vol-create <file>"}, {"help", gettext_noop("create a vol from an XML file")}, {"desc", gettext_noop("Create a vol.")}, {NULL, NULL} diff --git a/tests/Makefile.am b/tests/Makefile.am index 0b4eebd..bec3791 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -58,6 +58,7 @@ test_scripts += \ undefine \ vcpupin virsh-all + virsh-synopsis endif EXTRA_DIST += $(test_scripts) diff --git a/tests/virsh-synopsis b/tests/virsh-synopsis new file mode 100755 index 0000000..6ce58a2 --- /dev/null +++ b/tests/virsh-synopsis @@ -0,0 +1,43 @@ +#!/bin/sh +# ensure that each command's help "SYNOPSIS" line starts with the command name + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +if test "$VERBOSE" = yes; then + set -x + virsh --version +fi + +. $srcdir/test-lib.sh + +fail=0 + +test_url=test:///default + +virsh -c $test_url help > cmds || framework_failure +cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure +test -n "$cmds" || framework_failure + +for i in $cmds; do + virsh -c $test_url help $i > help || fail=1 + grep -A1 '^ SYNOPSIS$' help > synopsis \ + || { echo 1>&2 missing or invalid help SYNOPSIS for $i; fail=1; } + sed -n 2p synopsis > s2 || framework_failure + grep -E "^ $i( |$)" s2 > /dev/null \ + || { echo 1>&2 "invalid help SYNOPSIS for $i:"; cat s2 1>&2; fail=1; } +done + +(exit $fail); exit $fail -- 1.6.0.4.1021.g4320

2 3

[libvirt] [PATCH] fix EventImpl-related error paths in remote driver
by David Lively 21 Nov '08

21 Nov '08

This patch makes the remote driver behave properly in the face of: (a) no registered EventImpl, or (b) an EventImpl that returns failure from AddHandle/Timeout In both cases, we now cleanup properly (rather than always passing bogus values to virEventRemoveHandle/Timeout) and fail attempts to register for domain events (w/VIR_ERR_NO_SUPPORT rather than blissfully continue when we can't possibly deliver events). Dave remote_internal.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)

2 1

[libvirt] [PATCH] fix libvirtd crash in qemu driver
by David Lively 21 Nov '08

21 Nov '08

I noticed that the following sequence of events would crash libvirtd when using the qemu driver: (1) establish a connection that successfully registers for domain events (either of the event-test programs will do, though the python one is currently broken -- another patch on the way for that) (2) close this connection (3) open another connection (4) do something (like start a domain) that issues a domain event The problem is that qemudClose() isn't removing registered domain event callbacks when the connection closes. This patch does that, and fixes the crash. Dave domain_event.c | 38 ++++++++++++++++++++++++++++++++++++++ domain_event.h | 3 +++ qemu_driver.c | 5 ++++- 3 files changed, 45 insertions(+), 1 deletion(-)

2 1

[libvirt] [PATCH] Allow rpm to build without uml
by Ben Guthro 21 Nov '08

21 Nov '08

Allow to build minimal rpm without uml

2 1

[libvirt] [PATCH] Fix UML syntax
by Ben Guthro 21 Nov '08

21 Nov '08

various changes to fix make syntax-check succeed with new UML driver

2 1

[libvirt] Relax requirement of bridge source device
by Jim Fehlig 20 Nov '08

20 Nov '08

Hi All, I wanted to get folks thoughts on relaxing the requirement for bridge source device in network interface of domain XML, e.g. allowing <interface type="bridge"> <mac address="aa:bb:cc:cc:ee:ff"/> </interface> Currently, virDomainNetDefParseXML() in src/domain_conf.c will fail such configuration. Since this is common code between backends I'm not sure how allowing this config will affect the various virtualizers. Xen's vif-bridge script will try to find a bridge if one is not specified, which perhaps is dubious behavior, but nonetheless convenient in migration scenarios where the target host may have a different bridge name (br1 vs br0 for example). IIRC, qemu's qemu-ifup script is not as forgiving in the absence of a bridge name. I would be happy to provide a patch if relaxing the source device requirement is acceptable. Thanks, Jim

2 2

[libvirt] PATCH: 0/12: Modular build & node devices integration
by Daniel P. Berrange 20 Nov '08

20 Nov '08

The following series of patches are updated version of patches 7-11 of this series http://www.redhat.com/archives/libvir-list/2008-October/msg00718.html And integrating David Lively's node device patches ontop Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

5 46

[libvirt] make install doesn't install to /usr/lib64
by Kenneth Nagin 20 Nov '08

20 Nov '08

I am working on a x86_64 machine. I expected 'make install' to install to libvirt.so to /usr/lib64. But it installs to /usr/lib. Is this a bug or is it the expected behavior? Kenneth Nagin

2 1

[libvirt] libvirt equivalent config for a kvm command line
by Rajkumar S 20 Nov '08

20 Nov '08

Hi, I had been running kvm in a previous version of Ubuntu with the following command line: /usr/bin/kvm -hda /mnt/kvm/vm-images-work/nanobsd.img -net nic,vlan=26,macaddr=52:54:00:12:34:26 -net tap,vlan=26,ifname=tap26 -net nic,vlan=27,macaddr=52:54:00:12:34:27 -net tap,vlan=27,ifname=tap27 -net nic,vlan=28,macaddr=52:54:00:12:34:28 -net tap,vlan=28,ifname=tap28 -m 640 -vnc :26 -usbdevice tablet The vm shows couple if lines in console and then redirects rest of the output to serial console. I can see that in ctrl-alt-3 of vncviewer ctrl-alt-2 gives access to emulation console and 4 gives access to parallel console. After upgrading to latest Intrepid Ibex I decided to move to using virsh to manage my vms. For the above vm I am using the following xml file. <domain type='kvm'> <name>nanobsd</name> <memory>262144</memory> <currentMemory>262144</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> </features> <clock offset='localtime'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='disk'> <source file='/mnt/kvm/vm-images-work/nanotest.img'/> <target dev='hda' bus='ide'/> </disk> <interface type='bridge'> <mac address='52:54:00:12:34:31'/> <source bridge='br0'/> </interface> <interface type='bridge'> <mac address='52:54:00:12:34:32'/> <source bridge='br0'/> </interface> <interface type='bridge'> <mac address='52:54:00:12:34:33'/> <source bridge='br0'/> </interface> <serial type='vc'> <target port='2'/> </serial> <console type='pty'> <target port='0'/> </console> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5931' listen='192.168.3.3'/> </devices> </domain> Which produces the following command line. /usr/bin/kvm -S -M pc -m 256 -smp 1 -name nanobsd -monitor pty -localtime -boot c -drive file=/mnt/kvm/vm-images-work/nanotest.img,if=ide,index=0,boot=on -net nic,macaddr=52:54:00:12:34:31,vlan=0 -net tap,fd=28,script=,vlan=0,ifname=vnet5 -net nic,macaddr=52:54:00:12:34:32,vlan=1 -net tap,fd=29,script=,vlan=1,ifname=vnet6 -net nic,macaddr=52:54:00:12:34:33,vlan=2 -net tap,fd=30,script=,vlan=2,ifname=vnet7 -serial vc -parallel none -usb -vnc 192.168.3.3:31 Problem with this configuration is that the screen freezes after couple of minuets of booting, I am not sure if this is the problem with the serial console or actual execution. I can see the serial console in ctrl-alt-2, but the window size changes. The image works perfectly in normal PC as well as if I use the previous command line. I guess I am missing some thing here, but I would be very happy if I can get the old behaviour back :) raj

3 4

[libvirt] [PATCH] fix WIN64 compatibility bug in external EventImpl API
by David Lively 20 Nov '08

20 Nov '08

While starting to think about Windows compability, I realized the newly exposed API for registering an external EventImpl is not adequate. Currently it's assuming 32-bit unix fds. But Windows uses a pointer (HANDLE) here. So we need to generalize this interface so it can be implemented for 64-bit Windows. The attached patch does this. (I'm sure it conflicts with work Dan B is doing, so I'm hoping he'll just incorporate this into his changes.) Dave include/libvirt/libvirt.h.in | 24 +++++++++++++++--------- src/event.c | 18 +++++++++--------- 2 files changed, 24 insertions(+), 18 deletions(-)

3 7