[Qemu-commits] [qemu/qemu] 592711: hw/watchdog/wdt_diag288: Remove unnecessary includes

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 592711e330972044e8666f6da32079d67e26a716
      
https://github.com/qemu/qemu/commit/592711e330972044e8666f6da32079d67e26a716
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-12-11 (Fri, 11 Dec 2020)

  Changed paths:
    M hw/watchdog/wdt_diag288.c

  Log Message:
  -----------
  hw/watchdog/wdt_diag288: Remove unnecessary includes

Neither sysbus.h nor module.h are required to compile this file.
diag288 is not a sysbus device, and module.h (for type_init) is
included eventually through qom/object.h.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <20201118090344.243117-1-thuth@redhat.com>
[CH: tweaked description]
Signed-off-by: Cornelia Huck <cohuck@redhat.com>


  Commit: 2d9ca5a37b12902f461d901e783cc2ffa4842b93
      
https://github.com/qemu/qemu/commit/2d9ca5a37b12902f461d901e783cc2ffa4842b93
  Author: Cornelia Huck <cohuck@redhat.com>
  Date:   2020-12-11 (Fri, 11 Dec 2020)

  Changed paths:
    M MAINTAINERS
    A tests/acceptance/machine_s390_ccw_virtio.py

  Log Message:
  -----------
  tests/acceptance: add a test for devices on s390x

This adds a very basic test for checking that we present devices
in a way that Linux can consume: boot with both virtio-net-ccw and
virtio-net-pci attached and then verify that Linux is able to see
and detect these devices.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201126130158.1471985-1-cohuck@redhat.com>


  Commit: 083470b579bd7587bf2ecf479eced8ef6103614c
      
https://github.com/qemu/qemu/commit/083470b579bd7587bf2ecf479eced8ef6103614c
  Author: Cornelia Huck <cohuck@redhat.com>
  Date:   2020-12-11 (Fri, 11 Dec 2020)

  Changed paths:
    M tests/acceptance/machine_s390_ccw_virtio.py

  Log Message:
  -----------
  tests/acceptance: test virtio-ccw revision handling

The max_revision prop of virtio-ccw devices can be used to force
an older revision for compatibility handling. The easiest way to
check this is to force a device to revision 0, which turns off
virtio-1.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
[re-formatted overlong lines]
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201130180216.15366-2-cohuck@redhat.com>


  Commit: 864852ccb8359bda6b7fc51b676b3426562715e0
      
https://github.com/qemu/qemu/commit/864852ccb8359bda6b7fc51b676b3426562715e0
  Author: Cornelia Huck <cohuck@redhat.com>
  Date:   2020-12-11 (Fri, 11 Dec 2020)

  Changed paths:
    M tests/acceptance/machine_s390_ccw_virtio.py

  Log Message:
  -----------
  tests/acceptance: verify s390x device detection

The kernel/initrd combination does not provide the virtio-net
driver; therefore, simply check whether the presented device type
is indeed virtio-net for the two virtio-net-{ccw,pci} devices.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
[re-formatted overlong lines]
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201130180216.15366-3-cohuck@redhat.com>


  Commit: 085cec59cfd651a24ab8233c494a0e174de8ab5d
      
https://github.com/qemu/qemu/commit/085cec59cfd651a24ab8233c494a0e174de8ab5d
  Author: Cornelia Huck <cohuck@redhat.com>
  Date:   2020-12-11 (Fri, 11 Dec 2020)

  Changed paths:
    M tests/acceptance/machine_s390_ccw_virtio.py

  Log Message:
  -----------
  tests/acceptance: test s390x zpci fid propagation

Verify that a fid specified on the command line shows up correctly
as the function_id in the guest.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>
[re-formatted overlong lines]
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201130180216.15366-4-cohuck@redhat.com>


  Commit: c7454f05171405b8013a9d6b57045cd614ccc386
      
https://github.com/qemu/qemu/commit/c7454f05171405b8013a9d6b57045cd614ccc386
  Author: Gan Qixin <ganqixin@huawei.com>
  Date:   2020-12-11 (Fri, 11 Dec 2020)

  Changed paths:
    M target/s390x/cpu.c

  Log Message:
  -----------
  s390x/cpu: Use timer_free() in the finalize function to avoid memleaks

When running device-introspect-test, a memory leak occurred in the 
s390_cpu_initfn
function, this patch use timer_free() in the finalize function to fix it.

ASAN shows memory leak stack:

Direct leak of 3552 byte(s) in 74 object(s) allocated from:
    #0 0xfffeb3d4e1f0 in __interceptor_calloc (/lib64/libasan.so.5+0xee1f0)
    #1 0xfffeb36e6800 in g_malloc0 (/lib64/libglib-2.0.so.0+0x56800)
    #2 0xaaad51a8f9c4 in timer_new_full qemu/include/qemu/timer.h:523
    #3 0xaaad51a8f9c4 in timer_new qemu/include/qemu/timer.h:544
    #4 0xaaad51a8f9c4 in timer_new_ns qemu/include/qemu/timer.h:562
    #5 0xaaad51a8f9c4 in s390_cpu_initfn qemu/target/s390x/cpu.c:304
    #6 0xaaad51e00f58 in object_init_with_type qemu/qom/object.c:371
    #7 0xaaad51e0406c in object_initialize_with_type qemu/qom/object.c:515
    #8 0xaaad51e042e0 in object_new_with_type qemu/qom/object.c:729
    #9 0xaaad51e3ff40 in qmp_device_list_properties qemu/qom/qom-qmp-cmds.c:153
    #10 0xaaad51910518 in qdev_device_help qemu/softmmu/qdev-monitor.c:283
    #11 0xaaad51911918 in qmp_device_add qemu/softmmu/qdev-monitor.c:801
    #12 0xaaad51911e48 in hmp_device_add qemu/softmmu/qdev-monitor.c:916

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Gan Qixin <ganqixin@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20201204081209.360524-4-ganqixin@huawei.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>


  Commit: a4b307b0eaf44530cf03934e4db161db1ea7389f
      
https://github.com/qemu/qemu/commit/a4b307b0eaf44530cf03934e4db161db1ea7389f
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-12-11 (Fri, 11 Dec 2020)

  Changed paths:
    M MAINTAINERS
    M hw/watchdog/wdt_diag288.c
    M target/s390x/cpu.c
    A tests/acceptance/machine_s390_ccw_virtio.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201211' into staging

First set of 6.0 patches for s390x:
- acceptance test for device detection
- bugfixes

# gpg: Signature made Fri 11 Dec 2020 12:21:45 GMT
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20201211:
  s390x/cpu: Use timer_free() in the finalize function to avoid memleaks
  tests/acceptance: test s390x zpci fid propagation
  tests/acceptance: verify s390x device detection
  tests/acceptance: test virtio-ccw revision handling
  tests/acceptance: add a test for devices on s390x
  hw/watchdog/wdt_diag288: Remove unnecessary includes

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/f6029bb614ce...a4b307b0eaf4