ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

-no-kqemu option 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1280 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2005-02-10 22:00:06 +00:00
parent 49b470eb96
commit d993e0260b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vl.c
View File

@ -2760,6 +2760,9 @@ void help(void)
"-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"
" translation (t=none or lba) (usually qemu can guess them)\n" " translation (t=none or lba) (usually qemu can guess them)\n"
"-L path set the directory for the BIOS and VGA BIOS\n" "-L path set the directory for the BIOS and VGA BIOS\n"
#ifdef USE_KQEMU
"-no-kqemu disable KQEMU kernel module usage\n"
#endif
#ifdef USE_CODE_COPY #ifdef USE_CODE_COPY
"-no-code-copy disable code copy acceleration\n" "-no-code-copy disable code copy acceleration\n"
#endif #endif
@ -2848,6 +2851,7 @@ enum {
QEMU_OPTION_loadvm, QEMU_OPTION_loadvm,
QEMU_OPTION_full_screen, QEMU_OPTION_full_screen,
QEMU_OPTION_pidfile, QEMU_OPTION_pidfile,
QEMU_OPTION_no_kqemu,
}; };
typedef struct QEMUOption { typedef struct QEMUOption {
@ -2898,6 +2902,9 @@ const QEMUOption qemu_options[] = {
{ "hdachs", HAS_ARG, QEMU_OPTION_hdachs }, { "hdachs", HAS_ARG, QEMU_OPTION_hdachs },
{ "L", HAS_ARG, QEMU_OPTION_L }, { "L", HAS_ARG, QEMU_OPTION_L },
{ "no-code-copy", 0, QEMU_OPTION_no_code_copy }, { "no-code-copy", 0, QEMU_OPTION_no_code_copy },
#ifdef USE_KQEMU
{ "no-kqemu", 0, QEMU_OPTION_no_kqemu },
#endif
#ifdef TARGET_PPC #ifdef TARGET_PPC
{ "prep", 0, QEMU_OPTION_prep }, { "prep", 0, QEMU_OPTION_prep },
{ "g", 1, QEMU_OPTION_g }, { "g", 1, QEMU_OPTION_g },
@ -3358,6 +3365,11 @@ int main(int argc, char **argv)
case QEMU_OPTION_pidfile: case QEMU_OPTION_pidfile:
create_pidfile(optarg); create_pidfile(optarg);
break; break;
#ifdef USE_KQEMU
case QEMU_OPTION_no_kqemu:
kqemu_allowed = 0;
break;
#endif
} }
} }
} }
@ -3433,12 +3445,7 @@ int main(int argc, char **argv)
phys_ram_size = ram_size + vga_ram_size + bios_size; phys_ram_size = ram_size + vga_ram_size + bios_size;
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_SOFTMMU
#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
if (!phys_ram_base) { if (!phys_ram_base) {
fprintf(stderr, "Could not allocate physical memory\n"); fprintf(stderr, "Could not allocate physical memory\n");
exit(1); exit(1);

1
vl.h
View File

@ -124,6 +124,7 @@ extern int graphic_width;
extern int graphic_height; extern int graphic_height;
extern int graphic_depth; extern int graphic_depth;
extern const char *keyboard_layout; extern const char *keyboard_layout;
extern int kqemu_allowed;
/* XXX: make it dynamic */ /* XXX: make it dynamic */
#if defined (TARGET_PPC) #if defined (TARGET_PPC)