[Qemu-commits] [qemu/qemu] f75ca6: vfio: fix a typo

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f75ca627234bbe69d0540dfceba35228d4eadacd
      
https://github.com/qemu/qemu/commit/f75ca627234bbe69d0540dfceba35228d4eadacd
  Author: Chen Zhang <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M hw/vfio/pci.c

  Log Message:
  -----------
  vfio: fix a typo

Signed-off-by: Chen Zhang <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 31e404151bddbfd7215e471b5822ea2e96024e02
      
https://github.com/qemu/qemu/commit/31e404151bddbfd7215e471b5822ea2e96024e02
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M block/qapi.c
    M include/qemu-common.h
    M include/qemu/cutils.h
    M qapi/string-output-visitor.c

  Log Message:
  -----------
  cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h"

"qemu/cutils.h" contains various qemu_strtosz_*() functions
useful to convert strings to size. It seems natural to have
the opposite usage (from size to string) there too.

The function definition is already in util/cutils.c.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 976e8c54142586285f71f524308e4715f6e04e2d
      
https://github.com/qemu/qemu/commit/976e8c54142586285f71f524308e4715f6e04e2d
  Author: Thomas Huth <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M python/qemu/qtest.py
    M qemu-deprecated.texi
    M qemu-options.hx
    M tests/libqtest.c
    M tests/migration/guestperf/engine.py
    M tests/qemu-iotests/172

  Log Message:
  -----------
  Replace '-machine accel=xyz' with '-accel xyz'

We've got a separate option to configure the accelerator nowadays, which
is shorter to type and the preferred way of specifying an accelerator.
Use it in the source and examples to show that it is the favored option.
(However, do not touch the places yet which also specify other machine
options or multiple accelerators - these are currently still better
handled with one single "-machine" statement instead)

Signed-off-by: Thomas Huth <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 198d7003f109e78444c7296efe03e30f01de18d9
      
https://github.com/qemu/qemu/commit/198d7003f109e78444c7296efe03e30f01de18d9
  Author: KONRAD Frederic <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M target/m68k/fpu_helper.c

  Log Message:
  -----------
  target/m68k/fpu_helper.c: rename the access arguments

The "access" arguments clash with a macro under Windows with MinGW:
  CC      m68k-softmmu/target/m68k/fpu_helper.o
  target/m68k/fpu_helper.c: In function 'fmovem_predec':
  target/m68k/fpu_helper.c:405:56: error: macro "access" passed 4 arguments,
   but takes just 2
               size = access(env, addr, &env->fregs[i], ra);

So this renames them access_fn.

Tested with:
 ./configure --target-list=m68k-softmmu
 make -j8

Signed-off-by: KONRAD Frederic <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 5c95975d8d904f09733999bf77a5b67abe1d39e0
      
https://github.com/qemu/qemu/commit/5c95975d8d904f09733999bf77a5b67abe1d39e0
  Author: Eric Blake <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  build: Don't ignore qapi-visit-core.c

This file is version-controlled, and not generated from a .json file.

Fixes: bf582c3461b
Reported-by: Thomas Huth <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 5ca156cfde0f3821f15988619e51cf3cda99aaa6
      
https://github.com/qemu/qemu/commit/5ca156cfde0f3821f15988619e51cf3cda99aaa6
  Author: Justin Hibbits <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M util/cacheinfo.c

  Log Message:
  -----------
  Fix cacheline detection on FreeBSD/powerpc.

machdep.cacheline_size is an integer, not a long.  Since PowerPC is
big-endian this causes sysctlbyname() to fill in the upper bits of the
argument, rather than the correct 'lower bits' of the word.  Specify the
correct type to fix this.

Fixes: b255b2c8a548 ("util: add cacheinfo")
Signed-off-by: Justin Hibbits <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Tested-by: Justin Hibbits <address@hidden>
Message-Id: <address@hidden>


  Commit: 84b6ea05ea13628d0dd99e3582060b26b7a1225a
      
https://github.com/qemu/qemu/commit/84b6ea05ea13628d0dd99e3582060b26b7a1225a
  Author: Greg Kurz <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M include/sysemu/kvm.h

  Log Message:
  -----------
  kvm: Fix typo in header of kvm_device_access()

Signed-off-by: Greg Kurz <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 754119198de633683d7af79bc08e73c2de9df011
      
https://github.com/qemu/qemu/commit/754119198de633683d7af79bc08e73c2de9df011
  Author: James Le Cuirot <address@hidden>
  Date:   2019-09-19 (Thu, 19 Sep 2019)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Add xkbcommon configure options

This dependency is currently "automagic", which is bad for distributions.

Signed-off-by: James Le Cuirot <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: f5c7af6295b18c9cb9bc183648ce37481b49f432
      
https://github.com/qemu/qemu/commit/f5c7af6295b18c9cb9bc183648ce37481b49f432
  Author: Peter Maydell <address@hidden>
  Date:   2019-09-20 (Fri, 20 Sep 2019)

  Changed paths:
    M .gitignore
    M block/qapi.c
    M configure
    M hw/vfio/pci.c
    M include/qemu-common.h
    M include/qemu/cutils.h
    M include/sysemu/kvm.h
    M python/qemu/qtest.py
    M qapi/string-output-visitor.c
    M qemu-deprecated.texi
    M qemu-options.hx
    M target/m68k/fpu_helper.c
    M tests/libqtest.c
    M tests/migration/guestperf/engine.py
    M tests/qemu-iotests/172
    M util/cacheinfo.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier2/tags/trivial-branch-pull-request' into staging

Trivial patches 20190919

# gpg: Signature made Thu 19 Sep 2019 14:50:55 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier <address@hidden>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <address@hidden>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  configure: Add xkbcommon configure options
  kvm: Fix typo in header of kvm_device_access()
  Fix cacheline detection on FreeBSD/powerpc.
  build: Don't ignore qapi-visit-core.c
  target/m68k/fpu_helper.c: rename the access arguments
  Replace '-machine accel=xyz' with '-accel xyz'
  cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h"
  vfio: fix a typo

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/b53c54c63f04...f5c7af6295b1