summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-11-22 15:30:56 +0200
committerAvi Kivity <avi@redhat.com>2009-11-22 15:30:56 +0200
commit43f43cd41c18e973149061cf333fbe1732f28d2e (patch)
tree09d777980c87f9dcdc433fa504a51a6863405082 /pc-bios
parentMerge commit '3a3fb96d0d9e3331e3beb672108ec18a6d3d8c1c' into upstream-merge (diff)
parentAllow build of linuxboot.S with old assemblers (diff)
downloadqemu-kvm-43f43cd41c18e973149061cf333fbe1732f28d2e.tar.gz
qemu-kvm-43f43cd41c18e973149061cf333fbe1732f28d2e.tar.bz2
qemu-kvm-43f43cd41c18e973149061cf333fbe1732f28d2e.zip
Merge commit 'dd4239d6574ca41c94fc0d0f77ddc728510ffc57' into upstream-merge
* commit 'dd4239d6574ca41c94fc0d0f77ddc728510ffc57': Allow build of linuxboot.S with old assemblers Avoid segfault on net_tap_init() failure tap-bsd: handle ifname on FreeBSD hosts Fix tap breakage on BSD hosts (no IFF_VNET_HDR) Fix OpenBSD build of qemu-io Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/optionrom/optionrom.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h
index 34d69af89..4dcb90645 100644
--- a/pc-bios/optionrom/optionrom.h
+++ b/pc-bios/optionrom/optionrom.h
@@ -66,7 +66,10 @@
outw %ax, (%dx); \
mov $BIOS_CFG_IOPORT_DATA, %dx; \
cld; \
- rep insb (%dx), %es:(%edi);
+ /* old as(1) doesn't like this insn so emit the bytes instead: \
+ rep insb (%dx), %es:(%edi); \
+ */ \
+ .dc.b 0x67,0xf3,0x6c
#define OPTION_ROM_START \
.code16; \