- Devel - libvirt List Archives

[libvirt] [PATCH v2] xen: Prevent updating device when attaching a device
by Osier Yang 12 Feb '11

12 Feb '11

When attaching a device that already exists, xend driver updates the device with "device_configure", it causes problems (e.g. for disk device, 'device_configure' only can be used to update device like CDROM), on the other hand, we provide additional API (virDomainUpdateDevice) to update device, this fix is to raise up errors instead of updating the existed device which is not CDROM device. Changes from v1 to v2: - allow update CDROM * src/xen/xend_internal.c --- src/xen/xend_internal.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index cd30336..bc23595 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -3965,6 +3965,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, virDomainDefPtr def = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; + char *target = NULL; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); @@ -4029,6 +4030,13 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, STREQ(def->os.type, "hvm") ? 1 : 0, priv->xendConfigVersion, 1) < 0) goto cleanup; + + if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { + if (!(target = strdup(dev->data.disk->dst))) { + virReportOOMError(); + goto cleanup; + } + } break; case VIR_DOMAIN_DEVICE_NET: @@ -4038,6 +4046,14 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, STREQ(def->os.type, "hvm") ? 1 : 0, priv->xendConfigVersion, 1) < 0) goto cleanup; + + char macStr[VIR_MAC_STRING_BUFLEN]; + virFormatMacAddr(dev->data.net->mac, macStr); + + if (!(target = strdup(macStr))) { + virReportOOMError(); + goto cleanup; + } break; case VIR_DOMAIN_DEVICE_HOSTDEV: @@ -4046,6 +4062,17 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, if (xenDaemonFormatSxprOnePCI(dev->data.hostdev, &buf, 0) < 0) goto cleanup; + + virDomainDevicePCIAddress PCIAddr; + + PCIAddr = dev->data.hostdev->source.subsys.u.pci; + virAsprintf(&target, "PCI device: %.4x:%.2x:%.2x", PCIAddr.domain, + PCIAddr.bus, PCIAddr.slot); + + if (target == NULL) { + virReportOOMError(); + goto cleanup; + } } else { virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); @@ -4065,17 +4092,22 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); - } - else { - /* device exists, attempt to modify it */ - ret = xend_op(domain->conn, domain->name, "op", "device_configure", - "config", sexpr, "dev", ref, NULL); + } else { + if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { + virXendError(VIR_ERR_OPERATION_INVALID, + _("target '%s' already exists"), target); + } else { + /* device exists, attempt to modify it */ + ret = xend_op(domain->conn, domain->name, "op", "device_configure", + "config", sexpr, "dev", ref, NULL); + } } cleanup: VIR_FREE(sexpr); virDomainDefFree(def); virDomainDeviceDefFree(dev); + VIR_FREE(target); return ret; } -- 1.7.3.2

3 5

[libvirt] [PATCH] build: fix cygwin strerror_r failure
by Eric Blake 11 Feb '11

11 Feb '11

Building the 0.8.8 release candidate on cygwin produced this compiler warning, which is indicative of catastrophic failure on any attempt to print an error message with errno turned to a string: CC strerror_r.lo strerror_r.c: In function 'rpl_strerror_r': strerror_r.c:67: warning: assignment makes integer from pointer without a cast This has been fixed in gnulib. * .gnulib: Update to latest, for strerror_r fix. * src/util/memory.c (includes): Satisfy 'make syntax-check'. --- Pushing this under the build-breaker rule, even if cygwin is the only platform where the build was broken. * .gnulib 2f41af6...4cce65c (113): > doc: update users.txt > doc: update users.txt > doc: update users.txt > gnulib-tool: Make copyright notice adjustment more robust. > New module 'towctrans'. > New module 'wctrans'. > New module 'iswctype'. > New module 'wctype'. > wctype-h: Ensure wctype_t and wctrans_t are defined. > flock: fix license typo > Split large sed scripts, for HP-UX sed. > stdlib: improve random_r modularization > stdlib: don't depend on stdint > getloadavg: don't depend on c-strtod, cloexec, fcntl-safer > di-set.h, ino-map.h: add multiple-inclusion guard > iswblank: Ensure declaration on glibc systems. > New module 'iswblank'. > di-set tests: Refactor. > ino-map tests: Refactor. > di-set: add "const" to a cast > ChangeLog: fix my old entry to give credit to Bastien > update from texinfo > Rename module 'wctype' to 'wctype-h'. > New module 'wcswidth'. > New module 'wcstok'. > New module 'wcsstr'. > New module 'wcspbrk'. > New module 'wcsspn'. > New module 'wcscspn'. > New module 'wcsrchr'. > New module 'wcschr'. > New module 'wcsdup'. > New module 'wcsxfrm'. > New module 'wcscoll'. > New module 'wcsncasecmp'. > New module 'wcscasecmp'. > New module 'wcsncmp'. > New module 'wcscmp'. > New module 'wcsncat'. > New module 'wcscat'. > New module 'wcpncpy'. > New module 'wcsncpy'. > New module 'wcpcpy'. > New module 'wcscpy'. > New module 'wcsnlen'. > New module 'wcslen'. > New module 'wmemset'. > New module 'wmemmove'. > New module 'wmemcpy'. > New module 'wmemcmp'. > di-set, ino-map: new modules, from coreutils > getloadavg: merge minor changes from Emacs > Allow multiple gnulib generated replacements to coexist. > libposix: Revert the unreviewed part of yesterday's big merge. > unsetenv: work around Haiku issues > libposix: Add _HEADERS primaries to posix modules. Modify gnulib-tool to strip them from generated Makefile.am-s where they are not needed. Also, replace M4 macro prefixes when requested. Finally, omit calls to error() for libposix. > strerror_r-posix: port to cygwin > New module 'wmemchr', part 3. > New module 'wmemchr', part 2. > New module 'wmemchr'. > fdopendir: detect FreeBSD bug > stdbool: do not define HAVE_STDBOOL_H > wcsnrtombs: Prepare for new module wwcsnrtombs. > wcsrtombs: Prepare for new module wwcsrtombs. > mbsnrtowcs: Prepare for new module mbsnrtowwcs. > mbsrtowcs: Prepare for new module mbsrtowwcs. > vasnprintf: Reduce use of malloc for small format strings. > autoudpate > update from texinfo > dup2: work around Haiku bug > doc: off_t is not available in eglibc 2.11.2 stdio.h. > ignore-value: add missing test dependency > mktime: clarify long_int width checking > ignore-value: Fix self-test. > TYPE_MAXIMUM: avoid theoretically undefined behavior > mktime: #undef mktime before #defining it > mktime: systematically normalize tm_isdst comparisons > mktime: fix some integer overflow issues and sidestep the rest > mktime: avoid infinite loop > rename, unlink, same-inode: Relicense. > mktime: avoid problems on NetBSD 5 / i386 > autoupdate > mktime: fix misspelling in comment > move-if-change: cope with concurrent mv of identical file. > users.txt: Mention sharutils. > doc: Update users.txt > Prepare for supporting FreeBSD 10. > Prepare for supporting FreeBSD 10. > vma-iter, get-rusage-as: Add OpenBSD support. > more make vars for makeinfo > regen > fcntl: work around Haiku F_DUPFD bugs > autoupdate > Enable memory leak tests on AIX. > Tests for module 'get-rusage-data'. > New module 'get-rusage-data'. > get-rusage-as: Allow for easier testing. > vma-iter: Treat Haiku like BeOS. > c-stack: fix regression on cygwin when libsigsegv is present > autoupdate > vma-iter: Avoid empty intervals. > u64: remove unnecessary #include > Allow the user to avoid the GNULIB_TEST_* macros. > New module 'vma-iter'. > uninorm: Tweak includes. > get-rusage-as: Improve on NetBSD. > xreadlink.h: remove unnecessary #include > maint.mk: add syntax-check rule: detect unnecessary #include <stddef.h> > get-rusage-as: Fix bug. > wctype: Ensure valid C syntax. > wctype: Ensure valid C syntax. > getopt: omit HAVE_OPTRESET, HAVE_GETOPT_CLIP from config.h > gl_CHECK_NEXT_HEADERS implies AC_CHECK_HEADERS_ONCE .gnulib | 2 +- src/util/memory.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index 2f41af6..4cce65c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 2f41af65087fb2460779bc4e7fb62453f79ebae3 +Subproject commit 4cce65cb2f10936f13760625f39d532564984fde diff --git a/src/util/memory.c b/src/util/memory.c index 03e2e80..bfa32a8 100644 --- a/src/util/memory.c +++ b/src/util/memory.c @@ -1,7 +1,7 @@ /* * memory.c: safer memory allocation * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -22,7 +22,6 @@ #include <config.h> #include <stdlib.h> -#include <stddef.h> #include "memory.h" #include "ignore-value.h" -- 1.7.4

