diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-31 11:27:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-31 11:27:43 +0100 |
| commit | 25dd0e77898c3e10796d4cbeb35e8af5ba6ce975 (patch) | |
| tree | c92fef1efcce9d5b05927b6df09e28ac45d5ae2f /include | |
| parent | 0c26c080ee592ea47597d3ab8fd712d7d2c4ba0f (diff) | |
| parent | 25e11d8774630600ef4c5e9906419a77163a28a1 (diff) | |
| download | qemu-25dd0e77898c3e10796d4cbeb35e8af5ba6ce975.zip qemu-25dd0e77898c3e10796d4cbeb35e8af5ba6ce975.tar.gz qemu-25dd0e77898c3e10796d4cbeb35e8af5ba6ce975.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-07-31
# gpg: Signature made Mon 31 Jul 2017 11:18:57 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: (25 commits)
docs: fix broken paths to docs/specs/ivshmem-spec.txt
docs: fix broken paths to docs/config/ich9-ehci-uhci.cfg
docs: fix broken paths to docs/devel/tracing.txt
docs: fix broken paths to docs/devel/atomics.txt
docs: fix broken paths to docs/devel/qapi-code-gen.txt
docs: fix broken paths to docs/interop/qcow2.txt
docs: fix broken paths to docs/interop dir
thunk: assert nb_fields is valid
syscall: check inotify() and eventfd() return value
syscall: fix use of uninitialized values
syscall: fix dereference of undefined pointer
linux-user/sh4: fix incorrect memory write
m68k/translate: fix incorrect copy/paste
net/eth: fix incorrect check of iov_to_buf() return value
ui/vnc: fix leak of SocketAddress **
qcow2: fix null pointer dereference
ivshmem: fix incorrect error handling in ivshmem_recv_msg()
loader: check get_image_size() return value
tests: add missing dependency to build QTEST_QEMU_BINARY
qemu-system-tricore: segfault when entering "x 0" on the monitor
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qapi/visitor.h | 2 | ||||
| -rw-r--r-- | include/qemu/atomic.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index fe9faf4..0f3b8cb 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -36,7 +36,7 @@ * QemuOpts, and clone visitors have some implementation limitations; * see the documentation for each visitor for more details on what it * supports. Also, see visitor-impl.h for the callback contracts - * implemented by each visitor, and docs/qapi-code-gen.txt for more + * implemented by each visitor, and docs/devel/qapi-code-gen.txt for more * about the QAPI code generator. * * All of the visitors are created via: diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index e07c797..b6b62fb 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -8,7 +8,7 @@ * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. * - * See docs/atomics.txt for discussion about the guarantees each + * See docs/devel/atomics.txt for discussion about the guarantees each * atomic primitive is meant to provide. */ @@ -427,7 +427,7 @@ * sequentially consistent operations. * * As long as they are used as paired operations they are safe to - * use. See docs/atomic.txt for more discussion. + * use. See docs/devel/atomics.txt for more discussion. */ #ifndef atomic_mb_read |