Commit 2bfdab638a463da3e3a7d399b3bf3162f4ed08df
1 parent
3b3fb322
Move nographic export to sysemu.h
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5414 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
4 changed files
with
1 additions
and
5 deletions
hw/fw_cfg.c
| @@ -259,7 +259,6 @@ void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, | @@ -259,7 +259,6 @@ void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, | ||
| 259 | { | 259 | { |
| 260 | FWCfgState *s; | 260 | FWCfgState *s; |
| 261 | int io_ctl_memory, io_data_memory; | 261 | int io_ctl_memory, io_data_memory; |
| 262 | - extern int nographic; | ||
| 263 | 262 | ||
| 264 | s = qemu_mallocz(sizeof(FWCfgState)); | 263 | s = qemu_mallocz(sizeof(FWCfgState)); |
| 265 | if (!s) | 264 | if (!s) |
hw/sun4m.c
| @@ -175,8 +175,6 @@ static int nvram_boot_set(void *opaque, const char *boot_device) | @@ -175,8 +175,6 @@ static int nvram_boot_set(void *opaque, const char *boot_device) | ||
| 175 | return 0; | 175 | return 0; |
| 176 | } | 176 | } |
| 177 | 177 | ||
| 178 | -extern int nographic; | ||
| 179 | - | ||
| 180 | static void nvram_init(m48t59_t *nvram, uint8_t *macaddr, const char *cmdline, | 178 | static void nvram_init(m48t59_t *nvram, uint8_t *macaddr, const char *cmdline, |
| 181 | const char *boot_devices, ram_addr_t RAM_size, | 179 | const char *boot_devices, ram_addr_t RAM_size, |
| 182 | uint32_t kernel_size, | 180 | uint32_t kernel_size, |
hw/sun4u.c
| @@ -108,8 +108,6 @@ static int nvram_boot_set(void *opaque, const char *boot_device) | @@ -108,8 +108,6 @@ static int nvram_boot_set(void *opaque, const char *boot_device) | ||
| 108 | return 0; | 108 | return 0; |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | -extern int nographic; | ||
| 112 | - | ||
| 113 | static int sun4u_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size, | 111 | static int sun4u_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size, |
| 114 | const char *arch, | 112 | const char *arch, |
| 115 | ram_addr_t RAM_size, | 113 | ram_addr_t RAM_size, |
sysemu.h
| @@ -78,6 +78,7 @@ extern int vmsvga_enabled; | @@ -78,6 +78,7 @@ extern int vmsvga_enabled; | ||
| 78 | extern int graphic_width; | 78 | extern int graphic_width; |
| 79 | extern int graphic_height; | 79 | extern int graphic_height; |
| 80 | extern int graphic_depth; | 80 | extern int graphic_depth; |
| 81 | +extern int nographic; | ||
| 81 | extern const char *keyboard_layout; | 82 | extern const char *keyboard_layout; |
| 82 | extern int win2k_install_hack; | 83 | extern int win2k_install_hack; |
| 83 | extern int alt_grab; | 84 | extern int alt_grab; |