Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04689e74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Two fixes --- one of them not exactly a one liner, but things are
  calming down on the KVM front at last"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Fix uninitialized op->type for some immediate values
  KVM: s390: virtio_ccw: remove unused variable
parents 74b60ef7 d29b9d7e

arch/x86/kvm/emulate.c

+8 −0
Original line number Diff line number Diff line
@@ -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:

drivers/s390/kvm/virtio_ccw.c

+0 −1
Original line number Diff line number Diff line
@@ -888,7 +888,6 @@ static void virtio_ccw_int_handler(struct ccw_device *cdev, 
	struct virtio_ccw_device *vcdev = dev_get_drvdata(&cdev->dev);

	int i;

	struct virtqueue *vq;

	struct virtio_driver *drv;



	if (!vcdev)

		return;