[Qemu-devel] [PATCH for-1.4 7/7] doc help: Collect block device stuff under its own heading

[Markus Armbruster]

Collect them from "Standard options", "File system options", "Virtual
File system pass-through options", "Debug/Expert options".

Signed-off-by: Markus Armbruster <address@hidden>
---
 qemu-options.hx | 722 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 356 insertions(+), 366 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index a252908..0e68b0d 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -103,196 +103,6 @@ Simulate a multi node NUMA system. If mem and cpus are 
omitted, resources
 are split equally.
 ETEXI
 
-DEF("fda", HAS_ARG, QEMU_OPTION_fda,
-    "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
-DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
-STEXI
address@hidden -fda @var{file}
address@hidden -fdb @var{file}
address@hidden -fda
address@hidden -fdb
-Use @var{file} as floppy disk 0/1 image (@pxref{disk_images}). You can
-use the host floppy by using @file{/dev/fd0} as filename (@pxref{host_drives}).
-ETEXI
-
-DEF("hda", HAS_ARG, QEMU_OPTION_hda,
-    "-hda/-hdb file  use 'file' as IDE hard disk 0/1 image\n", QEMU_ARCH_ALL)
-DEF("hdb", HAS_ARG, QEMU_OPTION_hdb, "", QEMU_ARCH_ALL)
-DEF("hdc", HAS_ARG, QEMU_OPTION_hdc,
-    "-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image\n", QEMU_ARCH_ALL)
-DEF("hdd", HAS_ARG, QEMU_OPTION_hdd, "", QEMU_ARCH_ALL)
-STEXI
address@hidden -hda @var{file}
address@hidden -hdb @var{file}
address@hidden -hdc @var{file}
address@hidden -hdd @var{file}
address@hidden -hda
address@hidden -hdb
address@hidden -hdc
address@hidden -hdd
-Use @var{file} as hard disk 0, 1, 2 or 3 image (@pxref{disk_images}).
-ETEXI
-
-DEF("cdrom", HAS_ARG, QEMU_OPTION_cdrom,
-    "-cdrom file     use 'file' as IDE cdrom image (cdrom is ide1 master)\n",
-    QEMU_ARCH_ALL)
-STEXI
address@hidden -cdrom @var{file}
address@hidden -cdrom
-Use @var{file} as CD-ROM image (you cannot use @option{-hdc} and
address@hidden at the same time). You can use the host CD-ROM by
-using @file{/dev/cdrom} as filename (@pxref{host_drives}).
-ETEXI
-
-DEF("drive", HAS_ARG, QEMU_OPTION_drive,
-    "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
-    "       [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
-    "       
[,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
-    "       [,serial=s][,addr=A][,id=name][,aio=threads|native]\n"
-    "       [,readonly=on|off][,copy-on-read=on|off]\n"
-    "       
[[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r][,iops_wr=w]]\n"
-    "                use 'file' as a drive image\n", QEMU_ARCH_ALL)
-STEXI
address@hidden -drive @var{option}[,@var{option}[,@var{option}[,...]]]
address@hidden -drive
-
-Define a new drive. Valid options are:
-
address@hidden @option
address@hidden address@hidden
-This option defines which disk image (@pxref{disk_images}) to use with
-this drive. If the filename contains comma, you must double it
-(for instance, "file=my,,file" to use file "my,file").
-
-Special files such as iSCSI devices can be specified using protocol
-specific URLs. See the section for "Device URL Syntax" for more information.
address@hidden address@hidden
-This option defines on which type on interface the drive is connected.
-Available types are: ide, scsi, sd, mtd, floppy, pflash, virtio.
address@hidden address@hidden,address@hidden
-These options define where is connected the drive by defining the bus number 
and
-the unit id.
address@hidden address@hidden
-This option defines where is connected the drive by using an index in the list
-of available connectors of a given interface type.
address@hidden address@hidden
-This option defines the type of the media: disk or cdrom.
address@hidden address@hidden,address@hidden,address@hidden,address@hidden
-These options have the same definition as they have in @option{-hdachs}.
address@hidden address@hidden
address@hidden is "on" or "off" and allows to enable snapshot for given drive 
(see @option{-snapshot}).
address@hidden address@hidden
address@hidden is "none", "writeback", "unsafe", "directsync" or "writethrough" 
and controls how the host cache is used to access block data.
address@hidden address@hidden
address@hidden is "threads", or "native" and selects between pthread based disk 
I/O and native Linux AIO.
address@hidden address@hidden
-Specify which disk @var{format} will be used rather than detecting
-the format.  Can be used to specifiy format=raw to avoid interpreting
-an untrusted format header.
address@hidden address@hidden
-This option specifies the serial number to assign to the device.
address@hidden address@hidden
-Specify the controller's PCI address (if=virtio only).
address@hidden address@hidden,address@hidden
-Specify which @var{action} to take on write and read errors. Valid actions are:
-"ignore" (ignore the error and try to continue), "stop" (pause QEMU),
-"report" (report the error to the guest), "enospc" (pause QEMU only if the
-host disk is full; report the error to the guest otherwise).
-The default setting is @option{werror=enospc} and @option{rerror=report}.
address@hidden readonly
-Open drive @option{file} as read-only. Guest write attempts will fail.
address@hidden address@hidden
address@hidden is "on" or "off" and enables whether to copy read backing
-file sectors into the image file.
address@hidden table
-
-By default, the @option{cache=writeback} mode is used. It will report data
-writes as completed as soon as the data is present in the host page cache.
-This is safe as long as your guest OS makes sure to correctly flush disk caches
-where needed. If your guest OS does not handle volatile disk write caches
-correctly and your host crashes or loses power, then the guest may experience
-data corruption.
-
-For such guests, you should consider using @option{cache=writethrough}. This
-means that the host page cache will be used to read and write data, but write
-notification will be sent to the guest only after QEMU has made sure to flush
-each write to the disk. Be aware that this has a major impact on performance.
-
-The host page cache can be avoided entirely with @option{cache=none}.  This 
will
-attempt to do disk IO directly to the guest's memory.  QEMU may still perform
-an internal copy of the data. Note that this is considered a writeback mode and
-the guest OS must handle the disk write cache correctly in order to avoid data
-corruption on host crashes.
-
-The host page cache can be avoided while only sending write notifications to
-the guest when the data has been flushed to the disk using
address@hidden
-
-In case you don't care about data integrity over host failures, use
address@hidden This option tells QEMU that it never needs to write any
-data to the disk but can instead keep things in cache. If anything goes wrong,
-like your host losing power, the disk storage getting disconnected 
accidentally,
-etc. your image will most probably be rendered unusable.   When using
-the @option{-snapshot} option, unsafe caching is always used.
-
-Copy-on-read avoids accessing the same backing file sectors repeatedly and is
-useful when the backing file is over a slow network.  By default copy-on-read
-is off.
-
-Instead of @option{-cdrom} you can use:
address@hidden
-qemu-system-i386 -drive file=file,index=2,media=cdrom
address@hidden example
-
-Instead of @option{-hda}, @option{-hdb}, @option{-hdc}, @option{-hdd}, you can
-use:
address@hidden
-qemu-system-i386 -drive file=file,index=0,media=disk
-qemu-system-i386 -drive file=file,index=1,media=disk
-qemu-system-i386 -drive file=file,index=2,media=disk
-qemu-system-i386 -drive file=file,index=3,media=disk
address@hidden example
-
-You can open an image using pre-opened file descriptors from an fd set:
address@hidden
-qemu-system-i386
--add-fd fd=3,set=2,opaque="rdwr:/path/to/file"
--add-fd fd=4,set=2,opaque="rdonly:/path/to/file"
--drive file=/dev/fdset/2,index=0,media=disk
address@hidden example
-
-You can connect a CDROM to the slave of ide0:
address@hidden
-qemu-system-i386 -drive file=file,if=ide,index=1,media=cdrom
address@hidden example
-
-If you don't specify the "file=" argument, you define an empty drive:
address@hidden
-qemu-system-i386 -drive if=ide,index=1,media=cdrom
address@hidden example
-
-You can connect a SCSI disk with unit ID 6 on the bus #0:
address@hidden
-qemu-system-i386 -drive file=file,if=scsi,bus=0,unit=6
address@hidden example
-
-Instead of @option{-fda}, @option{-fdb}, you can use:
address@hidden
-qemu-system-i386 -drive file=file,index=0,if=floppy
-qemu-system-i386 -drive file=file,index=1,if=floppy
address@hidden example
-
-By default, @var{interface} is "ide" and @var{index} is automatically
-incremented:
address@hidden
-qemu-system-i386 -drive file=a -drive file=b"
address@hidden example
-is interpreted like:
address@hidden
-qemu-system-i386 -hda a -hdb b
address@hidden example
-ETEXI
-
 DEF("add-fd", HAS_ARG, QEMU_OPTION_add_fd,
     "-add-fd fd=fd,set=set[,opaque=opaque]\n"
     "                Add 'fd' to fd 'set'\n", QEMU_ARCH_ALL)
@@ -349,31 +159,6 @@ created automatically by the machine model. To create a 
device which is not
 created automatically and set properties on it, use address@hidden
 ETEXI
 
-DEF("mtdblock", HAS_ARG, QEMU_OPTION_mtdblock,
-    "-mtdblock file  use 'file' as on-board Flash memory image\n",
-    QEMU_ARCH_ALL)
-STEXI
address@hidden -mtdblock @var{file}
address@hidden -mtdblock
-Use @var{file} as on-board Flash memory image.
-ETEXI
-
-DEF("sd", HAS_ARG, QEMU_OPTION_sd,
-    "-sd file        use 'file' as SecureDigital card image\n", QEMU_ARCH_ALL)
-STEXI
address@hidden -sd @var{file}
address@hidden -sd
-Use @var{file} as SecureDigital card image.
-ETEXI
-
-DEF("pflash", HAS_ARG, QEMU_OPTION_pflash,
-    "-pflash file    use 'file' as a parallel flash image\n", QEMU_ARCH_ALL)
-STEXI
address@hidden -pflash @var{file}
address@hidden -pflash
-Use @var{file} as a parallel flash image.
-ETEXI
-
 DEF("boot", HAS_ARG, QEMU_OPTION_boot,
     "-boot [order=drives][,once=drives][,menu=on|off]\n"
     "      [,splash=sp_name][,splash-time=sp_time][,reboot-timeout=rb_time]\n"
@@ -420,17 +205,6 @@ 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,
-    "-snapshot       write to temporary files instead of disk image files\n",
-    QEMU_ARCH_ALL)
-STEXI
address@hidden -snapshot
address@hidden -snapshot
-Write to temporary files instead of disk image files. In this case,
-the raw disk image you use is not written back. You can however force
-the write back by pressing @key{C-a s} (@pxref{disk_images}).
-ETEXI
-
 DEF("m", HAS_ARG, QEMU_OPTION_m,
     "-m megs         set virtual RAM size to megs MB [default="
     stringify(DEFAULT_RAM_SIZE) "]\n", QEMU_ARCH_ALL)
@@ -506,146 +280,323 @@ Enable audio and selected sound hardware. Use 'help' to 
print all
 available sound hardware.
 
 @example
-qemu-system-i386 -soundhw sb16,adlib disk.img
-qemu-system-i386 -soundhw es1370 disk.img
-qemu-system-i386 -soundhw ac97 disk.img
-qemu-system-i386 -soundhw hda disk.img
-qemu-system-i386 -soundhw all disk.img
-qemu-system-i386 -soundhw help
+qemu-system-i386 -soundhw sb16,adlib disk.img
+qemu-system-i386 -soundhw es1370 disk.img
+qemu-system-i386 -soundhw ac97 disk.img
+qemu-system-i386 -soundhw hda disk.img
+qemu-system-i386 -soundhw all disk.img
+qemu-system-i386 -soundhw help
address@hidden example
+
+Note that Linux's i810_audio OSS kernel (for AC97) module might
+require manually specifying clocking.
+
address@hidden
+modprobe i810_audio clocking=48000
address@hidden example
+ETEXI
+
+DEF("balloon", HAS_ARG, QEMU_OPTION_balloon,
+    "-balloon none   disable balloon device\n"
+    "-balloon virtio[,addr=str]\n"
+    "                enable virtio balloon device (default)\n", QEMU_ARCH_ALL)
+STEXI
address@hidden -balloon none
address@hidden -balloon
+Disable balloon device.
address@hidden -balloon virtio[,address@hidden
+Enable virtio balloon device (default), optionally with PCI address
address@hidden
+ETEXI
+
+DEF("device", HAS_ARG, QEMU_OPTION_device,
+    "-device driver[,prop[=value][,...]]\n"
+    "                add device (based on driver)\n"
+    "                prop=value,... sets driver properties\n"
+    "                use '-device help' to print all possible drivers\n"
+    "                use '-device driver,help' to print all possible 
properties\n",
+    QEMU_ARCH_ALL)
+STEXI
address@hidden -device @var{driver}[,@address@hidden,...]]
address@hidden -device
+Add device @var{driver}.  @address@hidden sets driver
+properties.  Valid properties depend on the driver.  To get help on
+possible drivers and properties, use @code{-device help} and
address@hidden @var{driver},help}.
+ETEXI
+
+DEF("name", HAS_ARG, QEMU_OPTION_name,
+    "-name string1[,process=string2]\n"
+    "                set the name of the guest\n"
+    "                string1 sets the window title and string2 the process 
name (on Linux)\n",
+    QEMU_ARCH_ALL)
+STEXI
address@hidden -name @var{name}
address@hidden -name
+Sets the @var{name} of the guest.
+This name will be displayed in the SDL window caption.
+The @var{name} will also be used for the VNC server.
+Also optionally set the top visible process name in Linux.
+ETEXI
+
+DEF("uuid", HAS_ARG, QEMU_OPTION_uuid,
+    "-uuid %08x-%04x-%04x-%04x-%012x\n"
+    "                specify machine UUID\n", QEMU_ARCH_ALL)
+STEXI
address@hidden -uuid @var{uuid}
address@hidden -uuid
+Set system UUID.
+ETEXI
+
+STEXI
address@hidden table
+ETEXI
+DEFHEADING()
+
+DEFHEADING(Block device options:)
+STEXI
address@hidden @option
+ETEXI
+
+DEF("fda", HAS_ARG, QEMU_OPTION_fda,
+    "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
+DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
+STEXI
address@hidden -fda @var{file}
address@hidden -fdb @var{file}
address@hidden -fda
address@hidden -fdb
+Use @var{file} as floppy disk 0/1 image (@pxref{disk_images}). You can
+use the host floppy by using @file{/dev/fd0} as filename (@pxref{host_drives}).
+ETEXI
+
+DEF("hda", HAS_ARG, QEMU_OPTION_hda,
+    "-hda/-hdb file  use 'file' as IDE hard disk 0/1 image\n", QEMU_ARCH_ALL)
+DEF("hdb", HAS_ARG, QEMU_OPTION_hdb, "", QEMU_ARCH_ALL)
+DEF("hdc", HAS_ARG, QEMU_OPTION_hdc,
+    "-hdc/-hdd file  use 'file' as IDE hard disk 2/3 image\n", QEMU_ARCH_ALL)
+DEF("hdd", HAS_ARG, QEMU_OPTION_hdd, "", QEMU_ARCH_ALL)
+STEXI
address@hidden -hda @var{file}
address@hidden -hdb @var{file}
address@hidden -hdc @var{file}
address@hidden -hdd @var{file}
address@hidden -hda
address@hidden -hdb
address@hidden -hdc
address@hidden -hdd
+Use @var{file} as hard disk 0, 1, 2 or 3 image (@pxref{disk_images}).
+ETEXI
+
+DEF("cdrom", HAS_ARG, QEMU_OPTION_cdrom,
+    "-cdrom file     use 'file' as IDE cdrom image (cdrom is ide1 master)\n",
+    QEMU_ARCH_ALL)
+STEXI
address@hidden -cdrom @var{file}
address@hidden -cdrom
+Use @var{file} as CD-ROM image (you cannot use @option{-hdc} and
address@hidden at the same time). You can use the host CD-ROM by
+using @file{/dev/cdrom} as filename (@pxref{host_drives}).
+ETEXI
+
+DEF("drive", HAS_ARG, QEMU_OPTION_drive,
+    "-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
+    "       [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
+    "       
[,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
+    "       [,serial=s][,addr=A][,id=name][,aio=threads|native]\n"
+    "       [,readonly=on|off][,copy-on-read=on|off]\n"
+    "       
[[,bps=b]|[[,bps_rd=r][,bps_wr=w]]][[,iops=i]|[[,iops_rd=r][,iops_wr=w]]\n"
+    "                use 'file' as a drive image\n", QEMU_ARCH_ALL)
+STEXI
address@hidden -drive @var{option}[,@var{option}[,@var{option}[,...]]]
address@hidden -drive
+
+Define a new drive. Valid options are:
+
address@hidden @option
address@hidden address@hidden
+This option defines which disk image (@pxref{disk_images}) to use with
+this drive. If the filename contains comma, you must double it
+(for instance, "file=my,,file" to use file "my,file").
+
+Special files such as iSCSI devices can be specified using protocol
+specific URLs. See the section for "Device URL Syntax" for more information.
address@hidden address@hidden
+This option defines on which type on interface the drive is connected.
+Available types are: ide, scsi, sd, mtd, floppy, pflash, virtio.
address@hidden address@hidden,address@hidden
+These options define where is connected the drive by defining the bus number 
and
+the unit id.
address@hidden address@hidden
+This option defines where is connected the drive by using an index in the list
+of available connectors of a given interface type.
address@hidden address@hidden
+This option defines the type of the media: disk or cdrom.
address@hidden address@hidden,address@hidden,address@hidden,address@hidden
+These options have the same definition as they have in @option{-hdachs}.
address@hidden address@hidden
address@hidden is "on" or "off" and allows to enable snapshot for given drive 
(see @option{-snapshot}).
address@hidden address@hidden
address@hidden is "none", "writeback", "unsafe", "directsync" or "writethrough" 
and controls how the host cache is used to access block data.
address@hidden address@hidden
address@hidden is "threads", or "native" and selects between pthread based disk 
I/O and native Linux AIO.
address@hidden address@hidden
+Specify which disk @var{format} will be used rather than detecting
+the format.  Can be used to specifiy format=raw to avoid interpreting
+an untrusted format header.
address@hidden address@hidden
+This option specifies the serial number to assign to the device.
address@hidden address@hidden
+Specify the controller's PCI address (if=virtio only).
address@hidden address@hidden,address@hidden
+Specify which @var{action} to take on write and read errors. Valid actions are:
+"ignore" (ignore the error and try to continue), "stop" (pause QEMU),
+"report" (report the error to the guest), "enospc" (pause QEMU only if the
+host disk is full; report the error to the guest otherwise).
+The default setting is @option{werror=enospc} and @option{rerror=report}.
address@hidden readonly
+Open drive @option{file} as read-only. Guest write attempts will fail.
address@hidden address@hidden
address@hidden is "on" or "off" and enables whether to copy read backing
+file sectors into the image file.
address@hidden table
+
+By default, the @option{cache=writeback} mode is used. It will report data
+writes as completed as soon as the data is present in the host page cache.
+This is safe as long as your guest OS makes sure to correctly flush disk caches
+where needed. If your guest OS does not handle volatile disk write caches
+correctly and your host crashes or loses power, then the guest may experience
+data corruption.
+
+For such guests, you should consider using @option{cache=writethrough}. This
+means that the host page cache will be used to read and write data, but write
+notification will be sent to the guest only after QEMU has made sure to flush
+each write to the disk. Be aware that this has a major impact on performance.
+
+The host page cache can be avoided entirely with @option{cache=none}.  This 
will
+attempt to do disk IO directly to the guest's memory.  QEMU may still perform
+an internal copy of the data. Note that this is considered a writeback mode and
+the guest OS must handle the disk write cache correctly in order to avoid data
+corruption on host crashes.
+
+The host page cache can be avoided while only sending write notifications to
+the guest when the data has been flushed to the disk using
address@hidden
+
+In case you don't care about data integrity over host failures, use
address@hidden This option tells QEMU that it never needs to write any
+data to the disk but can instead keep things in cache. If anything goes wrong,
+like your host losing power, the disk storage getting disconnected 
accidentally,
+etc. your image will most probably be rendered unusable.   When using
+the @option{-snapshot} option, unsafe caching is always used.
+
+Copy-on-read avoids accessing the same backing file sectors repeatedly and is
+useful when the backing file is over a slow network.  By default copy-on-read
+is off.
+
+Instead of @option{-cdrom} you can use:
address@hidden
+qemu-system-i386 -drive file=file,index=2,media=cdrom
address@hidden example
+
+Instead of @option{-hda}, @option{-hdb}, @option{-hdc}, @option{-hdd}, you can
+use:
address@hidden
+qemu-system-i386 -drive file=file,index=0,media=disk
+qemu-system-i386 -drive file=file,index=1,media=disk
+qemu-system-i386 -drive file=file,index=2,media=disk
+qemu-system-i386 -drive file=file,index=3,media=disk
address@hidden example
+
+You can open an image using pre-opened file descriptors from an fd set:
address@hidden
+qemu-system-i386
+-add-fd fd=3,set=2,opaque="rdwr:/path/to/file"
+-add-fd fd=4,set=2,opaque="rdonly:/path/to/file"
+-drive file=/dev/fdset/2,index=0,media=disk
address@hidden example
+
+You can connect a CDROM to the slave of ide0:
address@hidden
+qemu-system-i386 -drive file=file,if=ide,index=1,media=cdrom
 @end example
 
-Note that Linux's i810_audio OSS kernel (for AC97) module might
-require manually specifying clocking.
+If you don't specify the "file=" argument, you define an empty drive:
address@hidden
+qemu-system-i386 -drive if=ide,index=1,media=cdrom
address@hidden example
 
+You can connect a SCSI disk with unit ID 6 on the bus #0:
 @example
-modprobe i810_audio clocking=48000
+qemu-system-i386 -drive file=file,if=scsi,bus=0,unit=6
 @end example
-ETEXI
 
-DEF("balloon", HAS_ARG, QEMU_OPTION_balloon,
-    "-balloon none   disable balloon device\n"
-    "-balloon virtio[,addr=str]\n"
-    "                enable virtio balloon device (default)\n", QEMU_ARCH_ALL)
-STEXI
address@hidden -balloon none
address@hidden -balloon
-Disable balloon device.
address@hidden -balloon virtio[,address@hidden
-Enable virtio balloon device (default), optionally with PCI address
address@hidden
-ETEXI
+Instead of @option{-fda}, @option{-fdb}, you can use:
address@hidden
+qemu-system-i386 -drive file=file,index=0,if=floppy
+qemu-system-i386 -drive file=file,index=1,if=floppy
address@hidden example
 
-DEF("device", HAS_ARG, QEMU_OPTION_device,
-    "-device driver[,prop[=value][,...]]\n"
-    "                add device (based on driver)\n"
-    "                prop=value,... sets driver properties\n"
-    "                use '-device help' to print all possible drivers\n"
-    "                use '-device driver,help' to print all possible 
properties\n",
-    QEMU_ARCH_ALL)
-STEXI
address@hidden -device @var{driver}[,@address@hidden,...]]
address@hidden -device
-Add device @var{driver}.  @address@hidden sets driver
-properties.  Valid properties depend on the driver.  To get help on
-possible drivers and properties, use @code{-device help} and
address@hidden @var{driver},help}.
+By default, @var{interface} is "ide" and @var{index} is automatically
+incremented:
address@hidden
+qemu-system-i386 -drive file=a -drive file=b"
address@hidden example
+is interpreted like:
address@hidden
+qemu-system-i386 -hda a -hdb b
address@hidden example
 ETEXI
 
-DEF("name", HAS_ARG, QEMU_OPTION_name,
-    "-name string1[,process=string2]\n"
-    "                set the name of the guest\n"
-    "                string1 sets the window title and string2 the process 
name (on Linux)\n",
+DEF("mtdblock", HAS_ARG, QEMU_OPTION_mtdblock,
+    "-mtdblock file  use 'file' as on-board Flash memory image\n",
     QEMU_ARCH_ALL)
 STEXI
address@hidden -name @var{name}
address@hidden -name
-Sets the @var{name} of the guest.
-This name will be displayed in the SDL window caption.
-The @var{name} will also be used for the VNC server.
-Also optionally set the top visible process name in Linux.
-ETEXI
-
-DEF("uuid", HAS_ARG, QEMU_OPTION_uuid,
-    "-uuid %08x-%04x-%04x-%04x-%012x\n"
-    "                specify machine UUID\n", QEMU_ARCH_ALL)
-STEXI
address@hidden -uuid @var{uuid}
address@hidden -uuid
-Set system UUID.
address@hidden -mtdblock @var{file}
address@hidden -mtdblock
+Use @var{file} as on-board Flash memory image.
 ETEXI
 
+DEF("sd", HAS_ARG, QEMU_OPTION_sd,
+    "-sd file        use 'file' as SecureDigital card image\n", QEMU_ARCH_ALL)
 STEXI
address@hidden table
address@hidden -sd @var{file}
address@hidden -sd
+Use @var{file} as SecureDigital card image.
 ETEXI
-DEFHEADING()
 
-DEFHEADING(USB options:)
+DEF("pflash", HAS_ARG, QEMU_OPTION_pflash,
+    "-pflash file    use 'file' as a parallel flash image\n", QEMU_ARCH_ALL)
 STEXI
address@hidden @option
address@hidden -pflash @var{file}
address@hidden -pflash
+Use @var{file} as a parallel flash image.
 ETEXI
 
-DEF("usb", 0, QEMU_OPTION_usb,
-    "-usb            enable the USB driver (will be the default soon)\n",
+DEF("snapshot", 0, QEMU_OPTION_snapshot,
+    "-snapshot       write to temporary files instead of disk image files\n",
     QEMU_ARCH_ALL)
 STEXI
address@hidden -usb
address@hidden -usb
-Enable the USB driver (will be the default soon)
address@hidden -snapshot
address@hidden -snapshot
+Write to temporary files instead of disk image files. In this case,
+the raw disk image you use is not written back. You can however force
+the write back by pressing @key{C-a s} (@pxref{disk_images}).
 ETEXI
 
-DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice,
-    "-usbdevice name add the host or guest USB device 'name'\n",
+DEF("hdachs", HAS_ARG, QEMU_OPTION_hdachs, \
+    "-hdachs c,h,s[,t]\n" \
+    "                force hard disk 0 physical geometry and the optional 
BIOS\n" \
+    "                translation (t=none or lba) (usually QEMU can guess 
them)\n",
     QEMU_ARCH_ALL)
 STEXI
-
address@hidden -usbdevice @var{devname}
address@hidden -usbdevice
-Add the USB device @var{devname}. @xref{usb_devices}.
-
address@hidden @option
-
address@hidden mouse
-Virtual Mouse. This will override the PS/2 mouse emulation when activated.
-
address@hidden tablet
-Pointer device that uses absolute coordinates (like a touchscreen). This
-means QEMU is able to report the mouse position without having to grab the
-mouse. Also overrides the PS/2 mouse emulation when activated.
-
address@hidden disk:address@hidden:@var{file}
-Mass storage device based on file. The optional @var{format} argument
-will be used rather than detecting the format. Can be used to specifiy
address@hidden to avoid interpreting an untrusted format header.
-
address@hidden host:@address@hidden
-Pass through the host device identified by @address@hidden (Linux only).
-
address@hidden host:@var{vendor_id}:@var{product_id}
-Pass through the host device identified by @var{vendor_id}:@var{product_id}
-(Linux only).
-
address@hidden serial:address@hidden,address@hidden:@var{dev}
-Serial converter to host character device @var{dev}, see @code{-serial} for the
-available devices.
-
address@hidden braille
-Braille device.  This will use BrlAPI to display the braille output on a real
-or fake device.
-
address@hidden net:@var{options}
-Network adapter that supports CDC ethernet and RNDIS protocols.
-
address@hidden table
-ETEXI
-
-STEXI
address@hidden table
-ETEXI
-DEFHEADING()
-
-DEFHEADING(File system options:)
-STEXI
address@hidden @option
address@hidden -hdachs @var{c},@var{h},@var{s},[,@var{t}]
address@hidden -hdachs
+Force hard disk 0 physical geometry (1 <= @var{c} <= 16383, 1 <=
address@hidden <= 16, 1 <= @var{s} <= 63) and optionally force the BIOS
+translation mode (@var{t}=none, lba or auto). Usually QEMU can guess
+all those parameters. This option is useful for old MS-DOS disk
+images.
 ETEXI
 
 DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev,
@@ -710,16 +661,6 @@ Specifies the tag name to be used by the guest to mount 
this export point
 
 ETEXI
 
-STEXI
address@hidden table
-ETEXI
-DEFHEADING()
-
-DEFHEADING(Virtual File system pass-through options:)
-STEXI
address@hidden @option
-ETEXI
-
 DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs,
     "-virtfs 
local,path=path,mount_tag=tag,security_model=[mapped-xattr|mapped-file|passthrough|none]\n"
     "        
[,writeout=immediate][,readonly][,socket=socket|sock_fd=sock_fd]\n",
@@ -786,6 +727,70 @@ STEXI
 ETEXI
 DEFHEADING()
 
+DEFHEADING(USB options:)
+STEXI
address@hidden @option
+ETEXI
+
+DEF("usb", 0, QEMU_OPTION_usb,
+    "-usb            enable the USB driver (will be the default soon)\n",
+    QEMU_ARCH_ALL)
+STEXI
address@hidden -usb
address@hidden -usb
+Enable the USB driver (will be the default soon)
+ETEXI
+
+DEF("usbdevice", HAS_ARG, QEMU_OPTION_usbdevice,
+    "-usbdevice name add the host or guest USB device 'name'\n",
+    QEMU_ARCH_ALL)
+STEXI
+
address@hidden -usbdevice @var{devname}
address@hidden -usbdevice
+Add the USB device @var{devname}. @xref{usb_devices}.
+
address@hidden @option
+
address@hidden mouse
+Virtual Mouse. This will override the PS/2 mouse emulation when activated.
+
address@hidden tablet
+Pointer device that uses absolute coordinates (like a touchscreen). This
+means QEMU is able to report the mouse position without having to grab the
+mouse. Also overrides the PS/2 mouse emulation when activated.
+
address@hidden disk:address@hidden:@var{file}
+Mass storage device based on file. The optional @var{format} argument
+will be used rather than detecting the format. Can be used to specifiy
address@hidden to avoid interpreting an untrusted format header.
+
address@hidden host:@address@hidden
+Pass through the host device identified by @address@hidden (Linux only).
+
address@hidden host:@var{vendor_id}:@var{product_id}
+Pass through the host device identified by @var{vendor_id}:@var{product_id}
+(Linux only).
+
address@hidden serial:address@hidden,address@hidden:@var{dev}
+Serial converter to host character device @var{dev}, see @code{-serial} for the
+available devices.
+
address@hidden braille
+Braille device.  This will use BrlAPI to display the braille output on a real
+or fake device.
+
address@hidden net:@var{options}
+Network adapter that supports CDC ethernet and RNDIS protocols.
+
address@hidden table
+ETEXI
+
+STEXI
address@hidden table
+ETEXI
+DEFHEADING()
+
 DEFHEADING(Display options:)
 STEXI
 @table @option
@@ -2525,21 +2530,6 @@ STEXI
 Output log in @var{logfile} instead of /tmp/qemu.log
 ETEXI
 
-DEF("hdachs", HAS_ARG, QEMU_OPTION_hdachs, \
-    "-hdachs c,h,s[,t]\n" \
-    "                force hard disk 0 physical geometry and the optional 
BIOS\n" \
-    "                translation (t=none or lba) (usually QEMU can guess 
them)\n",
-    QEMU_ARCH_ALL)
-STEXI
address@hidden -hdachs @var{c},@var{h},@var{s},[,@var{t}]
address@hidden -hdachs
-Force hard disk 0 physical geometry (1 <= @var{c} <= 16383, 1 <=
address@hidden <= 16, 1 <= @var{s} <= 63) and optionally force the BIOS
-translation mode (@var{t}=none, lba or auto). Usually QEMU can guess
-all those parameters. This option is useful for old MS-DOS disk
-images.
-ETEXI
-
 DEF("L", HAS_ARG, QEMU_OPTION_L, \
     "-L path         set the directory for the BIOS, VGA BIOS and keymaps\n",
     QEMU_ARCH_ALL)
-- 
1.7.11.7