Commit 0db63474 authored by bellard's avatar bellard

qemu with softmmu is now the default executable


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@412 c046a42c-6fe2-441c-8c8c-71466251a162
parent 6e59c1db
......@@ -12,9 +12,9 @@ DYNGEN=../dyngen
QEMU_USER=qemu-$(TARGET_ARCH)
# system emulator name
ifdef CONFIG_SOFTMMU
QEMU_SYSTEM=qemu-softmmu
else
QEMU_SYSTEM=qemu
else
QEMU_SYSTEM=qemu-fast
endif
ifdef CONFIG_USER_ONLY
......
......@@ -3446,7 +3446,7 @@ int main_loop(void *opaque)
void help(void)
{
printf("QEMU PC emulator version " QEMU_VERSION ", Copyright (c) 2003 Fabrice Bellard\n"
"usage: qemu [options] [disk_image]\n"
"usage: %s [options] [disk_image]\n"
"\n"
"'disk_image' is a raw hard image image for IDE hard disk 0\n"
"\n"
......@@ -3472,8 +3472,20 @@ void help(void)
"-L path set the directory for the BIOS and VGA BIOS\n"
"\n"
"During emulation, use C-a h to get terminal commands:\n",
DEFAULT_NETWORK_SCRIPT, DEFAULT_GDBSTUB_PORT);
#ifdef CONFIG_SOFTMMU
"qemu",
#else
"qemu-fast",
#endif
DEFAULT_NETWORK_SCRIPT,
DEFAULT_GDBSTUB_PORT);
term_print_help();
#ifndef CONFIG_SOFTMMU
printf("\n"
"NOTE: this version of QEMU is faster but it needs slightly patched OSes to\n"
"work. Please use the 'qemu' executable to have a more accurate (but slower)\n"
"PC emulation.\n");
#endif
exit(1);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment