- Devel - libvirt List Archives

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 08 Dec '10

08 Dec '10

* .gnulib: Update to latest, for at least a stdint.h fix * src/storage/storage_driver.c (storageVolumeZeroSparseFile) (storageWipeExtent): Use better type, although it still triggers spurious -Wformat warning on MacOS's gcc. --- * .gnulib 48b1a1a...6491120 (47): > unistr/u8-strcmp: Avoid collision with libc function on Solaris 11. > Update internal documentation. > Put more information about failed tests into the test return codes. > Update for Solaris 11 2010-11. > nproc: Relax license. > maint: restore executable bit > utimecmp: fine-grained src to nearby coarse-grained dest > strerror_r-posix: Fix autoconf test. > Tests for module 'getdomainname'. > getdomainname: Use the system function when possible. > sys_socket: Ensure ss_family field on AIX. > readline: Improve configure output. > *printf-posix: Detect a bug on Solaris 10/x86. > Fix link error when module libunistring-optional is in use. > regex: Mention link dependencies. > ftoastr: Fix compilation error on Solaris. > Oops, fix typo in last commit. > autoupdate > autoupdate > getloadavg: Update documentation. > sys_socket: Fix test whether the functions are declared. > getpass: Make sure to get system declaration on some platforms. > iconv-h: Fix test-iconv-h-c++ failure on Solaris 11 2010-11. > ftoastr: comment fix > stdint: port to GCC 4.3 + OSX + Octave > doc: Corrections regarding MacOS X 10.4 and 10.5. > autoupdate > Uninstall ".bin" files installed by relocwrapper. > Update for NetBSD 5.0. > Update for HP-UX 11.23 and HP-UX 11.31. > Update for MacOS X 10.5. > bootstrap: add bootstrap_sync option. > Oops, fix incomplete ChangeLog entry. > Ensure that <features.h> is included before __GLIBC__ is tested. > memmem: Fix autoconf test. > Port to uClibc. > nproc: Fix condition. > Fix a comment. * lib/vasnprintf.c (VASNPRINTF): Fix comment. > ftoastr: don't assume snprintf > test-rename.h: fix compilation failure > maint.mk: add a URL discussing the no-@acronym policy > ftoastr: depend on snprintf, improve comments > ftoastr: port to hosts lacking strtof and strtold > c-strtold: Avoid link error on AIX 7. > intprops: new macro INT_BITS_STRLEN_BOUND > ftoastr: new module, for lossless conversion of floats to short strings > autoupdate .gnulib | 2 +- src/storage/storage_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gnulib b/.gnulib index 48b1a1a..6491120 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 48b1a1ae7d5b0f1494aabd4c8a02fbfcec531026 +Subproject commit 64911207854610668b480939469282fdaeb96f74 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 0f099f0..67d043b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1575,7 +1575,7 @@ storageVolumeZeroSparseFile(virStorageVolDefPtr vol, virReportSystemError(errno, _("Failed to truncate volume with " "path '%s' to %ju bytes"), - vol->target.path, (intmax_t)size); + vol->target.path, (uintmax_t)size); } out: @@ -1597,13 +1597,13 @@ storageWipeExtent(virStorageVolDefPtr vol, size_t write_size = 0; VIR_DEBUG("extent logical start: %ju len: %ju", - (intmax_t)extent_start, (intmax_t)extent_length); + (uintmax_t)extent_start, (uintmax_t)extent_length); if ((ret = lseek(fd, extent_start, SEEK_SET)) < 0) { virReportSystemError(errno, _("Failed to seek to position %ju in volume " "with path '%s'"), - (intmax_t)extent_start, vol->target.path); + (uintmax_t)extent_start, vol->target.path); goto out; } -- 1.7.3.2

2 2

[libvirt] [PATCH] Moved the nodeinfo command to the 'host' help keyword group
by Justin Clift 08 Dec '10

08 Dec '10

