Revision 94fc95cd vl.c

b/vl.c
6355 6355
           "\n"
6356 6356
           "Standard options:\n"
6357 6357
           "-M machine      select emulated machine (-M ? for list)\n"
6358
           "-cpu cpu        select CPU (-C ? for list)\n"
6358 6359
           "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n"
6359 6360
           "-hda/-hdb file  use 'file' as IDE hard disk 0/1 image\n"
6360 6361
           "-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image\n"
......
6487 6488
    QEMU_OPTION_h,
6488 6489

  
6489 6490
    QEMU_OPTION_M,
6491
    QEMU_OPTION_cpu,
6490 6492
    QEMU_OPTION_fda,
6491 6493
    QEMU_OPTION_fdb,
6492 6494
    QEMU_OPTION_hda,
......
6562 6564
    { "help", 0, QEMU_OPTION_h },
6563 6565

  
6564 6566
    { "M", HAS_ARG, QEMU_OPTION_M },
6567
    { "cpu", HAS_ARG, QEMU_OPTION_cpu },
6565 6568
    { "fda", HAS_ARG, QEMU_OPTION_fda },
6566 6569
    { "fdb", HAS_ARG, QEMU_OPTION_fdb },
6567 6570
    { "hda", HAS_ARG, QEMU_OPTION_hda },
......
6867 6870
    int parallel_device_index;
6868 6871
    const char *loadvm = NULL;
6869 6872
    QEMUMachine *machine;
6873
    const char *cpu_model;
6870 6874
    char usb_devices[MAX_USB_CMDLINE][128];
6871 6875
    int usb_devices_index;
6872 6876
    int fds[2];
......
6904 6908

  
6905 6909
    register_machines();
6906 6910
    machine = first_machine;
6911
    cpu_model = NULL;
6907 6912
    initrd_filename = NULL;
6908 6913
    for(i = 0; i < MAX_FD; i++)
6909 6914
        fd_filename[i] = NULL;
......
6995 7000
                    exit(1);
6996 7001
                }
6997 7002
                break;
7003
            case QEMU_OPTION_cpu:
7004
                /* hw initialization will check this */
7005
                if (optarg[0] == '?') {
7006
#if defined(TARGET_PPC)
7007
                    ppc_cpu_list(stdout, &fprintf);
7008
#endif
7009
                    exit(1);
7010
                } else {
7011
                    cpu_model = optarg;
7012
                }
7013
                break;
6998 7014
            case QEMU_OPTION_initrd:
6999 7015
                initrd_filename = optarg;
7000 7016
                break;
......
7569 7585

  
7570 7586
    machine->init(ram_size, vga_ram_size, boot_device,
7571 7587
                  ds, fd_filename, snapshot,
7572
                  kernel_filename, kernel_cmdline, initrd_filename);
7588
                  kernel_filename, kernel_cmdline, initrd_filename, cpu_model);
7573 7589

  
7574 7590
    /* init USB devices */
7575 7591
    if (usb_enabled) {

Also available in: Unified diff