Now that sparc and ppc can deal with uninitialized graphic_* variables we can drop the #ifdefs and also move the variables out of arch_init.c as they are not arch specific any more.
Signed-off-by: Gerd Hoffmann <kra...@redhat.com> --- arch_init.c | 11 ----------- vl.c | 3 +++ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/arch_init.c b/arch_init.c index 0810116..f41af1c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -34,17 +34,6 @@ #include "hw/acpi/acpi.h" #include "qemu/help_option.h" -#ifdef TARGET_SPARC -int graphic_width = 1024; -int graphic_height = 768; -int graphic_depth = 8; -#else -int graphic_width = 800; -int graphic_height = 600; -int graphic_depth = 32; -#endif - - #if defined(TARGET_ALPHA) #define QEMU_ARCH QEMU_ARCH_ALPHA #elif defined(TARGET_ARM) diff --git a/vl.c b/vl.c index 27d9829..3be883e 100644 --- a/vl.c +++ b/vl.c @@ -135,6 +135,9 @@ const char *bios_name = NULL; enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB; int request_opengl = -1; int display_opengl; +int graphic_width; +int graphic_height; +int graphic_depth; const char* keyboard_layout = NULL; ram_addr_t ram_size; const char *mem_path = NULL; -- 1.8.3.1