--- tools/virsh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 9ce3202..6c48a62 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10062,7 +10062,6 @@ static const vshCmdDef nodedevCmds[] = { {"nodedev-list", cmdNodeListDevices, opts_node_list_devices, info_node_list_devices}, {"nodedev-reattach", cmdNodeDeviceReAttach, opts_node_device_reattach, info_node_device_reattach}, {"nodedev-reset", cmdNodeDeviceReset, opts_node_device_reset, info_node_device_reset}, - {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {NULL, NULL, NULL, NULL} }; @@ -10127,6 +10126,7 @@ static const vshCmdDef hostAndHypervisorCmds[] = { {"connect", cmdConnect, opts_connect, info_connect}, {"freecell", cmdFreecell, opts_freecell, info_freecell}, {"hostname", cmdHostname, NULL, info_hostname}, + {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {"qemu-monitor-command", cmdQemuMonitorCommand, opts_qemu_monitor_command, info_qemu_monitor_command}, {"uri", cmdURI, NULL, info_uri}, {NULL, NULL, NULL, NULL} -- 1.7.3.2

2 2

[libvirt] [PATCH] openvz: convert popen to virCommand
by Eric Blake 08 Dec '10

08 Dec '10

popen must be matched with pclose (not fclose), or it will leak resources. Furthermore, it is a lousy interface when it comes to signal handling. We're much better off using our decent command wrapper. * src/openvz/openvz_conf.c (openvzLoadDomains, openvzGetVEID): Replace popen with virCommand usage. --- src/openvz/openvz_conf.c | 54 +++++++++++++++++++++++---------------------- 1 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 863af93..9d2689a 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -51,6 +51,7 @@ #include "util.h" #include "nodeinfo.h" #include "files.h" +#include "command.h" #define VIR_FROM_THIS VIR_FROM_OPENVZ @@ -433,26 +434,26 @@ openvzFreeDriver(struct openvz_driver *driver) int openvzLoadDomains(struct openvz_driver *driver) { - FILE *fp; int veid, ret; char status[16]; char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainObjPtr dom = NULL; char temp[50]; + char *outbuf = NULL; + char *line; + virCommandPtr cmd = NULL; if (openvzAssignUUIDs() < 0) return -1; - if ((fp = popen(VZLIST " -a -ovpsid,status -H 2>/dev/null", "r")) == NULL) { - openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("popen failed")); - return -1; - } - - while (!feof(fp)) { - if (fscanf(fp, "%d %s\n", &veid, status) != 2) { - if (feof(fp)) - break; + cmd = virCommandNewArgList(VZLIST, "-a", "-ovpsid,status", "-H", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + line = *outbuf ? outbuf : NULL; + while (line) { + if (sscanf(line, "%d %s\n", &veid, status) != 2) { openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to parse vzlist output")); goto cleanup; @@ -526,9 +527,14 @@ int openvzLoadDomains(struct openvz_driver *driver) { virDomainObjUnlock(dom); dom = NULL; + + line = strchr(line, '\n'); + if (line) + line++; } - VIR_FORCE_FCLOSE(fp); + virCommandFree(cmd); + VIR_FREE(outbuf); return 0; @@ -536,7 +542,8 @@ int openvzLoadDomains(struct openvz_driver *driver) { virReportOOMError(); cleanup: - VIR_FORCE_FCLOSE(fp); + virCommandFree(cmd); + VIR_FREE(outbuf); if (dom) virDomainObjUnref(dom); return -1; @@ -978,27 +985,22 @@ static int openvzAssignUUIDs(void) */ int openvzGetVEID(const char *name) { - char *cmd; + virCommandPtr cmd; + char *outbuf; int veid; - FILE *fp; bool ok; - if (virAsprintf(&cmd, "%s %s -ovpsid -H", VZLIST, name) < 0) { - openvzError(VIR_ERR_INTERNAL_ERROR, "%s", - _("virAsprintf failed")); + cmd = virCommandNewArgList(VZLIST, name, "-ovpsid", "-H", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) { + virCommandFree(cmd); return -1; } - fp = popen(cmd, "r"); - VIR_FREE(cmd); - - if (fp == NULL) { - openvzError(VIR_ERR_INTERNAL_ERROR, "%s", _("popen failed")); - return -1; - } + virCommandFree(cmd); + ok = sscanf(outbuf, "%d\n", &veid) == 1; + VIR_FREE(outbuf); - ok = fscanf(fp, "%d\n", &veid ) == 1; - VIR_FORCE_FCLOSE(fp); if (ok && veid >= 0) return veid; -- 1.7.3.2

2 7

[libvirt] [PATCH 1/2] virCommand: document behavior on no output
by Eric Blake 07 Dec '10

07 Dec '10

Option 1: This patch (all callers have to worry about NULL buffers, but checking for output is a simple pointer check). Option 2: Guarantee that outbuf/errbuf are allocated, even if to the empty string. Caller always has to free the result, and empty output check requires checking if *outbuf=='\0'. Personally, I prefer option 2. Thoughts? * docs/internals/command.html.in: Update documentation. * src/util/command.c (virCommandSetOutputBuffer) (virCommandSetErrorBuffer) Guarantee NULL buffer on no output. --- docs/internals/command.html.in | 4 ++-- src/util/command.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index c4fa800..ea9ec64 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -349,8 +349,8 @@ <p> Once the command has finished executing, these buffers - will contain the output. It is the callers responsibility - to free these buffers. + will contain the output, or be NULL if there was no output. It + is the callers responsibility to free these buffers. </p> <h3><a name="directory">Setting working directory</a></h3> diff --git a/src/util/command.c b/src/util/command.c index aa43f76..1923799 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -549,6 +549,7 @@ virCommandSetOutputBuffer(virCommandPtr cmd, char **outbuf) return; } + VIR_FREE(*outbuf); cmd->outbuf = outbuf; cmd->outfdptr = &cmd->outfd; } @@ -569,6 +570,7 @@ virCommandSetErrorBuffer(virCommandPtr cmd, char **errbuf) return; } + VIR_FREE(*errbuf); cmd->errbuf = errbuf; cmd->errfdptr = &cmd->errfd; } -- 1.7.3.2

5 8

[libvirt] [PATCH] command: enforce fd vs. buffer considerations
by Eric Blake 07 Dec '10

07 Dec '10

