Move watchdog, watchdog_action, give them internal linkage

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/watchdog.c b/hw/watchdog.c
index fde2f1b3d4e8c06a26770cc8b156200bb3b64c88..359c3185e3133478213e1d1971fcbeab641aa297 100644 (file)
--- 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 ad1fcfce56840f2fa9743658a4cca328c2700960..bb8120470090af60a0280e05b980ebd2c44e6e08 100644 (file)
--- 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 10857941900b961dfaa6e997cf092cf051815505..e3412dfe055cf32acae724954d5950bc7039af0b 100644 (file)
--- 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;