Revision 5a67135a vl.c

b/vl.c
51 51
#include "vl.h"
52 52

  
53 53
#define DEBUG_LOGFILE "/tmp/vl.log"
54
#define DEFAULT_NETWORK_SCRIPT "/etc/vl-ifup"
54
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
55 55
#define BIOS_FILENAME "bios.bin"
56 56
#define VGABIOS_FILENAME "vgabios.bin"
57 57

  
......
205 205

  
206 206
#define MAX_IOPORTS 4096
207 207

  
208
static const char *interp_prefix = CONFIG_QEMU_PREFIX;
208
static const char *bios_dir = CONFIG_QEMU_SHAREDIR;
209 209
char phys_ram_file[1024];
210 210
CPUX86State *global_env;
211 211
CPUX86State *cpu_single_env;
......
3547 3547
            gdbstub_port = atoi(optarg);
3548 3548
            break;
3549 3549
        case 'L':
3550
            interp_prefix = optarg;
3550
            bios_dir = optarg;
3551 3551
            break;
3552 3552
        }
3553 3553
    }
......
3693 3693
        /* RAW PC boot */
3694 3694

  
3695 3695
        /* BIOS load */
3696
        snprintf(buf, sizeof(buf), "%s/%s", interp_prefix, BIOS_FILENAME);
3696
        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME);
3697 3697
        ret = load_image(buf, phys_ram_base + 0x000f0000);
3698 3698
        if (ret != 0x10000) {
3699
            fprintf(stderr, "vl: could not load PC bios '%s'\n", BIOS_FILENAME);
3699
            fprintf(stderr, "vl: could not load PC bios '%s'\n", buf);
3700 3700
            exit(1);
3701 3701
        }
3702 3702

  
3703 3703
        /* VGA BIOS load */
3704
        snprintf(buf, sizeof(buf), "%s/%s", interp_prefix, VGABIOS_FILENAME);
3704
        snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_FILENAME);
3705 3705
        ret = load_image(buf, phys_ram_base + 0x000c0000);
3706 3706

  
3707 3707
        /* setup basic memory access */

Also available in: Unified diff