error message if user specifies SDL cmd line option when SDL is disabled
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
3264ff120c
commit
58fc096c76
|
@ -647,11 +647,9 @@ QEMU can display the VGA output when in text mode using a
|
||||||
curses/ncurses interface. Nothing is displayed in graphical mode.
|
curses/ncurses interface. Nothing is displayed in graphical mode.
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
#ifdef CONFIG_SDL
|
|
||||||
DEF("no-frame", 0, QEMU_OPTION_no_frame,
|
DEF("no-frame", 0, QEMU_OPTION_no_frame,
|
||||||
"-no-frame open SDL window without a frame and window decorations\n",
|
"-no-frame open SDL window without a frame and window decorations\n",
|
||||||
QEMU_ARCH_ALL)
|
QEMU_ARCH_ALL)
|
||||||
#endif
|
|
||||||
STEXI
|
STEXI
|
||||||
@item -no-frame
|
@item -no-frame
|
||||||
@findex -no-frame
|
@findex -no-frame
|
||||||
|
@ -660,42 +658,34 @@ available screen space. This makes the using QEMU in a dedicated desktop
|
||||||
workspace more convenient.
|
workspace more convenient.
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
#ifdef CONFIG_SDL
|
|
||||||
DEF("alt-grab", 0, QEMU_OPTION_alt_grab,
|
DEF("alt-grab", 0, QEMU_OPTION_alt_grab,
|
||||||
"-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n",
|
"-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n",
|
||||||
QEMU_ARCH_ALL)
|
QEMU_ARCH_ALL)
|
||||||
#endif
|
|
||||||
STEXI
|
STEXI
|
||||||
@item -alt-grab
|
@item -alt-grab
|
||||||
@findex -alt-grab
|
@findex -alt-grab
|
||||||
Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt).
|
Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt).
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
#ifdef CONFIG_SDL
|
|
||||||
DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab,
|
DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab,
|
||||||
"-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n",
|
"-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n",
|
||||||
QEMU_ARCH_ALL)
|
QEMU_ARCH_ALL)
|
||||||
#endif
|
|
||||||
STEXI
|
STEXI
|
||||||
@item -ctrl-grab
|
@item -ctrl-grab
|
||||||
@findex -ctrl-grab
|
@findex -ctrl-grab
|
||||||
Use Right-Ctrl to grab mouse (instead of Ctrl-Alt).
|
Use Right-Ctrl to grab mouse (instead of Ctrl-Alt).
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
#ifdef CONFIG_SDL
|
|
||||||
DEF("no-quit", 0, QEMU_OPTION_no_quit,
|
DEF("no-quit", 0, QEMU_OPTION_no_quit,
|
||||||
"-no-quit disable SDL window close capability\n", QEMU_ARCH_ALL)
|
"-no-quit disable SDL window close capability\n", QEMU_ARCH_ALL)
|
||||||
#endif
|
|
||||||
STEXI
|
STEXI
|
||||||
@item -no-quit
|
@item -no-quit
|
||||||
@findex -no-quit
|
@findex -no-quit
|
||||||
Disable SDL window close capability.
|
Disable SDL window close capability.
|
||||||
ETEXI
|
ETEXI
|
||||||
|
|
||||||
#ifdef CONFIG_SDL
|
|
||||||
DEF("sdl", 0, QEMU_OPTION_sdl,
|
DEF("sdl", 0, QEMU_OPTION_sdl,
|
||||||
"-sdl enable SDL\n", QEMU_ARCH_ALL)
|
"-sdl enable SDL\n", QEMU_ARCH_ALL)
|
||||||
#endif
|
|
||||||
STEXI
|
STEXI
|
||||||
@item -sdl
|
@item -sdl
|
||||||
@findex -sdl
|
@findex -sdl
|
||||||
|
|
8
vl.c
8
vl.c
|
@ -2625,6 +2625,14 @@ int main(int argc, char **argv, char **envp)
|
||||||
case QEMU_OPTION_sdl:
|
case QEMU_OPTION_sdl:
|
||||||
display_type = DT_SDL;
|
display_type = DT_SDL;
|
||||||
break;
|
break;
|
||||||
|
#else
|
||||||
|
case QEMU_OPTION_no_frame:
|
||||||
|
case QEMU_OPTION_alt_grab:
|
||||||
|
case QEMU_OPTION_ctrl_grab:
|
||||||
|
case QEMU_OPTION_no_quit:
|
||||||
|
case QEMU_OPTION_sdl:
|
||||||
|
fprintf(stderr, "SDL support is disabled\n");
|
||||||
|
exit(1);
|
||||||
#endif
|
#endif
|
||||||
case QEMU_OPTION_pidfile:
|
case QEMU_OPTION_pidfile:
|
||||||
pid_file = optarg;
|
pid_file = optarg;
|
||||||
|
|
Loading…
Reference in New Issue