mbox

[PULL,00/22] Trivial patches for 2017-06-04

Message ID cover.1496591095.git.mjt@msgid.tls.msk.ru
State New
Headers show

Pull-request

git://git.corpit.ru/qemu.git tags/trivial-patches-fetch

Message

Michael Tokarev June 4, 2017, 3:45 p.m. UTC
Trivial patches for 04 Jun 2017. Please consider applying.

/mjt

The following changes since commit c6e84fbd447a51e1161d74d71566a5f67b47eac5:

  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-06-02 17:46:22 +0100)

are available in the git repository at:

  git://git.corpit.ru/qemu.git tags/trivial-patches-fetch

for you to fetch changes up to 070ccceda3b23f85d048bbcf3c0040252a9a793a:

  hw/core: nmi.c can be compiled as common-obj nowadays (2017-06-04 18:43:09 +0300)

----------------------------------------------------------------
trivial patches for 2017-06-04

----------------------------------------------------------------
Eric Blake (2):
      block: Correct documentation for BLOCK_WRITE_THRESHOLD
      qapi: Fix some QMP documentation regressions

John Snow (1):
      ide-test: check return of fwrite

Juan Quintela (1):
      trivial: Remove unneeded ifndef in memory.h

Kamil Rytarowski (2):
      configure: Detect native NetBSD curses(3)
      ivshmem-server: ivshmem-client: Build when eventfd() is available

Luc MICHEL (1):
      target/arm: add data cache invalidation cp15 instruction to cortex-r5

Mao Zhongyi (1):
      scsi/lsi53c895a: Remove unused lsi_mem_*() return value

Marc-André Lureau (2):
      qemu-ga: remove useless allocation
      dump: fix memory_mapping_filter leak

Markus Armbruster (2):
      docs qemu-doc: Avoid ide-drive, it's deprecated
      docs/qdev-device-use.txt: update section Default Devices

Max Filippov (1):
      hw/xtensa: sim: use g_string/g_new

Paolo Bonzini (1):
      altera_timer: fix incorrect memset

Philippe Mathieu-Daudé (3):
      hw/sparc: use ARRAY_SIZE() macro
      register: display register prefix (name) since it is available
      hw/mips: add missing include

Suraj Jitindar Singh (1):
      help: Add newline to end of thread option help text

Thomas Huth (4):
      qemu-doc: Move the qemu-ga description into a separate chapter
      qemu-doc: Add hyperlinks to further license information
      tests/libqtest: Print error instead of aborting when env variable is missing
      hw/core: nmi.c can be compiled as common-obj nowadays

 configure                            |  5 +++--
 contrib/ivshmem-client/Makefile.objs |  2 +-
 contrib/ivshmem-server/Makefile.objs |  2 +-
 docs/bootindex.txt                   |  2 +-
 docs/qdev-device-use.txt             | 13 +++++++------
 hw/core/Makefile.objs                |  2 +-
 hw/core/register.c                   |  8 ++++----
 hw/scsi/lsi53c895a.c                 | 10 ++++------
 hw/sparc64/sun4u.c                   |  2 +-
 hw/timer/altera_timer.c              |  2 +-
 hw/xtensa/sim.c                      | 10 +++++-----
 include/exec/memory.h                |  2 --
 include/hw/mips/mips.h               |  1 +
 memory_mapping.c                     |  1 +
 qapi/block-core.json                 | 30 +++++++++++++++---------------
 qapi/block.json                      |  2 +-
 qemu-doc.texi                        | 21 +++++++++++----------
 qemu-options.hx                      |  4 ++--
 qga/commands-posix.c                 |  4 +---
 target/arm/cpu.c                     |  2 ++
 tests/ide-test.c                     |  8 ++++++--
 tests/libqtest.c                     |  5 ++++-
 22 files changed, 73 insertions(+), 65 deletions(-)

Comments

Peter Maydell June 5, 2017, 12:05 p.m. UTC | #1
On 4 June 2017 at 16:45, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Trivial patches for 04 Jun 2017. Please consider applying.
>
> /mjt
>
> The following changes since commit c6e84fbd447a51e1161d74d71566a5f67b47eac5:
>
>   Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-06-02 17:46:22 +0100)
>
> are available in the git repository at:
>
>   git://git.corpit.ru/qemu.git tags/trivial-patches-fetch
>
> for you to fetch changes up to 070ccceda3b23f85d048bbcf3c0040252a9a793a:
>
>   hw/core: nmi.c can be compiled as common-obj nowadays (2017-06-04 18:43:09 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2017-06-04
>
> ----------------------------------------------------------------

Hi. I'm afraid this doesn't build in the all-linux-static config
(configure '--cc=ccache gcc' '--enable-debug' '--static' '--disable-system'):

$ make -C build/all-linux-static/ V=1
make: Entering directory
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static'
(cd /home/petmay01/linaro/qemu-for-merges; printf '#define
QEMU_PKGVERSION '; if test -n ""; then printf '""\n'; else if test -d
.git; then printf '" ('; git describe --match 'v*' 2>/dev/null | tr -d
'\n'; if ! git diff-index --quiet HEAD &>/dev/null; then printf --
'-dirty'; fi; printf ')"\n'; else printf '""\n'; fi; fi) >
qemu-version.h.tmp
if ! cmp -s qemu-version.h qemu-version.h.tmp; then mv
qemu-version.h.tmp qemu-version.h; else rm qemu-version.h.tmp; fi
c++ -I/usr/include/pixman-1  -Werror -pthread -I/usr/include/glib-2.0
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -D_GNU_SOURCE
-I/usr/include/ncursesw -m64 -mcx16 -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
-Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes
-fno-strict-aliasing -fno-common -fwrapv  -Wendif-labels
-Wno-missing-include-dirs -Wempty-body -Wnested-externs
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers
-Wold-style-declaration -Wold-style-definition -Wtype-limits
-fstack-protector-strong    -I/usr/include/libpng12
-I/usr/include/libusb-1.0
-I/home/petmay01/linaro/qemu-for-merges/tests -g  -Wl,--warn-common
-m64 -static -g  -o ivshmem-client   libqemuutil.a libqemustub.a   -lm
-lgthread-2.0 -pthread -lglib-2.0 -pthread -lpcre -pthread  -lz -lrt
-lz -lcap-ng -lvdeplug -lnettle  -lutil
/usr/lib/gcc/x86_64-linux-gnu/5/../../../x86_64-linux-gnu/crt1.o: In
function `_start':
(.text+0x20): undefined reference to `main'
collect2: error: ld returned 1 exit status
Makefile:473: recipe for target 'ivshmem-client' failed

Looks like the makefile is trying to build ivshmem-client even though
it has no .o files in the link line. Similarly for ivshmem-server.

thanks
-- PMM