Re: [Xen-devel] [PATCH] fix public header hvm/save.h to be compatible with c++

[Ben Guthro <ben@xxxxxxxxxx>]

On Fri, Oct 5, 2012 at 9:13 AM, Jan Beulich <JBeulich@xxxxxxxx> wrote:
>>>> On 05.10.12 at 14:46, Ben Guthro <ben@xxxxxxxxxx> wrote:
>> Thanks for your review. Comments addressed, and re-tested.
>
> But now I fail to see why the rename is still necessary

I left the rename in there because you said you didn't mind them.
I was unsure if this meant you preferred the rename, or not. In the
interest of minimizing code churn to just the minimum - the ifdef
would be sufficient.
However, since you suggested I also fix the spacing around the equal
signs, I thought that the variable rename was in the same category,
for "code cleanup"

I think this is just a misunderstanding.

Would you like to see a third patch with just the ifdef?
Also - as a matter of procedure, should I reply to this original
thread when iterating on a patch like this, or start a new one, with
[PATCH v2] etc?

> - you don't write hypervisor code in C++, do you?
*shudders at the though* - no, most certainly not. This is someone
else's userspace daemon that I'm just integrating with new public
headers built against xen-unstable


Ben

> Jan
>
>> Including save.h in a C++ application was throwing some errors, as it
>> was unhappy about the "new" keyword being used (even when wrapped in
>> an "extern C" block)
>>
>> This change renames some variables, as well as wraps the function in a
>> __XEN__ preprocessor directive.
>>
>> Signed-off-by: Ben Guthro <ben@xxxxxxxxxx>
>>
>> diff --git a/xen/include/public/arch-x86/hvm/save.h
>> b/xen/include/public/arch-x86/hvm/save.h
>> index a82a5ee..1b88c28 100644
>> --- a/xen/include/public/arch-x86/hvm/save.h
>> +++ b/xen/include/public/arch-x86/hvm/save.h
>> @@ -268,19 +268,21 @@ struct hvm_hw_cpu_compat {
>>      uint32_t error_code;
>>  };
>>
>> +#ifdef __XEN__
>>  static inline int _hvm_hw_fix_cpu(void *h) {
>> -    struct hvm_hw_cpu *new=h;
>> -    struct hvm_hw_cpu_compat *old=h;
>> +    struct hvm_hw_cpu *new_cpu = h;
>> +    struct hvm_hw_cpu_compat *old_cpu = h;
>>
>>      /* If we copy from the end backwards, we should
>>       * be able to do the modification in-place */
>> -    new->error_code=old->error_code;
>> -    new->pending_event=old->pending_event;
>> -    new->tsc=old->tsc;
>> -    new->msr_tsc_aux=0;
>> +    new_cpu->error_code = old_cpu->error_code;
>> +    new_cpu->pending_event = old_cpu->pending_event;
>> +    new_cpu->tsc = old_cpu->tsc;
>> +    new_cpu->msr_tsc_aux = 0;
>>
>>      return 0;
>>  }
>> +#endif
>>
>>  DECLARE_HVM_SAVE_TYPE_COMPAT(CPU, 2, struct hvm_hw_cpu, \
>>                               struct hvm_hw_cpu_compat, _hvm_hw_fix_cpu);
>
>
>

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