mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 18:07:57 +00:00
Code Issues Releases Wiki Activity

space-before-tab whitespace cleanup

Browse Source 
Remove space before tab characters.

Found by git grep ' 	' (Space, Ctrl-V, Tab in shell).

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Kir Kolyshkin 2013-12-11 14:03:12 -08:00 committed by Pavel Emelyanov
parent d64d68d66c
commit 26fda7a319
18 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/include/asm/restore.h
View File

@ -5,13 +5,13 @@
#include "protobuf/core.pb-c.h" #include "protobuf/core.pb-c.h"
#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \ #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \
task_args) \ task_args) \
asm volatile( \ asm volatile( \
"mov %%sp, %%%0 \n" \ "mov %%sp, %%%0 \n" \
"mov %%r1, %%%1 \n" \ "mov %%r1, %%%1 \n" \
"mov %%r0, %%%2 \n" \ "mov %%r0, %%%2 \n" \
"bx %%r1 \n" \ "bx %%r1 \n" \
: \ : \
: "r"(new_sp), \ : "r"(new_sp), \
"r"(restore_task_exec_start), \ "r"(restore_task_exec_start), \

18
arch/arm/include/asm/restorer.h
View File

@ -76,32 +76,32 @@ struct rt_sigframe {
: "r"(new_sp) \ : "r"(new_sp) \
: "sp","memory") : "sp","memory")
#define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \ #define RUN_CLONE_RESTORE_FN(ret, clone_flags, new_sp, parent_tid, \
thread_args, clone_restore_fn) \ thread_args, clone_restore_fn) \
asm volatile( \ asm volatile( \
"clone_emul: \n" \ "clone_emul: \n" \
"ldr %%r1, %2 \n" \ "ldr %%r1, %2 \n" \
"sub %%r1, #16 \n" \ "sub %%r1, #16 \n" \
"mov %%r0, %%%6 \n" \ "mov %%r0, %%%6 \n" \
"str %%r0, [%%r1, #4] \n" \ "str %%r0, [%%r1, #4] \n" \
"mov %%r0, %%%5 \n" \ "mov %%r0, %%%5 \n" \
"str %%r0, [%%r1] \n" \ "str %%r0, [%%r1] \n" \
"mov %%r0, %%%1 \n" \ "mov %%r0, %%%1 \n" \
"mov %%r2, %%%3 \n" \ "mov %%r2, %%%3 \n" \
"mov %%r3, %%%4 \n" \ "mov %%r3, %%%4 \n" \
"mov %%r7, #"__stringify(__NR_clone)" \n" \ "mov %%r7, #"__stringify(__NR_clone)" \n" \
"svc #0 \n" \ "svc #0 \n" \
\ \
"cmp %%r0, #0 \n" \ "cmp %%r0, #0 \n" \
"beq thread_run \n" \ "beq thread_run \n" \
\ \
"mov %%%0, %%r0 \n" \ "mov %%%0, %%r0 \n" \
"b clone_end \n" \ "b clone_end \n" \
\ \
"thread_run: \n" \ "thread_run: \n" \
"pop { %%r1 } \n" \ "pop { %%r1 } \n" \
"pop { %%r0 } \n" \ "pop { %%r0 } \n" \
"bx %%r1 \n" \ "bx %%r1 \n" \
\ \
"clone_end: \n" \ "clone_end: \n" \
: "=r"(ret) \ : "=r"(ret) \
@ -117,7 +117,7 @@ struct rt_sigframe {
asm volatile( \ asm volatile( \
"mov %%sp, %0 \n" \ "mov %%sp, %0 \n" \
"mov %%r0, #0 \n" \ "mov %%r0, #0 \n" \
"bx %%r0 \n" \ "bx %%r0 \n" \
: \ : \
: "r"(ret) \ : "r"(ret) \
: "memory") : "memory")

4
arch/x86/include/asm/restore.h
View File

@ -5,13 +5,13 @@
#include "protobuf/core.pb-c.h" #include "protobuf/core.pb-c.h"
#define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \ #define JUMP_TO_RESTORER_BLOB(new_sp, restore_task_exec_start, \
task_args) \ task_args) \
asm volatile( \ asm volatile( \
"movq %0, %%rbx \n" \ "movq %0, %%rbx \n" \
"movq %1, %%rax \n" \ "movq %1, %%rax \n" \
"movq %2, %%rdi \n" \ "movq %2, %%rdi \n" \
"movq %%rbx, %%rsp \n" \ "movq %%rbx, %%rsp \n" \
"callq *%%rax \n" \ "callq *%%rax \n" \
: \ : \
: "g"(new_sp), \ : "g"(new_sp), \

2
cr-show.c
View File

@ -328,7 +328,7 @@ static struct show_image_info show_infos[] = {
{ PACKETSK_MAGIC, PB_PACKET_SOCK, false, NULL, "5:%d", }, { PACKETSK_MAGIC, PB_PACKET_SOCK, false, NULL, "5:%d", },
{ ITIMERS_MAGIC, PB_ITIMER, false, NULL, "*:%Lu", }, { ITIMERS_MAGIC, PB_ITIMER, false, NULL, "*:%Lu", },
{ POSIX_TIMERS_MAGIC, PB_POSIX_TIMER, false, NULL, "*:%d 5:%Lu 7:%Lu 8:%lu 9:%Lu 10:%Lu", }, { POSIX_TIMERS_MAGIC, PB_POSIX_TIMER, false, NULL, "*:%d 5:%Lu 7:%Lu 8:%lu 9:%Lu 10:%Lu", },
{ NETDEV_MAGIC, PB_NETDEV, false, NULL, "2:%d", }, { NETDEV_MAGIC, PB_NETDEV, false, NULL, "2:%d", },
{ PAGEMAP_MAGIC, PB_PAGEMAP_HEAD, true, show_pagemaps, NULL, }, { PAGEMAP_MAGIC, PB_PAGEMAP_HEAD, true, show_pagemaps, NULL, },
{ PIPES_DATA_MAGIC, PB_PIPE_DATA, false, pipe_data_handler, NULL, }, { PIPES_DATA_MAGIC, PB_PIPE_DATA, false, pipe_data_handler, NULL, },

2
files-reg.c
View File

@ -371,7 +371,7 @@ static int create_link_remap(char *path, int len, int lfd, u32 *idp)
tmp--; tmp--;
} }
rfe.id = *idp = fd_id_generate_special(); rfe.id = *idp = fd_id_generate_special();
rfe.flags = 0; rfe.flags = 0;
rfe.pos = 0; rfe.pos = 0;
rfe.fown = &fwn; rfe.fown = &fwn;

6
include/restorer.h
View File

@ -74,7 +74,7 @@ struct thread_restore_args {
struct restore_mem_zone mem_zone; struct restore_mem_zone mem_zone;
int pid; int pid;
UserRegsEntry gpregs; UserRegsEntry gpregs;
u64 clear_tid_addr; u64 clear_tid_addr;
bool has_futex; bool has_futex;
@ -122,8 +122,8 @@ struct task_restore_args {
struct itimerval itimers[3]; struct itimerval itimers[3];
int timer_n; int timer_n;
struct restore_posix_timer *posix_timers; struct restore_posix_timer *posix_timers;
CredsEntry creds; CredsEntry creds;
uint32_t cap_inh[CR_CAP_SIZE]; uint32_t cap_inh[CR_CAP_SIZE];

4
include/sockets.h
View File

@ -63,10 +63,10 @@ extern int do_restore_opt(int sk, int level, int name, void *val, int len);
#define restore_opt(s, l, n, f) do_restore_opt(s, l, n, f, sizeof(*f)) #define restore_opt(s, l, n, f) do_restore_opt(s, l, n, f, sizeof(*f))
#define sk_encode_shutdown(img, mask) do { \ #define sk_encode_shutdown(img, mask) do { \
/* \ /* \
* protobuf SK_SHUTDOWN__ bits match those \ * protobuf SK_SHUTDOWN__ bits match those \
* reported by kernel \ * reported by kernel \
*/ \ */ \
(img)->shutdown = mask; \ (img)->shutdown = mask; \
if ((img)->shutdown != SK_SHUTDOWN__NONE) \ if ((img)->shutdown != SK_SHUTDOWN__NONE) \
(img)->has_shutdown = true; \ (img)->has_shutdown = true; \

2
pie/Makefile
View File

@ -1,5 +1,5 @@
targets += parasite targets += parasite
targets += restorer targets += restorer
obj-y += log-simple.o obj-y += log-simple.o
obj-y += util.o obj-y += util.o

2
pie/restorer.c
View File

@ -36,7 +36,7 @@
#define sys_prctl_safe(opcode, val1, val2, val3) \ #define sys_prctl_safe(opcode, val1, val2, val3) \
({ \ ({ \
long __ret = sys_prctl(opcode, val1, val2, val3, 0); \ long __ret = sys_prctl(opcode, val1, val2, val3, 0); \
if (__ret) \ if (__ret) \
pr_err("prctl failed @%d with %ld\n", __LINE__, __ret);\ pr_err("prctl failed @%d with %ld\n", __LINE__, __ret);\
__ret; \ __ret; \
}) })

12
protobuf/Makefile
View File

@ -66,18 +66,18 @@ proto-h := $(proto-obj-y:.o=.pb-c.h)
$(obj)/%.proto.d: $(obj)/%.proto $(obj)/%.proto.d: $(obj)/%.proto
$(E) " PB DDEP " $@ $(E) " PB DDEP " $@
$(Q) grep "^[[:blank:]]*import[[:blank:]]" $^ | sed \ $(Q) grep "^[[:blank:]]*import[[:blank:]]" $^ | sed \
-e 's/[[:blank:]]*import[[:blank:]]*//' \ -e 's/[[:blank:]]*import[[:blank:]]*//' \
-e 's/[\";]//g' \ -e 's/[\";]//g' \
-e 's/.*/$(subst /,\/,$^):$(subst /,\/,$(obj))\/&/' | \ -e 's/.*/$(subst /,\/,$^):$(subst /,\/,$(obj))\/&/' | \
uniq > $@ uniq > $@
$(obj)/%.proto.c.d: $(obj)/%.proto | $(obj)/%.proto.d $(obj)/%.proto.c.d: $(obj)/%.proto | $(obj)/%.proto.d
$(E) " PB DEP " $@ $(E) " PB DEP " $@
$(Q) grep "^[[:blank:]]*import[[:blank:]]" $< | sed \ $(Q) grep "^[[:blank:]]*import[[:blank:]]" $< | sed \
-e 's/[[:blank:]]*import[[:blank:]]*//' \ -e 's/[[:blank:]]*import[[:blank:]]*//' \
-e 's/.proto/.pb-c.c/' \ -e 's/.proto/.pb-c.c/' \
-e 's/[\";]//g' \ -e 's/[\";]//g' \
-e 's/.*/$(subst .proto,.pb-c.c,$(subst /,\/,$<)):$(subst /,\/,$(obj))\/&/' | \ -e 's/.*/$(subst .proto,.pb-c.c,$(subst /,\/,$<)):$(subst /,\/,$(obj))\/&/' | \
uniq > $@ uniq > $@

4
protobuf/core-x86.proto
View File

@ -14,8 +14,8 @@ message user_x86_regs_entry {
required uint64 dx = 13; required uint64 dx = 13;
required uint64 si = 14; required uint64 si = 14;
required uint64 di = 15; required uint64 di = 15;
required uint64 orig_ax = 16; required uint64 orig_ax = 16;
required uint64 ip = 17; required uint64 ip = 17;
required uint64 cs = 18; required uint64 cs = 18;
required uint64 flags = 19; required uint64 flags = 19;
required uint64 sp = 20; required uint64 sp = 20;

4
protobuf/timer.proto
View File

@ -6,9 +6,9 @@ message itimer_entry {
} }
message posix_timer_entry { message posix_timer_entry {
required uint32 it_id = 1; required uint32 it_id = 1;
required uint32 clock_id = 2; required uint32 clock_id = 2;
required uint32 si_signo = 3; required uint32 si_signo = 3;
required uint32 it_sigev_notify = 4; required uint32 it_sigev_notify = 4;
required uint64 sival_ptr = 5; required uint64 sival_ptr = 5;
required uint32 overrun = 6; required uint32 overrun = 6;

2
scripts/Makefile.version
View File

@ -8,7 +8,7 @@ endif
$(VERSION_HEADER): Makefile scripts/Makefile.version $(VERSION_HEADER): Makefile scripts/Makefile.version
$(E) " GEN " $@ $(E) " GEN " $@
$(Q) echo "/* Autogenerated, do not edit */" > $(VERSION_HEADER) $(Q) echo "/* Autogenerated, do not edit */" > $(VERSION_HEADER)
$(Q) echo "#ifndef __CR_VERSION_H__" >> $(VERSION_HEADER) $(Q) echo "#ifndef __CR_VERSION_H__" >> $(VERSION_HEADER)
$(Q) echo "#define __CR_VERSION_H__" >> $(VERSION_HEADER) $(Q) echo "#define __CR_VERSION_H__" >> $(VERSION_HEADER)
$(Q) echo "#define CRIU_VERSION \"$(CRTOOLSVERSION)\"" >> $(VERSION_HEADER) $(Q) echo "#define CRIU_VERSION \"$(CRTOOLSVERSION)\"" >> $(VERSION_HEADER)

2
test/app-emu/lxc/run.sh
View File

@ -46,7 +46,7 @@ echo Press Enter for restoring CT
read read
echo "Restore the CT $name" echo "Restore the CT $name"
${criu} restore --evasive-devices \ ${criu} restore --evasive-devices \
--tcp-established \ --tcp-established \
--file-locks \ --file-locks \
-n net -n mnt -n ipc -n pid \ -n net -n mnt -n ipc -n pid \

2
test/zdtm/lib/zdtmtst.h
View File

@ -61,7 +61,7 @@ struct long_opt {
extern void __push_opt(struct long_opt *opt); extern void __push_opt(struct long_opt *opt);
#define TEST_OPTION(name, type, doc, is_required) \ #define TEST_OPTION(name, type, doc, is_required) \
param_check_##type(name, &(name)); \ param_check_##type(name, &(name)); \
static struct long_opt __long_opt_##name = { \ static struct long_opt __long_opt_##name = { \
#name, #type, doc, is_required, parse_opt_##type, &name }; \ #name, #type, doc, is_required, parse_opt_##type, &name }; \

2
test/zdtm/live/static/fpu00.c
View File

@ -65,7 +65,7 @@ int main(int argc, char ** argv)
start(a, b, c, d); start(a, b, c, d);
res1 = finish(); res1 = finish();
start(a, b, c, d); start(a, b, c, d);

2
test/zdtm/live/static/maps00.c
View File

@ -146,7 +146,7 @@ static int check_map(struct map *map)
map->ptr, map->flag, map->prot); map->ptr, map->flag, map->prot);
return -1; return -1;
} }
/* prot |= PROT_READ// need barrier before this line, /* prot |= PROT_READ// need barrier before this line,
because compiler change order commands. because compiler change order commands.
I finded one method: look at next lines*/ I finded one method: look at next lines*/
} else } else

4
test/zdtm/live/transition/Makefile
View File

@ -6,14 +6,14 @@ override CPPFLAGS += -I$(LIBDIR)
CFLAGS = -g -O2 -Wall -Werror CFLAGS = -g -O2 -Wall -Werror
TST_NOFILE = \ TST_NOFILE = \
ipc \ ipc \
ptrace \ ptrace \
epoll \ epoll \
fork \ fork \
fork2 \ fork2 \
TST_FILE = \ TST_FILE = \
file_read \ file_read \
TST = $(TST_NOFILE) $(TST_FILE) TST = $(TST_NOFILE) $(TST_FILE)
SRC = $(TST:%=%.c) SRC = $(TST:%=%.c)