* docs/internals/command.html.in: Better documentation of buffer vs. fd considerations. * src/util/command.c (virCommandRunAsync): Reject raw execution with string io. (virCommandRun): Reject execution with user-specified fds not visiting a regular file. --- Perhaps we need to relax the fstat check to permit block devices in addition to regular files; but that can be a later patch if needed. docs/internals/command.html.in | 35 ++++++++++++++++++++++++++--------- src/util/command.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index c4fa800..259e68e 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -250,7 +250,7 @@ allow an open file handle to be passed into the child, while controlling whether that handle remains open in the parent or guaranteeing that the handle will be closed in the parent after - either virCommandRun or virCommandFree. + virCommandRun, virCommandRunAsync, or virCommandFree. </p> <pre> @@ -266,9 +266,16 @@ With this, both file descriptors sharedfd and childfd in the current process remain open as the same file descriptors in the child. Meanwhile, after the child is spawned, sharedfd remains - open in the parent, while childfd is closed. For stdin/out/err - it is usually necessary to map a file handle. To attach file - descriptor 7 in the current process to stdin in the child: + open in the parent, while childfd is closed. + </p> + + <p> + For stdin/out/err it is sometimes necessary to map a file + handle. If a mapped file handle is a pipe fed or consumed by + the caller, then the caller should use virCommandDaemonize or + virCommandRunAsync rather than virCommandRun to avoid deadlock + (mapping a regular file is okay with virCommandRun). To attach + file descriptor 7 in the current process to stdin in the child: </p> <pre> @@ -322,11 +329,21 @@ <h3><a name="buffers">Feeding & capturing strings to/from the child</a></h3> <p> - Often dealing with file handles for stdin/out/err - is unnecessarily complex. It is possible to specify - a string buffer to act as the data source for the - child's stdin, if there are no embedded NUL bytes, - and if the command will be run with virCommandRun: + Often dealing with file handles for stdin/out/err is + unnecessarily complex; an alternative is to let virCommandRun + perform the I/O and interact via string buffers. Use of a buffer + only works with virCommandRun, and cannot be mixed with pipe + file descriptors. That is, the choice is generally between + managing all I/O in the caller (any fds not specified are tied + to /dev/null), or letting virCommandRun manage all I/O via + strings (unspecified stdin is tied to /dev/null, and unspecified + output streams get logged but are otherwise discarded). + </p> + + <p> + It is possible to specify a string buffer to act as the data + source for the child's stdin, if there are no embedded NUL + bytes, and if the command will be run with virCommandRun: </p> <pre> diff --git a/src/util/command.c b/src/util/command.c index c0520ec..d1d8f6d 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <stdbool.h> #include <stdlib.h> +#include <sys/stat.h> #include <sys/wait.h> #include "command.h" @@ -872,6 +873,9 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) char *outbuf = NULL; char *errbuf = NULL; int infd[2]; + struct stat st; + bool string_io; + bool async_io = false; if (!cmd ||cmd->has_error == ENOMEM) { virReportOOMError(); @@ -883,6 +887,28 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) return -1; } + /* Avoid deadlock, by requiring that any open fd not under our + * control must be visiting a regular file, or that we are + * daemonized and no string io is required. */ + string_io = cmd->inbuf || cmd->outbuf || cmd->errbuf; + if (cmd->infd != -1 && + (fstat(cmd->infd, &st) < 0 || !S_ISREG(st.st_mode))) + async_io = true; + if (cmd->outfdptr && cmd->outfdptr != &cmd->outfd && + (*cmd->outfdptr == -1 || + fstat(*cmd->outfdptr, &st) < 0 || !S_ISREG(st.st_mode))) + async_io = true; + if (cmd->errfdptr && cmd->errfdptr != &cmd->errfd && + (*cmd->errfdptr == -1 || + fstat(*cmd->errfdptr, &st) < 0 || !S_ISREG(st.st_mode))) + async_io = true; + if (async_io ? (!(cmd->flags & VIR_EXEC_DAEMON) || string_io) + : ((cmd->flags & VIR_EXEC_DAEMON) && string_io)) { + virCommandError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid use of command API")); + return -1; + } + /* If we have an input buffer, we need * a pipe to feed the data to the child */ if (cmd->inbuf) { @@ -921,7 +947,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) return -1; } - if (cmd->inbuf || cmd->outbuf || cmd->errbuf) + if (string_io) ret = virCommandProcessIO(cmd); if (virCommandWait(cmd, exitstatus) < 0) @@ -1001,6 +1027,15 @@ virCommandRunAsync(virCommandPtr cmd, pid_t *pid) return -1; } + /* Buffer management can only be requested via virCommandRun. */ + if ((cmd->inbuf && cmd->infd == -1) || + (cmd->outbuf && cmd->outfdptr != &cmd->outfd) || + (cmd->errbuf && cmd->errfdptr != &cmd->errfd)) { + virCommandError(VIR_ERR_INTERNAL_ERROR, "%s", + _("invalid use of command API")); + return -1; + } + if (cmd->pid != -1) { virCommandError(VIR_ERR_INTERNAL_ERROR, _("command is already running as pid %d"), -- 1.7.3.2

2 2

[libvirt] Just in case it's useful: virsh commands, their version, and their commits
by Justin Clift 07 Dec '10

07 Dec '10

Hi all, Just put a (temporary) page on the wiki showing all of the virsh commands, the version of libvirt each was introduced in, and the commit that did it. http://wiki.libvirt.org/page/VirshCmdAdditionCommits It's very "raw data" style, and at some point in the next week the info will get transferred somewhere better (Virsh Command Reference). But figured other people out there might have a use for it (no idea). Regards and best wishes, Justin Clift

1 0

[libvirt] [PATCH 0/4] Fix up the mess in commandtest
by Jiri Denemark 07 Dec '10

07 Dec '10

commandtest is quite messy with lots of memory leaks, some filedescriptor leaks and few other small issues. This patches fixes them. Jiri Denemark (4): tests: Fix code formating in commandtest tests: Fix leaks in commandtest tests: Fix commandtest in VPATH build tests: Fix detection of expected error tests/commandtest.c | 282 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 184 insertions(+), 98 deletions(-) -- 1.7.3.2

3 16

[libvirt] [PATCH] virsh: Remove redundant commands in group domain
by Osier Yang 07 Dec '10

07 Dec '10

