9ae3a8
From 1af4a2c0eed60017741611d15b22bcdaffc97453 Mon Sep 17 00:00:00 2001
9ae3a8
Message-Id: <1af4a2c0eed60017741611d15b22bcdaffc97453.1383564115.git.minovotn@redhat.com>
9ae3a8
In-Reply-To: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
9ae3a8
References: <5575e0aec51f40ebec46e98ec085cda053283aba.1383564115.git.minovotn@redhat.com>
9ae3a8
From: Markus Armbruster <armbru@redhat.com>
9ae3a8
Date: Fri, 27 Sep 2013 13:31:16 +0200
9ae3a8
Subject: [PATCH 06/14] doc: Drop ref to Bochs from -no-fd-bootchk
9ae3a8
 documentation
9ae3a8
9ae3a8
RH-Author: Markus Armbruster <armbru@redhat.com>
9ae3a8
Message-id: <1380288680-26645-7-git-send-email-armbru@redhat.com>
9ae3a8
Patchwork-id: 54562
9ae3a8
O-Subject: [PATCH 7.0 qemu-kvm 06/10] doc: Drop ref to Bochs from -no-fd-bootchk documentation
9ae3a8
Bugzilla: 997817
9ae3a8
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
9ae3a8
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
9ae3a8
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
9ae3a8
9ae3a8
From: Markus Armbruster <armbru@redhat.com>
9ae3a8
9ae3a8
Manual page and qemu-doc on talk about "Bochs BIOS".  We use SeaBIOS,
9ae3a8
and it implements the feature.  Replace by just "BIOS", and drop the
9ae3a8
TODO line wondering about the Bochs reference.
9ae3a8
9ae3a8
Signed-off-by: Markus Armbruster <armbru@redhat.com>
9ae3a8
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
9ae3a8
Message-id: 1371208516-7857-7-git-send-email-armbru@redhat.com
9ae3a8
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
9ae3a8
(cherry picked from commit 4eda32f588086b6cd0ec2be6a7a6c131f8c2b427)
9ae3a8
---
9ae3a8
 qemu-options.hx | 3 +--
9ae3a8
 1 file changed, 1 insertion(+), 2 deletions(-)
9ae3a8
9ae3a8
Signed-off-by: Michal Novotny <minovotn@redhat.com>
9ae3a8
---
9ae3a8
 qemu-options.hx | 3 +--
9ae3a8
 1 file changed, 1 insertion(+), 2 deletions(-)
9ae3a8
9ae3a8
diff --git a/qemu-options.hx b/qemu-options.hx
9ae3a8
index 202a2cf..3c60140 100644
9ae3a8
--- a/qemu-options.hx
9ae3a8
+++ b/qemu-options.hx
9ae3a8
@@ -1268,9 +1268,8 @@ DEF("no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk,
9ae3a8
 STEXI
9ae3a8
 @item -no-fd-bootchk
9ae3a8
 @findex -no-fd-bootchk
9ae3a8
-Disable boot signature checking for floppy disks in Bochs BIOS. It may
9ae3a8
+Disable boot signature checking for floppy disks in BIOS. May
9ae3a8
 be needed to boot from old floppy disks.
9ae3a8
-TODO: check reference to Bochs BIOS.
9ae3a8
 ETEXI
9ae3a8
 
9ae3a8
 DEF("no-acpi", 0, QEMU_OPTION_no_acpi,
9ae3a8
-- 
9ae3a8
1.7.11.7
9ae3a8