[Qemu-commits] [qemu/qemu] 1c3c9a: checkpatch: enforce process for expected files

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1c3c9a8c5ad419460b2f199999ef6bf124af350c
      
https://github.com/qemu/qemu/commit/1c3c9a8c5ad419460b2f199999ef6bf124af350c
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M scripts/checkpatch.pl

  Log Message:
  -----------
  checkpatch: enforce process for expected files

If the process documented in tests/qtest/bios-tables-test.c
is followed, then same patch never touches both expected
files and code. Teach checkpatch to enforce this rule.

Tested-by: Igor Mammedov <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6d7b25ad6e25ca639c84ba356f42d6ab8ef34e52
      
https://github.com/qemu/qemu/commit/6d7b25ad6e25ca639c84ba356f42d6ab8ef34e52
  Author: David Hildenbrand <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Add myself as virtio-balloon co-maintainer

As suggested by Michael, let's add me as co-maintainer of virtio-balloon.
While at it, also add "balloon.c" and "include/sysemu/balloon.h" to the
file list.

Cc: Michael S. Tsirkin <address@hidden>
Cc: Peter Maydell <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 0d930b870a87fe12648e5674288a2bcb6ae4a144
      
https://github.com/qemu/qemu/commit/0d930b870a87fe12648e5674288a2bcb6ae4a144
  Author: Pan Nengyuan <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M hw/char/virtio-serial-bus.c

  Log Message:
  -----------
  virtio-serial-bus: Plug memory leak on realize() error paths

We neglect to free port->bh on the error paths.  Fix that.
Reproducer:
    {'execute': 'device_add', 'arguments': {'id': 'virtio_serial_pci0', 
'driver': 'virtio-serial-pci', 'bus': 'pci.0', 'addr': '0x5'}, 'id': 'yVkZcGgV'}
    {'execute': 'device_add', 'arguments': {'id': 'port1', 'driver': 
'virtserialport', 'name': 'port1', 'chardev': 'channel1', 'bus': 
'virtio_serial_pci0.0', 'nr': 1}, 'id': '3dXdUgJA'}
    {'execute': 'device_add', 'arguments': {'id': 'port2', 'driver': 
'virtserialport', 'name': 'port2', 'chardev': 'channel2', 'bus': 
'virtio_serial_pci0.0', 'nr': 1}, 'id': 'qLzcCkob'}
    {'execute': 'device_add', 'arguments': {'id': 'port2', 'driver': 
'virtserialport', 'name': 'port2', 'chardev': 'channel2', 'bus': 
'virtio_serial_pci0.0', 'nr': 2}, 'id': 'qLzcCkob'}

The leak stack:
Direct leak of 40 byte(s) in 1 object(s) allocated from:
    #0 0x7f04a8008ae8 in __interceptor_malloc (/lib64/libasan.so.5+0xefae8)
    #1 0x7f04a73cf1d5 in g_malloc (/lib64/libglib-2.0.so.0+0x531d5)
    #2 0x56273eaee484 in aio_bh_new /mnt/sdb/backup/qemu/util/async.c:125
    #3 0x56273eafe9a8 in qemu_bh_new /mnt/sdb/backup/qemu/util/main-loop.c:532
    #4 0x56273d52e62e in virtser_port_device_realize 
/mnt/sdb/backup/qemu/hw/char/virtio-serial-bus.c:946
    #5 0x56273dcc5040 in device_set_realized 
/mnt/sdb/backup/qemu/hw/core/qdev.c:891
    #6 0x56273e5ebbce in property_set_bool 
/mnt/sdb/backup/qemu/qom/object.c:2238
    #7 0x56273e5e5a9c in object_property_set 
/mnt/sdb/backup/qemu/qom/object.c:1324
    #8 0x56273e5ef5f8 in object_property_set_qobject 
/mnt/sdb/backup/qemu/qom/qom-qobject.c:26
    #9 0x56273e5e5e6a in object_property_set_bool 
/mnt/sdb/backup/qemu/qom/object.c:1390
    #10 0x56273daa40de in qdev_device_add 
