D48965.diff
No OneTemporary
Actions

Size

932 B

Referenced Files

None

Subscribers

None

D48965.diff
View Options

	diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c
	--- a/sys/arm64/vmm/vmm_arm64.c
	+++ b/sys/arm64/vmm/vmm_arm64.c
	@@ -1373,19 +1373,18 @@

	if (val != 0) {
	hypctx->debug_spsr \|= (hypctx->tf.tf_spsr & PSR_SS);
	- hypctx->debug_mdscr \|= hypctx->mdscr_el1 &
	- (MDSCR_SS \| MDSCR_KDE);
	+ hypctx->debug_mdscr \|= (hypctx->mdscr_el1 & MDSCR_SS);

	hypctx->tf.tf_spsr \|= PSR_SS;
	- hypctx->mdscr_el1 \|= MDSCR_SS \| MDSCR_KDE;
	+ hypctx->mdscr_el1 \|= MDSCR_SS;
	hypctx->mdcr_el2 \|= MDCR_EL2_TDE;
	} else {
	hypctx->tf.tf_spsr &= ~PSR_SS;
	hypctx->tf.tf_spsr \|= hypctx->debug_spsr;
	hypctx->debug_spsr &= ~PSR_SS;
	- hypctx->mdscr_el1 &= ~(MDSCR_SS \| MDSCR_KDE);
	+ hypctx->mdscr_el1 &= ~MDSCR_SS;
	hypctx->mdscr_el1 \|= hypctx->debug_mdscr;
	- hypctx->debug_mdscr &= ~(MDSCR_SS \| MDSCR_KDE);
	+ hypctx->debug_mdscr &= ~MDSCR_SS;
	hypctx->mdcr_el2 &= ~MDCR_EL2_TDE;
	}
	break;