[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/10] watchdog: introduction of get_watchdog_action
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 06/10] watchdog: introduction of get_watchdog_action |
Date: |
Thu, 28 Jan 2016 12:09:07 +0100 |
From: Bo Tu <address@hidden>
Add get_watchdog_action(void) to allow access to the configured action.
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Bo Tu <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/watchdog/watchdog.c | 14 +++++---------
include/sysemu/watchdog.h | 10 ++++++++++
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 8d4b0ee..81de0e5 100644
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -29,15 +29,6 @@
#include "qapi-event.h"
#include "hw/nmi.h"
-/* Possible values for action parameter. */
-#define WDT_RESET 1 /* Hard reset. */
-#define WDT_SHUTDOWN 2 /* Shutdown. */
-#define WDT_POWEROFF 3 /* Quit. */
-#define WDT_PAUSE 4 /* Pause. */
-#define WDT_DEBUG 5 /* Prints a message and continues running. */
-#define WDT_NONE 6 /* Do nothing. */
-#define WDT_NMI 7 /* Inject nmi into the guest */
-
static int watchdog_action = WDT_RESET;
static QLIST_HEAD(watchdog_list, WatchdogTimerModel) watchdog_list;
@@ -105,6 +96,11 @@ int select_watchdog_action(const char *p)
return 0;
}
+int get_watchdog_action(void)
+{
+ return watchdog_action;
+}
+
/* This actually performs the "action" once a watchdog has expired,
* ie. reboot, shutdown, exit, etc.
*/
diff --git a/include/sysemu/watchdog.h b/include/sysemu/watchdog.h
index 3e9a970..72a4da0 100644
--- a/include/sysemu/watchdog.h
+++ b/include/sysemu/watchdog.h
@@ -24,6 +24,15 @@
#include "qemu/queue.h"
+/* Possible values for action parameter. */
+#define WDT_RESET 1 /* Hard reset. */
+#define WDT_SHUTDOWN 2 /* Shutdown. */
+#define WDT_POWEROFF 3 /* Quit. */
+#define WDT_PAUSE 4 /* Pause. */
+#define WDT_DEBUG 5 /* Prints a message and continues running. */
+#define WDT_NONE 6 /* Do nothing. */
+#define WDT_NMI 7 /* Inject nmi into the guest. */
+
struct WatchdogTimerModel {
QLIST_ENTRY(WatchdogTimerModel) entry;
@@ -37,6 +46,7 @@ typedef struct WatchdogTimerModel WatchdogTimerModel;
/* in hw/watchdog.c */
int select_watchdog(const char *p);
int select_watchdog_action(const char *action);
+int get_watchdog_action(void);
void watchdog_add_model(WatchdogTimerModel *model);
void watchdog_perform_action(void);
--
2.7.0
- [Qemu-devel] [PULL 00/10] next round of s390x patches, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 02/10] s390x/machine: make addon register fields static, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 01/10] s390x/skeys: Fix instance and class size, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 03/10] s390x/sclp: add device to the sysbus in sclp_realize, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 06/10] watchdog: introduction of get_watchdog_action,
Cornelia Huck <=
- [Qemu-devel] [PULL 08/10] s390x/css: fix control flags during csch, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 09/10] gdb: provide the name of the architecture in the target.xml, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 05/10] s390x: fix generation of event information crw, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 10/10] s390x: s390_cpu_get_phys_page_debug has to return -1, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 07/10] watchdog/diag288: don't reset for action=none|debug|pause, Cornelia Huck, 2016/01/28
- [Qemu-devel] [PULL 04/10] s390x/ioinst: set type and len for SEI response, Cornelia Huck, 2016/01/28
- Re: [Qemu-devel] [PULL 00/10] next round of s390x patches, Peter Maydell, 2016/01/28