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

Commit 5ff22e7e authored by Nicholas Krause's avatar Nicholas Krause Committed by Paolo Bonzini
Browse files

KVM: x86: Remove FIXMEs in emulate.c for the function,task_switch_32 



Remove FIXME comments about needing fault addresses to be returned.  These
are propaagated from walk_addr_generic to gva_to_gpa and from there to
ops->read_std and ops->write_std.

Signed-off-by: default avatarNicholas Krause <xerofoify@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 19d5f10b

arch/x86/kvm/emulate.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -2750,7 +2750,6 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt, 
	ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,

	ret = ops->read_std(ctxt, old_tss_base, &tss_seg, sizeof tss_seg,

			    &ctxt->exception);

			    &ctxt->exception);

	if (ret != X86EMUL_CONTINUE)

	if (ret != X86EMUL_CONTINUE)

		/* FIXME: need to provide precise fault address */

		return ret;

		return ret;





	save_state_to_tss32(ctxt, &tss_seg);

	save_state_to_tss32(ctxt, &tss_seg);
@@ -2759,13 +2758,11 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt, 
	ret = ops->write_std(ctxt, old_tss_base + eip_offset, &tss_seg.eip,

	ret = ops->write_std(ctxt, old_tss_base + eip_offset, &tss_seg.eip,

			     ldt_sel_offset - eip_offset, &ctxt->exception);

			     ldt_sel_offset - eip_offset, &ctxt->exception);

	if (ret != X86EMUL_CONTINUE)

	if (ret != X86EMUL_CONTINUE)

		/* FIXME: need to provide precise fault address */

		return ret;

		return ret;





	ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,

	ret = ops->read_std(ctxt, new_tss_base, &tss_seg, sizeof tss_seg,

			    &ctxt->exception);

			    &ctxt->exception);

	if (ret != X86EMUL_CONTINUE)

	if (ret != X86EMUL_CONTINUE)

		/* FIXME: need to provide precise fault address */

		return ret;

		return ret;





	if (old_tss_sel != 0xffff) {

	if (old_tss_sel != 0xffff) {
@@ -2776,7 +2773,6 @@ static int task_switch_32(struct x86_emulate_ctxt *ctxt, 
				     sizeof tss_seg.prev_task_link,

				     sizeof tss_seg.prev_task_link,

				     &ctxt->exception);

				     &ctxt->exception);

		if (ret != X86EMUL_CONTINUE)

		if (ret != X86EMUL_CONTINUE)

			/* FIXME: need to provide precise fault address */

			return ret;

			return ret;

	}

	}