gwj / at91sam9263 · Commits

Commit 7677f05d843cb41d50578bfa9615c51c08cb64a7

Authored by Alexander Graf
Committed by Anthony Liguori
1 parent 253d0942

Add documentation for Multiboot 

The documentation shows how to use -kernel and friends for booting Linux,
but obviously knows nothing about multiboot yet.

Let's include some documentation for multiboot, so people know how to fully
exploit this cool new feature.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 1 changed file with 13 additions and 4 deletions
qemu-options.hx
  View file @7677f05
@@ -1100,10 +1100,11 @@ ETEXI @@ -1100,10 +1100,11 @@ ETEXI
1100 1100
1101 DEFHEADING() 1101 DEFHEADING()
1102 1102
1103 -DEFHEADING(Linux boot specific:) 1103 +DEFHEADING(Linux/Multiboot boot specific:)
1104 STEXI 1104 STEXI
1105 -When using these options, you can use a given  
1106 -Linux kernel without installing it in the disk image. It can be useful 1105 +
  1106 +When using these options, you can use a given Linux or Multiboot
  1107 +kernel without installing it in the disk image. It can be useful
1107 for easier testing of various kernels. 1108 for easier testing of various kernels.
1108 1109
1109 @table @option 1110 @table @option
@@ -1113,7 +1114,8 @@ DEF(&quot;kernel&quot;, HAS_ARG, QEMU_OPTION_kernel, \ @@ -1113,7 +1114,8 @@ DEF(&quot;kernel&quot;, HAS_ARG, QEMU_OPTION_kernel, \
1113 "-kernel bzImage use 'bzImage' as kernel image\n") 1114 "-kernel bzImage use 'bzImage' as kernel image\n")
1114 STEXI 1115 STEXI
1115 @item -kernel @var{bzImage} 1116 @item -kernel @var{bzImage}
1116 -Use @var{bzImage} as kernel image. 1117 +Use @var{bzImage} as kernel image. The kernel can be either a Linux kernel
  1118 +or in multiboot format.
1117 ETEXI 1119 ETEXI
1118 1120
1119 DEF("append", HAS_ARG, QEMU_OPTION_append, \ 1121 DEF("append", HAS_ARG, QEMU_OPTION_append, \
@@ -1128,6 +1130,13 @@ DEF(&quot;initrd&quot;, HAS_ARG, QEMU_OPTION_initrd, \ @@ -1128,6 +1130,13 @@ DEF(&quot;initrd&quot;, HAS_ARG, QEMU_OPTION_initrd, \
1128 STEXI 1130 STEXI
1129 @item -initrd @var{file} 1131 @item -initrd @var{file}
1130 Use @var{file} as initial ram disk. 1132 Use @var{file} as initial ram disk.
  1133 +
  1134 +@item -initrd "@var{file1} arg=foo,@var{file2}"
  1135 +
  1136 +This syntax is only available with multiboot.
  1137 +
  1138 +Use @var{file1} and @var{file2} as modules and pass arg=foo as parameter to the
  1139 +first module.
1131 ETEXI 1140 ETEXI
1132 1141
1133 STEXI 1142 STEXI