- Devel - libvirt List Archives

[libvirt] How to connect to console of domain on PowerPC?
by Yin Olivia-R63875 04 Feb '13

04 Feb '13

Hi, I tried to use libvirt to run KVM/QEMU on Freescale PowerPC platforms. So far there's only one serial device (spapr-vty) defined in QEMU to work as console for IBM PSeries platform. There's no serial device support in QEMU for Freescale PowerPC (ePAPR). libvirt/src/qemu/qemu_command.c /* This function generates the correct '-device' string for character * devices of each architecture. */ char * qemuBuildChrDeviceStr(virDomainChrDefPtr serial, virBitmapPtr qemuCaps, char *os_arch, char *machine) { virBuffer cmd = VIR_BUFFER_INITIALIZER; if (STREQ(os_arch, "ppc64") && STREQ(machine, "pseries")) { if (serial->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && serial->source.type == VIR_DOMAIN_CHR_TYPE_PTY && serial->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) { virBufferAsprintf(&cmd, "spapr-vty,chardev=char%s", serial->info.alias); if (qemuBuildDeviceAddressStr(&cmd, &serial->info, qemuCaps) < 0) goto error; } } else virBufferAsprintf(&cmd, "isa-serial,chardev=char%s,id=%s", serial->info.alias, serial->info.alias); if (virBufferError(&cmd)) { virReportOOMError(); goto error; } return virBufferContentAndReset(&cmd); error: virBufferFreeAndReset(&cmd); return NULL; } We usually connect guest with telnet. For instance, /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4445,server Then to run 'telnet 10.193.20.xxx 4445' could connect the guest. The temporary workaround is not add '-device' string after '-serial' option. diff -Nur libvirt-0.10.1.orig/src/qemu/qemu_command.c libvirt-0.10.1/src/qemu/qemu_command.c --- libvirt-0.10.1.orig/src/qemu/qemu_command.c 2012-08-30 15:35:18.000000000 +0530 +++ libvirt-0.10.1/src/qemu/qemu_command.c 2012-10-05 17:19:32.060368755 +0530 @@ -5501,13 +5501,15 @@ virCommandAddArg(cmd, devstr); VIR_FREE(devstr); - virCommandAddArg(cmd, "-device"); - if (!(devstr = qemuBuildChrDeviceStr(serial, qemuCaps, + if (!STREQ(def->os.arch, "ppc")) { + virCommandAddArg(cmd, "-device"); + if (!(devstr = qemuBuildChrDeviceStr(serial, + qemuCaps, def->os.arch, def->os.machine))) - goto error; - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); + goto error; + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); + } } else { virCommandAddArg(cmd, "-serial"); if (!(devstr = qemuBuildChrArgStr(&serial->source, NULL))) Applying the above patch to libvirt, all the other domain control commands could work except 'virsh console domain'. # cat >demo.args <<EOF > /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 > -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk > -append "root=/dev/ram rw console=ttyS0,115200" -serial > tcp::4445,server -net nic EOF # vi demo.args /usr/bin/qemu-system-ppc -name demo -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4445,server -net nic # virsh domxml-from-native qemu-argv demo.args >demo.xml # vi demo.xml <domain type='kvm'> <name>demo</name> <uuid>985d7154-83c8-0763-cbac-ecd159eee8a6</uuid> <memory unit='KiB'>262144</memory> <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='ppc' machine='ppce500v2'>hvm</type> <kernel>/media/ram/uImage</kernel> <initrd>/media/ram/ramdisk</initrd> <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc</emulator> <serial type='tcp'> <source mode='bind' host='' service='4445'/> <protocol type='raw'/> <target port='0'/> </serial> <console type='tcp'> <source mode='bind' host='' service='4445'/> <protocol type='raw'/> <target type='serial' port='0'/> </console> <memballoon model='virtio'/> </devices> </domain> # virsh -c qemu:///system define demo.xml # virsh -c qemu:///system start demo But it seemed that can't connect to the console. # virsh -c qemu:///system console demo Connected to domain test Escape character is ^] error: internal error character device (null) is not using a PTY I tried also use '-serial pty' option, /usr/bin/qemu-system-ppc -name test -M ppce500v2 -enable-kvm -m 256 -nographic -kernel /media/ram/uImage -initrd /media/ram/ramdisk -append "root=/dev/ram rw console=ttyS0,115200" -serial pty Then there's no other output after the below message: # virsh -c qemu:///system console demo Connected to domain test Escape character is ^] It seemed not libvirt group issue. I also tried the LXC. It could connect to the console if <init>/bin/sh/</init> instead of <init>/sbin/init</init> Best Regards, Olivia

1 0

[libvirt] [PATCH] rpc: Fix crash on error paths of message dispatching
by Peter Krempa 03 Feb '13

03 Feb '13

When reading and dispatching of a message failed the message was freed but wasn't removed from the message queue. After that when the connection was about to be closed the pointer for the message was still present in the queue and it was passed to virNetMessageFree which tried to call the callback function from an uninitialized pointer. This patch removes the message from the queue before it's freed. * rpc/virnetserverclient.c: virNetServerClientDispatchRead: - avoid use after free of RPC messages --- src/rpc/virnetserverclient.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index af0560e..446e1e9 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -987,6 +987,7 @@ readmore: /* Decode the header so we can use it for routing decisions */ if (virNetMessageDecodeHeader(msg) < 0) { + virNetMessageQueueServe(&client->rx); virNetMessageFree(msg); client->wantClose = true; return; @@ -996,6 +997,7 @@ readmore: * file descriptors */ if (msg->header.type == VIR_NET_CALL_WITH_FDS && virNetMessageDecodeNumFDs(msg) < 0) { + virNetMessageQueueServe(&client->rx); virNetMessageFree(msg); client->wantClose = true; return; /* Error */ @@ -1005,6 +1007,7 @@ readmore: for (i = msg->donefds ; i < msg->nfds ; i++) { int rv; if ((rv = virNetSocketRecvFD(client->sock, &(msg->fds[i]))) < 0) { + virNetMessageQueueServe(&client->rx); virNetMessageFree(msg); client->wantClose = true; return; -- 1.8.1.1

5 9

[libvirt] [Libvirt]How to get libvirt version after git clone?
by harryxiyou 02 Feb '13

02 Feb '13

Hi all, After i clone libvirt git repo, how i could get this libvirt version exactly? $ git clone git://libvirt.org/libvirt.git $ git branch -a * master remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/v0.10.2-maint remotes/origin/v0.9.11-maint remotes/origin/v0.9.6-maint I can just see up stuffs but exact current version. Could anyone give me some suggestions? Thanks in advance. -- Thanks Harry Wei

3 3

[libvirt] [Libvirt]Snapshot operations in Libvirt
by harryxiyou 02 Feb '13

02 Feb '13

Hi all, I see our libvirt snapshot XML form like following, which this XML is to create a disk snapshot of just vda on a qemu domain with two disks. <domainsnapshot> <description>Snapshot of OS install and updates</description> <disks> <disk name='/path/to/old'> <source file='/path/to/new'/> </disk> <disk name='vdb' snapshot='no'/> </disks> </domainsnapshot> My understanding about up XML is like this: it creates a snapshot for '/path/to/old', which '/path/to/old' would be the read-only backing file to the new active file '/path/to/new'. I also have some questions about current libvirt snapshot operations like following. 1, Is my up understanding right? Or maybe you have any other suggestions. 2, I wonder whether libvirt *NOW* support start a snapshot and then mount this new storage block, which is based on the snapshot. Please give me some real examples (like Sheepdog volumes) if you can. -- Thanks Harry Wei

2 1

[libvirt] [PATCH] hyperv: Avoid Coverity warning about resource leak in hypervOpen
by Matthias Bolte 02 Feb '13

02 Feb '13

Coverity tagged the esxhypervPrivate pointer a potentially leaked because of the conditional free call. But this is a false positive, there is not actual leak. Avoid the conditial code to make this more obvious to Coverity. --- This patch is meant as a replacement for this patch https://www.redhat.com/archives/libvir-list/2013-January/msg00542.html src/hyperv/hyperv_driver.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 601a85a..0d2eaae 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -200,14 +200,11 @@ hypervOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags) } conn->privateData = priv; - + priv = NULL; result = VIR_DRV_OPEN_SUCCESS; cleanup: - if (result == VIR_DRV_OPEN_ERROR) { - hypervFreePrivate(&priv); - } - + hypervFreePrivate(&priv); VIR_FREE(username); VIR_FREE(password); hypervFreeObject(priv, (hypervObject *)computerSystem); -- 1.7.9.5

2 3

[libvirt] [PATCH] esx: Avoid Coverity warning about resource leak in esxOpen
by Matthias Bolte 02 Feb '13

02 Feb '13

Commit 4445e16bfa8056980ac643fabf17186f9e685925 changed the signature of esxConnectToHost and esxConnectToVCenter by replacing the esxPrivate pointer with virConnectPtr. The esxPrivate pointer was then retrieved again from virConnectPtr's privateData. This resulted in a NULL pointer dereference, because the privateData pointer was not yet initialized at the point where esxConnectToHost and esxConnectToVCenter are called. This was fixed in commit b126715a48cd0cbe32ec6468c267cd8cf2961c55 that moved the initialization of privateData before the problematic calls. Coverity tagged the esxPrivate pointer a potentially leaked because of the conditional free call. But this is a false positive, there is not actual leak. Avoid this warning from Coverity by making the call to esxFreePrivate unconditional and changing esxConnectToHost and esxConnectToVCenter back to take a esxPrivate pointer directly. This allows to assign esxPrivate to the virConnectPtr's privateData pointer as one of the last steps in esxOpen making it more obvious that it is not initialized during the earlier steps of esxOpen. --- This patch is meant as a replacement this patch: https://www.redhat.com/archives/libvir-list/2013-January/msg00530.html src/esx/esx_driver.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 1366c81..dad10a1 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -650,7 +650,8 @@ esxCapsInit(esxPrivate *priv) static int -esxConnectToHost(virConnectPtr conn, +esxConnectToHost(esxPrivate *priv, + virConnectPtr conn, virConnectAuthPtr auth, char **vCenterIpAddress) { @@ -663,7 +664,6 @@ esxConnectToHost(virConnectPtr conn, esxVI_String *propertyNameList = NULL; esxVI_ObjectContent *hostSystem = NULL; esxVI_Boolean inMaintenanceMode = esxVI_Boolean_Undefined; - esxPrivate *priv = conn->privateData; esxVI_ProductVersion expectedProductVersion = STRCASEEQ(conn->uri->scheme, "esx") ? esxVI_ProductVersion_ESX : esxVI_ProductVersion_GSX; @@ -785,7 +785,8 @@ esxConnectToHost(virConnectPtr conn, static int -esxConnectToVCenter(virConnectPtr conn, +esxConnectToVCenter(esxPrivate *priv, + virConnectPtr conn, virConnectAuthPtr auth, const char *hostname, const char *hostSystemIpAddress) @@ -796,7 +797,6 @@ esxConnectToVCenter(virConnectPtr conn, char *unescapedPassword = NULL; char *password = NULL; char *url = NULL; - esxPrivate *priv = conn->privateData; if (hostSystemIpAddress == NULL && (priv->parsedUri->path == NULL || STREQ(priv->parsedUri->path, "/"))) { @@ -1008,8 +1008,6 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, priv->supportsLongMode = esxVI_Boolean_Undefined; priv->usedCpuTimeCounterId = -1; - conn->privateData = priv; - /* * Set the port dependent on the transport protocol if no port is * specified. This allows us to rely on the port parameter being @@ -1036,7 +1034,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, if (STRCASEEQ(conn->uri->scheme, "esx") || STRCASEEQ(conn->uri->scheme, "gsx")) { /* Connect to host */ - if (esxConnectToHost(conn, auth, + if (esxConnectToHost(priv, conn, auth, &potentialVCenterIpAddress) < 0) { goto cleanup; } @@ -1075,7 +1073,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, } } - if (esxConnectToVCenter(conn, auth, + if (esxConnectToVCenter(priv, conn, auth, vCenterIpAddress, priv->host->ipAddress) < 0) { goto cleanup; @@ -1085,7 +1083,7 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, priv->primary = priv->host; } else { /* VPX */ /* Connect to vCenter */ - if (esxConnectToVCenter(conn, auth, + if (esxConnectToVCenter(priv, conn, auth, conn->uri->server, NULL) < 0) { goto cleanup; @@ -1101,13 +1099,12 @@ esxOpen(virConnectPtr conn, virConnectAuthPtr auth, goto cleanup; } + conn->privateData = priv; + priv = NULL; result = VIR_DRV_OPEN_SUCCESS; cleanup: - if (result == VIR_DRV_OPEN_ERROR) { - esxFreePrivate(&priv); - } - + esxFreePrivate(&priv); VIR_FREE(potentialVCenterIpAddress); return result; -- 1.7.9.5

3 6

[libvirt] [Sheepdog][Libvirt]Test boot VMs from sheepdog volumes in Libvirt
by harryxiyou 02 Feb '13

02 Feb '13

Hi all, We can get "Boot VMs from sheepdog volumes in Libvirt" way from https://github.com/collie/sheepdog/wiki/Libvirt like following. a, prepare a file containing an XML domain description $ cat > sheepdog.xml <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="testvdi"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> </domain> b, boot from testvdi with virsh $ virsh create sheepdog.xml c, connect to a VNC console of the running VM $ vncviewer localhost I have some following questions about up three steps. 1, Before a or b(up boot step) step, should we have to install our OS into 'testvdi'? That is to say, we have to install OS from os.iso file into 'testvdi', which should use 'qemu-system-x86_64' command to install OS, right? 2, Before this test, shoul we have to build Sheepdog, QEMU, Libvirt environment? 3, This is the storage online management in Libvirt, right? 4, This test just test the codes Morita take a patch named "add network disk support" for Libvirt, which is located here: http://libvirt.org/git/?p=libvirt.git;a=commit;h=036ad5052b43fe9f0d197e89fd… and also test Sheepdog driver for QEMU, right? 5, If i installed a 32bits OS to testvdi, should i modify <os> <type arch='x86_64'>hvm</type> </os> to be <os> <type arch='x86'>hvm</type> </os> , right? 6, The step c (up boot step), which is $ vncviewer localhost Actually, i am not clear about this 'localhost'. Why should we link localhost but other ip addresses? Could anyone please give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 4

[libvirt] [PATCH] docs: don't ignore virEvent API
by Eric Blake 02 Feb '13

02 Feb '13

Commit 6094ad7b (0.9.3 release) promoted several functions from internal to public, but forgot to fix the documentation generator to provide details about those functions. For an example of what this fixes, look at: file:///path/to/libvirt/docs/html/libvirt-libvirt.html#virEventAddHandle before and after the patch. * docs/apibuild.py (ignored_functions): Don't ignore functions that were turned into official API. * src/util/virevent.c: Fix comments to pass through parser. --- In response to my concerns raised on one of Claudio's patches: https://www.redhat.com/archives/libvir-list/2013-February/msg00048.html docs/apibuild.py | 6 ----- src/util/virevent.c | 78 +++++++++++++++++++++++++++++++++++------------------ 2 files changed, 52 insertions(+), 32 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index e5cbbe8..2bdbf2d 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -64,12 +64,6 @@ ignored_functions = { "virDomainMigratePrepareTunnel3": "private function for tunnelled migration", "virDrvSupportsFeature": "private function for remote access", "DllMain": "specific function for Win32", - "virEventAddHandle": "internal function in virevent.c", - "virEventUpdateHandle": "internal function in virevent.c", - "virEventRemoveHandle": "internal function in virevent.c", - "virEventAddTimeout": "internal function in virevent.c", - "virEventUpdateTimeout": "internal function in virevent.c", - "virEventRemoveTimeout": "internal function in virevent.c", "virTypedParameterArrayValidate": "internal function in virtypedparam.c", "virTypedParameterAssign": "internal function in virtypedparam.c", "virTypedParameterAssignFromStr": "internal function in virtypedparam.c", diff --git a/src/util/virevent.c b/src/util/virevent.c index 6900011..886cb6d 100644 --- a/src/util/virevent.c +++ b/src/util/virevent.c @@ -1,7 +1,7 @@ /* * virevent.c: event loop for monitoring file handles * - * Copyright (C) 2007, 2011 Red Hat, Inc. + * Copyright (C) 2007, 2011, 2013 Red Hat, Inc. * Copyright (C) 2007 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -38,20 +38,25 @@ static virEventUpdateTimeoutFunc updateTimeoutImpl = NULL; static virEventRemoveTimeoutFunc removeTimeoutImpl = NULL; /** - * virEventAddHandle: register a callback for monitoring file handle events + * virEventAddHandle: * * @fd: file handle to monitor for events * @events: bitset of events to watch from virEventHandleType constants * @cb: callback to invoke when an event occurs * @opaque: user data to pass to callback + * @ff: callback to free opaque when handle is removed * - * returns -1 if the file handle cannot be registered, 0 upon success + * Register a callback for monitoring file handle events. + * + * Returns -1 if the file handle cannot be registered, 0 upon success */ -int virEventAddHandle(int fd, - int events, - virEventHandleCallback cb, - void *opaque, - virFreeCallback ff) { +int +virEventAddHandle(int fd, + int events, + virEventHandleCallback cb, + void *opaque, + virFreeCallback ff) +{ if (!addHandleImpl) return -1; @@ -59,25 +64,33 @@ int virEventAddHandle(int fd, } /** - * virEventUpdateHandle: change event set for a monitored file handle + * virEventUpdateHandle: * * @watch: watch whose file handle to update * @events: bitset of events to watch from virEventHandleType constants * + * Change event set for a monitored file handle. + * * Will not fail if fd exists */ -void virEventUpdateHandle(int watch, int events) { +void +virEventUpdateHandle(int watch, int events) +{ updateHandleImpl(watch, events); } /** - * virEventRemoveHandle: unregister a callback from a file handle + * virEventRemoveHandle: * * @watch: watch whose file handle to remove * - * returns -1 if the file handle was not registered, 0 upon success + * Unregister a callback from a file handle. + * + * Returns -1 if the file handle was not registered, 0 upon success. */ -int virEventRemoveHandle(int watch) { +int +virEventRemoveHandle(int watch) +{ if (!removeHandleImpl) return -1; @@ -85,22 +98,27 @@ int virEventRemoveHandle(int watch) { } /** - * virEventAddTimeout: register a callback for a timer event + * virEventAddTimeout: * * @timeout: time between events in milliseconds * @cb: callback to invoke when an event occurs * @opaque: user data to pass to callback + * @ff: callback to free opaque when timeout is removed + * + * Register a callback for a timer event. * * Setting timeout to -1 will disable the timer. Setting the timeout * to zero will cause it to fire on every event loop iteration. * - * returns -1 if the timer cannot be registered, a positive - * integer timer id upon success + * Returns -1 if the timer cannot be registered, a positive + * integer timer id upon success. */ -int virEventAddTimeout(int timeout, - virEventTimeoutCallback cb, - void *opaque, - virFreeCallback ff) { +int +virEventAddTimeout(int timeout, + virEventTimeoutCallback cb, + void *opaque, + virFreeCallback ff) +{ if (!addTimeoutImpl) return -1; @@ -108,28 +126,36 @@ int virEventAddTimeout(int timeout, } /** - * virEventUpdateTimeoutImpl: change frequency for a timer + * virEventUpdateTimeout: * * @timer: timer id to change - * @frequency: time between events in milliseconds + * @timeout: time between events in milliseconds + * + * Change frequency for a timer. * * Setting frequency to -1 will disable the timer. Setting the frequency * to zero will cause it to fire on every event loop iteration. * * Will not fail if timer exists */ -void virEventUpdateTimeout(int timer, int timeout) { +void +virEventUpdateTimeout(int timer, int timeout) +{ updateTimeoutImpl(timer, timeout); } /** - * virEventRemoveTimeout: unregister a callback for a timer + * virEventRemoveTimeout: * * @timer: the timer id to remove * - * returns -1 if the timer was not registered, 0 upon success + * Unregister a callback for a timer. + * + * Returns -1 if the timer was not registered, 0 upon success. */ -int virEventRemoveTimeout(int timer) { +int +virEventRemoveTimeout(int timer) +{ if (!removeTimeoutImpl) return -1; -- 1.8.1

2 2

[libvirt] [Sheepdog][Libvirt]Boot VMs from sheepdog volumes error
by harryxiyou 01 Feb '13

01 Feb '13

Hi all, I wanna boot VMs from sheepdog volumes so i do according to https://github.com/collie/sheepdog/wiki/Libvirt However, some errors happened to me like following. $ ./virsh create os.xml error：create domain from os.xml failure error：(domain_definition):14: Premature end of data in tag domain line 1 (null) ^ $ cat os.xml <domain type='qemu'> <name>testvm</name> <memory>1048576</memory> <os> <type arch='x86_64'>hvm</type> </os> <devices> <disk type='network'> <source protocol="sheepdog" name="testvdi"/> <target dev='hda' bus='ide'/> </disk> <graphics type='vnc' port='-1' autoport='yes'/> </devices> Could anyone give me some help? Thanks. -- Thanks Harry Wei

2 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 01 Feb '13

01 Feb '13

CVE-2013-0242 in glibc's regex() can cause a DoS in any daemon that runs a regex search on user input while in a multibyte locale. I'm not sure how hard it would be to trigger such a setup for libvirtd, but rather than risk things, we can avoid the issue: gnulib has worked around the problem, and by updating to the latest gnulib, we can avoid the bug even on platforms where glibc has yet to be patched. * .gnulib: Update to latest, for various fixes, including regex. * bootstrap: Resync from upstream. --- * .gnulib 61c7b1e...a0b25da (45): > regex: avoid infinite configure test > openpty: fix bug where HAVE_OPENPTY wasn't defined > sys_time: port to Solaris 2.6 > regex: test for buffer overrun > regex: fix buffer overrun in regexp matcher > mountlist: don't consider "devtmpfs" as dummy > futimens-tests, utimens-tests: Depend on gettext. > test-getpeername: fix typo > bootstrap: remove the need for a sorted .gitignore > readlinkat: don't depend on gl_FUNC_OPENAT > statat: new module, split out from fstatat > autoupdate > Fix typo in previous change, by including <unistd.h>. > tests: don't assume fd 99 is closed > Fix ChangeLog typo. > stpncpy: port to OS X 10.8 > In intro, say only latest mingw is tested. > unistd: port to recent mingw > Fix typo in comment. > largefile: port better to Mac OS X 10.5 > doc: clarify -Werror > stdint: fix build with Android's Bionic fox x86 > net_if-tests: port to Solaris 7 + GCC 3.4.6 > net_if-tests: port to older Solaris > system-quote-tests: port to older Solaris > c-xvasprintf etc.: fix link errors on older Solaris > locale: port to Solaris 2.6 and 7 + GNU gettext > autoupdate > stdlib: port to Solaris 2.6 > Fix misspellings of "occurred". > autoupdate > autoupdate > doc: update main copyright year > doc: improve ISO 8601 discussion > doc: avoid small caps > regex: conform to strict C > gnulib-tool: fix incompatibility with autopoint 0.18.2 > autoupdate > fprintftime: bring back and reword fwrite comment > autoupdate > stdio: remove now-unnecessary stdio.c > unicodeio: depend on stdio, not ignore-value > fprintftime: depend on stdio, not ignore-value > stdint-tests: Fix expanded-before-required-warning. * modules/stdint-tests (Depends-on): Use AC_REQUIRE. > fwrite: silence __wur only for older glibc versions .gnulib | 2 +- bootstrap | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gnulib b/.gnulib index 61c7b1e..a0b25da 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 61c7b1e32e11e9e40b4d59ab888a807620befcd3 +Subproject commit a0b25daf001cb1a0352f329e2b5e1640acc88541 diff --git a/bootstrap b/bootstrap index 012907a..bee7765 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-12-28.10; # UTC +scriptversion=2013-01-20.16; # UTC # Bootstrap this package from checked-out sources. @@ -306,34 +306,34 @@ if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then die "Bootstrapping from a non-checked-out distribution is risky." fi -# Ensure that lines starting with ! sort last, per gitignore conventions -# for whitelisting exceptions after a more generic blacklist pattern. -sort_patterns() { - sort -u "$@" | sed '/^!/ { - H - d - } - $ { - P - x - s/^\n// - }' | sed '/^$/d' +# Strip blank and comment lines to leave significant entries. +gitignore_entries() { + sed '/^#/d; /^$/d' "$@" } -# If $STR is not already on a line by itself in $FILE, insert it, -# sorting the new contents of the file and replacing $FILE with the result. -insert_sorted_if_absent() { +# If $STR is not already on a line by itself in $FILE, insert it at the start. +# Entries are inserted at the start of the ignore list to ensure existing +# entries starting with ! are not overridden. Such entries support +# whitelisting exceptions after a more generic blacklist pattern. +insert_if_absent() { file=$1 str=$2 test -f $file || touch $file - echo "$str" | sort_patterns - $file | cmp -s - $file > /dev/null \ - || { echo "$str" | sort_patterns - $file > $file.bak \ - && mv $file.bak $file; } \ - || die "insert_sorted_if_absent $file $str: failed" + test -r $file || die "Error: failed to read ignore file: $file" + duplicate_entries=$(gitignore_entries $file | sort | uniq -d) + if [ "$duplicate_entries" ] ; then + die "Error: Duplicate entries in $file: " $duplicate_entries + fi + linesold=$(gitignore_entries $file | wc -l) + linesnew=$(echo "$str" | gitignore_entries - $file | sort -u | wc -l) + if [ $linesold != $linesnew ] ; then + { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \ + || die "insert_if_absent $file $str: failed" + fi } # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with -# insert_sorted_if_absent. +# insert_if_absent. insert_vc_ignore() { vc_ignore_file="$1" pattern="$2" @@ -344,7 +344,7 @@ insert_vc_ignore() { # .gitignore entry. pattern=$(echo "$pattern" | sed s,^,/,);; esac - insert_sorted_if_absent "$vc_ignore_file" "$pattern" + insert_if_absent "$vc_ignore_file" "$pattern" } # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. -- 1.8.1

2 2