Revert workaround for -nographic segfault.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2995 c046a42c-6fe2-441c-8c8c-71466251a162

hw/mips_malta.c

@@ -42,7 +42,6 @@
 #define ENVP_NB_ENTRIES	 	16
 #define ENVP_ENTRY_SIZE	 	256
 
-extern int nographic;
 extern FILE *logfile;
 
 typedef struct {
@@ -67,7 +66,6 @@ static void malta_fpga_update_display(void *opaque)
     int i;
     MaltaFPGAState *s = opaque;
 
-    if (!nographic) {
     for (i = 7 ; i >= 0 ; i--) {
         if (s->leds & (1 << i))
             leds_text[i] = '#';
@@ -78,7 +76,6 @@ static void malta_fpga_update_display(void *opaque)
 
     qemu_chr_printf(s->display, "\e[H\n\n|\e[32m%-8.8s\e[00m|\r\n", leds_text);
     qemu_chr_printf(s->display, "\n\n\n\n|\e[31m%-8.8s\e[00m|", s->display_text);
-    }
 }
 
 /*
@@ -415,7 +412,6 @@ MaltaFPGAState *malta_fpga_init(target_phys_addr_t base, CPUState *env)
     cpu_register_physical_memory(base, 0x900, malta);
     cpu_register_physical_memory(base + 0xa00, 0x100000 - 0xa00, malta);
 
-    if (!nographic) {
     s->display = qemu_chr_open("vc");
     qemu_chr_printf(s->display, "\e[HMalta LEDBAR\r\n");
     qemu_chr_printf(s->display, "+--------+\r\n");
@@ -430,7 +426,6 @@ MaltaFPGAState *malta_fpga_init(target_phys_addr_t base, CPUState *env)
     uart_chr = qemu_chr_open("vc");
     qemu_chr_printf(uart_chr, "CBUS UART\r\n");
     s->uart = serial_mm_init(base + 0x900, 3, env->irq[2], uart_chr, 1);
-    }
 
     malta_fpga_reset(s);
     qemu_register_reset(malta_fpga_reset, s);