From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MLH24-0006wQ-Tl for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:29 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MLH1w-0006sf-H7 for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:25 -0400 Received: from [199.232.76.173] (port=37390 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MLH1v-0006s7-QU for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:19 -0400 Received: from cantor.suse.de ([195.135.220.2]:48804 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MLH1u-00044Y-Su for qemu-devel@nongnu.org; Mon, 29 Jun 2009 09:36:19 -0400 From: Alexander Graf Date: Mon, 29 Jun 2009 15:37:41 +0200 Message-Id: <1246282661-4658-6-git-send-email-agraf@suse.de> In-Reply-To: <1246282661-4658-5-git-send-email-agraf@suse.de> References: <1246282661-4658-1-git-send-email-agraf@suse.de> <1246282661-4658-2-git-send-email-agraf@suse.de> <1246282661-4658-3-git-send-email-agraf@suse.de> <1246282661-4658-4-git-send-email-agraf@suse.de> <1246282661-4658-5-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 5/5] Add documentation for Multiboot List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, rene@exactcode.de 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 --- qemu-options.hx | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 503da33..3b6f885 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1068,10 +1068,11 @@ ETEXI DEFHEADING() -DEFHEADING(Linux boot specific:) +DEFHEADING(Linux/Multiboot boot specific:) STEXI -When using these options, you can use a given -Linux kernel without installing it in the disk image. It can be useful + +When using these options, you can use a given Linux or Multiboot +kernel without installing it in the disk image. It can be useful for easier testing of various kernels. @table @option @@ -1081,7 +1082,8 @@ DEF("kernel", HAS_ARG, QEMU_OPTION_kernel, \ "-kernel bzImage use 'bzImage' as kernel image\n") STEXI @item -kernel @var{bzImage} -Use @var{bzImage} as kernel image. +Use @var{bzImage} as kernel image. The kernel can be either a Linux kernel +or in multiboot format. ETEXI DEF("append", HAS_ARG, QEMU_OPTION_append, \ @@ -1096,6 +1098,13 @@ DEF("initrd", HAS_ARG, QEMU_OPTION_initrd, \ STEXI @item -initrd @var{file} Use @var{file} as initial ram disk. + +@item -initrd "@var{file1} arg=foo,@var{file2}" + +This syntax is only available with multiboot. + +Use @var{file1} and @var{file2} as modules and pass arg=foo as parameter to the +first module. ETEXI STEXI -- 1.6.0.2