diff options
| author | Izik Eidus <izike@qumranet.com> | 2007-11-11 13:40:48 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-11-27 14:08:22 +0100 |
| commit | e826ec9ae2baf9980402e85f0bbe1dac53ceb110 (patch) | |
| tree | d931387123cef2bec18115e1a710b60068c68efa /drivers/kvm | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/net-2.6 (diff) | |
| download | linux-e826ec9ae2baf9980402e85f0bbe1dac53ceb110.tar.xz linux-e826ec9ae2baf9980402e85f0bbe1dac53ceb110.zip | |
KVM: x86 emulator: fix JMP_REL
Change JMP_REL to call to register_address_increment(): the operands size
should not effect the calculation of the eip, instead the ad_bytes should
affect it.
Signed-off-by: Izik Eidus <izike@qumranet.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm')
| -rw-r--r-- | drivers/kvm/x86_emulate.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c index 33b181451557..a1a9c9be39b3 100644 --- a/drivers/kvm/x86_emulate.c +++ b/drivers/kvm/x86_emulate.c @@ -448,8 +448,7 @@ struct operand { #define JMP_REL(rel) \ do { \ - _eip += (int)(rel); \ - _eip = ((op_bytes == 2) ? (uint16_t)_eip : (uint32_t)_eip); \ + register_address_increment(_eip, rel); \ } while (0) /* |