diff options
author | Thomas Huth | 2017-08-16 16:08:48 +0200 |
---|---|---|
committer | Cornelia Huck | 2017-08-30 18:23:25 +0200 |
commit | 84ebd3e8c7d4fe955b359b9aac84395907b0412e (patch) | |
tree | fc18e8870f02079892e88462b88b3129df5364c1 | |
parent | s390x/tcg: specification exception for unknown diag (diff) | |
download | qemu-84ebd3e8c7d4fe955b359b9aac84395907b0412e.tar.gz qemu-84ebd3e8c7d4fe955b359b9aac84395907b0412e.tar.xz qemu-84ebd3e8c7d4fe955b359b9aac84395907b0412e.zip |
watchdog/wdt_diag288: Mark diag288 watchdog as non-hotpluggable
QEMU currently aborts when the user tries to hot-unplug a diag288
device:
$ qemu-system-s390x -nographic -nodefaults -S -monitor stdio
QEMU 2.9.92 monitor - type 'help' for more information
(qemu) device_add diag288,id=x
(qemu) device_del x
**
ERROR:qemu/qdev-monitor.c:872:qdev_unplug: assertion failed: (hotplug_ctrl)
Aborted (core dumped)
The device is not designed as hot-pluggable (it should only be used
via the "-watchdog" parameter), so let's simply remove the possibility
to hotplug it to prevent that users can run into this ugly situation.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1502892528-22618-1-git-send-email-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
-rw-r--r-- | hw/watchdog/wdt_diag288.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index a7b64e2c40..47f289216a 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -121,6 +121,7 @@ static void wdt_diag288_class_init(ObjectClass *klass, void *data) dc->realize = wdt_diag288_realize; dc->unrealize = wdt_diag288_unrealize; dc->reset = wdt_diag288_reset; + dc->hotpluggable = false; set_bit(DEVICE_CATEGORY_MISC, dc->categories); dc->vmsd = &vmstate_diag288; diag288->handle_timer = wdt_diag288_handle_timer; |