summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2009-10-28 10:55:42 +0000
committerMark McLoughlin <markmc@redhat.com>2009-10-28 10:55:42 +0000
commit3deaf5aa6ab23d2f8b0250ea63908a30ff2726af (patch)
tree5109988bec768a066a9b7b39f4411f422b3f67b3 /pc-bios
parentUpdate bios.bin (vapic removal) (diff)
parentne2k_isa: use qdev properties for configuration. (diff)
downloadqemu-kvm-3deaf5aa6ab23d2f8b0250ea63908a30ff2726af.tar.gz
qemu-kvm-3deaf5aa6ab23d2f8b0250ea63908a30ff2726af.tar.bz2
qemu-kvm-3deaf5aa6ab23d2f8b0250ea63908a30ff2726af.zip
Merge commit '93db66850d99fd9885edeff6af5679be51e1c610' into upstream-merge
* commit '93db66850d99fd9885edeff6af5679be51e1c610': (81 commits) ne2k_isa: use qdev properties for configuration. qdev/net: common nic property bits qdev: add vlan property qdev: add netdev property qdev: mac addr property fixups net: add macaddr type. Send a RARP packet after migration. multiboot.S patch for old as(1) (was: Re: [Qemu-devel] Some OpenBSD/amd64 build fixes) raw/linux-aio: Also initialize POSIX AIO qcow2: Fix grow_refcount_table error handling usb-linux: return USB_RET_STALL on -EPIPE Makefile: Change make to be quiet again when doing nothing eepro100: Restructure code target-arm: use native tcg-ops for ror/bic/vorn target-arm: fix neon shift helper functions target-arm: fix neon vsri, vshl and vsli ops target-arm: allow modifying vfp fpexc en bit only target-arm: add support for neon vld1.64/vst1.64 instructions target-arm: fix neon vshrn/vrshrn ops target-arm: fix incorrect temporary variable freeing ... Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/optionrom/multiboot.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/pc-bios/optionrom/multiboot.S b/pc-bios/optionrom/multiboot.S
index 93beb51b6..e6cbefdc9 100644
--- a/pc-bios/optionrom/multiboot.S
+++ b/pc-bios/optionrom/multiboot.S
@@ -113,7 +113,10 @@ mmap_loop:
/* entry size (mmap struct) & max buffer size (int15) */
movl $20, %ecx
/* store entry size */
+ /* old as(1) doesn't like this insn so emit the bytes instead:
movl %ecx, %es:-4(%edi)
+ */
+ .dc.b 0x26,0x67,0x66,0x89,0x4f,0xfc
/* e820 */
movl $0x0000e820, %eax
/* 'SMAP' magic */