[CRIU] [PATCHv1 04/26] sigframe: prepare macro helpers for two sigframes

[Dmitry Safonov]

On 06/16/2016 04:51 PM, Dmitry Safonov wrote:
> On 06/16/2016 04:40 PM, Dmitry Safonov wrote:
>> On 06/16/2016 04:34 PM, Laurent Dufour wrote:
>>> On 16/06/2016 12:53, Dmitry Safonov wrote:
>>>> As on x86 compat/native sigframe differ, I need to generalize/modify
>>>> sigframe macro helpers having in mind:
>>>> - SIGFRAME_OFFSET differ between native/compat tasks, so it takes
>>>>   sigframe parameter now, which will be used in following patches
>>>>   (also renamed it in RT_SIGFRAME_OFFSET to complement other macros)
>>>> - RT_SIGFRAME_FPU is now pointer, because each caller takes result's
>>>>   address with &RT_SIGFRAME_FPU(...)
>>>> - sigreturn_prep_fpu_frame now takes rt_sigframe parameter, as
>>>>   address of fpu_state pointer on x86 will depend on native/compat
>>>>   frame type, so I check local sigframe's type and count address
>>>>   for rsigframe. (See in the very next commit).
>>>>
>>>
>>> Hi Dimitry,
>>
>> Hi Laurent,
>>
>>> I've trouble applying your series on top of criu-dev (commit
>>> 674583f20cb6).
>>> I'd like to apply to it and give it a try before stating...
>>>
>>> Could you rebase it ?
>>
>> Could you tell what kind of trouble do you have?
>> I mean I based it on today criu-dev on the moment of sending,
>> and now rebased it on mentioned commit 674583f20cb6 without
>> any conflict.
>> The same is with criu-patchwork - it applied patches without fails,
>> afaics: https://zdtm.openvz.org/series/259/
>>
>> Thanks for giving it a try :)
>
> And I also applied sent patches on top of commit 674583f20cb6
> to try - didn't had any problem.
> Maybe there are some conflicts between working directory and patches?
> Did you try `make mrproper` or `git clean -fdx` before applying?
> (!)*NOTE*: `git clean -fdx` will *clean* all files that aren't in git -
> if you have some work in progress - stash or add it to some branch.
>
> However, AFAIK there shouldn't be any conflicts to previous working dirs
> contents - to autogenerated files or anything (otherwise I would have
> mentioned that).

Anyway, if there are still some problems about applying - here is
patches set on the top of criu-dev:
https://github.com/0x7f454c46/criu/commits/compat-3

you can fetch/clone that instead of git-am patches by hands.

Thanks again,
Dmitry