diff options
| author | Peter Maydell | 2020-12-11 23:22:50 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-12-11 23:22:50 +0100 |
| commit | a4b307b0eaf44530cf03934e4db161db1ea7389f (patch) | |
| tree | 72bc0110dc49d523cf9d30a9ba21c63b0d60a60f /hw | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20201211-pull-request' i... (diff) | |
| parent | s390x/cpu: Use timer_free() in the finalize function to avoid memleaks (diff) | |
| download | qemu-a4b307b0eaf44530cf03934e4db161db1ea7389f.tar.gz qemu-a4b307b0eaf44530cf03934e4db161db1ea7389f.tar.xz qemu-a4b307b0eaf44530cf03934e4db161db1ea7389f.zip | |
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 'hw')
| -rw-r--r-- | hw/watchdog/wdt_diag288.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index 71a945f0bd..4c4b6a6ab7 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -14,12 +14,10 @@ #include "qemu/osdep.h" #include "sysemu/reset.h" #include "sysemu/watchdog.h" -#include "hw/sysbus.h" #include "qemu/timer.h" #include "hw/watchdog/wdt_diag288.h" #include "migration/vmstate.h" #include "qemu/log.h" -#include "qemu/module.h" static WatchdogTimerModel model = { .wdt_name = TYPE_WDT_DIAG288, |