"echo" is already in group "virsh", "freecell" and "hostname" are already in group "host", so remove them from group "domain" * tools/virsh.c --- tools/virsh.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 441fd77..9ce3202 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -9956,10 +9956,7 @@ static const vshCmdDef domManagementCmds[] = { {"domxml-to-native", cmdDomXMLToNative, opts_domxmltonative, info_domxmltonative}, {"dump", cmdDump, opts_dump, info_dump}, {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, - {"echo", cmdEcho, opts_echo, info_echo}, {"edit", cmdEdit, opts_edit, info_edit}, - {"freecell", cmdFreecell, opts_freecell, info_freecell}, - {"hostname", cmdHostname, NULL, info_hostname}, {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave}, {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove, info_managedsaveremove}, {"maxvcpus", cmdMaxvcpus, opts_maxvcpus, info_maxvcpus}, -- 1.7.3.2

3 2

[libvirt] RFC: Setting a permanent MAC address for virtual network bridges
by Laine Stump 07 Dec '10

07 Dec '10

This is in reference to the following bugs that are filed against RHEL, but applicable to all Linux distros: https://bugzilla.redhat.com/show_bug.cgi?id=560994 https://bugzilla.redhat.com/show_bug.cgi?id=609463 "MAC address of virtual network bridge changes when TAP devices are added/removed" The problem is that the MAC address of a bridge that hasn't had its address specifically set, will be set to the MAC address of the first interface attached to it. If that interface later goes away, it will be set to the MAC address of another attached interface. Daniel's comments in the bug 1) state that the MAC address of a bridge device must match the MAC address of one of the attached interfaces, or no traffic will pass, and 2) suggest creating a dummy interface that is created and used purely to set a fixed MAC address that won't go away when any guest is destroyed (because it's not associated with any guest. I did some quick experimentation and found that: 1) It is possible to set a bridge's MAC address to something that isn't the address of an attached interface (although the range of numbers seems to be limited, at least when setting it using "ip link set virbr0 address xx:xx:xx:xx:xx:xx - anything starting with less than "B2" was rejected). 2) When a bridge's MAC address is set in that way, as Daniel says, no traffic passes. (Why is that, anyway?) 3) If I create a tap device, set a MAC address on it, attach it to the bridge, and make sure the bridge is assigned that MAC address, traffic does pass, and when guests are destroyed and restarted, the MAC address of the bridge doesn't change. So it looks like this is a viable way to solve the problem. Before digging into it, though, I thought I should ask if there are any alternate ideas, or problems that anyone sees with this approach. Also, I'm wondering where the name and MAC address of the dummy interfaces should come from, and whether I need to worry about storing them in the network XML. So far, this is what I think on those topics: 1) the MAC address can be autogenerated if it's not in the XML, but needs to be saved in the XML so that it's persistent across libvirtd restarts. 2) the dummy interface name can just be some derivation of the bridge device name ("virbr0-mac"?), and probably doesn't need to be saved in the XML. (Also, I just noticed the code that sets the first byte of the MAC address of all tap interfaces being attached to virtual network bridges to 0xFE. What's the story behind that? Does the bridge always take the numerically lowest MAC that's currently connected?)

2 2

[libvirt] [Patch 0/2] Add new feature into live migration
by Wen Congyang 07 Dec '10

07 Dec '10

If the memory of guest OS is changed constantly, the live migration can not be ended ever for ever. We can use the command 'virsh migrate-setmaxdowntime' to control the live migration. But the value of maxdowntime is diffcult to calculate because it depends on the transfer speed of network and constantly changing memroy size. We need a easy way to control the live migration. This patch set add the support of auto cold migration fallback on timeout. With this patch set, when we migrate the guest OS, we can specify a timeout. If the live migration timeouts, the migration will fallback to cold migration. TODO: 1. The timer for Windows has not been implemented. Test of this patchset: Env: a. The size of guest OS's memory: 1GB b. The transfer speed of network: about 100Mb/s c. The size of constantly changing memory: more than 900MB 1. migrate without timeout # virsh migrate --live RHEL6RC qemu+ssh://<dest IP>/system tcp://<dest IP>:49152 The migration does not end after 12 hours. 2. migrate with timeout(30 minutes): # date Tue Dec 7 10:00:13 CST 2010 # virsh migrate --live --timeout 1800 RHEL6RC qemu+ssh://10.167.225.67/system tcp:10.167.225.67:49152 # date Tue Dec 7 10:43:28 CST 2010 Wen Congyang (2): timer impl auto cold migration fallback at timeout configure.ac | 4 ++ src/Makefile.am | 6 ++- src/libvirt.c | 2 + src/libvirt_private.syms | 6 ++ src/util/timer.c | 116 ++++++++++++++++++++++++++++++++++++++++++++ src/util/timer.h | 37 ++++++++++++++ src/util/timer_linux.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.c | 53 ++++++++++++++++++++ 8 files changed, 343 insertions(+), 2 deletions(-) create mode 100644 src/util/timer.c create mode 100644 src/util/timer.h create mode 100644 src/util/timer_linux.c

1 2

[libvirt] Virsh commands in two help groups?
by Justin Clift 07 Dec '10

07 Dec '10

Hi Osier, Just noticed that some of the virsh commands are now listed in two groups: freecell: listed in both domain and host groups hostname: listed in both domain and host groups echo: listed in both domain and virsh groups Wondering if that's on purpose, or if it needs to be changed? The "echo" one seems a bit wrong in the domain group, but not sure about the others. :)

2 1

[libvirt] [PATCH v4 RESEND 0/4] Support of auto-dump on watchdog event in libvirtd
by Hu Tao 07 Dec '10

07 Dec '10

This patch series adds a new watchdog action `dump' which lets libvirtd can do auto-dump when receiving a watchdog event from qemu guest. In order to make the function work, there must be a watchdog device added to guest, and guest must have a watchdog daemon running, for example, /etc/init.d/watchdog start or auto-started on boot. Changes: v4: - updated threadpool to follow libvirt naming style, use appropriate internals APIs, and hide the struct definitions from the header (by Daniel) - fix an error that qemuDomainObjBeginJobWithDriver() get lost in qemuDomainCoreDump() - use thread pool in libvirtd (qemud worker) v3: - let default auto-dump dir be /var/lib/libvirt/qemu/dump Hu Tao (4): threadpool impl Add a new function doCoreDump Add a watchdog action `dump' Using threadpool API to manage qemud worker cfg.mk | 1 + daemon/libvirtd.c | 172 ++++++---------------------------- daemon/libvirtd.h | 4 + src/Makefile.am | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 6 + src/qemu/qemu.conf | 5 + src/qemu/qemu_conf.c | 16 +++- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_driver.c | 227 +++++++++++++++++++++++++++++++++----------- src/util/threadpool.c | 235 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/threadpool.h | 49 ++++++++++ 13 files changed, 521 insertions(+), 202 deletions(-) create mode 100644 src/util/threadpool.c create mode 100644 src/util/threadpool.h -- 1.7.3 -- Thanks, Hu Tao

3 15

[libvirt] [PATCH] Fix funny off-by-one error in clock-variable
by Dan Kenigsberg 06 Dec '10

06 Dec '10

Humans consider January as month #1, while gmtime_r(3) calls it month #0. While fixing it, render qemu's rtc parameter with leading zeros, as is more commonplace. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=660194 --- src/qemu/qemu_conf.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 83c0f83..973e95b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -3510,9 +3510,9 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) now += def->data.adjustment; gmtime_r(&now, &nowbits); - virBufferVSprintf(&buf, "base=%d-%d-%dT%d:%d:%d", + virBufferVSprintf(&buf, "base=%d-%d-%dT%02d:%02d:%02d", nowbits.tm_year + 1900, - nowbits.tm_mon, + nowbits.tm_mon + 1, nowbits.tm_mday, nowbits.tm_hour, nowbits.tm_min, -- 1.7.3.2

2 1

[libvirt] Syntax error "Bad fd number" when stopping libvirt-guests
by Laurent Léonard 06 Dec '10

06 Dec '10

Hi, When libvirt-guests is being stopped, I get the following message: $Running guests on default URI: test-vm $Suspending guests on default URI... $Suspending test-vm: /etc/init.d/libvirt-guests: 340: Syntax error: Bad fd number The size of RAM already dumped should be displayed instead. The attached patch fixes that issue. -- Laurent Léonard

2 1

[libvirt] [PATCH] util: Fix bug which will cause libvirtd crash
by Osier Yang 06 Dec '10

06 Dec '10

"virCommandRun": if "cmd->outbuf" or "cmd->errbuf" is NULL, libvirtd will be crashed when trying to start a qemu domain (which invokes "virCommandRun"), it caused by we try to use "*cmd->outbuf" and "*cmd->errbuf" regardless of cmd->outbuf or cmd->errbuf is NULL. * src/util/command.c (virCommandRun) --- src/util/command.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index aa43f76..38d462b 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -931,8 +931,8 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) ret = -1; VIR_DEBUG("Result stdout: '%s' stderr: '%s'", - NULLSTR(*cmd->outbuf), - NULLSTR(*cmd->errbuf)); + cmd->outbuf ? NULLSTR(*cmd->outbuf) : "(null)", + cmd->errbuf ? NULLSTR(*cmd->errbuf) : "(null)"); /* Reset any capturing, in case caller runs * this identical command again */ -- 1.7.3.2

