Commit 2021b7c9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



trivial patches 20200206

# gpg: Signature made Thu 06 Feb 2020 12:49:19 GMT
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  MAINTAINERS: Cc the qemu-arm@nongnu.org for the ARM machines
  aspeed/i2c: Prevent uninitialized warning
  hw/pci/pci_bridge: Fix typo in comment
  qemu-img: Place the '-i aio' option in alphabetical order
  qemu-options: replace constant 1 with HAS_ARG
  MAINTAINERS: Cover hppa-softmmu.mak in the HP-PARISC Machines section
  hw/i386/vmmouse: Fix crash when using the vmmouse on a machine without vmport
  hw/bt: Remove empty Kconfig file
  hw/timer/m48t59: Convert debug printf()s to trace events
  MAINTAINERS: update Leif Lindholm's address
  monitor: fix memory leak in monitor_fdset_dup_fd_find_remove
  hw/smbios/smbios: Remove unused include

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 418fa86d 8ef350b3

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com> 
Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com> <arikalo@wavecomp.com>

Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

Leif Lindholm <leif@nuviainc.com> <leif.lindholm@linaro.org>

Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>

Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>

Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ F: include/hw/ssi/imx_spi.h 
SBSA-REF

M: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>

M: Peter Maydell <peter.maydell@linaro.org>

R: Leif Lindholm <leif.lindholm@linaro.org>

R: Leif Lindholm <leif@nuviainc.com>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/sbsa-ref.c
@@ -809,6 +809,7 @@ F: hw/arm/virt-acpi-build.c 
STM32F205

M: Alistair Francis <alistair@alistair23.me>

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/stm32f205_soc.c

F: hw/misc/stm32f2xx_syscfg.c
@@ -821,6 +822,7 @@ F: include/hw/*/stm32*.h 
STM32F405

M: Alistair Francis <alistair@alistair23.me>

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/stm32f405_soc.c

F: hw/misc/stm32f4xx_syscfg.c
@@ -829,18 +831,21 @@ F: hw/misc/stm32f4xx_exti.c 
Netduino 2

M: Alistair Francis <alistair@alistair23.me>

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/netduino2.c



Netduino Plus 2

M: Alistair Francis <alistair@alistair23.me>

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/netduinoplus2.c



SmartFusion2

M: Subbaraya Sundeep <sundeep.lkml@gmail.com>

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/msf2-soc.c

F: hw/misc/msf2-sysreg.c
@@ -854,6 +859,7 @@ F: include/hw/ssi/mss-spi.h 
Emcraft M2S-FG484

M: Subbaraya Sundeep <sundeep.lkml@gmail.com>

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/arm/msf2-som.c
@@ -896,6 +902,7 @@ HP B160L 
M: Richard Henderson <rth@twiddle.net>

R: Helge Deller <deller@gmx.de>

S: Odd Fixes

F: default-configs/hppa-softmmu.mak

F: hw/hppa/

F: pc-bios/hppa-firmware.img
@@ -1401,6 +1408,7 @@ T: git https://github.com/jnsnow/qemu.git ide 


OMAP

M: Peter Maydell <peter.maydell@linaro.org>

L: qemu-arm@nongnu.org

S: Maintained

F: hw/*/omap*

F: include/hw/arm/omap.h

docs/interop/qemu-img.rst

+4 −4
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ Command description: 
  Amends the image format specific *OPTIONS* for the image file

  *FILENAME*. Not all file formats support this operation.



.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-n] [-i AIO] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME

.. option:: bench [-c COUNT] [-d DEPTH] [-f FMT] [--flush-interval=FLUSH_INTERVAL] [-i AIO] [-n] [--no-drain] [-o OFFSET] [--pattern=PATTERN] [-q] [-s BUFFER_SIZE] [-S STEP_SIZE] [-t CACHE] [-w] [-U] FILENAME



  Run a simple sequential I/O benchmark on the specified image. If ``-w`` is

  specified, a write test is performed, otherwise a read test is performed.
@@ -264,13 +264,13 @@ Command description: 
  ``--no-drain`` is specified, a flush is issued without draining the request

  queue first.



  if ``-i`` is specified, *AIO* option can be used to specify different

  AIO backends: ``threads``, ``native`` or ``io_uring``.



  If ``-n`` is specified, the native AIO backend is used if possible. On

  Linux, this option only works if ``-t none`` or ``-t directsync`` is

  specified as well.



  if ``-i`` is specified, *AIO* option can be used to specify different

  AIO backends: ``threads``, ``native`` or ``io_uring``.



  For write tests, by default a buffer filled with zeros is written. This can be

  overridden with a pattern byte specified by *PATTERN*.

hw/bt/Kconfig

deleted100644 → 0
+0 −0

Empty file deleted.

hw/i2c/aspeed_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static bool aspeed_i2c_check_sram(AspeedI2CBus *bus) 


static void aspeed_i2c_bus_cmd_dump(AspeedI2CBus *bus)

{

    g_autofree char *cmd_flags;

    g_autofree char *cmd_flags = NULL;

    uint32_t count;



    if (bus->cmd & (I2CD_RX_BUFF_ENABLE | I2CD_RX_BUFF_ENABLE)) {