/mnt/sdb/backup/qemu/qdev-monitor.c:680
    #11 0x56273daa53e9 in qmp_device_add /mnt/sdb/backup/qemu/qdev-monitor.c:805

Fixes: 199646d81522509ac2dba6d28c31e8c7d807bc93
Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Amit Shah <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: a3ec4bb7e55956dc633e2248cf76f27d3b9c9c9d
      
https://github.com/qemu/qemu/commit/a3ec4bb7e55956dc633e2248cf76f27d3b9c9c9d
  Author: Igor Mammedov <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M hw/acpi/pcihp.c

  Log Message:
  -----------
  acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot()

Coverity spots subj in following guest triggered code path
  pci_write(, data = 0) -> acpi_pcihp_eject_slot(,slots = 0)
     uinst32_t slot = ctz32(slots)
     ...
     ... = ~(1U << slot)
where 'slot' value is 32 in case 'slots' bitmap is empty.
'slots' is a bitmap and empty one shouldn't  do anything
so return early doing nothing if resulted slot value is
not valid (i.e. not in 0-31 range)

Reported-by: Peter Maydell <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: cfaf757edd77ccbab1097c9972d1163074c30d6a
      
https://github.com/qemu/qemu/commit/cfaf757edd77ccbab1097c9972d1163074c30d6a
  Author: Pan Nengyuan <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M hw/block/virtio-blk.c

  Log Message:
  -----------
  virtio-blk: delete vqs on the error path in realize()

virtio_vqs forgot to free on the error path in realize(). Fix that.

The asan stack:
Direct leak of 14336 byte(s) in 1 object(s) allocated from:
    #0 0x7f58b93fd970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970)
    #1 0x7f58b858249d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d)
    #2 0x5562cc627f49 in virtio_add_queue /mnt/sdb/qemu/hw/virtio/virtio.c:2413
    #3 0x5562cc4b524a in virtio_blk_device_realize 
/mnt/sdb/qemu/hw/block/virtio-blk.c:1202
    #4 0x5562cc613050 in virtio_device_realize 
/mnt/sdb/qemu/hw/virtio/virtio.c:3615
    #5 0x5562ccb7a568 in device_set_realized /mnt/sdb/qemu/hw/core/qdev.c:891
    #6 0x5562cd39cd45 in property_set_bool /mnt/sdb/qemu/qom/object.c:2238

Reported-by: Euler Robot <address@hidden>
Signed-off-by: Pan Nengyuan <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: de38ed300764cdee43747a2a4a9a9795696c203d
      
https://github.com/qemu/qemu/commit/de38ed300764cdee43747a2a4a9a9795696c203d
  Author: Pan Nengyuan <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M hw/virtio/virtio-iommu.c

  Log Message:
  -----------
  virtio-iommu: avoid memleak in the unrealize

req_vq/event_vq forgot to free in unrealize. Fix that.
And also do clean 's->as_by_busptr' hash table in unrealize to fix another leak.

Signed-off-by: Pan Nengyuan <address@hidden>
Acked-by: Eric Auger <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 32a2d6b1f6b4405f0fc20c031e61d5d48e3d9cd1
      
https://github.com/qemu/qemu/commit/32a2d6b1f6b4405f0fc20c031e61d5d48e3d9cd1
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M hw/i386/amd_iommu.c

  Log Message:
  -----------
  hw/i386/amd_iommu.c: Fix corruption of log events passed to guest

In the function amdvi_log_event(), we write an event log buffer
entry into guest ram, whose contents are passed to the function
via the "uint64_t *evt" argument. Unfortunately, a spurious
'&' in the call to dma_memory_write() meant that instead of
writing the event to the guest we would write the literal value
of the pointer, plus whatever was in the following 8 bytes
on the stack. This error was spotted by Coverity.

Fix the bug by removing the '&'.

Fixes: CID 1421945
Cc: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9d283f85d755285bf1b1bfcb1ab275239dbf2c7b
      
