- Devel - libvirt List Archives

[libvirt] [PATCH] docs: added new entries to apps page, plus adjusted a few existing
by Justin Clift 20 Jan '11

20 Jan '11

Added new entries for Hudson, LCFG, Tivoli Provisioning Manager, virt-what, and Zenoss. Adjusted the existing entries for BuildBot and vmware2libvirt. --- docs/apps.html.in | 94 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 76 insertions(+), 18 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index 054e8c2..09a1a7f 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -23,18 +23,6 @@ <img src="madeWith.png" alt="Made with libvirt"/> </p> - <h2><a name="automatedtesting">Automated compile/testing</a></h2> - - <dl> - <dt><a href="http://buildbot.net">BuildBot</a></dt> - <dd> - BuildBot is a system to automate the compile/test cycle required - by most software projects. CVS commits trigger new builds, run on - a variety of client machines. Build status (pass/fail/etc) are - displayed on a web page or through other protocols. - </dd> - </dl> - <h2><a name="clientserver">Client/Server applications</a></h2> <dl> @@ -103,6 +91,56 @@ Watch the CPU, memory, network and disk utilization of all virtual machines running on a host. </dd> + <dt> + <a href="http://people.redhat.com/~rjones/virt-what/">virt-what</a> + </dt> + <dd> + virt-what is a shell script for detecting if the program is running + in a virtual machine. It prints out a list of facts about the + virtual machine, derived from heuristics. + </dd> + </dl> + + <h2><a name="configmgmt">Configuration Management</a></h2> + + <dl> + <dt><a href="https://wiki.lcfg.org/bin/view/LCFG/LcfgLibvirt">LCFG</a></dt> + <dd> + LCFG is a system for automatically installing and managing the + configuration of large numbers of Unix systems. It is particularly + suitable for sites with very diverse and rapidly changing + configurations. + </dd> + <dd> + The lcfg-libvirt package adds support for virtualized systems to + LCFG, with both Xen and KVM known to work. Cloning guests is + supported, as are the bridged, routed, and isolated modes for + Virtual Networking. + </dd> + </dl> + + <h2><a name="continuousintegration">Continuous Integration</a></h2> + + <dl> + <dt><a href="http://buildbot.net/buildbot/docs/current/Libvirt.html">BuildBot</a></dt> + <dd> + BuildBot is a system to automate the compile/test cycle required + by most software projects. CVS commits trigger new builds, run on + a variety of client machines. Build status (pass/fail/etc) are + displayed on a web page or through other protocols. + </dd> + </dl> + + <dl> + <dt><a href="http://wiki.hudson-ci.org/display/HUDSON/Libvirt+Slaves+Plugin">Hudson</a></dt> + <dd> + This plugin for Hudson adds a way to control guest domains hosted + on Xen or QEMU/KVM. You configure a Hudson Slave, + selecting the guest domain and hypervisor. When you need to build a + job on a specific Slave, its guest domain is started, then the job is + run. When the build process is finished, the guest domain is shut + down, ready to be used again as required. + </dd> </dl> <h2><a name="conversion">Conversion</a></h2> @@ -133,9 +171,10 @@ possible. This conversion requires some Microsoft signed pieces, that Red Hat can provide. </dd> - <dt><a href="http://bazaar.launchpad.net/~ubuntu-virt/virt-goodies/trunk/annotate/head:/…">vmware2libvirt</a></dt> + <dt><a href="https://launchpad.net/virt-goodies">vmware2libvirt</a></dt> <dd> - A Python script for migrating a vmware image to libvirt. + Part of the <i>virt-goodies</i> package, vmware2libvirt is a python + script for migrating a vmware image to libvirt. </dd> </dl> @@ -188,9 +227,9 @@ </dd> </dl> - <h2><a name="monitoring">Monitoring plugins</a></h2> + <h2><a name="monitoring">Monitoring</a></h2> <dl> - <dt><a href="http://collectd.org/plugins/libvirt.shtml">for collectd</a></dt> + <dt><a href="http://collectd.org/plugins/libvirt.shtml">collectd</a></dt> <dd> The libvirt-plugin is part of <a href="http://collectd.org/">collectd</a> and gathers statistics about virtualized guests on a system. This @@ -199,13 +238,13 @@ For a full description, please refer to the libvirt section in the collectd.conf(5) manual page. </dd> - <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">for munin</a></dt> + <dt><a href="http://honk.sigxcpu.org/projects/libvirt/#munin">Munin</a></dt> <dd> The plugins provided by Guido Günther allow to monitor various things like network and block I/O with <a href="http://munin.projects.linpro.no/">Munin</a>. </dd> - <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">nagios-virt</a></dt> + <dt><a href="http://et.redhat.com/~rjones/nagios-virt/">Nagios-virt</a></dt> <dd> Nagios-virt is a configuration tool to add monitoring of your virtualised domains to <a href="http://www.nagios.org/">Nagios</a>. @@ -213,8 +252,27 @@ your Xen or QEMU/KVM guests, or to integrate with your existing Nagios installation. </dd> + <dt><a href="http://community.zenoss.org/docs/DOC-4687">Zenoss</a></dt> + <dd> + The Zenoss libvirt Zenpack adds support for monitoring virtualization + servers. It has been tested with KVM, QEMU, VMware ESX, and VMware + GSX. + </dd> </dl> + <h2><a name="provisioning">Provisioning</a></h2> + + <dl> + <dt><a href="http://www.ibm.com/software/tivoli/products/prov-mgr/">Tivoli Provisioning Manager</a></dt> + <dd> + Part of the IBM Tivoli family, Tivoli Provisioning Manager (TPM) is + an IT lifecycle automation product. It + <a href="http://publib.boulder.ibm.com/infocenter/tivihelp/v38r1/index.jsp?topic=/co…">uses libvirt</a> + for communication with virtualization hosts and guest domains. + </dd> + </dl> + + <h2><a name="web">Web applications</a></h2> <dl> -- 1.7.3.5

