[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 0c7322: watchdog/diag288: correctly register
From: |
GitHub |
Subject: |
[Qemu-commits] [qemu/qemu] 0c7322: watchdog/diag288: correctly register for system re... |
Date: |
Tue, 14 Jul 2015 12:30:03 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 0c7322cfd3fd382c0096c2a9f00775818a878e13
https://github.com/qemu/qemu/commit/0c7322cfd3fd382c0096c2a9f00775818a878e13
Author: Xu Wang <address@hidden>
Date: 2015-07-14 (Tue, 14 Jul 2015)
Changed paths:
M hw/s390x/s390-virtio-ccw.c
M hw/watchdog/wdt_diag288.c
Log Message:
-----------
watchdog/diag288: correctly register for system reset requests
The diag288 watchdog is no sysbus device, therefore it doesn't get
triggered on resets automatically using dc->reset.
Let's register the reset handler manually, so we get correctly notified
again when a system reset was requested. Also reset the watchdog on
subsystem resets that don't trigger a full system reset.
Signed-off-by: Xu Wang <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Tested-by: Christian Borntraeger <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Commit: 2af9170c8c269c4fba73e5271453ca15a57f5844
https://github.com/qemu/qemu/commit/2af9170c8c269c4fba73e5271453ca15a57f5844
Author: Christian Borntraeger <address@hidden>
Date: 2015-07-14 (Tue, 14 Jul 2015)
Changed paths:
M hw/s390x/virtio-ccw.c
Log Message:
-----------
s390/virtio-ccw: Fix migration
commit 213941d73b ("virtio-ccw: migrate ->revision") broke
migration:
2015-07-07T11:22:55.570968Z qemu-system-s390x: VQ 39 address 0x0 inconsistent
with Host index 0x100
2015-07-07T11:22:55.571008Z qemu-system-s390x: error while loading state for
instance 0x0 of
If thinint support is active, the config_load function returns early.
Make sure to load the revision all the time.
Signed-off-by: Christian Borntraeger <address@hidden>
Fixes: 213941d73b ("virtio-ccw: migrate ->revision")
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Commit: 661725da09f47eb92d356fac10a4cf3b7ad1f61d
https://github.com/qemu/qemu/commit/661725da09f47eb92d356fac10a4cf3b7ad1f61d
Author: Peter Maydell <address@hidden>
Date: 2015-07-14 (Tue, 14 Jul 2015)
Changed paths:
M hw/s390x/s390-virtio-ccw.c
M hw/s390x/virtio-ccw.c
M hw/watchdog/wdt_diag288.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150714' into staging
s390x fixes for 2.4:
- virtio migration regression
- missing diag288 watchdog resets
# gpg: Signature made Tue Jul 14 18:17:54 2015 BST using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg: aka "Cornelia Huck <address@hidden>"
* remotes/cohuck/tags/s390x-20150714:
s390/virtio-ccw: Fix migration
watchdog/diag288: correctly register for system reset requests
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/f3947986d9bb...661725da09f4
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 0c7322: watchdog/diag288: correctly register for system re...,
GitHub <=