From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 16 Oct 2017 17:29:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/huth/tags/pull-request-2017-10-16' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e24cdd07216890d24468cdcbdd5a3e60b3e9f23b;p=qemu.git

Merge remote-tracking branch 'remotes/huth/tags/pull-request-2017-10-16' into staging

Some m68k, qtest and config improvements

# gpg: Signature made Mon 16 Oct 2017 13:38:03 BST
# gpg:                using RSA key 0x2ED9D774FE702DB5
# 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/tags/pull-request-2017-10-16:
  default-configs: Enable CONFIG_VMXNET3_PCI only on x86
  tests/prom-env: Bump the timeout, and test pseries only in slow mode
  tests: use g_new() family of functions
  M68K: use g_new() family of functions
  hw/m68k: Replace fprintf(stderr, "*\n" with error_report()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

e24cdd07216890d24468cdcbdd5a3e60b3e9f23b