/[qemu]/qemu/vl.c
ViewVC logotype

Diff of /qemu/vl.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.119 by bellard, Sun Jan 30 22:57:54 2005 UTC revision 1.120 by bellard, Thu Feb 10 22:00:06 2005 UTC
# Line 2760  void help(void) Line 2760  void help(void)
2760             "-hdachs c,h,s[,t]  force hard disk 0 physical geometry and the optional BIOS\n"             "-hdachs c,h,s[,t]  force hard disk 0 physical geometry and the optional BIOS\n"
2761             "                translation (t=none or lba) (usually qemu can guess them)\n"             "                translation (t=none or lba) (usually qemu can guess them)\n"
2762             "-L path         set the directory for the BIOS and VGA BIOS\n"             "-L path         set the directory for the BIOS and VGA BIOS\n"
2763    #ifdef USE_KQEMU
2764               "-no-kqemu       disable KQEMU kernel module usage\n"
2765    #endif
2766  #ifdef USE_CODE_COPY  #ifdef USE_CODE_COPY
2767             "-no-code-copy   disable code copy acceleration\n"             "-no-code-copy   disable code copy acceleration\n"
2768  #endif  #endif
# Line 2848  enum { Line 2851  enum {
2851      QEMU_OPTION_loadvm,      QEMU_OPTION_loadvm,
2852      QEMU_OPTION_full_screen,      QEMU_OPTION_full_screen,
2853      QEMU_OPTION_pidfile,      QEMU_OPTION_pidfile,
2854        QEMU_OPTION_no_kqemu,
2855  };  };
2856    
2857  typedef struct QEMUOption {  typedef struct QEMUOption {
# Line 2898  const QEMUOption qemu_options[] = { Line 2902  const QEMUOption qemu_options[] = {
2902      { "hdachs", HAS_ARG, QEMU_OPTION_hdachs },      { "hdachs", HAS_ARG, QEMU_OPTION_hdachs },
2903      { "L", HAS_ARG, QEMU_OPTION_L },      { "L", HAS_ARG, QEMU_OPTION_L },
2904      { "no-code-copy", 0, QEMU_OPTION_no_code_copy },      { "no-code-copy", 0, QEMU_OPTION_no_code_copy },
2905    #ifdef USE_KQEMU
2906        { "no-kqemu", 0, QEMU_OPTION_no_kqemu },
2907    #endif
2908  #ifdef TARGET_PPC  #ifdef TARGET_PPC
2909      { "prep", 0, QEMU_OPTION_prep },      { "prep", 0, QEMU_OPTION_prep },
2910      { "g", 1, QEMU_OPTION_g },      { "g", 1, QEMU_OPTION_g },
# Line 3358  int main(int argc, char **argv) Line 3365  int main(int argc, char **argv)
3365              case QEMU_OPTION_pidfile:              case QEMU_OPTION_pidfile:
3366                  create_pidfile(optarg);                  create_pidfile(optarg);
3367                  break;                  break;
3368    #ifdef USE_KQEMU
3369                case QEMU_OPTION_no_kqemu:
3370                    kqemu_allowed = 0;
3371                    break;
3372    #endif
3373              }              }
3374          }          }
3375      }      }
# Line 3433  int main(int argc, char **argv) Line 3445  int main(int argc, char **argv)
3445      phys_ram_size = ram_size + vga_ram_size + bios_size;      phys_ram_size = ram_size + vga_ram_size + bios_size;
3446    
3447  #ifdef CONFIG_SOFTMMU  #ifdef CONFIG_SOFTMMU
3448  #ifdef _BSD      phys_ram_base = qemu_vmalloc(phys_ram_size);
     /* mallocs are always aligned on BSD. valloc is better for correctness */  
     phys_ram_base = valloc(phys_ram_size);  
 #else  
     phys_ram_base = memalign(TARGET_PAGE_SIZE, phys_ram_size);  
 #endif  
3449      if (!phys_ram_base) {      if (!phys_ram_base) {
3450          fprintf(stderr, "Could not allocate physical memory\n");          fprintf(stderr, "Could not allocate physical memory\n");
3451          exit(1);          exit(1);

Legend:
Removed from v.1.119  
changed lines
  Added in v.1.120

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26