Re: [Xen-devel] [PATCH] xsm_remove_from_physmap is (so far) only defined for X86 architecture, not for ARM

[Lars Rasmusson <lra@xxxxxxx>]

On Jan 11, 2013, at 14:47 , Keir Fraser <keir@xxxxxxx> wrote:

> On 11/01/2013 13:32, "lra@xxxxxxx" <lra@xxxxxxx> wrote:
> 
>> From: Lars Rasmusson <Lars.Rasmusson@xxxxxxx>
>> 
>> Signed-off-by: Lars Rasmusson <Lars.Rasmusson@xxxxxxx>
> 
> If this is a build fix after my checkins this morning then:
> Acked-by: Keir Fraser <keir@xxxxxxx>

Yes, the XEN_TARGET_ARCH=arm32 make  breaks when compiling memory.c

In xen/include/xsm/dummy.h where many of the functions are used, some are
declared only for X86, so I picked the same #ifdef CONFIG_X86
as the header file uses.

As Ian said, it's not pretty, but since ARM doesn't have xsm (yet?) I think 
adding a dummy xsm_remove_from_physmap for arm also is ugly.

Is there some other way to write memory.c so that it doesn't need
xsm_remove...?  (I mean, it does't need xsm_add....)


/Lars


> 
>> ---
>> xen/common/memory.c |    3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>> 
>> diff --git a/xen/common/memory.c b/xen/common/memory.c
>> index c8c1ef2..8230565 100644
>> --- a/xen/common/memory.c
>> +++ b/xen/common/memory.c
>> @@ -676,12 +676,13 @@ long do_memory_op(unsigned long cmd,
>> XEN_GUEST_HANDLE_PARAM(void) arg)
>>         if ( rc != 0 )
>>             return rc;
>> 
>> +#ifdef CONFIG_X86
>>         if ( xsm_remove_from_physmap(current->domain, d) )
>>         {
>>             rcu_unlock_domain(d);
>>             return -EPERM;
>>         }
>> -
>> +#endif
>>         domain_lock(d);
>> 
>>         page = get_page_from_gfn(d, xrfp.gpfn, NULL, P2M_ALLOC);
> 
> 


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