Commit 77f7c747 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-10-17' into staging 



- Updates for qtest entries in test/Makefile.include
- Simple updates for some shell scripts
- Misc simple patches for files without regular subsystem pull requests

# gpg: Signature made Wed 17 Oct 2018 08:20:35 BST
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2018-10-17:
  configure: remove glib_subprocess check
  hw/core/generic-loader: Compile only once, not for each target
  cpu: Provide a proper prototype for target_words_bigendian() in a header
  hw/core/generic-loader: Set a category for the generic-loader device
  qemu/compiler: Wrap __attribute__((flatten)) in a macro
  mailmap: Fix Reimar Döffinger name
  show-fixed-bugs.sh: Modern shell scripting (use $() instead of ``)
  git-submodule.sh: Modern shell scripting (use $() instead of ``)
  archive-source.sh: Modern shell scripting (use $() instead of ``)
  MAINTAINERS: update block/sheepdog maintainers
  gdbstub: Remove unused include
  tests: remove gcov-files- variables
  tests: Prevent more accidental test disabling
  target/cris/translate: Get rid of qemu_log_separate()
  qemu-common.h: update copyright date to 2018

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b151fc0e 7fc527cd

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -33,5 +33,6 @@ Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu 




# Also list preferred name forms where people have changed their

# git author config

# git author config, or having utf8/latin1 encoding issues.

Daniel P. Berrangé <berrange@redhat.com>

Reimar Döffinger <Reimar.Doeffinger@gmx.de>

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -2023,7 +2023,6 @@ F: block/rbd.c 
T: git git://github.com/codyprime/qemu-kvm-jtc.git block



Sheepdog

M: Hitoshi Mitake <mitake.hitoshi@lab.ntt.co.jp>

M: Liu Yuan <namei.unix@gmail.com>

M: Jeff Cody <jcody@redhat.com>

L: qemu-block@nongnu.org

configure

+0 −6
Original line number Diff line number Diff line
@@ -3531,12 +3531,6 @@ if ! compile_prog "$CFLAGS" "$LIBS" ; then 
	       "build target"

fi



# g_test_trap_subprocess added in 2.38. Used by some tests.

glib_subprocess=yes

if ! $pkg_config --atleast-version=2.38 glib-2.0; then

    glib_subprocess=no

fi



# Silence clang 3.5.0 warnings about glib attribute __alloc_size__ usage

cat > $TMPC << EOF

#include <glib.h>

docs/devel/testing.rst

+1 −3
Original line number Diff line number Diff line
@@ -43,15 +43,13 @@ add a new unit test: 


3. Add the test to ``tests/Makefile.include``. First, name the unit test

   program and add it to ``$(check-unit-y)``; then add a rule to build the

   executable. Optionally, you can add a magical variable to support ``gcov``.

   For example:

   executable.  For example:



.. code::



  check-unit-y += tests/foo-test$(EXESUF)

  tests/foo-test$(EXESUF): tests/foo-test.o $(test-util-obj-y)

  ...

  gcov-files-foo-test-y = util/foo.c



Since unit tests don't require environment variables, the simplest way to debug

a unit test failure is often directly invoking it or even running it under

exec.c

+0 −5
Original line number Diff line number Diff line
@@ -3906,11 +3906,6 @@ int qemu_target_page_bits_min(void) 
}

#endif



/*

 * A helper function for the _utterly broken_ virtio device model to find out if

 * it's running on a big endian machine. Don't do this at home kids!

 */

bool target_words_bigendian(void);

bool target_words_bigendian(void)

{

#if defined(TARGET_WORDS_BIGENDIAN)