2 1

[libvirt] "shadows a global declaration" warnings in virsh
by Justin Clift 06 Dec '10

06 Dec '10

Hi all, Started seeing these warnings when compiling virsh: virsh.c: In function 'cmdRunConsole': virsh.c:735: warning: declaration of 'devname' shadows a global declaration [-Wshadow] /usr/include/stdlib.h:290: warning: shadowed declaration is here [-Wshadow] virsh.c: In function 'cmdConsole': virsh.c:765: warning: declaration of 'devname' shadows a global declaration [-Wshadow] /usr/include/stdlib.h:290: warning: shadowed declaration is here [-Wshadow] virsh.c: In function 'vshReadlineInit': virsh.c:11575: warning: assignment discards qualifiers from pointer target type Haven't looked into it yet as they're only warnings. Anyone know if they're important enough to look into? Regards and best wishes, Justin Clift

7 18

[libvirt] [PATCH] Implement virVMOperationType{To|From}String independent from WITH_MACVTAP
by Matthias Bolte 06 Dec '10

06 Dec '10

As this symbols are exported independent from WITH_MACVTAP. --- src/util/macvtap.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/util/macvtap.c b/src/util/macvtap.c index 2aa319c..4345d97 100644 --- a/src/util/macvtap.c +++ b/src/util/macvtap.c @@ -27,12 +27,13 @@ #include <config.h> +#include <stdint.h> + #if WITH_MACVTAP || WITH_VIRTUALPORT # include <stdio.h> # include <errno.h> # include <fcntl.h> -# include <stdint.h> # include <c-ctype.h> # include <sys/socket.h> # include <sys/ioctl.h> @@ -44,10 +45,15 @@ # include <netlink/msg.h> -# include "util.h" +#endif /* WITH_MACVTAP || WITH_VIRTUALPORT */ + +#include "util.h" +#include "macvtap.h" + +#if WITH_MACVTAP || WITH_VIRTUALPORT + # include "memory.h" # include "logging.h" -# include "macvtap.h" # include "interface.h" # include "conf/domain_conf.h" # include "virterror_internal.h" @@ -77,17 +83,6 @@ # define LLDPAD_PID_FILE "/var/run/lldpad.pid" -VIR_ENUM_IMPL(virVMOperation, VIR_VM_OP_LAST, - "create", - "save", - "restore", - "destroy", - "migrate out", - "migrate in start", - "migrate in finish", - "no-op") - - enum virVirtualPortOp { ASSOCIATE = 0x1, DISASSOCIATE = 0x2, @@ -1609,3 +1604,13 @@ vpDisassociatePortProfileId(const char *macvtap_ifname, } #endif /* WITH_MACVTAP || WITH_VIRTUALPORT */ + +VIR_ENUM_IMPL(virVMOperation, VIR_VM_OP_LAST, + "create", + "save", + "restore", + "destroy", + "migrate out", + "migrate in start", + "migrate in finish", + "no-op") -- 1.7.0.4

3 5

[libvirt] directory storage pools reported available space
by Ryan Harper 06 Dec '10

06 Dec '10

We recently had an issue with not being able to allocate the full capacity of a directory based storage pool. The reported value via pool-info was larger than what was available to the image creator. Looking at the storage code, in virStorageBackendFileSystemRefresh() we're using statvfs, and reporting back pool->def->available = ((unsigned long long)sb.f_bfree * (unsigned long long)sb.f_bsize); Which is the amount of blocks available, including any root reservation if present on the filesystem. This does't line up with df output , which at least on RHEL5 and 6 systems reports the available space from f_bavail, which excludes and reserved space. Is it reasonable to have the available value line up with output from df and not report reserved space? -- Ryan Harper Software Engineer; Linux Technology Center IBM Corp., Austin, Tx ryanh(a)us.ibm.com

4 5

[libvirt] [RFC] new preferences requirement
by Osier Yang 06 Dec '10

06 Dec '10

Hi, all We have some new requirements of preferences, I listed which of them I known, and think is useful as follows: 1) for the path of x509 certificate and keys of client The path of x509 certificate and keys of client is hard coded in remote driver. e.g. /* Defaults for PKI directory. */ # define LIBVIRT_PKI_DIR SYSCONFDIR "/pki" # define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem" # define LIBVIRT_CLIENTKEY LIBVIRT_PKI_DIR "/libvirt/private /clientkey.pem" # define LIBVIRT_CLIENTCERT LIBVIRT_PKI_DIR "/libvirt/clientcert.pem" 2) for default default driver and subdriver for disk image Another requirement of new preference is default driver and subdriver for disk images, currently we use "phy" for "driver" in virsh, and "raw" for "subdriver" in qemu driver by default if user doesn't specify them, it causes bugs, though we could say to user "you should use options --driver and --subdriver", but these two options are optional. IMHO, the best solution for those bugs is to provide new preferences. 3) for default NIC and storage type "Chris Phillips" raised up the requirement not long ago: http://www.redhat.com/archives/libvirt-users/2010-November/msg00033.html ==================== Should we add these new preferences(if they are really neccessary) in qemu.conf? or create new config file, e.g. The approch Justin raised up an approch before: http://www.redhat.com/archives/libvir-list/2010-November/msg00651.html Though for Justin's approch, IMHO we'd better also to provide a default config file, e.g. "/etc/libvirt/client.conf". Any feedback is welcomed, thanks - Osier