https://github.com/qemu/qemu/commit/9d283f85d755285bf1b1bfcb1ab275239dbf2c7b
  Author: Li Feng <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M hw/block/vhost-user-blk.c
    M include/hw/virtio/vhost-user-blk.h

  Log Message:
  -----------
  fix vhost_user_blk_watch crash

the G_IO_HUP is watched in tcp_chr_connect, and the callback
vhost_user_blk_watch is not needed, because tcp_chr_hup is registered as
callback. And it will close the tcp link.

Signed-off-by: Li Feng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 17e89077b7e3bc1d96540e21ddc7451c3e077049
      
https://github.com/qemu/qemu/commit/17e89077b7e3bc1d96540e21ddc7451c3e077049
  Author: Gerd Hoffmann <address@hidden>
  Date:   2020-03-29 (Sun, 29 Mar 2020)

  Changed paths:
    M hw/arm/virt-acpi-build.c
    M hw/arm/virt.c
    M hw/i386/acpi-build.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/x86.c
    M include/hw/acpi/acpi.h
    M include/hw/arm/virt.h
    M include/hw/i386/x86.h
    M softmmu/vl.c

  Log Message:
  -----------
  acpi: add acpi=OnOffAuto machine property to x86 and arm virt

Remove the global acpi_enabled bool and replace it with an
acpi OnOffAuto machine property.

qemu throws an error now if you use -no-acpi while the machine
type you are using doesn't support acpi in the first place.

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: e82cdba3945340f524ba153170d52800dbd55ca4
      
https://github.com/qemu/qemu/commit/e82cdba3945340f524ba153170d52800dbd55ca4
  Author: Stefano Garzarella <address@hidden>
  Date:   2020-03-31 (Tue, 31 Mar 2020)

  Changed paths:
    M hw/virtio/vhost-vsock.c

  Log Message:
  -----------
  vhost-vsock: fix double close() in the realize() error path

vhost_dev_cleanup() closes the vhostfd parameter passed to
vhost_dev_init(), so this patch avoids closing it twice in
the vhost_vsock_device_realize() error path.

Signed-off-by: Stefano Garzarella <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: 82915faec385547dfbd3c6fb4105e3b2ba6ef9f5
      
https://github.com/qemu/qemu/commit/82915faec385547dfbd3c6fb4105e3b2ba6ef9f5
  Author: Peter Maydell <address@hidden>
  Date:   2020-03-31 (Tue, 31 Mar 2020)

  Changed paths:
    M MAINTAINERS
    M hw/acpi/pcihp.c
    M hw/arm/virt-acpi-build.c
    M hw/arm/virt.c
    M hw/block/vhost-user-blk.c
    M hw/block/virtio-blk.c
    M hw/char/virtio-serial-bus.c
    M hw/i386/acpi-build.c
    M hw/i386/amd_iommu.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/x86.c
    M hw/virtio/vhost-vsock.c
    M hw/virtio/virtio-iommu.c
    M include/hw/acpi/acpi.h
    M include/hw/arm/virt.h
    M include/hw/i386/x86.h
    M include/hw/virtio/vhost-user-blk.h
    M scripts/checkpatch.pl
    M softmmu/vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, pci, pc: bugfixes, checkpatch, maintainers

Bugfixes all over the place.
Add a new balloon maintainer.
A checkpatch enhancement to enforce ACPI change rules.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Tue 31 Mar 2020 15:54:36 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>" [full]
# gpg:                 aka "Michael S. Tsirkin <address@hidden>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  vhost-vsock: fix double close() in the realize() error path
  acpi: add acpi=OnOffAuto machine property to x86 and arm virt
  fix vhost_user_blk_watch crash
  hw/i386/amd_iommu.c: Fix corruption of log events passed to guest
  virtio-iommu: avoid memleak in the unrealize
  virtio-blk: delete vqs on the error path in realize()
  acpi: pcihp: fix left shift undefined behavior in acpi_pcihp_eject_slot()
  virtio-serial-bus: Plug memory leak on realize() error paths
  MAINTAINERS: Add myself as virtio-balloon co-maintainer
  checkpatch: enforce process for expected files

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


Compare: https://github.com/qemu/qemu/compare/17083d6d1e06...82915faec385