From: Ian Campbell Date: Tue, 9 Oct 2012 14:05:31 +0000 (+0100) Subject: arm: implement VGCF_online X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7776 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=657d06105b4e409dd83bf32e5ff3ac44bf481118;p=xen.git arm: implement VGCF_online Signed-off-by: Ian Campbell Acked-by: Tim Deegan Committed-by: Ian Campbell --- diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index 3eef0d0181..65dafe8bed 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -101,6 +101,8 @@ static int vcpu_arm(struct xc_dom_image *dom, void *ptr) ctxt->user_regs.cpsr = PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC; + ctxt->flags = VGCF_online; + DOMPRINTF("Initial state CPSR %#"PRIx32" PC %#"PRIx32, ctxt->user_regs.cpsr, ctxt->user_regs.pc); diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 57d8746fa3..ee58d68677 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -503,7 +503,10 @@ int arch_set_info_guest( v->arch.ttbr1 = ctxt->ttbr1; v->arch.ttbcr = ctxt->ttbcr; - clear_bit(_VPF_down, &v->pause_flags); + if ( ctxt->flags & VGCF_online ) + clear_bit(_VPF_down, &v->pause_flags); + else + set_bit(_VPF_down, &v->pause_flags); return 0; } diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index f18bafa28f..e3d4ad9bc6 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -125,6 +125,10 @@ typedef uint64_t xen_pfn_t; typedef uint32_t xen_ulong_t; struct vcpu_guest_context { +#define _VGCF_online 0 +#define VGCF_online (1<<_VGCF_online) + uint32_t flags; /* VGCF_* */ + struct cpu_user_regs user_regs; /* User-level CPU registers */ uint32_t sctlr;