diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2015-04-09 12:24:18 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2015-04-10 00:38:17 -0400 |
| commit | 3b9b9f2446e69a081c5f10a1755b62a31980c52a (patch) | |
| tree | fcd923043a820ab76adda1637923f52378205b92 /vgasrc | |
| parent | 9d3c06336ec443b6763c92f929013afcfce70c4a (diff) | |
| download | qemu-seabios-3b9b9f2446e69a081c5f10a1755b62a31980c52a.tar.gz | |
vgabios: Don't use "smsww" instruction - it confuses x86emu
Commit 251e2638 introduced the "smsww" instruction to the vgabios.
Unfortunately, it appears at least some versions of x86emu crash when
executing that instruction (eg, FC13 installer crashes). That
instruction wasn't required to work around the problem fixed in
251e2638, so just avoid it.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'vgasrc')
| -rw-r--r-- | vgasrc/vgabios.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 7c1f0b8..f07e85b 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -304,7 +304,7 @@ vga_set_mode(int mode, int flags) SET_BDA(video_mode, 0xff); SET_BDA_EXT(vbe_mode, mode | (flags & MF_VBEFLAGS)); SET_BDA_EXT(vgamode_offset, (u32)vmode_g); - if (CONFIG_VGA_ALLOCATE_EXTRA_STACK && !(getcr0_vm86() & CR0_PE)) + if (CONFIG_VGA_ALLOCATE_EXTRA_STACK) // Disable extra stack if it appears a modern OS is in use. // This works around bugs in some versions of Windows (Vista // and possibly later) when the stack is in the e-segment. |