This commit adapts the function "p2m_restore_state" in a way that the currently active altp2m table is considered during state restoration.
Signed-off-by: Sergej Proskurin <prosku...@sec.in.tum.de> Acked-by: Julien Grall <julien.gr...@arm.com> --- Cc: Stefano Stabellini <sstabell...@kernel.org> Cc: Julien Grall <julien.gr...@arm.com> --- v3: Moved declaration of "altp2m_switch_domain_altp2m_by_id" out of this patch. v4: Moved the variable "p2m", as to satisfy compiler warnings, prohibiting mixing declarations and code. --- xen/arch/arm/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index e017e2972e..16c7585ffa 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -112,8 +112,8 @@ void p2m_save_state(struct vcpu *p) void p2m_restore_state(struct vcpu *n) { - struct p2m_domain *p2m = p2m_get_hostp2m(n->domain); uint8_t *last_vcpu_ran; + struct p2m_domain *p2m = p2m_get_active_p2m(n); if ( is_idle_vcpu(n) ) return; -- 2.13.3 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel