summaryrefslogtreecommitdiff
path: root/pc-bios
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-24 15:38:50 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-08 09:58:41 -0600
commitd0652aa8ac8d82e077acf8e781557f4c4367dcf5 (patch)
tree157fa2fc7a9f34a28c0f7405b700303be521d215 /pc-bios
parent810f49b56a5d0cd6848856af51d3093ae9adc7b1 (diff)
downloadqemu-d0652aa8ac8d82e077acf8e781557f4c4367dcf5.tar.gz
qemu-d0652aa8ac8d82e077acf8e781557f4c4367dcf5.tar.bz2
qemu-d0652aa8ac8d82e077acf8e781557f4c4367dcf5.zip
linuxboot: fix gdt address calculation
The gdt address calculation in linuxboot.bin is broken in two ways: first it loads %cs into %eax, but that instruction leaves the high bits of %eax undefined and we did not clear them. Secondly, we completely ignore the incorrect %eax, and use the undefined %ebx instead. With these issues fixed, linuxboot works again. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'pc-bios')
-rw-r--r--pc-bios/optionrom/linuxboot.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/pc-bios/optionrom/linuxboot.S b/pc-bios/optionrom/linuxboot.S
index c4c9109b67..8aebe51ee5 100644
--- a/pc-bios/optionrom/linuxboot.S
+++ b/pc-bios/optionrom/linuxboot.S
@@ -86,9 +86,10 @@ copy_kernel:
/* Now create the GDT descriptor */
movw $((3 * 8) - 1), -16(%bp)
mov %cs, %eax
+ movzwl %ax, %eax
shl $4, %eax
- addl $gdt, %ebx
- movl %ebx, -14(%bp)
+ addl $gdt, %eax
+ movl %eax, -14(%bp)
/* And load the GDT */
data32 lgdt -16(%bp)