1 0

[libvirt] [PATCH] qemu: Fix escape_monitor(escape_shell(command))
by Philipp Hahn 11 Feb '11

11 Feb '11

Suspending a VM which contains shell meta characters doesn't work with libvirt-0.8.7: /var/log/libvirt/qemu/andreas_231-ne\ doch\ nicht.log: sh: -c: line 0: syntax error near unexpected token `doch' sh: -c: line 0: `cat | { dd bs=4096 seek=1 if=/dev/null && dd bs=1048576; } Although target="andreas_231-ne doch nicht" contains shell meta characters (here: blanks), they are not properly escaped by src/qemu/qemu_monitor_{json,text}.c#qemuMonitor{JSON,Text}MigrateToFile() First, the filename needs to be properly escaped for the shell, than this command line has to be properly escaped for qemu again. For this to work, remove the old qemuMonitorEscapeArg() wrapper, rename qemuMonitorEscape() to it removing the handling for shell=TRUE, and implement a new qemuMonitorEscapeShell() returning strings using single quotes. Using double quotes or escaping special shell characters with backslashes would also be possible, but the set of special characters heavily depends on the concrete shell (dsh, bash, zsh) and its setting (history expansion, interactive use, ...) Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/qemu/qemu_monitor.c | 65 +++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 27 deletions(-)

2 1

[libvirt] [RFC PATCH 0/6] Switch over qemu command line capabilities to virBitmap
by Jiri Denemark 11 Feb '11

11 Feb '11

There are two main reasons behind this patchset: - we are getting very close to 64 flags which is the maximum we can use with unsigned long long - by using LL constants in enum we already violates C99 constraint that enum values have to fit into int This is a very conflict-prone patchset so I'd like to get some feedback on the ideas and naming used so that this could possible be among the first patches pushed after 0.8.8 release. Patches 2/6 and 4/6 are fully and 3/6 mostly mechanical. 5/6 and 6/6 need to be squashed into a single patch but are provided separately for easier review. Jiri Denemark (6): util: Add API for converting virBitmap into printable string qemu: Rename QEMUD_CMD_FLAG_* to QEMU_CAPS_* qemu: Use helper functions for handling cmd line capabilities qemu: Rename qemud\?CmdFlags to qemuCaps qemu: Switch over command line capabilities to virBitmap tests: Use virBitmap for qemu command line caps src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 238 +++++++++----- src/qemu/qemu_capabilities.h | 150 +++++---- src/qemu/qemu_command.c | 384 +++++++++++----------- src/qemu/qemu_command.h | 30 +- src/qemu/qemu_driver.c | 106 ++++--- src/qemu/qemu_hotplug.c | 162 +++++----- src/qemu/qemu_hotplug.h | 32 +- src/util/bitmap.c | 32 ++- src/util/bitmap.h | 3 + tests/qemuargv2xmltest.c | 2 +- tests/qemuhelptest.c | 745 +++++++++++++++++++++--------------------- tests/qemuxml2argvtest.c | 470 +++++++++++++------------- 13 files changed, 1249 insertions(+), 1106 deletions(-) -- 1.7.4

3 20

[libvirt] [PATCH] Imprint all logs with version + package build information
by Daniel P. Berrange 11 Feb '11

11 Feb '11

The logging functions are enhanced so that immediately prior to the first log message being printed to any output channel, the libvirt package version will be printed. eg $ LIBVIRT_DEBUG=1 virsh 18:13:28.013: 17536: info : libvirt version: 0.8.7 18:13:28.013: 17536: debug : virInitialize:361 : register drivers ... The 'configure' script gains two new arguments which can be used as --with-packager="Fedora Project, x86-01.phx2.fedoraproject.org, 01-27-2011-18:00:10" --with-packager-version="1.fc14" to allow distros to append a custom string with package specific data. The RPM specfile is modified so that it appends the RPM version, the build host, the build date and the packager name. eg $ LIBVIRT_DEBUG=1 virsh 18:14:52.086: 17551: info : libvirt version: 0.8.7, package: 1.fc13 (Fedora Project, x86-01.phx2.fedoraproject.org, 01-27-2011-18:00:10) 18:14:52.086: 17551: debug : virInitialize:361 : register drivers Thus when distro packagers receive bug reports they can clearly see what version was in use, even if the bug reporter mistakenly or intentionally lies about version/builds * src/util/logging.c: Output version data prior to first log message * libvirt.spec.in: Include RPM release, date, hostname & packager * configure.ac: Add --with-packager & --with-packager-version args --- configure.ac | 19 +++++++++++ libvirt.spec.in | 9 +++++ src/util/logging.c | 91 +++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 104 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 8a4083f..3cd824a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,25 @@ AC_SUBST([LIBVIRT_VERSION]) AC_SUBST([LIBVIRT_VERSION_INFO]) AC_SUBST([LIBVIRT_VERSION_NUMBER]) +AC_ARG_WITH([packager], + [AS_HELP_STRING([--with-packager], + [Extra packager name])], + [],[]) +AC_ARG_WITH([packager-version], + [AS_HELP_STRING([--with-packager-version], + [Extra packager version])], + [],[]) +if test "x$with_packager" != "xno" +then + AC_DEFINE_UNQUOTED([PACKAGER], ["$with_packager"], + [Extra package name]) +fi +if test "x$with_packager_version" != "xno" +then + AC_DEFINE_UNQUOTED([PACKAGER_VERSION], ["$with_packager_version"], + [Extra package version]) +fi + dnl Required minimum versions of all libs we depend on LIBXML_REQUIRED="2.6.0" GNUTLS_REQUIRED="1.0.25" diff --git a/libvirt.spec.in b/libvirt.spec.in index 0a2d10e..da1fe4a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -592,6 +592,13 @@ of recent versions of Linux (and other OSes). %define _without_dtrace --without-dtrace %endif +%define when %(date +"%%m-%%d-%%Y-%%H:%%M:%%S") +%define where %(hostname) +%define who %{?packager}%{!?packager:Unknown} +%define with_packager --with-packager="%{who}, %{when}, %{where}" +%define with_packager_version --with-packager-version="%{release}" + + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -626,6 +633,8 @@ of recent versions of Linux (and other OSes). %{?_without_macvtap} \ %{?_without_audit} \ %{?_without_dtrace} \ + %{with_packager} \ + %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ diff --git a/src/util/logging.c b/src/util/logging.c index a80c3e3..85406bf 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -108,6 +108,7 @@ static int virLogNbFilters = 0; * after filtering, multiple output can be used simultaneously */ struct _virLogOutput { + bool logVersion; void *data; virLogOutputFunc f; virLogCloseFunc c; @@ -490,6 +491,7 @@ int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, void *data, goto cleanup; } ret = virLogNbOutputs++; + virLogOutputs[ret].logVersion = true; virLogOutputs[ret].f = f; virLogOutputs[ret].c = c; virLogOutputs[ret].data = data; @@ -501,6 +503,55 @@ cleanup: return ret; } +static int +virLogFormatString(char **msg, + const char *funcname, + long long linenr, + struct tm *time_info, + struct timeval *cur_time, + int priority, + const char *str) +{ + int ret; + if ((funcname != NULL)) { + ret = virAsprintf(msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n", + time_info->tm_hour, time_info->tm_min, + time_info->tm_sec, (int) cur_time->tv_usec / 1000, + virThreadSelfID(), + virLogPriorityString(priority), funcname, linenr, str); + } else { + ret = virAsprintf(msg, "%02d:%02d:%02d.%03d: %d: %s : %s\n", + time_info->tm_hour, time_info->tm_min, + time_info->tm_sec, (int) cur_time->tv_usec / 1000, + virThreadSelfID(), + virLogPriorityString(priority), str); + } + return ret; +} + +static int +virLogVersionString(char **msg, + struct tm *time_info, + struct timeval *cur_time) +{ +#ifdef PACKAGER_VERSION +# ifdef PACKAGER +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")" +# else +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION ", package: " PACKAGER_VERSION +# endif +#else +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION +#endif + + return virLogFormatString(msg, NULL, 0, + time_info, cur_time, + VIR_LOG_INFO, LOG_VERSION_STRING); +} + /** * virLogMessage: * @category: where is that message coming from @@ -516,6 +567,7 @@ cleanup: */ void virLogMessage(const char *category, int priority, const char *funcname, long long linenr, int flags, const char *fmt, ...) { + static bool logVersionStderr = true; char *str = NULL; char *msg; struct timeval cur_time; @@ -547,19 +599,9 @@ void virLogMessage(const char *category, int priority, const char *funcname, gettimeofday(&cur_time, NULL); localtime_r(&cur_time.tv_sec, &time_info); - if ((funcname != NULL)) { - ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, - virThreadSelfID(), - virLogPriorityString(priority), funcname, linenr, str); - } else { - ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, - virThreadSelfID(), - virLogPriorityString(priority), str); - } + ret = virLogFormatString(&msg, funcname, linenr, + &time_info, &cur_time, + priority, str); VIR_FREE(str); if (ret < 0) { /* apparently we're running out of memory */ @@ -578,12 +620,31 @@ void virLogMessage(const char *category, int priority, const char *funcname, virLogStr(msg, len); virLogLock(); for (i = 0; i < virLogNbOutputs;i++) { - if (priority >= virLogOutputs[i].priority) + if (priority >= virLogOutputs[i].priority) { + if (virLogOutputs[i].logVersion) { + char *ver = NULL; + if (virLogVersionString(&ver, &time_info, &cur_time) >= 0) + virLogOutputs[i].f(category, priority, __func__, __LINE__, + ver, strlen(ver), + virLogOutputs[i].data); + VIR_FREE(ver); + virLogOutputs[i].logVersion = false; + } virLogOutputs[i].f(category, priority, funcname, linenr, msg, len, virLogOutputs[i].data); + } } - if ((virLogNbOutputs == 0) && (flags != 1)) + if ((virLogNbOutputs == 0) && (flags != 1)) { + if (logVersionStderr) { + char *ver = NULL; + if (virLogVersionString(&ver, &time_info, &cur_time) >= 0) + ignore_value (safewrite(STDERR_FILENO, + ver, strlen(ver))); + VIR_FREE(ver); + logVersionStderr = false; + } ignore_value (safewrite(STDERR_FILENO, msg, len)); + } virLogUnlock(); VIR_FREE(msg); -- 1.7.3.5

2 3

[libvirt] [PATCH JAVA] Add an automated build control script
by Daniel P. Berrange 11 Feb '11

11 Feb '11

Add a control script to be used by the automated build system * autobuild.sh: Automated build control file * libvirt-java.spec.in: Include %extra_release --- autobuild.sh | 31 +++++++++++++++++++++++++++++++ libvirt-java.spec.in | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) create mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh new file mode 100755 index 0000000..cca4066 --- /dev/null +++ b/autobuild.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e +set -v + +test -n "$1" && RESULTS=$1 || RESULTS=results.log + +ant clean || : + +ant build docs + +ant test 2>&1 | tee $RESULTS + +rm -f *.tar.gz +ant src + +if [ -n "$AUTOBUILD_COUNTER" ]; then + EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" +else + NOW=`date +"%s"` + EXTRA_RELEASE=".$USER$NOW" +fi + +if [ -x /usr/bin/rpmbuild ] +then + ant spec + rpmbuild --nodeps \ + --define "extra_release $EXTRA_RELEASE" \ + --define "_sourcedir `pwd`/target" \ + -ba --clean target/libvirt-java.spec +fi diff --git a/libvirt-java.spec.in b/libvirt-java.spec.in index 1ded8a0..2c972b7 100644 --- a/libvirt-java.spec.in +++ b/libvirt-java.spec.in @@ -2,7 +2,7 @@ Summary: Java bindings for the libvirt virtualization API Name: libvirt-java Version: @version@ Prefix: libvirt -Release: @release@%{?dist} +Release: @release@%{?dist}%{?extra_release} License: LGPLv2+ BuildArch: noarch Group: Development/Libraries -- 1.7.4

2 1

[libvirt] consistency of virsh help output
by Zdenek Styblik 11 Feb '11

11 Feb '11

Hello, I've found virsh help output to be inconsistent. ~~~ SNIP ~~~ attach-disk <domain> <source> <target> [--driver <string>]... X attach-interface <domain> <type> <source> [<target>] ... ~~~ SNIP ~~~ where <KEYWORD> is usually explained in OPTIONS as: ~~~ SNIP ~~~ [--domain] <string> domain name, id or uuid ~~~ SNIP ~~~ Substitution of <domain> -> [--domain] <string> resp. that you can only provide a <string> without [--domain] and it's still going to work. This took me some time to figure out. But back on point. As you can see from snips, once you use eg. <domain> and substitution resp. explanation is in OPTIONS and second you put "explanation" right into SYNOPSIS. I think it would be worth of cleaning out and make everything one way or another. Would it be a problem? I presume it's just matter of modifying "couple" printf()-s. Have a nice day, Z. -- Zdenek Styblik Net/Linux admin OS TurnovFree.net email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

3 8

[libvirt] [PATCH 0/2] set QEMUD_CMD_FLAG_PCI_MULTIBUS for x86_64 and i686 architectures
by Wen Congyang 11 Feb '11

11 Feb '11

When we attach a interface to a guest machine, we receive the following error messages: [root@wency ~]# virsh attach-interface RHEL6RC network default error: Failed to attach interface error: internal error unable to execute QEMU command 'device_add': Bus 'pci' not found This bug was caused by 0b864eb1. Wen Congyang (2): QEMUD_CMD_FLAG_PCI_MULTIBUS should be set in the function qemuCapsExtractVersionInfo() tests: set QEMUD_CMD_FLAG_PCI_MULTIBUS in testCompareXMLToArgvFiles() src/qemu/qemu_capabilities.c | 12 +++++++++--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 6 ------ src/qemu/qemu_driver.c | 20 +++++++++++--------- tests/qemuxml2argvtest.c | 9 +++++++++ 5 files changed, 30 insertions(+), 19 deletions(-)

3 5

[libvirt] [PATCH ruby-libvirt] Add a control file for automated builds
by Daniel P. Berrange 10 Feb '11

10 Feb '11

* autobuild.sh: Automated build control * ruby-libvirt.spec: Add autobuild release tag --- autobuild.sh | 29 +++++++++++++++++++++++++++++ ruby-libvirt.spec | 2 +- 2 files changed, 30 insertions(+), 1 deletions(-) create mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh new file mode 100755 index 0000000..216264e --- /dev/null +++ b/autobuild.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -e +set -v + +rake clean || : + +rake build +#rake test + +rm -rf pkg +rake package + +if [ -n "$AUTOBUILD_COUNTER" ]; then + EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" +else + NOW=`date +"%s"` + EXTRA_RELEASE=".$USER$NOW" +fi + +if [ -f /usr/bin/rpmbuild ]; then + ver=`grep '^PKG_VERSION' Rakefile | sed -e "s/PKG_VERSION=//" -e "s/'//g"` + sed -e "s/\@VERSION\@/$ver/" < ruby-libvirt.spec > pkg/ruby-libvirt.spec + rpmbuild --nodeps \ + --define "extra_release $EXTRA_RELEASE" \ + --define "_sourcedir `pwd`/pkg" \ + -ba --clean pkg/ruby-libvirt.spec +fi + diff --git a/ruby-libvirt.spec b/ruby-libvirt.spec index 2cefe2c..dd82a73 100644 --- a/ruby-libvirt.spec +++ b/ruby-libvirt.spec @@ -3,7 +3,7 @@ Name: ruby-libvirt Version: @VERSION@ -Release: 1%{?dist} +Release: 1%{?dist}%{?extra_release} Summary: Ruby bindings for libvirt Group: Development/Languages -- 1.7.4

2 1

[libvirt] domain.rng updated ?
by arnaud.champion＠devatom.fr 10 Feb '11

10 Feb '11

?Hi, I'm working on C# bindings, my goal is to expose xml descriptions (domain, node, storage and so on...) as real C# objects, for this, I'm studying the rng files provided in /docs/schemas/ directory of the sources. I'm currently working on domain.rng. I don't know if the domain.rng file is up to date because, for example, the disk device definition in the rng doesn't speak about the "address" node that a virhs dumpxml show : <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/image/Ubuntu-10.10.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> Is the domain.rng up to date or should I use the libvirt.org XML format page only ? Regards, Arnaud

2 2

[libvirt] [PATCH] Avoid warnings from nwfilter driver when run non-root
by Daniel P. Berrange 10 Feb '11

10 Feb '11

When run non-root the nwfilter driver logs error messages about being unable to find iptables/ebtables commands (they are in /sbin which isn't in $PATH). The nwfilter driver can't ever work as non-root, so simply skip it entirely thus avoiding the error messages * src/conf/nwfilter_conf.h, src/nwfilter/nwfilter_driver.c, src/nwfilter/nwfilter_gentech_driver.c, src/nwfilter/nwfilter_gentech_driver.h: Pass 'bool privileged' flag down to final driver impl * src/nwfilter/nwfilter_ebiptables_driver.c: Skip initialization if not privileged --- src/conf/nwfilter_conf.h | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 9 ++++++--- src/nwfilter/nwfilter_gentech_driver.c | 6 +++--- src/nwfilter/nwfilter_gentech_driver.h | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 8f8383f..34ff399 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -502,7 +502,7 @@ struct domUpdateCBStruct { }; -typedef int (*virNWFilterTechDrvInit)(void); +typedef int (*virNWFilterTechDrvInit)(bool privileged); typedef void (*virNWFilterTechDrvShutdown)(void); enum virDomainNetType; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index f903311..a579306 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -69,7 +69,7 @@ nwfilterDriverStartup(int privileged) { if (virNWFilterLearnInit() < 0) return -1; - virNWFilterTechDriversInit(); + virNWFilterTechDriversInit(privileged); if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) goto conf_init_err; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 1b8730d..39cd0f3 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -114,7 +114,7 @@ static const char *m_physdev_out_str = "-m physdev " PHYSDEV_OUT; #define COMMENT_VARNAME "comment" static int ebtablesRemoveBasicRules(const char *ifname); -static int ebiptablesDriverInit(void); +static int ebiptablesDriverInit(bool privileged); static void ebiptablesDriverShutdown(void); static int ebtablesCleanAll(const char *ifname); static int ebiptablesAllTeardown(const char *ifname); @@ -3653,11 +3653,14 @@ virNWFilterTechDriver ebiptables_driver = { static int -ebiptablesDriverInit(void) +ebiptablesDriverInit(bool privileged) { virBuffer buf = VIR_BUFFER_INITIALIZER; int cli_status; + if (!privileged) + return 0; + if (virMutexInit(&execCLIMutex)) return EINVAL; @@ -3730,7 +3733,7 @@ ebiptablesDriverInit(void) static void -ebiptablesDriverShutdown() +ebiptablesDriverShutdown(void) { VIR_FREE(gawk_cmd_path); VIR_FREE(grep_cmd_path); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index e64c3ec..9ef3692 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -50,17 +50,17 @@ static virNWFilterTechDriverPtr filter_tech_drivers[] = { }; -void virNWFilterTechDriversInit() { +void virNWFilterTechDriversInit(bool privileged) { int i = 0; while (filter_tech_drivers[i]) { if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) - filter_tech_drivers[i]->init(); + filter_tech_drivers[i]->init(privileged); i++; } } -void virNWFilterTechDriversShutdown() { +void virNWFilterTechDriversShutdown(void) { int i = 0; while (filter_tech_drivers[i]) { if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index c9dd4a1..271bf85 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -28,7 +28,7 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, void *data); -void virNWFilterTechDriversInit(void); +void virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); enum instCase { -- 1.7.4

2 1

[libvirt] [PATCH] Reduce log level when cgroups aren't mounted
by Daniel P. Berrange 10 Feb '11

10 Feb '11

Quite a few hosts don't have cgroups mounted and so see warnings from libvirt logged, which then cause bug reports, etc. Reduce the log level to INFO so they're not visible by default * src/qemu/qemu_driver.c: Reduce log level for cgroups --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 52ea98e..20a4157 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1331,7 +1331,7 @@ qemudStartup(int privileged) { rc = virCgroupForDriver("qemu", &qemu_driver->cgroup, privileged, 1); if (rc < 0) { char buf[1024]; - VIR_WARN("Unable to create cgroup for driver: %s", + VIR_INFO("Unable to create cgroup for driver: %s, disabling cgroups", virStrerror(-rc, buf, sizeof(buf))); } -- 1.7.4

2 1

[libvirt] [libvirt-snmp][PATCH v2] Remove the hard coded connection URI.
by Michal Privoznik 10 Feb '11

10 Feb '11

So now we rely on libvirt LIBVIRT_DEFAULT_URI environment variable. --- src/libvirtSnmp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index ce21369..39b74bd 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -180,7 +180,8 @@ int libvirtSnmpInit(void) /* virConnectOpenAuth is called here with all default parameters, * except, possibly, the URI of the hypervisor. */ /* TODO: configure the URI */ - conn = virConnectOpenAuth("qemu:///system", virConnectAuthPtrDefault, 0); + /* Use libvirt env variable LIBVIRT_DEFAULT_URI by default*/ + conn = virConnectOpenAuth("", virConnectAuthPtrDefault, 0); if (NULL == conn) { printf("No connection to hypervisor\n"); -- 1.7.3.5

3 2

[libvirt] [PATCH] Fix spice's passwdValidTo setting
by Michal Privoznik 10 Feb '11

10 Feb '11

This fix the typo in the source. https://bugzilla.redhat.com/show_bug.cgi?id=676374 --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7c1fb47..59adf36 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3873,7 +3873,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { def->data.spice.listenAddr = virXMLPropString(node, "listen"); def->data.spice.keymap = virXMLPropString(node, "keymap"); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) goto error; cur = node->children; -- 1.7.3.5

2 1

[libvirt] [libvirt-snmp][PATCH] New environment variable managing connection URI.
by Michal Privoznik 10 Feb '11

10 Feb '11

Add environment variable LIBVIRT_MIB_CONNECT_URI to control URI which snmp agent is connecting to. It is now possible to connect to all hypervisors (including test:///) instead of hardcoded qemu:///system, which is used now by default when variable is not set. --- src/libvirtSnmp.c | 5 ++++- src/libvirtSnmp.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index ce21369..7652da0 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -180,7 +180,10 @@ int libvirtSnmpInit(void) /* virConnectOpenAuth is called here with all default parameters, * except, possibly, the URI of the hypervisor. */ /* TODO: configure the URI */ - conn = virConnectOpenAuth("qemu:///system", virConnectAuthPtrDefault, 0); + /* A simple workaround for testing - environment variable */ + char *connect_uri = getenv(CONNECT_URI_ENV); + + conn = virConnectOpenAuth((connect_uri ? connect_uri : "qemu:///system"), virConnectAuthPtrDefault, 0); if (NULL == conn) { printf("No connection to hypervisor\n"); diff --git a/src/libvirtSnmp.h b/src/libvirtSnmp.h index 4ac6130..67b6125 100644 --- a/src/libvirtSnmp.h +++ b/src/libvirtSnmp.h @@ -10,6 +10,9 @@ #include <net-snmp/net-snmp-includes.h> #include <net-snmp/agent/net-snmp-agent-includes.h> +/* Environment variable to control connection URI */ +#define CONNECT_URI_ENV "LIBVIRT_MIB_CONNECT_URI" + /* * Populate libvirtGuestTable into given container. */ -- 1.7.3.5

3 2

[libvirt] [PATCH libvirt-site v2] Add information about libvirt-php new location [was Change PHP binding link to new one hosted on libvirt.org]
by Michal Novotny 10 Feb '11

10 Feb '11

Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- docs/bindings.html.in | 8 +++--- docs/php.html.in | 57 ++---------------------------------------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 87d894d..2d936a0 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -28,16 +28,16 @@ <li> PHP: Radek Hladik started developing - <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a> in 2010. + <a href="http://libvirt.org/php">PHP bindings</a> in 2010. - In February 2011 the binding development has been moved to the - <a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt.org as libvirt-php project</a>. + In February 2011 the binding development has been moved to the libvirt.org website as + libvirt-php project. The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information including the information on posting - the patches you to libvirt-php please refer to <a href="php.html">PHP binding page</a>. + the patches you to libvirt-php please refer to <a href="http://libvirt.org/php">PHP binding</a>. </li> <li> diff --git a/docs/php.html.in b/docs/php.html.in index ea4f76a..5283e67 100644 --- a/docs/php.html.in +++ b/docs/php.html.in @@ -24,60 +24,9 @@ It can also be browsed at </pre> -<h2>Building</h2> -The code is using autotools to generate the files necessary for compilation. The preferred way of building is - to run autogen.sh to generate configure script and then go on with the standard linux make commands, i.e. - -<pre> -$ cd libvirt-php -$ ./autogen.sh -$ make -</pre> - - -<h2>Enabling the module in PHP</h2> -Before you start using the module you have to install the module first. The module -php_libvirt.so is being generated when you compile it. This is necessary to be loaded -in the extensions sections of php.ini file for PHP version older than PHP-5. - -Starting with PHP-5 you can create a file called libvirt.ini in /etc/php.d having just -one line <code>extension=php_libvirt.so</code> to enable the extension. Of course, you -need to have this module copied in the directory with the rest of your PHP modules to -make PHP find the module for you. - -If you're using PHP as a module (mod_php5.so) in the Apache webserver you need to -restart your Apache to trigger configuration reload for PHP. - - -If you're not sure that you have everything set up right and you don't want to restart -your Apache webserver before you're sure everything will be working fine you could try -running the test using cli-based PHP interpreter. There are some example scripts coming -along the source codes in the <code>example</code> subdirectory so you can try to run -php on the index.php script to check whether it's working fine to establish connection or not. - - -When you're having some issues with the connection make sure the apache user is having -access to libvirt. For more information please see <a href="auth.html">Libvirt access control</a> page. - -<h2>Contribution</h2> - -If you would like to contribute to the libvirt-php project you could write patches for it but please -make sure you're following the procedure below: - -<ol> - <li>Sign up to libvirt list if you're not on it yet (libvir-list(a)redhat.com)</li> - <li>Clone the repository from libvirt.org site using: - <pre>git clone git://libvirt.org/libvirt-php</pre> - </li> - <li>Set your git username and e-mail and also set the subject prefix in the project's repository using: - <pre>git config --local format.subjectprefix "libvirt-php"</pre> - </li> - <li>Create the patch in the form of the commits and include also information about usage (example source codes maybe) and testing</li> - <li>Format it using <code>git format-patch -X</code> where X is the number of patch parts to be posted, for multipart patch (X is greater than 1) please use also numbering (-n) option and include the cover-letter (--cover-letter).</li> - <li>Send to libvir-list(a)redhat.com using the <code>git send-email <files> --to libvir-list(a)redhat.com</code> command where <files> can be 000* to send all the patches formatted by git format-patch since git format-patch names the files starting with the 4 digit numbers.</li> -</ol> - -When you send the patch you're patch will be reviewed and later committed to the libvirt-php repository. You'll be contacted in case some flaws are found during the review. +<h2>Project pages</h2> +Since February 2011 the project have it's own pages hosted at libvirt.org. For more information on the project + please refer to <a href="http://libvirt.org/php">http://libvirt.org/php</a>. -- 1.7.3.2

2 2

Re: [libvirt] [PATCH] Basic support for VDE networking
by LiuCougar 09 Feb '11

09 Feb '11

On 12/01/2011, at 11:29 PM, Daniel P. Berrange wrote: > On Tue, Jan 11, 2011 at 04:12:57PM +0100, Renzo Davoli wrote: >> I have seen several messages asking for VDE networking support. >> There is an item also in your todo web page. >> http://libvirt.org/todo.html >> I have developed a patch to provide a basic support for VDE. >> It defines and manages the syntax: >> >> <domain ....> >> <device> >> <interface type='vde'> >> ... >> <switch path='/tmp/vde.ctl'/> >> </interface> >> </device> >> </domain> >> >> the switch tag can be omitted: vde uses the default switch. >> I have tested the qemu/kvm support. >> user-mode linux support is included but not tested yet. >> libvirt vde support for virtualbox has not been coded yet (virtualbox >> itself supports vde). ... > eg, so you'd be able to create/delete/manage VDE daemon instances > using the 'virsh net-XXX' command set. The guest domains would be > connected to VDE using the existing <interface type='network'> > syntax, and not expose any 'vde' syntax in the guest XML directly. > I think letting apps manage VDE daemon instances via the libvirt > APi would make this functionality much more friendly & useful The patch as it's submitted in this thread is very useful for all users of qemu/kvm with VDE: it makes it possible for these users to directly migrated to libvirt to manage VMs without too much hassle. If it can be managed automatically by libvirt, that would be a plus, but even then, I think it would be good to still support exposing VDE directly in the XML so users can manually handle VDE configuration if they choose to do so. Is it possible to merge this patch into libvirt so VDE users can benefit from libvirt? thanks, liucougar

1 0

[libvirt] [PATCH] build: distribute 'make syntax-check' tweaks
by Eric Blake 09 Feb '11

09 Feb '11

* Makefile.am (EXTRA_DIST): Distribute cfg.mk. --- I noticed that the 0.8.7 tarball lacks cfg.mk, so running 'make syntax-check' on that tarball is bound to have problems (without that file, you don't exempt tests in gnulib's maint.mk that libvirt is not interested in, and you miss out on lots of other tests that are libvirt-specific). Tested with 'make distcheck', then inspecting the resulting tarball. I almost pushed this under a trivial rule, but restrained myself to wait for a proper review. :) Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.am b/Makefile.am index 597ec61..882e676 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ EXTRA_DIST = \ autobuild.sh \ Makefile.nonreentrant \ autogen.sh \ + cfg.mk \ examples/domain-events/events-python \ $(syntax_check_exceptions) \ $(XML_EXAMPLES) -- 1.7.3.5

2 3

[libvirt] [PATCH] maint: whitespace cleanup
by Eric Blake 09 Feb '11

09 Feb '11

* cfg.mk (sc_TAB_in_indentation): Check more files. * .dir-locals.el (html-mode): Let emacs help out. * docs/internals/command.html.in: Fix offenders. * docs/formatdomain.html.in: Likewise. * docs/internals.html.in: Likewise. Reported by Jiri Denemark. --- Here's the git diff -b output; actual patch below the diffstat. diff --git c/.dir-locals.el w/.dir-locals.el index 7c483d2..f24ec61 100644 --- c/.dir-locals.el +++ w/.dir-locals.el @@ -5,4 +5,7 @@ (c-indent-level . 4) (c-basic-offset . 4) )) + (html-mode . ( + (indent-tabs-mode . nil) + )) ) diff --git c/cfg.mk w/cfg.mk index 7664bdf..120f452 100644 --- c/cfg.mk +++ w/cfg.mk @@ -322,13 +322,13 @@ sc_prohibit_ctype_h: halt="don't use ctype.h; instead, use c-ctype.h" \ $(_sc_search_regexp) -# Ensure that no C source file or rng schema uses TABs for +# Ensure that no C source file, docs, or rng schema uses TABs for # indentation. Also match *.h.in files, to get libvirt.h.in. Exclude # files in gnulib, since they're imported. sc_TAB_in_indentation: @prohibit='^ * ' \ - in_vc_files='(\.(rng|[ch](\.in)?)|(daemon|tools)/.*\.in)$$' \ - halt='use spaces, not TAB, for indentation in C, sh, and RNG schemas' \ + in_vc_files='(\.(rng|[ch](\.in)?|html.in)|(daemon|tools)/.*\.in)$$' \ + halt='use leading spaces, not TAB, in C, sh, html, and RNG schemas' \ $(_sc_search_regexp) ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\ .dir-locals.el | 3 + cfg.mk | 6 +- docs/formatdomain.html.in | 224 ++++++++++++++++++++-------------------- docs/internals.html.in | 4 +- docs/internals/command.html.in | 32 +++--- 5 files changed, 136 insertions(+), 133 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 7c483d2..f24ec61 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -5,4 +5,7 @@ (c-indent-level . 4) (c-basic-offset . 4) )) + (html-mode . ( + (indent-tabs-mode . nil) + )) ) diff --git a/cfg.mk b/cfg.mk index 7664bdf..120f452 100644 --- a/cfg.mk +++ b/cfg.mk @@ -322,13 +322,13 @@ sc_prohibit_ctype_h: halt="don't use ctype.h; instead, use c-ctype.h" \ $(_sc_search_regexp) -# Ensure that no C source file or rng schema uses TABs for +# Ensure that no C source file, docs, or rng schema uses TABs for # indentation. Also match *.h.in files, to get libvirt.h.in. Exclude # files in gnulib, since they're imported. sc_TAB_in_indentation: @prohibit='^ * ' \ - in_vc_files='(\.(rng|[ch](\.in)?)|(daemon|tools)/.*\.in)$$' \ - halt='use spaces, not TAB, for indentation in C, sh, and RNG schemas' \ + in_vc_files='(\.(rng|[ch](\.in)?|html.in)|(daemon|tools)/.*\.in)$$' \ + halt='use leading spaces, not TAB, in C, sh, html, and RNG schemas' \ $(_sc_search_regexp) ctype_re = isalnum|isalpha|isascii|isblank|iscntrl|isdigit|isgraph|islower\ diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 43c78fc..b048bb5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -304,20 +304,20 @@ omitted, it defaults to the OS provided defaults.</dd> <dt><code>hard_limit</code></dt> <dd> The optional <code>hard_limit</code> element is the maximum memory - the guest can use. The units for this value are kilobytes (i.e. blocks - of 1024 bytes)</dd> + the guest can use. The units for this value are kilobytes (i.e. blocks + of 1024 bytes)</dd> <dt><code>soft_limit</code></dt> <dd> The optional <code>soft_limit</code> element is the memory limit to - enforce during memory contention. The units for this value are - kilobytes (i.e. blocks of 1024 bytes)</dd> + enforce during memory contention. The units for this value are + kilobytes (i.e. blocks of 1024 bytes)</dd> <dt><code>swap_hard_limit</code></dt> <dd> The optional <code>swap_hard_limit</code> element is the maximum - swap the guest can use. The units for this value are kilobytes - (i.e. blocks of 1024 bytes)</dd> + swap the guest can use. The units for this value are kilobytes + (i.e. blocks of 1024 bytes)</dd> <dt><code>min_guarantee</code></dt> <dd> The optional <code>min_guarantee</code> element is the guaranteed - minimum memory allocation for the guest. The units for this value are - kilobytes (i.e. blocks of 1024 bytes)</dd> + minimum memory allocation for the guest. The units for this value are + kilobytes (i.e. blocks of 1024 bytes)</dd> <dt><code>vcpu</code></dt> <dd>The content of this element defines the maximum number of virtual CPUs allocated for the guest OS, which must be between 1 and @@ -387,8 +387,8 @@ match the specification.</dd> </dl> - Since 0.8.5 the <code>match</code> - attribute can be omitted and will default to <code>exact</code>. + Since 0.8.5 the <code>match</code> + attribute can be omitted and will default to <code>exact</code>. </dd> <dt><code>model</code></dt> @@ -436,8 +436,8 @@ CPU.</dd> </dl> - Since 0.8.5 the <code>policy</code> - attribute can be omitted and will default to <code>require</code>. + Since 0.8.5 the <code>policy</code> + attribute can be omitted and will default to <code>require</code>. </dd> </dl> @@ -566,101 +566,101 @@ <dl> <dt><code>clock</code></dt> <dd> - The <code>offset</code> attribute takes four possible - values, allowing fine grained control over how the guest - clock is synchronized to the host. NB, not all hypervisors - support all modes. - <dl> - <dt><code>utc</code></dt> - <dd> - The guest clock will always be synchronized to UTC when - booted</dd> - <dt><code>localtime</code></dt> - <dd> - The guest clock will be synchronized to the host's configured - timezone when booted, if any. - </dd> - <dt><code>timezone</code></dt> - <dd> - The guest clock will be synchronized to the requested timezone - using the <code>timezone</code> attribute. - Since 0.7.7 - </dd> - <dt><code>variable</code></dt> - <dd> - The guest clock will have an arbitrary offset applied - relative to UTC. The delta relative to UTC is specified - in seconds, using the <code>adjustment</code> attribute. - The guest is free to adjust the RTC over time an expect - that it will be honoured at next reboot. This is in - contrast to 'utc' mode, where the RTC adjustments are - lost at each reboot. Since 0.7.7 - </dd> - </dl> - - A <code>clock</code> may have zero or more - <code>timer</code>sub-elements. Since - 0.8.0 - + The <code>offset</code> attribute takes four possible + values, allowing fine grained control over how the guest + clock is synchronized to the host. NB, not all hypervisors + support all modes. + <dl> + <dt><code>utc</code></dt> + <dd> + The guest clock will always be synchronized to UTC when + booted</dd> + <dt><code>localtime</code></dt> + <dd> + The guest clock will be synchronized to the host's configured + timezone when booted, if any. + </dd> + <dt><code>timezone</code></dt> + <dd> + The guest clock will be synchronized to the requested timezone + using the <code>timezone</code> attribute. + Since 0.7.7 + </dd> + <dt><code>variable</code></dt> + <dd> + The guest clock will have an arbitrary offset applied + relative to UTC. The delta relative to UTC is specified + in seconds, using the <code>adjustment</code> attribute. + The guest is free to adjust the RTC over time an expect + that it will be honoured at next reboot. This is in + contrast to 'utc' mode, where the RTC adjustments are + lost at each reboot. Since 0.7.7 + </dd> + </dl> + + A <code>clock</code> may have zero or more + <code>timer</code>sub-elements. Since + 0.8.0 + </dd> <dt><code>timer</code></dt> <dd> - - Each timer element requires a <code>name</code> attribute, - and has other optional attributes that depend on - the <code>name</code> specified. Various hypervisors - support different combinations of attributes. - - <dl> - <dt><code>name</code></dt> - <dd> - The <code>name</code> attribute selects which timer is - being modified, and can be one of "platform", "pit", - "rtc", "hpet", or "tsc". - </dd> - <dt><code>track</code></dt> - <dd> - The <code>track</code> attribute specifies what the timer - tracks, and can be "boot", "guest", or "wall". - Only valid for <code>name="rtc"</code> - or <code>name="platform"</code>. - </dd> - <dt><code>tickpolicy</code></dt> - <dd> - The <code>tickpolicy</code> attribute determines how - missed ticks in the guest are handled, and can be "delay", - "catchup", "merge", or "discard". If the policy is - "catchup", there can be further details in - the <code>catchup</code> sub-element. - <dl> - <dt><code>catchup</code></dt> - <dd> - The <code>catchup</code> element has three optional - attributes, each a positive integer. The attributes - are <code>threshold</code>, <code>slew</code>, - and <code>limit</code>. - </dd> - </dl> - </dd> - <dt><code>frequency</code></dt> - <dd> - The <code>frequency</code> attribute is an unsigned - integer specifying the frequency at - which <code>name="tsc"</code> runs. - </dd> - <dt><code>mode</code></dt> - <dd> - The <code>mode</code> attribute controls how - the <code>name="tsc"</code> timer is managed, and can be - "auto", "native", "emulate", "paravirt", or "smpsafe". - Other timers are always emulated. - </dd> - <dt><code>present</code></dt> - <dd> - The <code>present</code> attribute can be "yes" or "no" to - specify whether a particular timer is available to the guest. - </dd> - </dl> + + Each timer element requires a <code>name</code> attribute, + and has other optional attributes that depend on + the <code>name</code> specified. Various hypervisors + support different combinations of attributes. + + <dl> + <dt><code>name</code></dt> + <dd> + The <code>name</code> attribute selects which timer is + being modified, and can be one of "platform", "pit", + "rtc", "hpet", or "tsc". + </dd> + <dt><code>track</code></dt> + <dd> + The <code>track</code> attribute specifies what the timer + tracks, and can be "boot", "guest", or "wall". + Only valid for <code>name="rtc"</code> + or <code>name="platform"</code>. + </dd> + <dt><code>tickpolicy</code></dt> + <dd> + The <code>tickpolicy</code> attribute determines how + missed ticks in the guest are handled, and can be "delay", + "catchup", "merge", or "discard". If the policy is + "catchup", there can be further details in + the <code>catchup</code> sub-element. + <dl> + <dt><code>catchup</code></dt> + <dd> + The <code>catchup</code> element has three optional + attributes, each a positive integer. The attributes + are <code>threshold</code>, <code>slew</code>, + and <code>limit</code>. + </dd> + </dl> + </dd> + <dt><code>frequency</code></dt> + <dd> + The <code>frequency</code> attribute is an unsigned + integer specifying the frequency at + which <code>name="tsc"</code> runs. + </dd> + <dt><code>mode</code></dt> + <dd> + The <code>mode</code> attribute controls how + the <code>name="tsc"</code> timer is managed, and can be + "auto", "native", "emulate", "paravirt", or "smpsafe". + Other timers are always emulated. + </dd> + <dt><code>present</code></dt> + <dd> + The <code>present</code> attribute can be "yes" or "no" to + specify whether a particular timer is available to the guest. + </dd> + </dl> </dd> </dl> @@ -1490,7 +1490,7 @@ qemu-kvm -net nic,model=? /dev/null </dd> <dt><code>"spice"</code></dt> <dd> - + Starts a SPICE server. The <code>port</code> attribute specifies the TCP port number (with -1 as legacy syntax indicating that it should be auto-allocated), while <code>tlsPort</code> gives an alternative @@ -1502,8 +1502,8 @@ qemu-kvm -net nic,model=? /dev/null to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> assumed to be in UTC. NB, this may not be supported by all hypervisors. - - + + When SPICE has both a normal and TLS secured TCP port configured, it can be desirable to restrict what channels can be run on each port. This is achieved by adding one or more <channel> elements inside @@ -1511,8 +1511,8 @@ qemu-kvm -net nic,model=? /dev/null <code>main</code>, <code>display</code>, <code>inputs</code>, <code>cursor</code>, <code>playback</code>, <code>record</code>; and since 0.8.8: <code>smartcard</code>. - - <pre> + + <pre> <graphics type='spice' port='-1' tlsPort='-1' autoport='yes'> <channel name='main' mode='secure'/> <channel name='record' mode='insecure'/> @@ -1569,7 +1569,7 @@ qemu-kvm -net nic,model=? /dev/null <dd> The <code>model</code> element has a mandatory <code>type</code> attribute which takes the value "vga", "cirrus", "vmvga", "qxl", - "xen" or "vbox", depending on the hypervisor features available. + "xen" or "vbox", depending on the hypervisor features available. You can also provide the amount of video memory in kilobytes using <code>vram</code> and the number of screen with <code>heads</code>. </dd> @@ -2167,8 +2167,8 @@ qemu-kvm -net nic,model=? /dev/null <dd> The required <code>model</code> attribute specifies what type - of balloon device is provided. Valid values are specific to - the virtualization platform + of balloon device is provided. Valid values are specific to + the virtualization platform <ul> <li>'virtio' — default with QEMU/KVM</li> diff --git a/docs/internals.html.in b/docs/internals.html.in index dc88eab..6fa2de3 100644 --- a/docs/internals.html.in +++ b/docs/internals.html.in @@ -10,10 +10,10 @@ <ul> <li>Introduction to basic rules and guidelines for <a href="hacking.html">hacking<a> - on libvirt code</li> + on libvirt code</li> <li>Guide to adding <a href="api_extension.html">public APIs<a></li> <li>Approach for <a href="internals/command.html">spawning commands</a> from - libvirt driver code</li> + libvirt driver code</li> </ul> </body> diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index 95d2b81..27dcf9c 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -20,27 +20,27 @@ <ul> <li><code>fork+exec</code>: The lowest & most flexible - level, but very hard to use correctly / safely. It - is easy to leak file descriptors, have unexpected - signal handler behaviour and not handle edge cases. - Furthermore, it is not portable to mingw. - </li> + level, but very hard to use correctly / safely. It + is easy to leak file descriptors, have unexpected + signal handler behaviour and not handle edge cases. + Furthermore, it is not portable to mingw. + </li> <li><code>system</code>: Convenient if you don't care - about capturing command output, but has the serious - downside that the command string is interpreted by - the shell. This makes it very dangerous to use, because - improperly validated user input can lead to exploits - via shell meta characters. + about capturing command output, but has the serious + downside that the command string is interpreted by + the shell. This makes it very dangerous to use, because + improperly validated user input can lead to exploits + via shell meta characters. </li> <li><code>popen</code>: Inherits the flaws of - <code>system</code>, and has no option for bi-directional - communication. + <code>system</code>, and has no option for bi-directional + communication. </li> <li><code>posix_spawn</code>: A half-way house between - simplicity of system() and the flexibility of fork+exec. - It does not allow for a couple of important features - though, such as running a hook between the fork+exec - stage, or closing all open file descriptors.</li> + simplicity of system() and the flexibility of fork+exec. + It does not allow for a couple of important features + though, such as running a hook between the fork+exec + stage, or closing all open file descriptors.</li> </ul> -- 1.7.4

2 3

[libvirt] [PATCH libvirt-site v2] Add information about libvirt-php new location [was Change PHP binding link to new one hosted on libvirt.org]
by Michal Novotny 09 Feb '11

09 Feb '11

Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- docs/bindings.html.in | 8 +++--- docs/php.html.in | 57 ++---------------------------------------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 87d894d..2d936a0 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -28,16 +28,16 @@ <li> PHP: Radek Hladik started developing - <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a> in 2010. + <a href="http://libvirt.org/php">PHP bindings</a> in 2010. - In February 2011 the binding development has been moved to the - <a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt.org as libvirt-php project</a>. + In February 2011 the binding development has been moved to the libvirt.org website as + libvirt-php project. The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information including the information on posting - the patches you to libvirt-php please refer to <a href="php.html">PHP binding page</a>. + the patches you to libvirt-php please refer to <a href="http://libvirt.org/php">PHP binding</a>. </li> <li> diff --git a/docs/php.html.in b/docs/php.html.in index ea4f76a..5283e67 100644 --- a/docs/php.html.in +++ b/docs/php.html.in @@ -24,60 +24,9 @@ It can also be browsed at </pre> -<h2>Building</h2> -The code is using autotools to generate the files necessary for compilation. The preferred way of building is - to run autogen.sh to generate configure script and then go on with the standard linux make commands, i.e. - -<pre> -$ cd libvirt-php -$ ./autogen.sh -$ make -</pre> - - -<h2>Enabling the module in PHP</h2> -Before you start using the module you have to install the module first. The module -php_libvirt.so is being generated when you compile it. This is necessary to be loaded -in the extensions sections of php.ini file for PHP version older than PHP-5. - -Starting with PHP-5 you can create a file called libvirt.ini in /etc/php.d having just -one line <code>extension=php_libvirt.so</code> to enable the extension. Of course, you -need to have this module copied in the directory with the rest of your PHP modules to -make PHP find the module for you. - -If you're using PHP as a module (mod_php5.so) in the Apache webserver you need to -restart your Apache to trigger configuration reload for PHP. - - -If you're not sure that you have everything set up right and you don't want to restart -your Apache webserver before you're sure everything will be working fine you could try -running the test using cli-based PHP interpreter. There are some example scripts coming -along the source codes in the <code>example</code> subdirectory so you can try to run -php on the index.php script to check whether it's working fine to establish connection or not. - - -When you're having some issues with the connection make sure the apache user is having -access to libvirt. For more information please see <a href="auth.html">Libvirt access control</a> page. - -<h2>Contribution</h2> - -If you would like to contribute to the libvirt-php project you could write patches for it but please -make sure you're following the procedure below: - -<ol> - <li>Sign up to libvirt list if you're not on it yet (libvir-list(a)redhat.com)</li> - <li>Clone the repository from libvirt.org site using: - <pre>git clone git://libvirt.org/libvirt-php</pre> - </li> - <li>Set your git username and e-mail and also set the subject prefix in the project's repository using: - <pre>git config --local format.subjectprefix "libvirt-php"</pre> - </li> - <li>Create the patch in the form of the commits and include also information about usage (example source codes maybe) and testing</li> - <li>Format it using <code>git format-patch -X</code> where X is the number of patch parts to be posted, for multipart patch (X is greater than 1) please use also numbering (-n) option and include the cover-letter (--cover-letter).</li> - <li>Send to libvir-list(a)redhat.com using the <code>git send-email <files> --to libvir-list(a)redhat.com</code> command where <files> can be 000* to send all the patches formatted by git format-patch since git format-patch names the files starting with the 4 digit numbers.</li> -</ol> - -When you send the patch you're patch will be reviewed and later committed to the libvirt-php repository. You'll be contacted in case some flaws are found during the review. +<h2>Project pages</h2> +Since February 2011 the project have it's own pages hosted at libvirt.org. For more information on the project + please refer to <a href="http://libvirt.org/php">http://libvirt.org/php</a>. -- 1.7.3.2

1 0

[libvirt] [PATCH libvirt site] Change PHP binding link to new one hosted on libvirt.org
by Michal Novotny 09 Feb '11

09 Feb '11

Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- docs/bindings.html.in | 8 ++++---- docs/sitemap.html.in | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 87d894d..2d936a0 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -28,16 +28,16 @@ <li> PHP: Radek Hladik started developing - <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a> in 2010. + <a href="http://libvirt.org/php">PHP bindings</a> in 2010. - In February 2011 the binding development has been moved to the - <a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt.org as libvirt-php project</a>. + In February 2011 the binding development has been moved to the libvirt.org website as + libvirt-php project. The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information including the information on posting - the patches you to libvirt-php please refer to <a href="php.html">PHP binding page</a>. + the patches you to libvirt-php please refer to <a href="http://libvirt.org/php">PHP binding</a>. </li> <li> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index ac0af71..c987c49 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -266,10 +266,6 @@ <a href="csharp.html">C#</a> overview of the C# API bindings </li> - <li> - <a href="php.html">PHP</a> - overview of the PHP API bindings - </li> </ul> </li> <li> -- 1.7.3.2

2 4

Re: [libvirt] [virt-tools-list] difference between blkid of a system and uuid of virtual machine by virt-manager
by Cole Robinson 09 Feb '11

09 Feb '11

On 02/08/2011 02:06 PM, Tapas Mishra wrote: > I want to know what is the difference between the output blkid command > shows and the uuid which is set by virt-manager > while creating a guest. > Suppose in case of a re installation sort of situation I want to do a > fresh install and restore things from a backup then > where does this UUID thing comes into picture and what is its role > with respect to Virtual Machines. > > AFAIU it's just a unique identifier for use with libvirt, though nowadays it might be passed down to the guest for other purposes. cc-ing libvirt-list - Cole

1 0

[libvirt] [PATCH] Adjust some log levels in udev driver
by Daniel P. Berrange 09 Feb '11

09 Feb '11

Most of te VIR_INFO calls in the udev driver are only relevant to developers so can switch to VIR_DEBUG. Failure to initialize libpciaccess though is a fatal error * src/node_device/node_device_udev.c: Adjust log levels --- src/node_device/node_device_udev.c | 44 ++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 93390af..475cbb5 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -116,8 +116,8 @@ static int udevGetDeviceProperty(struct udev_device *udev_device, udev_value = udev_device_get_property_value(udev_device, property_key); if (udev_value == NULL) { - VIR_INFO(_("udev reports device '%s' does not have property '%s'"), - udev_device_get_sysname(udev_device), property_key); + VIR_DEBUG("udev reports device '%s' does not have property '%s'", + udev_device_get_sysname(udev_device), property_key); ret = PROPERTY_MISSING; goto out; } @@ -205,8 +205,8 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device, udev_value = udev_device_get_sysattr_value(udev_device, attr_name); if (udev_value == NULL) { - VIR_INFO(_("udev reports device '%s' does not have sysfs attr '%s'"), - udev_device_get_sysname(udev_device), attr_name); + VIR_DEBUG("udev reports device '%s' does not have sysfs attr '%s'", + udev_device_get_sysname(udev_device), attr_name); ret = PROPERTY_MISSING; goto out; } @@ -950,9 +950,9 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) { int ret = -1; - VIR_INFO("Could not find definitive storage type for device " - "with sysfs path '%s', trying to guess it", - def->sysfs_path); + VIR_DEBUG("Could not find definitive storage type for device " + "with sysfs path '%s', trying to guess it", + def->sysfs_path); if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { /* virtio disk */ @@ -963,8 +963,8 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) } if (ret != 0) { - VIR_INFO("Could not determine storage type for device " - "with sysfs path '%s'", def->sysfs_path); + VIR_DEBUG("Could not determine storage type for device " + "with sysfs path '%s'", def->sysfs_path); } else { VIR_DEBUG("Found storage type '%s' for device " "with sysfs path '%s'", @@ -1062,8 +1062,8 @@ static int udevProcessStorage(struct udev_device *device, } else if (STREQ(def->caps->data.storage.drive_type, "floppy")) { ret = udevProcessFloppy(device, def); } else { - VIR_INFO("Unsupported storage type '%s'", - def->caps->data.storage.drive_type); + VIR_DEBUG("Unsupported storage type '%s'", + def->caps->data.storage.drive_type); goto out; } @@ -1141,9 +1141,9 @@ static int udevGetDeviceType(struct udev_device *device, goto out; } - VIR_INFO("Could not determine device type for device " - "with sysfs path '%s'", - udev_device_get_sysname(device)); + VIR_DEBUG("Could not determine device type for device " + "with sysfs path '%s'", + udev_device_get_sysname(device)); ret = -1; out: @@ -1209,8 +1209,8 @@ static int udevRemoveOneDevice(struct udev_device *device) dev->def->name, name); virNodeDeviceObjRemove(&driverState->devs, dev); } else { - VIR_INFO("Failed to find device to remove that has udev name '%s'", - name); + VIR_DEBUG("Failed to find device to remove that has udev name '%s'", + name); ret = -1; } nodeDeviceUnlock(driverState); @@ -1237,8 +1237,8 @@ static int udevSetParent(struct udev_device *device, parent_sysfs_path = udev_device_get_syspath(parent_device); if (parent_sysfs_path == NULL) { - VIR_INFO("Could not get syspath for parent of '%s'", - udev_device_get_syspath(parent_device)); + VIR_DEBUG("Could not get syspath for parent of '%s'", + udev_device_get_syspath(parent_device)); } dev = virNodeDeviceFindBySysfsPath(&driverState->devs, @@ -1350,8 +1350,8 @@ static int udevProcessDeviceListEntry(struct udev *udev, if (device != NULL) { if (udevAddOneDevice(device) != 0) { - VIR_INFO("Failed to create node device for udev device '%s'", - name); + VIR_DEBUG("Failed to create node device for udev device '%s'", + name); } ret = 0; } @@ -1598,8 +1598,8 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) if ((pciret = pci_system_init()) != 0) { char ebuf[256]; - VIR_INFO("Failed to initialize libpciaccess: %s", - virStrerror(pciret, ebuf, sizeof ebuf)); + VIR_ERROR("Failed to initialize libpciaccess: %s", + virStrerror(pciret, ebuf, sizeof ebuf)); ret = -1; goto out; } -- 1.7.4

3 2

[libvirt] [libvirt-snmp][PATCH] Created .gitignore to ignore generated/compiled files.
by Michal Privoznik 09 Feb '11

09 Feb '11

I've forgotten to add .gitignore to let git ignore some garbage. --- .gitignore | 27 +++++++++++++++++++++++++++ src/.gitignore | 10 ++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f4821fb --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +#*# +*.#*# +*.a +*.exe +*.gcda +*.gcno +*.gcov +*.o +*.orig +*.rej +*~ +.git +.git-module-status +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache/ +/config.h +/config.h.in +/config.log +/config.status +/configure +/depcomp +/install-sh +/libvirt-snmp.spec +/missing +/stamp-h1 diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..2c8801e --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +.deps +.libs +*.lo +*.loT +*.la +*.exe +*.cov +/libvirtMib_subagent -- 1.7.3.5

2 1

[libvirt] [PATCH] Reserve PCI addresses 3 and 4 on qemu-system-ppc
by Niels de Vos 09 Feb '11

09 Feb '11

On PPC emulated by recent versions of qemu, PCI-bus 0 already has a macio connected in slot 3 and OHCI on slot 4. Reference: - https://bugzilla.redhat.com/show_bug.cgi?id=667345 Signed-off-by: Niels de Vos <ndevos(a)redhat.com> --- Imho this patch is relatively ugly. Unfortunately I did not find a better way of changing the reserved PCI-addresses on a per architecture basis. It can well be that qemuAssignDevicePCISlots() needs to be updated for other architectures as well. A more modular/dynamic approach might be more suitable. Feel free to suggest an alternative way to solve this. Thanks, Niels src/qemu/qemu_command.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f78ce71..50e3ad7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -983,6 +983,14 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) goto error; } + /* qemu-system-ppc has macio on slot 3 and ohci on slot 4 */ + if (STREQ(def->os.arch, "ppc")) { + if (qemuDomainPCIAddressReserveSlot(addrs, 3) < 0) + goto error; + if (qemuDomainPCIAddressReserveSlot(addrs, 4) < 0) + goto error; + } + /* Network interfaces */ for (i = 0; i < def->nnets ; i++) { if (def->nets[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) -- 1.7.4

3 4