2 2

[libvirt] [PATCH] docs: document <sysinfo> and <symbios> elements
by Eric Blake 20 Jan '11

20 Jan '11

* docs/formatdomain.html.in: Talk about <sysinfo> throughout. --- More in the vein of adding missing documentation. docs/formatdomain.html.in | 79 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 78 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8d6b69e..9719346 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -48,7 +48,10 @@ a globally unique identifier for the virtual machine. The format must be RFC 4122 compliant, eg <code>3e3fce45-4f53-4fa7-bb32-11f34168b82b</code>. If omitted when defining/creating a new machine, a random - UUID is generated. <span class="since">Since 0.0.1</span></dd> + UUID is generated. It is also possible to provide the UUID + via a <a href="#elementsSysinfo"><code>sysinfo</code></a> + specification. <span class="since">Since 0.0.1, sysinfo + since 0.8.7</span></dd> <dt><code>description</code></dt> <dd>The content of the <code>description</code> element provides a @@ -81,6 +84,7 @@ <boot dev='hd'/> <boot dev='cdrom'/> <bootmenu enable='yes'/> + <smbios mode='sysinfo'/> </os> ...</pre> @@ -115,6 +119,16 @@ If not specified, the hypervisor default is used. <span class="since"> Since 0.8.3</span> </dd> + <dt><code>smbios</code></dt> + <dd>How to populate SMBIOS information visible in the guest. + The <code>mode</code> attribute must be specified, and is either + "emulate" (let the hypervisor generate all values), "host" (copy + all of Block 0 and Block 1, except for the UUID, from the host's + SMBIOS values), or "sysinfo" (use the values in + the <a href="#elementsSysinfo">sysinfo</a> element). If not + specified, the hypervisor default is used. <span class="since"> + Since 0.8.7</span> + </dd> </dl> <h4><a name="elementsOSBootloader">Host bootloader</a></h4> @@ -188,6 +202,69 @@ installation media source / kickstart file</dd> </dl> + <h3><a name="elementsSysinfo">SMBIOS System Information</a></h3> + + <p> + Some hypervisors allow control over what system information is + presented to the guest (for example, SMBIOS fields can be + populated by a hypervisor and inspected via + the <code>dmidecode</code> command in the guest). The + optional <code>sysinfo</code> element covers all such categories + of information. <span class="since">Since 0.8.7</span> + </p> + +<pre> + ... + <os> + <smbios mode='sysinfo'/> + ... + </os> + <sysinfo type='smbios'> + <bios> + <entry name='vendor'>LENOVO</entry> + </bios> + <system> + <entry name='manufacturer'>Fedora</entry> + <entry name='vendor'>Virt-Manager</entry> + </system> + </sysinfo> + ...</pre> + + <p> + The <code>sysinfo</code> element has a mandatory + attribute <code>type</code> that determine the layout of + sub-elements, with supported values of: + </p> + + <dl> + <dt><code>smbios</code></dt> + <dd>Sub-elements call out specific SMBIOS values, which will + affect the guest if used in conjunction with + the <code>smbios</code> sub-element of + the <a href="#elementsOS"><code>os</code></a> element. Each + sub-element of <code>sysinfo</code> names a SMBIOS block, and + within those elements can be a list of <code>entry</code> + elements that describe a field within the block. The following + blocks and entries are recognized: + <dl> + <dt><code>bios</code></dt> + <dd> + This is block 0 of SMBIOS, with entry names drawn from + "vendor", "version", "date", and "release". + </dd> + <dt><code>system</code></dt> + <dd> + This is block 1 of SMBIOS, with entry names drawn from + "manufacturer", "product", "version", "serial", "uuid", + "sku", and "family". If a "uuid" entry is provided + alongside a + top-level <a href="#elementsMetadata"><code>uuid</code> + element</a>, the two values must match. + </dd> + </dl> + </dd> + </dl> + <h3><a name="elementsResources">Basic resources</a></h3> <pre> -- 1.7.3.4

3 3

[libvirt] [PATCH] qemu: Avoid sending STOPPED event twice
by Jiri Denemark 20 Jan '11

20 Jan '11

In some circumstances, libvirtd would issue two STOPPED events after it stopped a domain. This was because an EOF event can arrive after a qemu process is killed but before qemuMonitorClose() is called. qemuHandleMonitorEOF() should ignore EOF when the domain is not running. I wasn't able to reproduce this bug directly, only after adding an artificial sleep() into qemudShutdownVMDaemon(). --- src/qemu/qemu_driver.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 22dc272..cff7a43 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -356,6 +356,12 @@ qemuHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjLock(vm); + if (!virDomainObjIsActive(vm)) { + VIR_DEBUG("Domain %p is not active, ignoring EOF", vm); + virDomainObjUnlock(vm); + return; + } + priv = vm->privateData; if (!hasError && priv->monJSON && !priv->gotShutdown) { VIR_DEBUG("Monitor connection to '%s' closed without SHUTDOWN event; " -- 1.7.4.rc2

2 2

[libvirt] [PATCH] qemu: Fail if per-device boot is used but deviceboot is not supported
by Jiri Denemark 19 Jan '11

19 Jan '11

--- src/qemu/qemu_command.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24acc10..537e537 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2949,6 +2949,13 @@ qemuBuildCommandLine(virConnectPtr conn, } virCommandAddArgBuffer(cmd, &boot_buf); + } else if (!(qemuCmdFlags & QEMUD_CMD_FLAG_BOOTINDEX)) { + /* def->os.nBootDevs is guaranteed to be > 0 unless per-device boot + * configuration is used + */ + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hypervisor lacks deviceboot feature")); + goto error; } if (def->os.kernel) -- 1.7.4.rc2

2 2

[libvirt] [PATCH] spec: Start libvirt-guests only if it's on in current runlevel
by Jiri Denemark 19 Jan '11

19 Jan '11

--- libvirt.spec.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index d673cf6..0a2d10e 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -775,7 +775,8 @@ fi /sbin/ldconfig /sbin/chkconfig --add libvirt-guests if [ $1 -ge 1 ]; then - if /sbin/chkconfig --list libvirt-guests | /bin/grep -q :on ; then + level=$(/sbin/runlevel | /bin/cut -d ' ' -f 2) + if /sbin/chkconfig --list libvirt-guests | /bin/grep -q $level:on ; then # this doesn't do anything but allowing for libvirt-guests to be # stopped on the first shutdown /sbin/service libvirt-guests start > /dev/null 2>&1 || true -- 1.7.4.rc2

2 2

[libvirt] [PATCH 0/3] qemu: improve device capability detection
by Eric Blake 19 Jan '11

19 Jan '11

As promised in https://www.redhat.com/archives/libvir-list/2011-January/msg00562.html Patch 1 is complete, patch 2 can be pushed as-is, but if anyone has qemu-0.12.1 or qemu-kvm-0.12.3 handy (Fedora12 has 0.11.x, and Fedora13 has 0.12.5), then we can enhance it by filling in the contents of a couple more files. Patch 3 does not need to be pushed until the rest of my smartcard series is complete, but I'm including it now to show how to rewrite things in order to parse more device characteristics from a single qemu run, so it can be reused by the boot order patch series (add "-device","virtio-blk-pci,?" to extract; add strstr(str,"virtio-blk-pci.bootindex") to parse; and possibly update the qemuhelpdata/*-device files to include appropriate new lines to trigger the new flag detection). Eric Blake (3): qemu: convert capabilities to use virCommand qemu: improve device flag parsing smartcard: check for qemu capability src/qemu/qemu_capabilities.c | 229 +++++++------------- src/qemu/qemu_capabilities.h | 5 +- tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device | 57 +++++ tests/qemuhelpdata/qemu-kvm-0.13.0-device | 70 ++++++ tests/qemuhelptest.c | 48 +++- 5 files changed, 244 insertions(+), 165 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-0.12.1-device create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel60-device create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device create mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device -- 1.7.3.4

6 19

[libvirt] [PATCH] Basic support for VDE networking
by Renzo Davoli 19 Jan '11

19 Jan '11

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). The patch is against libvirt-0.8.7. renzo (designer/developer of VDE, university of bologna, wiki.virtualsquare.org) Signed-off-by: Renzo Davoli <renzo(a)cs.unibo.it> --- --- a/src/lxc/lxc_driver.c 2011-01-10 11:49:49.000000000 +0100 +++ b/src/lxc/lxc_driver.c 2011-01-10 11:50:03.000000000 +0100 @@ -1083,6 +1083,7 @@ case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_LAST: + case VIR_DOMAIN_NET_TYPE_VDE: break; } --- a/src/uml/uml_conf.c 2011-01-10 12:03:54.000000000 +0100 +++ b/src/uml/uml_conf.c 2011-01-10 13:26:08.000000000 +0100 @@ -269,6 +269,14 @@ virBufferVSprintf(&buf, "tuntap,%s", def->ifname); break; + case VIR_DOMAIN_NET_TYPE_VDE: + /* ethNNN=vde,vde_switch,macaddr,port,group,mode,description */ + if (def->data.vde.vdeswitch) { + virBufferVSprintf(&buf, "vde,%s", def->data.vde.vdeswitch); + } else + virBufferAddLit(&buf, "vde"); + break; + case VIR_DOMAIN_NET_TYPE_INTERNAL: umlReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("internal networking type not supported")); --- a/src/conf/domain_conf.h 2011-01-10 11:41:07.000000000 +0100 +++ b/src/conf/domain_conf.h 2011-01-10 13:21:08.000000000 +0100 @@ -288,6 +288,7 @@ VIR_DOMAIN_NET_TYPE_BRIDGE, VIR_DOMAIN_NET_TYPE_INTERNAL, VIR_DOMAIN_NET_TYPE_DIRECT, + VIR_DOMAIN_NET_TYPE_VDE, VIR_DOMAIN_NET_TYPE_LAST, }; @@ -336,6 +337,9 @@ int mode; virVirtualPortProfileParams virtPortProfile; } direct; + struct { + char *vdeswitch; + } vde; } data; char *ifname; virDomainDeviceInfo info; --- a/src/conf/domain_conf.c 2011-01-10 11:42:04.000000000 +0100 +++ b/src/conf/domain_conf.c 2011-01-10 14:49:46.000000000 +0100 @@ -182,7 +182,8 @@ "network", "bridge", "internal", - "direct") + "direct", + "vde") VIR_ENUM_IMPL(virDomainChrChannelTarget, VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST, @@ -598,6 +599,10 @@ VIR_FREE(def->data.direct.linkdev); break; + case VIR_DOMAIN_NET_TYPE_VDE: + VIR_FREE(def->data.vde.vdeswitch); + break; + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -2293,6 +2298,7 @@ char *internal = NULL; char *devaddr = NULL; char *mode = NULL; + char *vdeswitch = NULL; virNWFilterHashTablePtr filterparams = NULL; virVirtualPortProfileParams virtPort; bool virtPortParsed = false; @@ -2379,7 +2385,11 @@ xmlStrEqual(cur->name, BAD_CAST "state")) { /* Legacy back-compat. Don't add any more attributes here */ devaddr = virXMLPropString(cur, "devaddr"); - } + } else if ((vdeswitch == NULL) && + def->type == VIR_DOMAIN_NET_TYPE_VDE && + xmlStrEqual(cur->name, BAD_CAST "switch")) { + vdeswitch = virXMLPropString(cur, "path"); + } } cur = cur->next; } @@ -2529,6 +2539,11 @@ break; + case VIR_DOMAIN_NET_TYPE_VDE: + def->data.vde.vdeswitch = vdeswitch; + vdeswitch = NULL; + break; + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: break; @@ -6263,6 +6278,12 @@ " "); break; + case VIR_DOMAIN_NET_TYPE_VDE: + if (def->data.vde.vdeswitch) + virBufferEscapeString(buf, " <switch path='%s'/>\n", + def->data.vde.vdeswitch); + break; + case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: break; --- a/src/qemu/qemu_command.c 2011-01-10 13:11:17.000000000 +0100 +++ b/src/qemu/qemu_command.c 2011-01-10 13:26:28.000000000 +0100 @@ -1602,12 +1602,21 @@ case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_VDE: case VIR_DOMAIN_NET_TYPE_LAST: break; } type_sep = ','; break; + case VIR_DOMAIN_NET_TYPE_VDE: + virBufferAddLit(&buf, "vde"); + if (net->data.vde.vdeswitch) + virBufferVSprintf(&buf, "%csock=%s", + type_sep, + net->data.vde.vdeswitch); + break; + case VIR_DOMAIN_NET_TYPE_USER: default: virBufferAddLit(&buf, "user");

