summaryrefslogtreecommitdiff
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 10:01:39 -0600
commit4713c69fa2319fceb5dd939d72a35e8b97c26878 (patch)
tree9f167f196434b2cd95e6c8dec2d0ad5b5e6c11dd /pc-bios
parentQMP: Drop wrong assert() (diff)
downloadqemu-kvm-4713c69fa2319fceb5dd939d72a35e8b97c26878.tar.gz
qemu-kvm-4713c69fa2319fceb5dd939d72a35e8b97c26878.tar.bz2
qemu-kvm-4713c69fa2319fceb5dd939d72a35e8b97c26878.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> (cherry picked from commit d0652aa8ac8d82e077acf8e781557f4c4367dcf5)
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 c4c9109b6..8aebe51ee 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)