Commit 25dd0e77 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 0c26c080 25e11d87

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ NETBSD 
L: qemu-devel@nongnu.org

M: Kamil Rytarowski <kamil@netbsd.org>

S: Maintained

K: (?i)NetBSD

K: ^Subject:.*(?i)NetBSD



W32, W64

L: qemu-devel@nongnu.org

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py) 
		"GEN","$@")



QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)

$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)

$(qga-obj-y): $(QGALIB_GEN)



qemu-ga$(EXESUF): $(qga-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)

audio/trace-events

+1 −1
Original line number Diff line number Diff line 
# See docs/tracing.txt for syntax documentation.

# See docs/devel/tracing.txt for syntax documentation.



# audio/alsaaudio.c

alsa_revents(int revents) "revents = %d"

block/qcow2-refcount.c

+2 −2
Original line number Diff line number Diff line
@@ -2189,6 +2189,8 @@ write_refblocks: 
             * this will leak that range, but we can easily fix that by running

             * a leak-fixing check after this rebuild operation */

            reftable_offset = -1;

        } else {

            assert(on_disk_reftable);

        }

        on_disk_reftable[refblock_index] = refblock_offset;
@@ -2258,8 +2260,6 @@ write_refblocks: 
        goto write_refblocks;

    }



    assert(on_disk_reftable);



    for (refblock_index = 0; refblock_index < reftable_size; refblock_index++) {

        cpu_to_be64s(&on_disk_reftable[refblock_index]);

    }

block/trace-events

+1 −1
Original line number Diff line number Diff line 
# See docs/tracing.txt for syntax documentation.

# See docs/devel/tracing.txt for syntax documentation.



# block.c

bdrv_open_common(void *bs, const char *filename, int flags, const char *format_name) "bs %p filename \"%s\" flags %#x format_name \"%s\""