• Avi Kivity's avatar
    KVM: x86 emulator: fix hypercall return value on AMD · 33e3885d
    Avi Kivity authored
    The hypercall instructions on Intel and AMD are different.  KVM allows the
    guest to choose one or the other (the default is Intel), and if the guest
    chooses incorrectly, KVM will patch it at runtime to select the correct
    instruction.  This allows live migration between Intel and AMD machines.
    
    This patching occurs in the x86 emulator.  The current code also executes
    the hypercall.  Unfortunately, the tail end of the x86 emulator code also
    executes, overwriting the return value of the hypercall with the original
    contents of rax (which happens to be the hypercall number).
    
    Fix not by executing the hypercall in the emulator context; instead let the
    guest reissue the patched instruction and execute the hypercall via the
    normal path.
    Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
    33e3885d
x86_emulate.c 52.3 KB