[Qemu-commits] [qemu/qemu] aa32c2: hw/smbios/smbios: Remove unused include

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: aa32c243922374666a9ae852ac2693664bb9801a
      
https://github.com/qemu/qemu/commit/aa32c243922374666a9ae852ac2693664bb9801a
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M hw/smbios/smbios.c

  Log Message:
  -----------
  hw/smbios/smbios: Remove unused include

Nothing from "sysemu/cpus.h" is used by smbios.c, remove the include.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: a661614de18c89f58cad3fc1bb8aab44e820183a
      
https://github.com/qemu/qemu/commit/a661614de18c89f58cad3fc1bb8aab44e820183a
  Author: Chen Qun <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M monitor/misc.c

  Log Message:
  -----------
  monitor: fix memory leak in monitor_fdset_dup_fd_find_remove

When remove dup_fd in monitor_fdset_dup_fd_find_remove function,
we need to free mon_fdset_fd_dup. ASAN shows memory leak stack:

Direct leak of 96 byte(s) in 3 object(s) allocated from:
    #0 0xfffd37b033b3 in __interceptor_calloc (/lib64/libasan.so.4+0xd33b3)
    #1 0xfffd375c71cb in g_malloc0 (/lib64/libglib-2.0.so.0+0x571cb)
    #2 0xaaae25bf1c17 in monitor_fdset_dup_fd_add /qemu/monitor/misc.c:1724
    #3 0xaaae265cfd8f in qemu_open /qemu/util/osdep.c:315
    #4 0xaaae264e2b2b in qmp_chardev_open_file_source 
/qemu/chardev/char-fd.c:122
    #5 0xaaae264e47cf in qmp_chardev_open_file /qemu/chardev/char-file.c:81
    #6 0xaaae264e118b in qemu_char_open /qemu/chardev/char.c:237
    #7 0xaaae264e118b in qemu_chardev_new /qemu/chardev/char.c:964
    #8 0xaaae264e1543 in qemu_chr_new_from_opts /qemu/chardev/char.c:680
    #9 0xaaae25e12e0f in chardev_init_func /qemu/vl.c:2083
    #10 0xaaae26603823 in qemu_opts_foreach /qemu/util/qemu-option.c:1170
    #11 0xaaae258c9787 in main /qemu/vl.c:4089
    #12 0xfffd35b80b9f in __libc_start_main (/lib64/libc.so.6+0x20b9f)
    #13 0xaaae258d7b63  
(/qemu/build/aarch64-softmmu/qemu-system-aarch64+0x8b7b63)

Reported-by: Euler Robot <address@hidden>
Signed-off-by: Chen Qun <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: aff55693d067d028b4cc799d63a0918c0d4cff4f
      
https://github.com/qemu/qemu/commit/aff55693d067d028b4cc799d63a0918c0d4cff4f
  Author: Leif Lindholm <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M .mailmap
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: update Leif Lindholm's address

Update address to reflect new employer.

Signed-off-by: Leif Lindholm <address@hidden>
Reviewed-by: Leif Lindholm <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Leif Lindholm <address@hidden>
Message-Id: <address@hidden>
[lv: added .mailmap changes]
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: e21d73ec7fe0d734589fd3cd5a25c71bcec093d1
      
https://github.com/qemu/qemu/commit/e21d73ec7fe0d734589fd3cd5a25c71bcec093d1
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M hw/rtc/m48t59-internal.h
    M hw/rtc/m48t59.c
    M hw/rtc/trace-events

  Log Message:
  -----------
  hw/timer/m48t59: Convert debug printf()s to trace events

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


  Commit: 34959c24b0ef0d64316d96dc7d4c2566016696ea
      
https://github.com/qemu/qemu/commit/34959c24b0ef0d64316d96dc7d4c2566016696ea
  Author: Thomas Huth <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    R hw/bt/Kconfig

  Log Message:
  -----------
  hw/bt: Remove empty Kconfig file

While removing the bluetooth code some weeks ago, I had to leave the
hw/bt/Kconfig file around. Otherwise some of the builds would have been
broken since the generated dependency files tried to include it before
they were rebuilt. Meanwhile, all those dependency files should have
been updated, so we can remove the empty Kconfig file now, too.

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


  Commit: bb38df846dc73ebca7d28585c1773f612e335274
      
