diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-19 09:27:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-19 09:27:28 +0100 |
| commit | 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3 (patch) | |
| tree | 93a1691d7a5d90ddbb77a3210299089fcede4947 /util | |
| parent | a257c741491ff1c3c192d13a89c136dd6401c54d (diff) | |
| parent | cb8d4c8f54b8271f642f02382eec29d468bb1c77 (diff) | |
| download | qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.zip qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.gz qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging
trivial patches for 2016-05-18
# gpg: Signature made Wed 18 May 2016 13:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2016-05-18:
Fix some typos found by codespell
9p: drop unused declaration from coth.h
smbios: fix typo
accel: make configure_accelerator return void
configure: Use uniform description for devel packages
ipack: Update e-mail address
util: fix comment typos
qdict: fix unbounded stack warning for qdict_array_entries
Fix typo in variable name (found and fixed by codespell)
vl: fix comment about when parsing cpu definitions
loader: fix potential memory leak
remove comment for nonexistent structure member
s390: remove misleading comment
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/buffer.c | 4 | ||||
| -rw-r--r-- | util/qemu-sockets.c | 2 | ||||
| -rw-r--r-- | util/timed-average.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/util/buffer.c b/util/buffer.c index a6118bf..33e94d1 100644 --- a/util/buffer.c +++ b/util/buffer.c @@ -25,7 +25,7 @@ #define BUFFER_MIN_INIT_SIZE 4096 #define BUFFER_MIN_SHRINK_SIZE 65536 -/* define the factor alpha for the expentional smoothing +/* define the factor alpha for the exponential smoothing * that is used in the average size calculation. a shift * of 7 results in an alpha of 1/2^7. */ #define BUFFER_AVG_SIZE_SHIFT 7 @@ -45,7 +45,7 @@ static void buffer_adj_size(Buffer *buffer, size_t len) old, buffer->capacity); /* make it even harder for the buffer to shrink, reset average size - * to currenty capacity if it is larger than the average. */ + * to current capacity if it is larger than the average. */ buffer->avg_size = MAX(buffer->avg_size, buffer->capacity << BUFFER_AVG_SIZE_SHIFT); } diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 2a2c524..0d6cd1f 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -93,7 +93,7 @@ NetworkAddressFamily inet_netfamily(int family) * t f PF_INET * t t PF_INET6 * - * NB, this matrix is only about getting the neccessary results + * NB, this matrix is only about getting the necessary results * from getaddrinfo(). Some of the cases require further work * after reading results from getaddrinfo in order to fully * apply the logic the end user wants. eg with the last case diff --git a/util/timed-average.c b/util/timed-average.c index 2eef9cb..2b49d53 100644 --- a/util/timed-average.c +++ b/util/timed-average.c @@ -8,9 +8,9 @@ * Benoît Canet <benoit.canet@nodalink.com> * Alberto Garcia <berto@igalia.com> * - * This program is free sofware: you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Sofware Foundation, either version 2 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) version 3 or any later version. * * This program is distributed in the hope that it will be useful, |