diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-17 13:13:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-17 13:13:03 +0100 |
| commit | a9038e5e1992b7fac33e346ec10a01e4a4f33ab2 (patch) | |
| tree | c59e8ba82daac9ac27712a6f2c71fd925323e521 /include | |
| parent | dabc50e4c68c1be046d4a42908af0f9df69f910a (diff) | |
| parent | 6b4f250bfc529bdf73a10ca6873a460175e666cc (diff) | |
| download | qemu-a9038e5e1992b7fac33e346ec10a01e4a4f33ab2.tar.gz | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-10-16
# gpg: Signature made Mon 16 Oct 2017 21:32:05 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch:
Add myself as maintainer for TPM code
filter-mirror: segfault when specifying non existent device
MAINTAINERS: Track default-configs/pci.mak
MAINTAINERS: Fix Sun4v file
MAINTAINERS: Clean up SCSI device section
include/hw/or-irq.h: Drop unused in_irqs field
io: Add missing GCC_FMT_ATTR (fix -Werror=suggest-attribute=format)
os-posix: Drop misleading comment
linux-user: Add some random ioctls
futex: add missing header guards
ui/gtk: Fix deprecation of vte_terminal_copy_clipboard
gitignore: ignore check-qlit test
linux-user: remove duplicate break in syscall
qemu-doc.texi: remove trailing whitespace
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/or-irq.h | 1 | ||||
| -rw-r--r-- | include/qemu/futex.h | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/include/hw/or-irq.h b/include/hw/or-irq.h index d400a8120b..fd900fcf19 100644 --- a/include/hw/or-irq.h +++ b/include/hw/or-irq.h @@ -38,7 +38,6 @@ struct OrIRQState { DeviceState parent_obj; qemu_irq out_irq; - qemu_irq *in_irqs; bool levels[MAX_OR_LINES]; uint16_t num_lines; }; diff --git a/include/qemu/futex.h b/include/qemu/futex.h index bb7dc9e296..91ae88966e 100644 --- a/include/qemu/futex.h +++ b/include/qemu/futex.h @@ -11,6 +11,9 @@ * */ +#ifndef QEMU_FUTEX_H +#define QEMU_FUTEX_H + #include <sys/syscall.h> #include <linux/futex.h> @@ -34,3 +37,5 @@ static inline void qemu_futex_wait(void *f, unsigned val) } } } + +#endif /* QEMU_FUTEX_H */ |