summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-01-17 15:39:57 +0200
committerAvi Kivity <avi@redhat.com>2010-01-17 15:39:57 +0200
commitb874ce1db7d8654850c8a6606b95ffb1c7d22ce2 (patch)
tree0e031a914e520fdc6e86cd49c7b0156dd0decd92 /pc-bios
parentMerge branch 'stable-0.12-upstream' into stable-0.12 (diff)
parentUpdate version and changelog for release (diff)
downloadqemu-kvm-b874ce1db7d8654850c8a6606b95ffb1c7d22ce2.tar.gz
qemu-kvm-b874ce1db7d8654850c8a6606b95ffb1c7d22ce2.tar.bz2
qemu-kvm-b874ce1db7d8654850c8a6606b95ffb1c7d22ce2.zip
Merge remote branch 'upstream/stable-0.12' into stable-0.12
* upstream/stable-0.12: (27 commits) Update version and changelog for release Update SeaBIOS to 0.5.1 Qemu's internal TFTP server breaks lock-step-iness of TFTP osdep.c: Fix accept4 fallback pc: add rombar to compat properties for pc-0.10 and pc-0.11 pci: allow loading roms via fw_cfg. roms: rework rom loading via fw fw_cfg: rom loader tweaks. roms: minor fixes and cleanups. pc: add machine type for 0.12 loader: more ignores for rom intended to be loaded by the bios vnc_refresh: return if vd->timer is NULL QMP: Don't free async event's 'data' Handle TFTP ERROR from client dmg: fix ->open failure virtio-pci: thinko fix pc-bios: Update README (SeaBIOS) vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow remove pending exception on vcpu reset. Fix CPU topology initialization ... Conflicts: hw/pc.c hw/pci.h qemu-options.hx Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/README3
-rw-r--r--pc-bios/bios.binbin131072 -> 131072 bytes
2 files changed, 2 insertions, 1 deletions
diff --git a/pc-bios/README b/pc-bios/README
index 9eaa52262..5be01f829 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -1,4 +1,5 @@
-- The PC BIOS comes from the Bochs project (http://bochs.sourceforge.net/).
+- SeaBIOS (bios.bin) is the successor of pc bios.
+ See http://www.seabios.org/ for more information.
- The VGA BIOS and the Cirrus VGA BIOS come from the LGPL VGA bios
project (http://www.nongnu.org/vgabios/).
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index 827327db9..1741eeced 100644
--- a/pc-bios/bios.bin
+++ b/pc-bios/bios.bin
Binary files differ