https://github.com/qemu/qemu/commit/bb38df846dc73ebca7d28585c1773f612e335274
  Author: Thomas Huth <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M hw/i386/vmmouse.c

  Log Message:
  -----------
  hw/i386/vmmouse: Fix crash when using the vmmouse on a machine without vmport

QEMU currently crashes when the user tries to use the "vmmouse" on a
machine without vmport, e.g.:

 $ x86_64-softmmu/qemu-system-x86_64 -machine microvm -device vmmouse
 Segmentation fault (core dumped)

or:

 $ x86_64-softmmu/qemu-system-x86_64 -device vmmouse -M pc,vmport=off
 Segmentation fault (core dumped)

Let's avoid the crash by checking for the vmport device first.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: a2a82ad6fc0a8fd37d034a8f2e4ddecdb9d73a57
      
https://github.com/qemu/qemu/commit/a2a82ad6fc0a8fd37d034a8f2e4ddecdb9d73a57
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Cover hppa-softmmu.mak in the HP-PARISC Machines section

Modifications to default-configs/hppa-softmmu.mak should be
reviewed by the hppa-softmmu users (currently a single machine).

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Helge Deller <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 60f9a4ef7ebddf070a8f7470e9968ef24f273449
      
https://github.com/qemu/qemu/commit/60f9a4ef7ebddf070a8f7470e9968ef24f273449
  Author: John Snow <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M qemu-options.hx

  Log Message:
  -----------
  qemu-options: replace constant 1 with HAS_ARG

This is the only instance of a non-zero constant not using a symbolic
constant.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: John Snow <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 890fb1f6b36028dd21ad428a4eddc0172cb69377
      
https://github.com/qemu/qemu/commit/890fb1f6b36028dd21ad428a4eddc0172cb69377
  Author: Julia Suvorova <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M docs/interop/qemu-img.rst
    M qemu-img-cmds.hx

  Log Message:
  -----------
  qemu-img: Place the '-i aio' option in alphabetical order

The '-i AIO' option was accidentally placed after '-n' and '-t'. Move it
after '--flush-interval'.

Signed-off-by: Julia Suvorova <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: b7709d0e0ac08965662979d8f351e168fc809cd7
      
https://github.com/qemu/qemu/commit/b7709d0e0ac08965662979d8f351e168fc809cd7
  Author: Julia Suvorova <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M include/hw/pci/pci_bridge.h

  Log Message:
  -----------
  hw/pci/pci_bridge: Fix typo in comment

Signed-off-by: Julia Suvorova <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: f821bac4af692e88137722bbf8e601337b9e1722
      
https://github.com/qemu/qemu/commit/f821bac4af692e88137722bbf8e601337b9e1722
  Author: Miroslav Rezanina <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M hw/i2c/aspeed_i2c.c

  Log Message:
  -----------
  aspeed/i2c: Prevent uninitialized warning

Compiler reports uninitialized warning for cmd_flags variable.

Adding NULL initialization to prevent this warning.

Signed-off-by: Miroslav Rezanina <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 8ef350b32fe08d254f92a3a7efe89809397fff77
      
https://github.com/qemu/qemu/commit/8ef350b32fe08d254f92a3a7efe89809397fff77
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Cc the address@hidden for the ARM machines

Not all ARM machines sections Cc the address@hidden list,
fix this.

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


  Commit: 2021b7c9716cd579e20b4993ed75842f4e0deb34
      
https://github.com/qemu/qemu/commit/2021b7c9716cd579e20b4993ed75842f4e0deb34
  Author: Peter Maydell <address@hidden>
  Date:   2020-02-06 (Thu, 06 Feb 2020)

  Changed paths:
    M .mailmap
    M MAINTAINERS
    M docs/interop/qemu-img.rst
    R hw/bt/Kconfig
    M hw/i2c/aspeed_i2c.c
    M hw/i386/vmmouse.c
    M hw/rtc/m48t59-internal.h
    M hw/rtc/m48t59.c
    M hw/rtc/trace-events
    M hw/smbios/smbios.c
    M include/hw/pci/pci_bridge.h
    M monitor/misc.c
    M qemu-img-cmds.hx
    M qemu-options.hx

  Log Message:
  -----------
  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 "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:
  MAINTAINERS: Cc the address@hidden 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: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/418fa86dd465...2021b7c9716c