gwj / at91sam9263 · Commits

Commit be3edd95908863ae39936d1b0608f0727256a3c3

Authored by bellard
1 parent 023fe10d

update 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@870 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
Changelog
  View file @be3edd9
@@ -15,6 +15,7 @@ version 0.5.6: @@ -15,6 +15,7 @@ version 0.5.6:
15 - VGA font selection fix (Daniel Serpell) 15 - VGA font selection fix (Daniel Serpell)
16 - PIC reset fix (Hidemi KAWAI) 16 - PIC reset fix (Hidemi KAWAI)
17 - PIC spurious irq support (aka Solaris install bug) 17 - PIC spurious irq support (aka Solaris install bug)
  18 + - added '-localtime' option
18 19
19 version 0.5.5: 20 version 0.5.5:
20 21
qemu-doc.texi
  View file @be3edd9
@@ -196,7 +196,8 @@ General options: @@ -196,7 +196,8 @@ General options:
196 @table @option 196 @table @option
197 @item -fda file 197 @item -fda file
198 @item -fdb file 198 @item -fdb file
199 -Use @var{file} as floppy disk 0/1 image (@xref{disk_images}). 199 +Use @var{file} as floppy disk 0/1 image (@xref{disk_images}). You can
  200 +use the host floppy by using @file{/dev/fd0} as filename.
200 201
201 @item -hda file 202 @item -hda file
202 @item -hdb file 203 @item -hdb file
@@ -206,7 +207,8 @@ Use @var{file} as hard disk 0, 1, 2 or 3 image (@xref{disk_images}). @@ -206,7 +207,8 @@ Use @var{file} as hard disk 0, 1, 2 or 3 image (@xref{disk_images}).
206 207
207 @item -cdrom file 208 @item -cdrom file
208 Use @var{file} as CD-ROM image (you cannot use @option{-hdc} and and 209 Use @var{file} as CD-ROM image (you cannot use @option{-hdc} and and
209 -@option{-cdrom} at the same time). 210 +@option{-cdrom} at the same time). You can use the host CD-ROM by
  211 +using @file{/dev/cdrom} as filename.
210 212
211 @item -boot [a|c|d] 213 @item -boot [a|c|d]
212 Boot on floppy (a), hard disk (c) or CD-ROM (d). Hard disk boot is 214 Boot on floppy (a), hard disk (c) or CD-ROM (d). Hard disk boot is