commit 5a67135a0b169b768435ace7c7698f7709ba131f
author bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Oct 01 00:13:48 2003 +0000
committer bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Oct 01 00:13:48 2003 +0000
tree 601e4bdc79f2c9436140ad0d5dcf823755abbbfe
parent 42f1e0e49b9c162c211eba0115c5e7d1de861f44

automatic man page generation - BIOS installation


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

vl.c

diff --git a/vl.c b/vl.c
index f70c6af..2978694 100644
--- a/vl.c
+++ b/vl.c
@@ -51,7 +51,7 @@
 #include "vl.h"
 
 #define DEBUG_LOGFILE "/tmp/vl.log"
-#define DEFAULT_NETWORK_SCRIPT "/etc/vl-ifup"
+#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 #define BIOS_FILENAME "bios.bin"
 #define VGABIOS_FILENAME "vgabios.bin"
 
@@ -205,7 +205,7 @@
 
 #define MAX_IOPORTS 4096
 
-static const char *interp_prefix = CONFIG_QEMU_PREFIX;
+static const char *bios_dir = CONFIG_QEMU_SHAREDIR;
 char phys_ram_file[1024];
 CPUX86State *global_env;
 CPUX86State *cpu_single_env;
@@ -3547,7 +3547,7 @@
             gdbstub_port = atoi(optarg);
             break;
         case 'L':
-            interp_prefix = optarg;
+            bios_dir = optarg;
             break;
         }
     }
@@ -3693,15 +3693,15 @@
         /* RAW PC boot */
 
         /* BIOS load */
-        snprintf(buf, sizeof(buf), "%s/%s", interp_prefix, BIOS_FILENAME);
+        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
         ret = load_image(buf, phys_ram_base + 0x000f0000);
         if (ret != 0x10000) {
-            fprintf(stderr, "vl: could not load PC bios '%s'\n", BIOS_FILENAME);
+            fprintf(stderr, "vl: could not load PC bios '%s'\n", buf);
             exit(1);
         }
 
         /* VGA BIOS load */
-        snprintf(buf, sizeof(buf), "%s/%s", interp_prefix, VGABIOS_FILENAME);
+        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME);
         ret = load_image(buf, phys_ram_base + 0x000c0000);
 
         /* setup basic memory access */