3 4

[libvirt] Installing libvirt 0.8.7 Ubuntu 9.10
by Marcela Castro León 19 Jan '11

19 Jan '11

Hello: I'm installing libvirt 0.8.7 on Ubuntu 9.10 to work at a project at Autonomous University. But when make ./configure, I've got: checking pkg-config is at least version 0.9.0... yes checking for XMLRPC... no checking for LIBXML... no checking libxml2 xml2-config >= 2.6.0 ... configure: error: Could not find libxml2 anywhere (see config.log for details). But I've libxml2 installed on mu system marcela@santacruz:~/libvirt/libvirt-0.8.7$ dpkg -l | grep libxml2 ii libxml2 2.7.5.dfsg-1ubuntu1.2 GNOME XML library ii libxml2-utils 2.7.5.dfsg-1ubuntu1.2 XML utilities ii python-libxml2 2.7.5.dfsg-1ubuntu1.2 Python bindings for the GNOME XML library The config.log mention No package 'libxml-2.0', but this libary doesn't exit. I've attach this log to further information. Can you tell me how to follow? Thank you.

3 3

[libvirt] Spice in libvirt 0.8.x?
by Justin Clift 19 Jan '11

19 Jan '11

Hi us, Does anyone know if Spice in libvirt 0.8.7 works ok? Noticed two BZ's (still open) by Amador Pahim (CC'd), where he tested with 0.8.6 and noticed problems with our XML vs reality (for him): https://bugzilla.redhat.com/show_bug.cgi?id=664190 https://bugzilla.redhat.com/show_bug.cgi?id=664192 He was able to get it working by commenting out two pieces of qemu_command.c, so I'm just wondering if this is useful info to us or if it's already dated? /* if ((def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) && * !(qemuCmdFlags & QEMUD_CMD_FLAG_VGA_QXL)) { * qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", * _("This QEMU does not support QXL graphics adapters")); * goto error; * } */ /* * if (def->graphics[0]->data.spice.listenAddr) * virBufferVSprintf(&opt, ",addr=%s", def->graphics[0]>data.spice.listenAddr); * else if (driver->spiceListen) * virBufferVSprintf(&opt, ",addr=%s", driver->spiceListen); */ + Justin

