Re: [PATCH] kvm: external module: fix unifdef problem

[Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>]

Hi Avi,
Hollis and I discussed how to continue on that.
Atm the upstream code is broken for powerpc and your response is too 
vague for me to extend our patch in some way.
So which way should we go? Will you apply (or should I resubmit ?) 
Hollis patch for now to fix upstream for powerpc. And we/you extend it 
later or what else would you prefer?

Avi Kivity wrote:
> Hollis Blanchard wrote:
>> Guys, I don't mind if you add new things that aren't enabled for other
>> architectures, but please try to be a little more careful about breaking
>> us.
>>
>> This patch results in the following on PowerPC:
>>         mv $i $i.orig && unifdef -DCONFIG_POWERPC -UCONFIG_X86 IA64
>>         $i.orig > $i; [ $? -le 2 ] && rm $i.orig; done
>>         unifdef: can only do one file
>>
>>   
>
> Aw.
>
>> Here's my proposed fix:
>>
>> kvm: external module: Treat NONARCH_CONFIG as a list, not a single item.
>>
>> Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
>>
>> diff --git a/kernel/Makefile b/kernel/Makefile
>> --- a/kernel/Makefile
>> +++ b/kernel/Makefile
>> @@ -25,8 +25,9 @@ _hack = mv $1 $1.orig && \
>>      gawk -v version=$(version) -f $(ARCH_DIR)/hack-module.awk $1.orig \
>>          | sed '/\#include/! s/\blapic\b/l_apic/g' > $1 && rm $1.orig
>>  
>> +unifdef_uflags = $(foreach arch, $(NONARCH_CONFIG), -UCONFIG_$(arch))
>>   
>
> $(patsubst ...), or even $(NONARCH_CONFIG:%=-UCONFIG_%)
>
> But I think NONARCH_CONFIG needs to be adjusted as well.
>


-- 

Grüsse / regards, 
Christian Ehrhardt
IBM Linux Technology Center, Open Virtualization