From 88b3be201acf64e0bd19782bebd533901c951c87 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 21 Aug 2009 10:31:32 +0200 Subject: [PATCH] Move watchdog, watchdog_action, give them internal linkage Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- hw/watchdog.c | 10 ++++++++++ hw/watchdog.h | 11 ----------- vl.c | 2 -- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/hw/watchdog.c b/hw/watchdog.c index fde2f1b..359c318 100644 --- a/hw/watchdog.c +++ b/hw/watchdog.c @@ -24,6 +24,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) diff --git a/hw/watchdog.h b/hw/watchdog.h index ad1fcfc..bb81204 100644 --- a/hw/watchdog.h +++ b/hw/watchdog.h @@ -25,13 +25,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; @@ -48,10 +41,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); diff --git a/vl.c b/vl.c index 1085794..e3412df 100644 --- a/vl.c +++ b/vl.c @@ -233,8 +233,6 @@ uint8_t irq0override = 1; #ifndef _WIN32 int daemonize = 0; #endif -WatchdogTimerModel *watchdog = NULL; -int watchdog_action = WDT_RESET; const char *option_rom[MAX_OPTION_ROMS]; int nb_option_roms; int semihosting_enabled = 0; -- 2.7.4