diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-11 22:22:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-12-11 22:22:50 +0000 |
| commit | a4b307b0eaf44530cf03934e4db161db1ea7389f (patch) | |
| tree | 72bc0110dc49d523cf9d30a9ba21c63b0d60a60f /target/s390x | |
| parent | f6029bb614cebb0d6c9800990af49d55338231fd (diff) | |
| parent | c7454f05171405b8013a9d6b57045cd614ccc386 (diff) | |
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>
Diffstat (limited to 'target/s390x')
| -rw-r--r-- | target/s390x/cpu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7b66718c44..8a734c2f8c 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -313,6 +313,11 @@ static void s390_cpu_finalize(Object *obj) #if !defined(CONFIG_USER_ONLY) S390CPU *cpu = S390_CPU(obj); + timer_del(cpu->env.tod_timer); + timer_free(cpu->env.tod_timer); + timer_del(cpu->env.cpu_timer); + timer_free(cpu->env.cpu_timer); + qemu_unregister_reset(s390_cpu_machine_reset_cb, cpu); g_free(cpu->irqstate); #endif |