mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-30 13:58:34 +00:00
Code Issues Releases Wiki Activity

util: Drop jerr macros

Browse Source 
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
This commit is contained in:
Cyrill Gorcunov
2012-02-15 18:36:32 +04:00
parent dcb1cbfb82
commit cf8b39d4aa
2 changed files with 13 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cr-dump.c
View File

@@ -578,8 +578,15 @@ static int get_task_regs(pid_t pid, struct core_entry *core)
user_regs_struct_t regs = {-1}; user_regs_struct_t regs = {-1};
int ret = -1; int ret = -1;
jerr(ptrace(PTRACE_GETREGS, pid, NULL, &regs), err); if (ptrace(PTRACE_GETREGS, pid, NULL, &regs)) {
jerr(ptrace(PTRACE_GETFPREGS, pid, NULL, &fpregs), err); pr_err("Can't obtain GP registers for %d\n", pid);
goto err;
}
if (ptrace(PTRACE_GETFPREGS, pid, NULL, &fpregs)) {
pr_err("Can't obtain FPU registers for %d\n", pid);
goto err;
}
/* Did we come from a system call? */ /* Did we come from a system call? */
if ((int)regs.orig_ax >= 0) { if ((int)regs.orig_ax >= 0) {
@@ -1085,8 +1092,10 @@ static int dump_task_thread(pid_t pid, struct cr_fdset *cr_fdset)
ret = get_task_regs(pid, core); ret = get_task_regs(pid, core);
if (ret) if (ret)
goto err_free; goto err_free;
jerr(ptrace(PTRACE_GET_TID_ADDRESS, pid, NULL, if (ptrace(PTRACE_GET_TID_ADDRESS, pid, NULL, &core->clear_tid_address)) {
&core->clear_tid_address), err_free); pr_err("Can't get TID address for %d\n", pid);
goto err_free;
}
pr_info("OK\n"); pr_info("OK\n");
core->tc.task_state = TASK_ALIVE; core->tc.task_state = TASK_ALIVE;

25
include/util.h
View File

@@ -37,31 +37,6 @@ extern void printk(const char *format, ...)
#define pr_panic(fmt, ...) printk("PANIC (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define pr_panic(fmt, ...) printk("PANIC (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define pr_warning(fmt, ...) printk("Warning (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__) #define pr_warning(fmt, ...) printk("Warning (%s:%d): " fmt, __FILE__, __LINE__, ##__VA_ARGS__)
#define pr_err_jmp(label) \
do { \
printk("EJMP: %s:%d\n", __FILE__, __LINE__); \
goto label; \
} while (0)
#define jerr(code, label) \
do { \
if ((code)) \
pr_err_jmp(label); \
} while (0)
#define jerr_cond(code, cond, label) \
do { \
if ((code) cond) \
pr_err_jmp(label); \
} while (0)
#define jerr_rc(code, rc, label) \
do { \
rc = (code); \
if (rc) \
pr_err_jmp(label); \
} while (0)
#ifdef CR_DEBUG #ifdef CR_DEBUG
#define pr_debug(fmt, ...) \ #define pr_debug(fmt, ...) \
do { \ do { \