4 8

[libvirt] Looking for Hypervisor Vulerability Example
by Shi Jin 06 Dec '10

06 Dec '10

Hi there, I am researching on virtualization security and particularly on sVirt. >From this sVirt presentation[1] and this RHEL-6 documentation on sVirt [2], I read: If there is a security flaw in the hypervisor that can be exploited by a guest instance, this guest may be able to not only attack the host, but also other guests running on that host. This is not theoretical; attacks already exist on hypervisors. These attacks can extend beyond the guest instance and could expose other guests to attack. I am very interested to know about the exact attacks: which version of hypervisor on which OS, how was the exploit used and how it affected the systems. I want to be able to reproduce one of the attacks in our lab so that I can demonstrate to people on the security issues and then how sVirt could be used to actually prevent to attacks on hosting system and other VMs. I believe a real demonstration is better than a million words. I appreciate your help. Shi [1]:http://namei.org/presentations/svirt-lca-2009.pdf [2]:http://docs.redhat.com/docs/en-US/Red_Hat_Enterprise_Linux/6/html/Virtua… -- Shi Jin, PhD

2 3

[libvirt] Release of libvirt 0.8.6
by Daniel Veillard 06 Dec '10

06 Dec '10

As indicated 10 days ago, today was time for a release, I didn't had much time so I simply generated a release from libvirt git without much testing. Hopefully this will be okay ! Release is available as usual at ftp://libvirt.org/libvirt/ There is actually a number of significant features rolled in this release, along with the usual fixes and improvements: Features: - new API virDomainIsUpdated (Osier Yang) - Add support for iSCSI target auto-discovery (Daniel P. Berrange) - QED: Basic support for QED images (Adam Litke) - Introduce a virDomainOpenConsole API (Daniel P. Berrange) - Support for SPICE graphics (Daniel P. Berrange) - Add a sysinfo and SMBIOS support (Daniel Veillard) - Implement virsh qemu-monitor-command. (Chris Lalancette) Documentation: - updated c# bindings with arnauds latest changes (Justin Clift) - Fix spelling of virBufferVSprintf (Jiri Denemark) - Fix broken XML entity for '>' (Philipp Hahn) - removed outdated reference to virt-mem (Justin Clift) - Add doc for missed options of migrate (Osier Yang) - add doc for missed parameters of attach-disk (Osier Yang) - update virsh manual (Osier Yang) - updated virsh command reference with libvirt.org links (Justin Clift) - Generate HACKING from docs/hacking.html.in (Matthias Bolte) - Prepare hacking.html.in to generate HACKING from it (Matthias Bolte) - updated csharp pages with latest info (Justin Clift) - trivial typo fix (Justin Clift) - added virsh command reference page. (Justin Clift) - rpm: Fix summary wording (Cole Robinson) - Augment bug reporting documentation (Daniel Veillard) - virsh: fix incorrect help text mentioning non-existent network 'id' (Justin Clift) - Fix off-by-1 in todo page generator (Daniel P. Berrange) - Fix comment for <video> tag in domain RNG schema (Daniel P. Berrange) - fix typo (Eric Blake) Portability: - remote: Fix TLS transport on Windows (Matthias Bolte) - Rename 'remove' param to 'toremove' to avoid clash with stdio.h (Daniel P. Berrange) - virt-aa-helper: Fix several compile errors (Matthias Bolte) - maint: improve i18n on non-Linux (Eric Blake) - nwfilter: use /bin/sh rather than requiring bash (Eric Blake) - Use python discovered through env instead of hardcoding a path (Matthias Bolte) - esx: Avoid warnings about breaking strict-aliasing rules on FreeBSD (Matthias Bolte) - Make sure struct sockaddr_in is defined on FreeBSD (Matthias Bolte) - configure: Disable FS storage driver if mntent.h is not available (Matthias Bolte) - daemon: Include stdlib.h in dispatch.c (Matthias Bolte) - xen: work with xen 4.0.1 headers (Eric Blake) - Fix build with polkit 0 (Jim Fehlig) - xen: work with ia64 MAX_VIRT_CPUS of 64 (Eric Blake) - build: cleanup declaration of xen tests. (Diego Elio Pettenò) - qemu: check compression program availability of virsh save and dump (KAMEZAWA Hiroyuki) Bug Fixes: - correct the arguments of migrate_speed (Wen Congyang) - Fix memory leaks in audit & VirtualBox code (Daniel P. Berrange) - Fix host CPU counting on unusual NUMA topologies (Jiri Denemark) - security, storage: plug memory leaks for security_context_t (Eric Blake) - network: plug memory leak (Eric Blake) - qemu: plug memory leak (Eric Blake) - Always close drivers when a virConnectPtr is released (Matthias Bolte) - libvirtd: fix bug when shrinking number of clients (Eric Blake) - Fix 32-bit int truncation in QED header check (Daniel P. Berrange) - Fix error handling in virsh when listing storage volumes (Daniel P. Berrange) - Fix parsing of port attribute in storage XML configuration (Daniel P. Berrange) - Don't catch SIGCHLD in libvirtd (Daniel P. Berrange) - Ensure logfile isn't truncated by shutdown message. (Daniel P. Berrange) - xend: Escape reserved sexpr characters (Cole Robinson) - xend: urlencode: Properly escape '&' (Cole Robinson) - conf: Fix parsing python style triple quotes (Cole Robinson) - nwfilter: re-order lock grabbed by IP addr. learn thread (Stefan Berger) - virExec: fix bug in setting up child stderr/out with /dev/null (Daniel P. Berrange) - Fix a failure to restore SELinux label for character devices (Daniel Veillard) - nwfilter: also purge ip(6)tables rules before detecting IP address (Stefan Berger) - Fix ipv4-addr definition in interface.rng (Laine Stump) - remote_driver.c: fix non-literal format strings w/o args (Laine Stump) - ignore SELinuxSetFilecon error in SELinuxSetSecurityFileLabel if on nfs (Laine Stump) - Fix reference counting bug in virsh console (Daniel P. Berrange) - Fix busy-wait loop on closed file descriptor (Daniel P. Berrange) - Fix LXC container console device setup (Daniel P. Berrange) - rpm: fix /var/lib/libvirt permissions (Eric Blake) - xencapstest: Don't fail when Xen is installed (Matthias Bolte) - virsh: fix non-literal string format (Laine Stump) - Fix syntax-check error in domain.rng (Matthias Bolte) - qemu: Fix non-literal format string (Jiri Denemark) - macvtap: libvirtd forgot macvtap dev name when restarted (Stefan Berger) - tests: fix daemon-conf testing failure (Osier Yang) - Fix virPipeReadUntilEOF on more than 1024 bytes of data (Daniel Veillard) - Misc error handling fixes in text mode monitor commands (Daniel P. Berrange) - Ignore open failures when relabelling disk images (Daniel P. Berrange) - Treat failure to relabel stdin_path as non-fatal on NFS (Daniel P. Berrange) - qemu: add the USB devices to the cgroup whitelist (Diego Elio Pettenò) Improvements: - Log client errors in libvirtd at debug priority - maint: prohibit most uses of xmlGetProp (Eric Blake) - maint: ensure syntax check exceptions are distributed (Eric Blake) - Implementations of virDomainIsUpdated for drivers except qemu (Osier Yang) - implement callback function for qemu driver (Osier Yang) - implement the remote protocol (Osier Yang) - implement public API virDomainIsUpdated (Osier Yang) - define internal driver API (Osier Yang) - tests: Fix dispatching internal error reports (Cole Robinson) - Improve SCSI volume name generation (Daniel P. Berrange) - Fix error codes returned when a storage pool is inactive (Daniel P. Berrange) - Check whether pools are already active upon libvirtd startup (Daniel P. Berrange) - Allow iSCSI IQN to be set with find-storage-pool-sources-as command (Daniel P. Berrange) - Switch the virsh XML generation to use virBuffer instead of virAsprintf (Daniel P. Berrange) - Stop iSCSI targets automatically logging back in after logout (Daniel P. Berrange) - Refactor iSCSI driver code to facilitate future changes (Daniel P. Berrange) - Ensure virExec preserves logging environment (Daniel P. Berrange) - Include a thread identifier in log messages (Daniel P. Berrange) - qemu: setvcpus: Save config changes to disk (Cole Robinson) - qemu: setvcpus: Simplify altering the persistent config (Cole Robinson) - qemu: setvcpus: Fix maxvcpus check (Cole Robinson) - conf: domain: Improve vcpus validation reporting (Cole Robinson) - Make state driver device hotplug/update actually transient (Cole Robinson) - domain_conf: Add virDomainObjSetDefTransient (Cole Robinson) - buf: Simplify virBufferEscapeString (Cole Robinson) - conf: Convert ParseString to use STRPREFIX (Cole Robinson) - schemas: domain: Add more valid file path chars (Cole Robinson) - qed: Minor updates to QED support patches (Adam Litke) - Support for probing qed image metadata (Adam Litke) - storage_file: Add a new flag to mark backing files that are safe to probe (Adam Litke) - Allow probing of image formats without version information (Adam Litke) - maint: tighten strncmp syntax check (Eric Blake) - capabilities, cpu: use new array API (Eric Blake) - memory: make it easier to avoid quadratic scaling of arrays (Eric Blake) - memory: make it safer to expand arrays (Eric Blake) - build: fix autobuild failures on gcov upgrade (Eric Blake) - virt-aa-helper: translate error messages (Eric Blake) - maint: update to latest gnulib (Eric Blake) - deprecate fclose() and introduce VIR_{FORCE_}FCLOSE() (Stefan Berger) - qemu: record timestamp in qemu domain log (Osier Yang) - virsh: add net-info command (Osier Yang) - interface.rng: Make miimon and arpmon optional for bond interfaces (Laine Stump) - macvtap: convert send / recv function to use libnl (Stefan Berger) - configure: Remove bashism and replace 'test ==' with 'test =' (Matthias Bolte) - virsh: Fix compile error in VPATH build (Matthias Bolte) - qemu: Remove unnecessary quoting from the process name argument (John Morrissey) - phyp: Don't do a flags check in the storage driver (Matthias Bolte) - qemu: Add qemu-system-s390x to the emulators list (Matthias Bolte) - macvtap: convert nl msg construction to use libnl (Stefan Berger) - Do a better job of validating IP and MAC addresses in network.rng (Laine Stump) - virt-aa-helper should require <uuid> in XML (Jamie Strandboge) - esx: Support SMBIOS host mode (Matthias Bolte) - Wire up virDomainOpenConsole for LXC, Xen and UML (Daniel P. Berrange) - Re-write virsh console to use streams (Daniel P. Berrange) - Convert daemon/events.c to use virMutex and virThread (Daniel P. Berrange) - Introduce portability APIs for creating threads (Daniel P. Berrange) - Support virDomainOpenConsole with QEMU (Daniel P. Berrange) - Add a generic internal API for handling any FD based stream (Daniel P. Berrange) - Lower logging level in remote driver streams (Daniel P. Berrange) - Remote driver client and server for virDomainOpenConsole (Daniel P. Berrange) - Support callbacks on virStream APIs in remote driver client (Daniel P. Berrange) - virsh: supply long option for -V (Eric Blake) - qemu: Add flag to force a CDROM eject (Cole Robinson) - Allow non-file disk backingStores (Adam Litke) - bye to close(), welcome to VIR_(FORCE_)CLOSE() (Stefan Berger) - esx: Add support for memtune/min_guarantee (Matthias Bolte) - schema: Move timer element inside clock (Jiri Denemark) - Misc test case fixes for SPICE (Daniel P. Berrange) - virsh: Add .xml suffix to tmp files used in *edit commands (Jiri Denemark) - Support SPICE channel security options (Daniel P. Berrange) - Support multiple QXL video cards (Daniel P. Berrange) - Define XML syntax for password expiry (Daniel P. Berrange) - Add SPICE support for QEMU driver configuration file (Daniel P. Berrange) - Support automatic port number allocation for SPICE (Daniel P. Berrange) - Implement QEMU/KVM QXL video card support in QEMU driver (Daniel P. Berrange) - Add a <graphics> type for SPICE protocol (Daniel P. Berrange) - Add a QXL graphics card type to domain XML schema (Daniel P. Berrange) - Show compiled in options in virsh -V (Daniel Veillard) - lxc: Exit on first error in lxcDomainGetMemoryParameters (Matthias Bolte) - Allow virDomainGetMemoryParameters on read-only connections (Matthias Bolte) - Add a new test for sysinfo and smbios handling (Daniel Veillard) - Add sysinfo/smbios support to the QEmu driver (Daniel Veillard) - Read the host sysinfo for the QEmu driver (Daniel Veillard) - Add smbios element to schema and configuration to HVM os (Daniel Veillard) - Sysinfo parsing and saving to/from configuration files (Daniel Veillard) - Sysinfo extension to relax-ng schemas (Daniel Veillard) - Change calling conventions in remote driver client internals (Daniel P. Berrange) - util: Add helper function to build timestamp string (Osier Yang) - misc: encode the Emacs suggstions from HACKING into a .dir-locals.el file (Diego Elio Pettenò) - add compression support for "virsh dump" (KAMEZAWA Hiroyuki) - qemu_driver: add virCgroupMounted (Lai Jiangshan) Cleanups: - tests: Fix detection of expected errors (Jiri Denemark) - Remove bogus check for Xen in example program (Daniel P. Berrange) - build: enforce files.h usage (Eric Blake) - maint: sort exports (Eric Blake) - Remove bogus port handling code in virsh (Daniel P. Berrange) - Remove trailing ':' from timestamp (Daniel P. Berrange) - Log all errors at level INFO to stop polluting syslog (Daniel P. Berrange) - daemon: use safer memory growth macros (Eric Blake) - maint: avoid remaining sprintf uses (Eric Blake) - maint: use gnulib configmake rather than open-coding things (Eric Blake) - replace last instances of close() (Stefan Berger) - daemon: fix indention problem in daemon/libvirt.c (Osier Yang) - qemu: fix typos in qemu_monitor_text.c (Osier Yang) - re-indent network.rng following structural change (Laine Stump) - Put network.rng contents inside <grammar> for uniformity with other RNGs (Laine Stump) - maint: Commit .gitignore sorting done by bootstrap (Jiri Denemark) - xen-proxy: Remove it entirely and use libvirtd instead (Matthias Bolte) - qemu: Remove redundant slash in save directory path (Matthias Bolte) - virterror: supply missing spaces (Eric Blake) - Fix several warnings about a non-literal format string (Jiri Denemark) - build: avoid compiler warning in xen code (Eric Blake) Thanks everybody for their input, ideas, patches or documentation used in this release ! 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/

