From be3edd95908863ae39936d1b0608f0727256a3c3 Mon Sep 17 00:00:00 2001 From: bellard Date: Thu, 3 Jun 2004 12:48:45 +0000 Subject: [PATCH] update git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@870 c046a42c-6fe2-441c-8c8c-71466251a162 --- Changelog | 1 + qemu-doc.texi | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 0f232e3ec..95b456267 100644 --- a/Changelog +++ b/Changelog @@ -15,6 +15,7 @@ version 0.5.6: - VGA font selection fix (Daniel Serpell) - PIC reset fix (Hidemi KAWAI) - PIC spurious irq support (aka Solaris install bug) + - added '-localtime' option version 0.5.5: diff --git a/qemu-doc.texi b/qemu-doc.texi index 0e3f617b7..395f39a3f 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -196,7 +196,8 @@ General options: @table @option @item -fda file @item -fdb file -Use @var{file} as floppy disk 0/1 image (@xref{disk_images}). +Use @var{file} as floppy disk 0/1 image (@xref{disk_images}). You can +use the host floppy by using @file{/dev/fd0} as filename. @item -hda file @item -hdb file @@ -206,7 +207,8 @@ Use @var{file} as hard disk 0, 1, 2 or 3 image (@xref{disk_images}). @item -cdrom file Use @var{file} as CD-ROM image (you cannot use @option{-hdc} and and -@option{-cdrom} at the same time). +@option{-cdrom} at the same time). You can use the host CD-ROM by +using @file{/dev/cdrom} as filename. @item -boot [a|c|d] Boot on floppy (a), hard disk (c) or CD-ROM (d). Hard disk boot is