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 /include/hw | |
| 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 'include/hw')
| -rw-r--r-- | include/hw/ipack/ipack.h | 2 | ||||
| -rw-r--r-- | include/hw/smbios/smbios.h | 2 | ||||
| -rw-r--r-- | include/hw/xen/xen_common.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/ipack/ipack.h b/include/hw/ipack/ipack.h index e95ffe8..e33e032 100644 --- a/include/hw/ipack/ipack.h +++ b/include/hw/ipack/ipack.h @@ -2,7 +2,7 @@ * QEMU IndustryPack emulation * * Copyright (C) 2012 Igalia, S.L. - * Author: Alberto Garcia <agarcia@igalia.com> + * Author: Alberto Garcia <berto@igalia.com> * * This code is licensed under the GNU GPL v2 or (at your option) any * later version. diff --git a/include/hw/smbios/smbios.h b/include/hw/smbios/smbios.h index 76ccf70..ba36746 100644 --- a/include/hw/smbios/smbios.h +++ b/include/hw/smbios/smbios.h @@ -33,7 +33,7 @@ typedef enum SmbiosEntryPointType { /* SMBIOS Entry Point * There are two types of entry points defined in the SMBIOS specification - * (see below). BIOS must place the entry point(s) at a 16-bit-aligned + * (see below). BIOS must place the entry point(s) at a 16-byte-aligned * address between 0xf0000 and 0xfffff. Note that either entry point type * can be used in a 64-bit target system, except that SMBIOS 2.1 entry point * only allows the SMBIOS struct table to reside below 4GB address space. diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index bd65e67..7b52e8f 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -26,7 +26,7 @@ * We don't support Xen prior to 4.2.0. */ -/* Xen 4.2 thru 4.6 */ +/* Xen 4.2 through 4.6 */ #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 471 typedef xc_interface xenforeignmemory_handle; |