7 15

[libvirt] [PATCH] tests: Don't ignore return value of getcwd()
by Jiri Denemark 06 Dec '10

06 Dec '10

--- tests/commandhelper.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 2ee9153..5b2f301 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -97,7 +97,8 @@ int main(int argc, char **argv) { fprintf(log, "DAEMON:%s\n", getppid() == 1 ? "yes" : "no"); char cwd[1024]; - getcwd(cwd, sizeof(cwd)); + if (!getcwd(cwd, sizeof(cwd))) + return EXIT_FAILURE; if (strlen(cwd) > strlen("/commanddata") && STREQ(cwd + strlen(cwd) - strlen("/commanddata"), "/commanddata")) strcpy(cwd, ".../commanddata"); -- 1.7.3.2

2 2

[libvirt] [PATCH] build: Fix internal docs generation in VPATH builds
by Jiri Denemark 06 Dec '10

06 Dec '10

--- docs/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index ce0b391..43c54f6 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -117,6 +117,7 @@ todo: internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ + $(MKDIR_P) "$(builddir)/internals"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ $(XSLTPROC) --stringparam pagename $$name --nonet --html \ $(top_srcdir)/docs/subsite.xsl $< > $@ \ -- 1.7.3.2

2 2

[libvirt] [PATCH] Change return value of VIR_DRV_SUPPORTS_FEATURE to bool
by Jiri Denemark 06 Dec '10

06 Dec '10

virDrvSupportsFeature API is allowed to return -1 on error while all but one uses of VIR_DRV_SUPPORTS_FEATURE only check for (non)zero return value. Let's make this macro return zero on error, which is what everyone expects anyway. --- src/driver.h | 8 ++++---- src/libvirt.c | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/driver.h b/src/driver.h index b770e5e..e797a75 100644 --- a/src/driver.h +++ b/src/driver.h @@ -52,12 +52,12 @@ typedef enum { * Note that you must check for errors. * * Returns: - * >= 1 Feature is supported. + * != 0 Feature is supported. * 0 Feature is not supported. - * -1 Error. */ -# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \ - ((drv)->supports_feature ? (drv)->supports_feature((conn),(feature)) : 0) +# define VIR_DRV_SUPPORTS_FEATURE(drv,conn,feature) \ + ((drv)->supports_feature ? \ + (drv)->supports_feature((conn), (feature)) > 0 : 0) typedef virDrvOpenStatus (*virDrvOpen) (virConnectPtr conn, diff --git a/src/libvirt.c b/src/libvirt.c index b4951c2..4188b45 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1605,7 +1605,10 @@ virDrvSupportsFeature (virConnectPtr conn, int feature) return (-1); } - ret = VIR_DRV_SUPPORTS_FEATURE (conn->driver, conn, feature); + if (!conn->driver->supports_feature) + ret = 0; + else + ret = conn->driver->supports_feature(conn, feature); if (ret < 0) virDispatchError(conn); -- 1.7.3.2

2 4

[libvirt] [Patch v2] Add VMware Workstation and Player driver
by Jean-Baptiste Rouault 05 Dec '10

05 Dec '10

Many changes since v2 based on Matthias review (http://www.redhat.com/archives/libvir-list/2010-November/msg00799.html) popen() calls will be removed when the new virCommand API is available.

2 2