1 0

[libvirt] [PATCH] build: use more gnulib modules for simpler code
by Eric Blake 19 Jan '11

19 Jan '11

* .gnulib: Update to latest, for sigpipe and sigaction modules. * bootstrap.conf (gnulib_modules): Add siaction, sigpipe, strerror_r. * tools/virsh.c (vshSetupSignals) [!SIGPIPE]: Delete, now that gnulib guarantees it. (SA_SIGINFO): Define for mingw fallback. * src/util/virterror.c (virStrerror): Simplify, now that gnulib guarantees the POSIX interface. * configure.ac (AC_CHECK_FUNCS_ONCE): Drop redundant check. (AM_PROG_CC_STDC): Move earlier, to keep autoconf happy. --- Gnulib makes it possible to prefer the POSIX strerror_r signature everywhere, even on Linux. And even though mingw lacks SA_SIGINFO (even with gnulib), the virsh signal handler still works for mingw with gnulib's implementation of SIGPIPE with minimal effort. * .gnulib 9779055...e7853fe (3): > sigaction: relax license from LGPLv3+ to LGPLv2+ > update from texinfo > autoupdate .gnulib | 2 +- bootstrap.conf | 3 +++ configure.ac | 13 ++++++------- src/util/virterror.c | 18 +----------------- tools/virsh.c | 17 +++++++++-------- 5 files changed, 20 insertions(+), 33 deletions(-) diff --git a/.gnulib b/.gnulib index 9779055..e7853fe 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9779055889c2715b593930e39ead552759b5ddc2 +Subproject commit e7853fee14b339b6d5327c3b5d5de59b13c4e39e diff --git a/bootstrap.conf b/bootstrap.conf index a55fca2..88832d1 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -58,12 +58,15 @@ random_r sched send setsockopt +sigaction +sigpipe snprintf socket stpcpy strchrnul strndup strerror +strerror_r-posix strptime strsep strtok_r diff --git a/configure.ac b/configure.ac index 337ce17..574e952 100644 --- a/configure.ac +++ b/configure.ac @@ -49,11 +49,11 @@ dnl Checks for C compiler. AC_PROG_CC AC_PROG_INSTALL AC_PROG_CPP +AM_PROG_CC_STDC gl_EARLY gl_INIT -AM_PROG_CC_STDC AC_TYPE_UID_T dnl Make sure we have an ANSI compiler @@ -93,12 +93,11 @@ fi AC_MSG_RESULT([$have_cpuid]) -dnl Availability of various common functions (non-fatal if missing). -AC_CHECK_FUNCS_ONCE([cfmakeraw regexec sched_getaffinity getuid getgid initgroups \ - posix_fallocate mmap]) - -dnl Availability of various not common threadsafe functions -AC_CHECK_FUNCS_ONCE([strerror_r getmntent_r getgrnam_r getpwuid_r]) +dnl Availability of various common functions (non-fatal if missing), +dnl and various less common threadsafe functions +AC_CHECK_FUNCS_ONCE([cfmakeraw regexec sched_getaffinity getuid getgid \ + initgroups posix_fallocate mmap \ + getmntent_r getgrnam_r getpwuid_r]) dnl Availability of pthread functions (if missing, win32 threading is dnl assumed). Because of $LIB_PTHREAD, we cannot use AC_CHECK_FUNCS_ONCE. diff --git a/src/util/virterror.c b/src/util/virterror.c index 7543603..3dd6256 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1250,7 +1250,7 @@ void virReportErrorHelper(virConnectPtr conn, * @errBuf: the buffer to save the error to * @errBufLen: the buffer length * - * Generate an erro string for the given errno + * Generate an error string for the given errno * * Returns a pointer to the error string, possibly indicating that the * error is unknown @@ -1260,24 +1260,8 @@ const char *virStrerror(int theerrno, char *errBuf, size_t errBufLen) int save_errno = errno; const char *ret; -#ifdef HAVE_STRERROR_R -# ifdef __USE_GNU - /* Annoying linux specific API contract */ - ret = strerror_r(theerrno, errBuf, errBufLen); -# else strerror_r(theerrno, errBuf, errBufLen); ret = errBuf; -# endif -#else - /* Mingw lacks strerror_r and its strerror is definitely not - * threadsafe, so safest option is to just print the raw errno - * value - we can at least reliably & safely look it up in the - * header files for debug purposes - */ - int n = snprintf(errBuf, errBufLen, "errno=%d", theerrno); - ret = (0 < n && n < errBufLen - ? errBuf : _("internal error: buffer too small")); -#endif errno = save_errno; return ret; } diff --git a/tools/virsh.c b/tools/virsh.c index 5b26c78..aba7945 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -497,16 +497,21 @@ out: */ static int disconnected = 0; /* we may have been disconnected */ -#ifdef SIGPIPE +/* Gnulib doesn't guarantee SA_SIGINFO support. */ +#ifndef SA_SIGINFO +# define SA_SIGINFO 0 +#endif + /* * vshCatchDisconnect: * * We get here when a SIGPIPE is being raised, we can't do much in the * handler, just save the fact it was raised */ -static void vshCatchDisconnect(int sig, siginfo_t * siginfo, - void* context ATTRIBUTE_UNUSED) { - if ((sig == SIGPIPE) || (siginfo->si_signo == SIGPIPE)) +static void vshCatchDisconnect(int sig, siginfo_t *siginfo, + void *context ATTRIBUTE_UNUSED) { + if ((sig == SIGPIPE) || + (SA_SIGINFO && siginfo->si_signo == SIGPIPE)) disconnected++; } @@ -526,10 +531,6 @@ vshSetupSignals(void) { sigaction(SIGPIPE, &sig_action, NULL); } -#else -static void -vshSetupSignals(void) {} -#endif /* * vshReconnect: -- 1.7.3.4

2 2