ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Armbruster 2009-08-21 10:31:32 +02:00 committed by Anthony Liguori
parent 87b245db05
commit 88b3be201a
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/watchdog.c
View File

@ -24,6 +24,16 @@
#include "sysemu.h" #include "sysemu.h"
#include "hw/watchdog.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; static LIST_HEAD(watchdog_list, WatchdogTimerModel) watchdog_list;
void watchdog_add_model(WatchdogTimerModel *model) void watchdog_add_model(WatchdogTimerModel *model)

11
hw/watchdog.h
View File

@ -25,13 +25,6 @@
extern void wdt_i6300esb_init(void); extern void wdt_i6300esb_init(void);
extern void wdt_ib700_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 { struct WatchdogTimerModel {
LIST_ENTRY(WatchdogTimerModel) entry; LIST_ENTRY(WatchdogTimerModel) entry;
@ -48,10 +41,6 @@ struct WatchdogTimerModel {
}; };
typedef struct WatchdogTimerModel WatchdogTimerModel; typedef struct WatchdogTimerModel WatchdogTimerModel;
/* in vl.c */
extern WatchdogTimerModel *watchdog;
extern int watchdog_action;
/* in hw/watchdog.c */ /* in hw/watchdog.c */
extern int select_watchdog(const char *p); extern int select_watchdog(const char *p);
extern int select_watchdog_action(const char *action); extern int select_watchdog_action(const char *action);

2
vl.c
View File

@ -233,8 +233,6 @@ uint8_t irq0override = 1;
#ifndef _WIN32 #ifndef _WIN32
int daemonize = 0; int daemonize = 0;
#endif #endif
WatchdogTimerModel *watchdog = NULL;
int watchdog_action = WDT_RESET;
const char *option_rom[MAX_OPTION_ROMS]; const char *option_rom[MAX_OPTION_ROMS];
int nb_option_roms; int nb_option_roms;
int semihosting_enabled = 0; int semihosting_enabled = 0;