diff options
author | Avi Kivity <avi@redhat.com> | 2009-07-28 19:27:26 +0300 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-07-28 19:27:26 +0300 |
commit | 42baf3e47bdef812cc9b76c18a53ad91db2537eb (patch) | |
tree | 0be7923fab86ab4647852f1f9e0ed70ae347097e /qemu-options.hx | |
parent | Merge commit '9538749118d47dfcd3ed45804736027d87ec054e' into upstream-merge (diff) | |
parent | Regenerate BIOS and add patches for -boot option (diff) | |
download | qemu-kvm-42baf3e47bdef812cc9b76c18a53ad91db2537eb.tar.gz qemu-kvm-42baf3e47bdef812cc9b76c18a53ad91db2537eb.tar.bz2 qemu-kvm-42baf3e47bdef812cc9b76c18a53ad91db2537eb.zip |
Merge commit 'ef2039f17d3e2226b8650b4d7692e5f458a37573' into upstream-merge
* commit 'ef2039f17d3e2226b8650b4d7692e5f458a37573':
Regenerate BIOS and add patches for -boot option
Update boot option documentation
Conflicts:
pc-bios/bios.bin (dropped)
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
-rw-r--r-- | qemu-options.hx | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 8e6cd437b..3038acddf 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -220,11 +220,30 @@ Use 'file' as a parallel flash image. ETEXI DEF("boot", HAS_ARG, QEMU_OPTION_boot, - "-boot [a|c|d|n] boot on floppy (a), hard disk (c), CD-ROM (d), or network (n)\n") + "-boot [order=drives][,once=drives][,menu=on|off]\n" + " 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n)\n") STEXI -@item -boot [a|c|d|n] -Boot on floppy (a), hard disk (c), CD-ROM (d), or Etherboot (n). Hard disk boot -is the default. +@item -boot [order=@var{drives}][,once=@var{drives}][,menu=on|off] + +Specify boot order @var{drives} as a string of drive letters. Valid +drive letters depend on the target achitecture. The x86 PC uses: a, b +(floppy 1 and 2), c (first hard disk), d (first CD-ROM), n-p (Etherboot +from network adapter 1-4), hard disk boot is the default. To apply a +particular boot order only on the first startup, specify it via +@option{once}. + +Interactive boot menus/prompts can be enabled via @option{menu=on} as far +as firmware/BIOS supports them. The default is non-interactive boot. + +@example +# try to boot from network first, then from hard disk +qemu -boot order=nc +# boot from CD-ROM first, switch back to default order after reboot +qemu -boot once=d +@end example + +Note: The legacy format '-boot @var{drives}' is still supported but its +use is discouraged as it may be removed from future versions. ETEXI DEF("snapshot", 0, QEMU_OPTION_snapshot, |