diff options
| author | Chris Zankel <chris@zankel.net> | 2014-12-16 07:09:06 +0300 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-12-16 07:09:06 +0300 |
| commit | 865566ed33f08637c3486b4d301e96a9064ad2eb (patch) | |
| tree | dfa26622c8feaa57153d87d207133f01aff5858b /arch/x86/kvm/emulate.c | |
| parent | c0d7aa07504a8f4abd7b02b9144c4a92b7565f45 (diff) | |
| parent | b2776bf7149bddd1f4161f14f79520f17fc1d71d (diff) | |
| download | linux-865566ed33f08637c3486b4d301e96a9064ad2eb.tar.xz | |
Merge tag 'v3.18' into for_next
Linux 3.18
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 5edf088ca51e..9f8a2faf5040 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -4287,6 +4287,7 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, fetch_register_operand(op); break; case OpCL: + op->type = OP_IMM; op->bytes = 1; op->val = reg_read(ctxt, VCPU_REGS_RCX) & 0xff; break; @@ -4294,6 +4295,7 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, rc = decode_imm(ctxt, op, 1, true); break; case OpOne: + op->type = OP_IMM; op->bytes = 1; op->val = 1; break; @@ -4352,21 +4354,27 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, ctxt->memop.bytes = ctxt->op_bytes + 2; goto mem_common; case OpES: + op->type = OP_IMM; op->val = VCPU_SREG_ES; break; case OpCS: + op->type = OP_IMM; op->val = VCPU_SREG_CS; break; case OpSS: + op->type = OP_IMM; op->val = VCPU_SREG_SS; break; case OpDS: + op->type = OP_IMM; op->val = VCPU_SREG_DS; break; case OpFS: + op->type = OP_IMM; op->val = VCPU_SREG_FS; break; case OpGS: + op->type = OP_IMM; op->val = VCPU_SREG_GS; break; case OpImplicit: |