Re: [Qemu-devel] [PATCH 01/21] target-s390x: fix style

[Alexander Graf]

On 03.09.2012, at 15:10, Blue Swirl <address@hidden> wrote:

> On Mon, Sep 3, 2012 at 4:31 AM, Alexander Graf <address@hidden> wrote:
>> 
>> On 02.09.2012, at 13:33, Blue Swirl wrote:
>> 
>>> Before splitting op_helper.c and helper.c in the next patches,
>>> fix style issues. No functional changes.
>>> 
>>> Replace also GCC specific __FUNCTION__ with
>>> standard __func__.
>>> 
>>> Don't init static variable (cpu_s390x_init:inited) with 0.
>>> 
>>> Signed-off-by: Blue Swirl <address@hidden>
>> 
>> 
>> Phew. Have you hooked up with Richard about these changes? He had quite a 
>> big rewrite of the s390 target in the works, and I don't want you guys to 
>> work needlessly on major conflicts :)
> 
> I missed that one. He's rewriting translate.c, while I'm mostly
> touching op_helper.c. I'd expect it would be simpler for Richard to
> rebase on my series, because they only change helper calls but don't
> otherwise touch code. His series rearranges the code heavily and if I
> rebased on that, it would probably make the patch conflicts harder to
> resolve. What do you think?

I also think that way around makes more sense, but mainly because you posted 
patches while he posted an RFC :).

Either way, will hopefully get around to review and/or apply your patches next 
week :)


Alex