[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/27] watchdog: add information from -watchdog help to -device he
From: |
Paolo Bonzini |
Subject: |
[PULL 14/27] watchdog: add information from -watchdog help to -device help |
Date: |
Wed, 3 Nov 2021 16:04:29 +0100 |
List all watchdog devices in a separate category, and populate
their descriptions.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/watchdog/sbsa_gwdt.c | 3 ++-
hw/watchdog/wdt_aspeed.c | 3 ++-
hw/watchdog/wdt_diag288.c | 3 ++-
hw/watchdog/wdt_i6300esb.c | 3 ++-
hw/watchdog/wdt_ib700.c | 3 ++-
hw/watchdog/wdt_imx2.c | 4 ++--
include/hw/qdev-core.h | 1 +
softmmu/qdev-monitor.c | 1 +
8 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c
index d0998f8489..e49cacd0e2 100644
--- a/hw/watchdog/sbsa_gwdt.c
+++ b/hw/watchdog/sbsa_gwdt.c
@@ -273,8 +273,9 @@ static void wdt_sbsa_gwdt_class_init(ObjectClass *klass,
void *data)
dc->realize = wdt_sbsa_gwdt_realize;
dc->reset = wdt_sbsa_gwdt_reset;
dc->hotpluggable = false;
- set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories);
dc->vmsd = &vmstate_sbsa_gwdt;
+ dc->desc = "SBSA-compliant generic watchdog device";
}
static const TypeInfo wdt_sbsa_gwdt_info = {
diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c
index 146ffcd713..6aa6f90b66 100644
--- a/hw/watchdog/wdt_aspeed.c
+++ b/hw/watchdog/wdt_aspeed.c
@@ -293,9 +293,10 @@ static void aspeed_wdt_class_init(ObjectClass *klass, void
*data)
dc->desc = "ASPEED Watchdog Controller";
dc->realize = aspeed_wdt_realize;
dc->reset = aspeed_wdt_reset;
- set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories);
dc->vmsd = &vmstate_aspeed_wdt;
device_class_set_props(dc, aspeed_wdt_properties);
+ dc->desc = "Aspeed watchdog device";
}
static const TypeInfo aspeed_wdt_info = {
diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c
index e135a4de8b..9e8882a11c 100644
--- a/hw/watchdog/wdt_diag288.c
+++ b/hw/watchdog/wdt_diag288.c
@@ -122,9 +122,10 @@ static void wdt_diag288_class_init(ObjectClass *klass,
void *data)
dc->unrealize = wdt_diag288_unrealize;
dc->reset = wdt_diag288_reset;
dc->hotpluggable = false;
- set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories);
dc->vmsd = &vmstate_diag288;
diag288->handle_timer = wdt_diag288_handle_timer;
+ dc->desc = "diag288 device for s390x platform";
}
static const TypeInfo wdt_diag288_info = {
diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c
index 4c52e3bb9e..f99a1c9d29 100644
--- a/hw/watchdog/wdt_i6300esb.c
+++ b/hw/watchdog/wdt_i6300esb.c
@@ -476,7 +476,8 @@ static void i6300esb_class_init(ObjectClass *klass, void
*data)
k->class_id = PCI_CLASS_SYSTEM_OTHER;
dc->reset = i6300esb_reset;
dc->vmsd = &vmstate_i6300esb;
- set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories);
+ dc->desc = "Intel 6300ESB";
}
static const TypeInfo i6300esb_info = {
diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c
index 177aaa503f..91d1bdc0da 100644
--- a/hw/watchdog/wdt_ib700.c
+++ b/hw/watchdog/wdt_ib700.c
@@ -140,7 +140,8 @@ static void wdt_ib700_class_init(ObjectClass *klass, void
*data)
dc->realize = wdt_ib700_realize;
dc->reset = wdt_ib700_reset;
dc->vmsd = &vmstate_ib700;
- set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories);
+ dc->desc = "iBASE 700";
}
static const TypeInfo wdt_ib700_info = {
diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c
index a5fb76308f..c3128370b5 100644
--- a/hw/watchdog/wdt_imx2.c
+++ b/hw/watchdog/wdt_imx2.c
@@ -280,8 +280,8 @@ static void imx2_wdt_class_init(ObjectClass *klass, void
*data)
dc->realize = imx2_wdt_realize;
dc->reset = imx2_wdt_reset;
dc->vmsd = &vmstate_imx2_wdt;
- dc->desc = "i.MX watchdog timer";
- set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+ dc->desc = "i.MX2 watchdog timer";
+ set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories);
}
static const TypeInfo imx2_wdt_info = {
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 1bad07002d..72622bd337 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -26,6 +26,7 @@ typedef enum DeviceCategory {
DEVICE_CATEGORY_SOUND,
DEVICE_CATEGORY_MISC,
DEVICE_CATEGORY_CPU,
+ DEVICE_CATEGORY_WATCHDOG,
DEVICE_CATEGORY_MAX
} DeviceCategory;
diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c
index e49d9773d2..f8b3a4cd82 100644
--- a/softmmu/qdev-monitor.c
+++ b/softmmu/qdev-monitor.c
@@ -165,6 +165,7 @@ static void qdev_print_devinfos(bool show_no_user)
[DEVICE_CATEGORY_SOUND] = "Sound",
[DEVICE_CATEGORY_MISC] = "Misc",
[DEVICE_CATEGORY_CPU] = "CPU",
+ [DEVICE_CATEGORY_WATCHDOG]= "Watchdog",
[DEVICE_CATEGORY_MAX] = "Uncategorized",
};
GSList *list, *elt;
--
2.31.1
- [PULL 10/27] configure: remove useless NPTL probe, (continued)
- [PULL 10/27] configure: remove useless NPTL probe, Paolo Bonzini, 2021/11/03
- [PULL 11/27] configure: do not duplicate CPU_CFLAGS into QEMU_LDFLAGS, Paolo Bonzini, 2021/11/03
- [PULL 01/27] Makefile: Fix gtags generation, Paolo Bonzini, 2021/11/03
- [PULL 04/27] configure/optionrom: Fix MSYS2 multiboot.bin issue, Paolo Bonzini, 2021/11/03
- [PULL 07/27] target/i386: move linuxboot_dma_enabled to X86MachineState, Paolo Bonzini, 2021/11/03
- [PULL 12/27] hvf: Avoid mapping regions < PAGE_SIZE as ram, Paolo Bonzini, 2021/11/03
- [PULL 15/27] vl: deprecate -watchdog, Paolo Bonzini, 2021/11/03
- [PULL 17/27] hw/i386: fix vmmouse registration, Paolo Bonzini, 2021/11/03
- [PULL 26/27] configure: Remove the check for the __thread keyword, Paolo Bonzini, 2021/11/03
- [PULL 27/27] configure: fix --audio-drv-list help message, Paolo Bonzini, 2021/11/03
- [PULL 14/27] watchdog: add information from -watchdog help to -device help,
Paolo Bonzini <=
- [PULL 22/27] meson.build: Allow to disable OSS again, Paolo Bonzini, 2021/11/03
- [PULL 23/27] meson: remove pointless warnings, Paolo Bonzini, 2021/11/03
- [PULL 24/27] meson: remove unnecessary coreaudio test program, Paolo Bonzini, 2021/11/03
- [PULL 19/27] esp: ensure in-flight SCSI requests are always cancelled, Paolo Bonzini, 2021/11/03
- [PULL 20/27] qtest/am53c974-test: add test for cancelling in-flight requests, Paolo Bonzini, 2021/11/03
- [PULL 16/27] watchdog: remove select_watchdog_action, Paolo Bonzini, 2021/11/03
- [PULL 13/27] hw/i386: Rename default_bus_bypass_iommu, Paolo Bonzini, 2021/11/03
- [PULL 18/27] KVM: SVM: add migration support for nested TSC scaling, Paolo Bonzini, 2021/11/03
- [PULL 21/27] meson: bump submodule to 0.59.3, Paolo Bonzini, 2021/11/03
- [PULL 25/27] Move the l2tpv3 test from configure to meson.build, Paolo Bonzini, 2021/11/03