Revision 6515b203 vl.c

b/vl.c
157 157
#else
158 158
#define MAX_CPUS 1
159 159
#endif
160
int acpi_enabled = 1;
160 161

  
161 162
/***********************************************************/
162 163
/* x86 ISA bus support */
......
4675 4676
           "                translation (t=none or lba) (usually qemu can guess them)\n"
4676 4677
           "-L path         set the directory for the BIOS and VGA BIOS\n"
4677 4678
#ifdef USE_KQEMU
4679
           "-kernel-kqemu   enable KQEMU full virtualization (default is user mode only)\n"
4678 4680
           "-no-kqemu       disable KQEMU kernel module usage\n"
4679 4681
#endif
4680 4682
#ifdef USE_CODE_COPY
......
4683 4685
#ifdef TARGET_I386
4684 4686
           "-std-vga        simulate a standard VGA card with VESA Bochs Extensions\n"
4685 4687
           "                (default is CL-GD5446 PCI VGA)\n"
4688
           "-no-acpi        disable ACPI\n"
4686 4689
#endif
4687 4690
           "-loadvm file    start right away with a saved state (loadvm in monitor)\n"
4688 4691
	   "-vnc display    start a VNC server on display\n"
......
4770 4773
    QEMU_OPTION_usbdevice,
4771 4774
    QEMU_OPTION_smp,
4772 4775
    QEMU_OPTION_vnc,
4776
    QEMU_OPTION_no_acpi,
4773 4777
};
4774 4778

  
4775 4779
typedef struct QEMUOption {
......
4842 4846
    /* temporary options */
4843 4847
    { "usb", 0, QEMU_OPTION_usb },
4844 4848
    { "cirrusvga", 0, QEMU_OPTION_cirrusvga },
4849
    { "no-acpi", 0, QEMU_OPTION_no_acpi },
4845 4850
    { NULL },
4846 4851
};
4847 4852

  
......
5443 5448
		    exit(1);
5444 5449
		}
5445 5450
		break;
5451
            case QEMU_OPTION_no_acpi:
5452
                acpi_enabled = 0;
5453
                break;
5446 5454
            }
5447 5455
        }
5448 5456
    }

Also available in: Unified diff