Commit abca195e authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Andrei Vagin

criu: arch, x86 -- Rename registers mode

@gpregs_case is a bit vague name, lets
define traditional @mode here.
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 5c7e141b
...@@ -317,7 +317,7 @@ static int save_task_regs(CoreEntry *core, ...@@ -317,7 +317,7 @@ static int save_task_regs(CoreEntry *core,
assign_reg(gpregs, regs->compat, ss); assign_reg(gpregs, regs->compat, ss);
gpregs->mode = USER_X86_REGS_MODE__COMPAT; gpregs->mode = USER_X86_REGS_MODE__COMPAT;
} }
gpregs->has_gpregs_case = true; gpregs->has_mode = true;
if (!fpregs) if (!fpregs)
return 0; return 0;
...@@ -701,15 +701,15 @@ static void restore_native_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r) ...@@ -701,15 +701,15 @@ static void restore_native_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r) int restore_gpregs(struct rt_sigframe *f, UserX86RegsEntry *r)
{ {
switch (r->gpregs_case) { switch (r->mode) {
case USER_X86_REGS_CASE_T__NATIVE: case USER_X86_REGS_MODE__NATIVE:
restore_native_gpregs(f, r); restore_native_gpregs(f, r);
break; break;
case USER_X86_REGS_CASE_T__COMPAT: case USER_X86_REGS_MODE__COMPAT:
restore_compat_gpregs(f, r); restore_compat_gpregs(f, r);
break; break;
default: default:
pr_err("Can't prepare rt_sigframe: regs_case corrupt\n"); pr_err("Can't prepare rt_sigframe: registers mode corrupted (%d)\n", r->mode);
return -1; return -1;
} }
return 0; return 0;
......
...@@ -2,7 +2,7 @@ syntax = "proto2"; ...@@ -2,7 +2,7 @@ syntax = "proto2";
import "opts.proto"; import "opts.proto";
enum user_x86_regs_case_t { enum user_x86_regs_mode {
NATIVE = 1; NATIVE = 1;
COMPAT = 2; COMPAT = 2;
} }
...@@ -36,7 +36,7 @@ message user_x86_regs_entry { ...@@ -36,7 +36,7 @@ message user_x86_regs_entry {
required uint64 es = 25; required uint64 es = 25;
required uint64 fs = 26; required uint64 fs = 26;
required uint64 gs = 27; required uint64 gs = 27;
optional user_x86_regs_case_t gpregs_case = 28 [default = NATIVE]; optional user_x86_regs_mode mode = 28 [default = NATIVE];
} }
message user_x86_xsave_entry { message user_x86_xsave_entry {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment