Commit 8e3fb802 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 2018-02-10

# gpg: Signature made Sat 10 Feb 2018 07:54:03 GMT
# gpg:                using RSA key 701B4F6B1A693E59
# 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:
  tests/qapi: use ARRAY_SIZE macro
  tests/qapi: use QEMU_IS_ALIGNED macro
  tests/hbitmap: use ARRAY_SIZE macro
  async: use ARRAY_SIZE macro
  qga: use ARRAY_SIZE macro
  MAINTAINERS: Add qemu-binfmt-conf.sh script
  oslib-posix: check for posix_memalign in configure script
  maint: Mention web site maintenance in README
  build: fix typo in error message
  configure: Allow capstone=git only if git update is not disabled
  scripts/make-release: Don't archive .git files
  qemu-options.hx: Remove confusing spaces in parameter listings
  mailmap: set preferred spelling for Daniel Berrangé
  Drop unneeded system header includes
  machine: Polish -machine xxx,help
  scripts/argparse.py: spelling (independant)
  qapi-schema.json: spelling (independant comparation)

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 019bb9ac d40d74a6

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -18,3 +18,7 @@ malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> 
# There is also a:

#    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>

# for the cvs2svn initialization commit e63c3dc74bf.

#

# Also list preferred name forms where people have changed their

# git author config

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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1761,6 +1761,7 @@ R: Laurent Vivier <laurent@vivier.eu> 
S: Maintained

F: linux-user/

F: default-configs/*-linux-user.mak

F: scripts/qemu-binfmt-conf.sh



Tiny Code Generator (TCG)

-------------------------

README

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ the QEMU website 
  https://qemu.org/Contribute/SubmitAPatch

  https://qemu.org/Contribute/TrivialPatches



The QEMU website is also maintained under source control.



  git clone git://git.qemu.org/qemu-web.git

  https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/



Bug reporting

=============

configure

+20 −1
Original line number Diff line number Diff line
@@ -4568,7 +4568,7 @@ case "$capstone" in 
  "" | yes)

    if $pkg_config capstone; then

      capstone=system

    elif test -e "${source_path}/.git" ; then

    elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then

      capstone=git

    elif test -e "${source_path}/capstone/Makefile" ; then

      capstone=internal
@@ -4658,6 +4658,21 @@ if compile_prog "" "" ; then 
    posix_madvise=yes

fi



##########################################

# check if we have posix_memalign()



posix_memalign=no

cat > $TMPC << EOF

#include <stdlib.h>

int main(void) {

    void *p;

    return posix_memalign(&p, 8, 8);

}

EOF

if compile_prog "" "" ; then

    posix_memalign=yes

fi



##########################################

# check if we have posix_syslog
@@ -5746,6 +5761,7 @@ echo "preadv support $preadv" 
echo "fdatasync         $fdatasync"

echo "madvise           $madvise"

echo "posix_madvise     $posix_madvise"

echo "posix_memalign    $posix_memalign"

echo "libcap-ng support $cap_ng"

echo "vhost-net support $vhost_net"

echo "vhost-scsi support $vhost_scsi"
@@ -6232,6 +6248,9 @@ fi 
if test "$posix_madvise" = "yes" ; then

  echo "CONFIG_POSIX_MADVISE=y" >> $config_host_mak

fi

if test "$posix_memalign" = "yes" ; then

  echo "CONFIG_POSIX_MEMALIGN=y" >> $config_host_mak

fi



if test "$spice" = "yes" ; then

  echo "CONFIG_SPICE=y" >> $config_host_mak

hw/core/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static void machine_class_init(ObjectClass *oc, void *data) 
    object_class_property_set_description(oc, "accel",

        "Accelerator list", &error_abort);



    object_class_property_add(oc, "kernel-irqchip", "OnOffSplit",

    object_class_property_add(oc, "kernel-irqchip", "on|off|split",

        NULL, machine_set_kernel_irqchip,

        NULL, NULL, &error_abort);

    object_class_property_set_description(oc, "kernel-irqchip",