diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-11 12:56:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-11 12:56:58 +0000 |
| commit | 692a5519ab1510ff48bdde9701017b9425643058 (patch) | |
| tree | d408009c661e9750322911a50a8e2961812b7b99 /include | |
| parent | cc06ca4c97e7bd101fba965c5de74d9c242964f6 (diff) | |
| parent | fe02fc5209d497d011b2b4b09395e2503d9dedc6 (diff) | |
| download | qemu-692a5519ab1510ff48bdde9701017b9425643058.zip qemu-692a5519ab1510ff48bdde9701017b9425643058.tar.gz qemu-692a5519ab1510ff48bdde9701017b9425643058.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-01-11' into staging
trivial patches for 2016-01-11
# gpg: Signature made Mon 11 Jan 2016 08:39:32 GMT 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-01-11:
hw/s390x: Remove superfluous return statements
hw/core/qdev: Remove superfluous return statement
hw/acpi: Remove superfluous return statement
hw/ide: Remove superfluous return statements
osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h
scripts/checkpatch.pl: Don't allow special cases of unspaced operators
PCI Bonito: QOMify and cleanup
SH PCI Host: convert to realize()
gt64120: convert to realize()
Add missing syscall nrs. according to more recent Linux kernels
hw/misc/edu: Convert to realize()
configure: fix trace backend check
xen/Makefile.objs: simplify
crypto: Fix typo in example
MAINTAINERS: Add the correct device_tree.h file
iscsi: fix readcapacity error message
net: convert qemu_log to error_report, fix message
linux-user: enable sigaltstack for all architectures
unicore32: convert get_sp_from_cpustate from macro to inline
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/tlssession.h | 2 | ||||
| -rw-r--r-- | include/qemu-common.h | 1 | ||||
| -rw-r--r-- | include/qemu/osdep.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/crypto/tlssession.h b/include/crypto/tlssession.h index b38fe69..d356a8d 100644 --- a/include/crypto/tlssession.h +++ b/include/crypto/tlssession.h @@ -56,7 +56,7 @@ * * static int mysock_run_tls(int sockfd, * QCryptoTLSCreds *creds, - * Error *erp) + * Error *errp) * { * QCryptoTLSSession *sess; * diff --git a/include/qemu-common.h b/include/qemu-common.h index 405364f..22b010c 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -22,7 +22,6 @@ #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) -#include "glib-compat.h" #include "qemu/option.h" #include "qemu/host-utils.h" diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 84e84ac..59a7f8d 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -69,6 +69,8 @@ #include "sysemu/os-posix.h" #endif +#include "glib-compat.h" + #include "qapi/error.h" #if defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10 |