Re: [Xen-devel] [PATCH FOR-4.5] xen: arm: avoid "PV" terminology

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Tue, 2014-02-04 at 13:02 +0000, Julien Grall wrote:
> 
> On 04/02/14 11:41, Ian Campbell wrote:
> > Xen on ARM guests are neither PV nor HVM, they are just "guests". Avoid the
> > incorrect use of the term pv in the guest type macros.
> >
> > Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> 
> I think there is some coding style error (was already on the current 
> code),

Right, I mostly wrote this patch with sed...

>  see below. Except that:
> 
> Acked-by: Julien Grall <julien.grall@xxxxxxxxxx>
> 
> > ---
> > Common code still has is_pv_domain, is_hvm_domain and even is_pvh_domain.
> 
> I have a patch to get a rid of is_pv_domain in common/grant-table.c. I 
> will send it with my IOMMU patch series for ARM.
> 
> > diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
> > index 635a9a4..1e4f298 100644
> > --- a/xen/arch/arm/domain.c
> > +++ b/xen/arch/arm/domain.c
> > @@ -263,7 +263,7 @@ static void continue_new_vcpu(struct vcpu *prev)
> >
> >       if ( is_idle_vcpu(current) )
> >           reset_stack_and_jump(idle_loop);
> > -    else if is_pv32_domain(current->domain)
> > +    else if is_32bit_domain(current->domain)
>         else if ( ... ) ?

Oh wow. this only compiles at all because is_pv32_domain is enclosed in
() in the definition.

> 
> > diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> > index ea77cb8..21efd55 100644
> > --- a/xen/arch/arm/traps.c
> > +++ b/xen/arch/arm/traps.c
> > @@ -1721,12 +1721,12 @@ asmlinkage void do_trap_hypervisor(struct 
> > cpu_user_regs *regs)
> >           advance_pc(regs, hsr);
> >           break;
> >       case HSR_EC_CP15_32:
> > -        if ( ! is_pv32_domain(current->domain) )
> > +        if ( ! is_32bit_domain(current->domain) )
>                ( !is_... ) ?
> 
> >               goto bad_trap;
> >           do_cp15_32(regs, hsr);
> >           break;
> >       case HSR_EC_CP15_64:
> > -        if ( ! is_pv32_domain(current->domain) )
> > +        if ( ! is_32bit_domain(current->domain) )
> 
> Same here.

Thanks.



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel