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

Diff of /qemu/vl.c

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

revision 1.141 by bellard, Sun Nov 6 16:49:55 2005 UTC revision 1.142 by bellard, Sun Nov 6 18:20:36 2005 UTC
# Line 134  int adlib_enabled = 0; Line 134  int adlib_enabled = 0;
134  int gus_enabled = 0;  int gus_enabled = 0;
135  int es1370_enabled = 0;  int es1370_enabled = 0;
136  #endif  #endif
 int pci_enabled = 1;  
 int prep_enabled = 0;  
137  int rtc_utc = 1;  int rtc_utc = 1;
138  int cirrus_vga_enabled = 1;  int cirrus_vga_enabled = 1;
139  #ifdef TARGET_SPARC  #ifdef TARGET_SPARC
# Line 3087  enum { Line 3085  enum {
3085      QEMU_OPTION_hdachs,      QEMU_OPTION_hdachs,
3086      QEMU_OPTION_L,      QEMU_OPTION_L,
3087      QEMU_OPTION_no_code_copy,      QEMU_OPTION_no_code_copy,
     QEMU_OPTION_pci,  
     QEMU_OPTION_isa,  
     QEMU_OPTION_prep,  
3088      QEMU_OPTION_k,      QEMU_OPTION_k,
3089      QEMU_OPTION_localtime,      QEMU_OPTION_localtime,
3090      QEMU_OPTION_cirrusvga,      QEMU_OPTION_cirrusvga,
# Line 3163  const QEMUOption qemu_options[] = { Line 3158  const QEMUOption qemu_options[] = {
3158  #ifdef USE_KQEMU  #ifdef USE_KQEMU
3159      { "no-kqemu", 0, QEMU_OPTION_no_kqemu },      { "no-kqemu", 0, QEMU_OPTION_no_kqemu },
3160  #endif  #endif
 #ifdef TARGET_PPC  
     { "prep", 0, QEMU_OPTION_prep },  
 #endif  
3161  #if defined(TARGET_PPC) || defined(TARGET_SPARC)  #if defined(TARGET_PPC) || defined(TARGET_SPARC)
3162      { "g", 1, QEMU_OPTION_g },      { "g", 1, QEMU_OPTION_g },
3163  #endif  #endif
3164      { "localtime", 0, QEMU_OPTION_localtime },      { "localtime", 0, QEMU_OPTION_localtime },
     { "isa", 0, QEMU_OPTION_isa },  
3165      { "std-vga", 0, QEMU_OPTION_std_vga },      { "std-vga", 0, QEMU_OPTION_std_vga },
3166      { "monitor", 1, QEMU_OPTION_monitor },      { "monitor", 1, QEMU_OPTION_monitor },
3167      { "serial", 1, QEMU_OPTION_serial },      { "serial", 1, QEMU_OPTION_serial },
# Line 3183  const QEMUOption qemu_options[] = { Line 3174  const QEMUOption qemu_options[] = {
3174            
3175      /* temporary options */      /* temporary options */
3176      { "usb", 0, QEMU_OPTION_usb },      { "usb", 0, QEMU_OPTION_usb },
     { "pci", 0, QEMU_OPTION_pci },  
3177      { "cirrusvga", 0, QEMU_OPTION_cirrusvga },      { "cirrusvga", 0, QEMU_OPTION_cirrusvga },
3178      { NULL },      { NULL },
3179  };  };
# Line 3239  void register_machines(void) Line 3229  void register_machines(void)
3229  {  {
3230  #if defined(TARGET_I386)  #if defined(TARGET_I386)
3231      qemu_register_machine(&pc_machine);      qemu_register_machine(&pc_machine);
3232        qemu_register_machine(&isapc_machine);
3233  #elif defined(TARGET_PPC)  #elif defined(TARGET_PPC)
3234      qemu_register_machine(&heathrow_machine);      qemu_register_machine(&heathrow_machine);
3235      qemu_register_machine(&core99_machine);      qemu_register_machine(&core99_machine);
# Line 3676  int main(int argc, char **argv) Line 3667  int main(int argc, char **argv)
3667              case QEMU_OPTION_S:              case QEMU_OPTION_S:
3668                  start_emulation = 0;                  start_emulation = 0;
3669                  break;                  break;
             case QEMU_OPTION_pci:  
                 pci_enabled = 1;  
                 break;  
             case QEMU_OPTION_isa:  
                 pci_enabled = 0;  
                 break;  
             case QEMU_OPTION_prep:  
                 prep_enabled = 1;  
                 break;  
3670              case QEMU_OPTION_k:              case QEMU_OPTION_k:
3671                  keyboard_layout = optarg;                  keyboard_layout = optarg;
3672                  break;                  break;

Legend:
Removed from v.1.141  
changed lines
  Added in v.1.142

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