SDL static config fix (Roman Zippel)

[qemu] / vl.c

diff --git a/vl.c b/vl.c
index 8206706..e89091d 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -111,9 +111,12 @@ NetDriverState nd_table[MAX_NICS];
 SerialState *serial_console;
 QEMUTimer *gui_timer;
 int vm_running;
+int audio_enabled = 0;
 
 /***********************************************************/
-/* x86 io ports */
+/* x86 ISA bus support */
+
+target_phys_addr_t isa_mem_base = 0;
 
 uint32_t default_ioport_readb(void *opaque, uint32_t address)
 {
@@ -1323,7 +1326,7 @@ int qemu_loadvm(const char *filename)
     }
     for(;;) {
 #if defined (DO_TB_FLUSH)
-        tb_flush();
+        tb_flush(global_env);
 #endif
         len = qemu_get_byte(f);
         if (feof(f))
@@ -1744,8 +1747,10 @@ int main_loop(void)
             qemu_run_timers(&active_timers[QEMU_TIMER_VIRTUAL], 
                             qemu_get_clock(vm_clock));
             
-            /* XXX: add explicit timer */
-            SB16_run();
+            if (audio_enabled) {
+                /* XXX: add explicit timer */
+                SB16_run();
+            }
             
             /* run dma transfers, if any */
             DMA_run();
@@ -1761,7 +1766,7 @@ int main_loop(void)
 
 void help(void)
 {
-    printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003 Fabrice Bellard\n"
+    printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003-2004 Fabrice Bellard\n"
            "usage: %s [options] [disk_image]\n"
            "\n"
            "'disk_image' is a raw hard image image for IDE hard disk 0\n"
@@ -1775,6 +1780,7 @@ void help(void)
           "-snapshot       write to temporary files instead of disk image files\n"
            "-m megs         set virtual RAM size to megs MB\n"
            "-nographic      disable graphical output and redirect serial I/Os to console\n"
+           "-enable-audio   enable audio support\n"
            "\n"
            "Network options:\n"
            "-nics n         simulate 'n' network cards [default=1]\n"
@@ -1842,6 +1848,7 @@ struct option long_options[] = {
     { "macaddr", 1, NULL, 0 },
     { "user-net", 0, NULL, 0 },
     { "dummy-net", 0, NULL, 0 },
+    { "enable-audio", 0, NULL, 0 },
     { NULL, 0, NULL, 0 },
 };
 
@@ -2033,6 +2040,9 @@ int main(int argc, char **argv)
             case 19:
                 net_if_type = NET_IF_DUMMY;
                 break;
+            case 20:
+                audio_enabled = 1;
+                break;
             }
             break;
         case 'h':
@@ -2143,7 +2153,8 @@ int main(int argc, char **argv)
             if (i < nb_tun_fds) {
                 net_fd_init(nd, tun_fds[i]);
             } else {
-                net_tun_init(nd);
+                if (net_tun_init(nd) < 0)
+                    net_dummy_init(nd);
             }
             break;
 #endif