diff options
| author | Stefan Hajnoczi | 2010-05-08 12:49:09 +0200 |
|---|---|---|
| committer | Michael Brown | 2010-05-25 07:24:58 +0200 |
| commit | 0d108681ac5b1e1d652c28b44377a151041ea425 (patch) | |
| tree | 0309063f93ed321e82c63a8eb3905147a63d9372 /src/arch/i386/interface/syslinux | |
| parent | [qib7322] Add support for QLogic 7322 HCA (diff) | |
| download | ipxe-0d108681ac5b1e1d652c28b44377a151041ea425.tar.gz ipxe-0d108681ac5b1e1d652c28b44377a151041ea425.tar.xz ipxe-0d108681ac5b1e1d652c28b44377a151041ea425.zip | |
[comboot] Propagate carry flag from COMBOOT API
COMBOOT API calls set the carry flag on failure. This was not being
propagated because the COMBOOT interrupt handler used iret to return
with EFLAGS restored from the stack. This patch propagates CF before
returning from the interrupt.
Reported-by: Geoff Lywood <glywood@vmware.com>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Marty Connor <mdc@etherboot.org>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/interface/syslinux')
| -rw-r--r-- | src/arch/i386/interface/syslinux/comboot_call.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/arch/i386/interface/syslinux/comboot_call.c b/src/arch/i386/interface/syslinux/comboot_call.c index e5bf11c91..b1489efd0 100644 --- a/src/arch/i386/interface/syslinux/comboot_call.c +++ b/src/arch/i386/interface/syslinux/comboot_call.c @@ -669,6 +669,7 @@ void hook_comboot_interrupts ( ) { "pushw %%cs\n\t" "call prot_call\n\t" "addw $4, %%sp\n\t" + "call patch_cf\n\t" "iret\n\t" ) : : "i" ( int20 ) ); @@ -681,6 +682,7 @@ void hook_comboot_interrupts ( ) { "pushw %%cs\n\t" "call prot_call\n\t" "addw $4, %%sp\n\t" + "call patch_cf\n\t" "iret\n\t" ) : : "i" ( int21 ) ); @@ -693,6 +695,7 @@ void hook_comboot_interrupts ( ) { "pushw %%cs\n\t" "call prot_call\n\t" "addw $4, %%sp\n\t" + "call patch_cf\n\t" "iret\n\t" ) : : "i" ( int22) ); |