73 lines
2.8 KiB
Diff
73 lines
2.8 KiB
Diff
|
|
||
|
|
Subject: Move watchdog, watchdog_action, give them internal linkage
|
||
|
|
From: Markus Armbruster armbru@redhat.com Fri Aug 21 10:31:32 2009 +0200
|
||
|
|
Date: Thu Aug 27 20:30:23 2009 -0500:
|
||
|
|
Git: 88b3be201acf64e0bd19782bebd533901c951c87
|
||
|
|
|
||
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
||
|
|
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
||
|
|
|
||
|
|
Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/hw/watchdog.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.2.0-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/watchdog.c
|
||
|
|
+++ xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/hw/watchdog.c
|
||
|
|
@@ -26,6 +26,16 @@
|
||
|
|
#include "sysemu.h"
|
||
|
|
#include "hw/watchdog.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. */
|
||
|
|
+
|
||
|
|
+static WatchdogTimerModel *watchdog;
|
||
|
|
+static int watchdog_action = WDT_RESET;
|
||
|
|
static LIST_HEAD(watchdog_list, WatchdogTimerModel) watchdog_list;
|
||
|
|
|
||
|
|
void watchdog_add_model(WatchdogTimerModel *model)
|
||
|
|
Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/hw/watchdog.h
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.2.0-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/watchdog.h
|
||
|
|
+++ xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/hw/watchdog.h
|
||
|
|
@@ -27,13 +27,6 @@
|
||
|
|
extern void wdt_i6300esb_init(void);
|
||
|
|
extern void wdt_ib700_init(void);
|
||
|
|
|
||
|
|
-/* 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. */
|
||
|
|
|
||
|
|
struct WatchdogTimerModel {
|
||
|
|
LIST_ENTRY(WatchdogTimerModel) entry;
|
||
|
|
@@ -50,10 +43,6 @@ struct WatchdogTimerModel {
|
||
|
|
};
|
||
|
|
typedef struct WatchdogTimerModel WatchdogTimerModel;
|
||
|
|
|
||
|
|
-/* in vl.c */
|
||
|
|
-extern WatchdogTimerModel *watchdog;
|
||
|
|
-extern int watchdog_action;
|
||
|
|
-
|
||
|
|
/* in hw/watchdog.c */
|
||
|
|
extern int select_watchdog(const char *p);
|
||
|
|
extern int select_watchdog_action(const char *action);
|
||
|
|
Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/vl.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.2.0-testing.orig/tools/qemu-xen-traditional-dir-remote/vl.c
|
||
|
|
+++ xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/vl.c
|
||
|
|
@@ -250,8 +250,6 @@ int no_shutdown = 0;
|
||
|
|
int cursor_hide = 1;
|
||
|
|
int graphic_rotate = 0;
|
||
|
|
int daemonize = 0;
|
||
|
|
-WatchdogTimerModel *watchdog = NULL;
|
||
|
|
-int watchdog_action = WDT_RESET;
|
||
|
|
const char *option_rom[MAX_OPTION_ROMS];
|
||
|
|
int nb_option_roms;
|
||
|
|
int semihosting_enabled = 0;
|