git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
um
/
kernel
/
tt
/
syscall_user.c
diff --git
a/arch/um/kernel/tt/syscall_user.c
b/arch/um/kernel/tt/syscall_user.c
index
f7c845d
..
32fbe32
100644
(file)
--- a/
arch/um/kernel/tt/syscall_user.c
+++ b/
arch/um/kernel/tt/syscall_user.c
@@
-17,10
+17,6
@@
#include "syscall_user.h"
#include "tt.h"
#include "syscall_user.h"
#include "tt.h"
-/* XXX Bogus */
-#define ERESTARTSYS 512
-#define ERESTARTNOINTR 513
-#define ERESTARTNOHAND 514
void syscall_handler_tt(int sig, union uml_pt_regs *regs)
{
void syscall_handler_tt(int sig, union uml_pt_regs *regs)
{
@@
-33,7
+29,7
@@
void syscall_handler_tt(int sig, union uml_pt_regs *regs)
SC_START_SYSCALL(sc);
index = record_syscall_start(syscall);
SC_START_SYSCALL(sc);
index = record_syscall_start(syscall);
- syscall_trace();
+ syscall_trace(
regs, 0
);
result = execute_syscall(regs);
/* regs->sc may have changed while the system call ran (there may
result = execute_syscall(regs);
/* regs->sc may have changed while the system call ran (there may
@@
-42,39
+38,38
@@
void syscall_handler_tt(int sig, union uml_pt_regs *regs)
UPT_SC(regs) = sc;
SC_SET_SYSCALL_RETURN(sc, result);
UPT_SC(regs) = sc;
SC_SET_SYSCALL_RETURN(sc, result);
- if((result == -ERESTARTNOHAND) || (result == -ERESTARTSYS) ||
- (result == -ERESTARTNOINTR))
- do_signal(result);
- syscall_trace();
+ syscall_trace(
regs, 1
);
record_syscall_end(index, result);
}
record_syscall_end(index, result);
}
-int do_syscall(void *task, int pid)
+void do_sigtrap(void *task)
+{
+ UPT_SYSCALL_NR(TASK_REGS(task)) = -1;
+}
+
+void do_syscall(void *task, int pid, int local_using_sysemu)
{
unsigned long proc_regs[FRAME_SIZE];
{
unsigned long proc_regs[FRAME_SIZE];
- union uml_pt_regs *regs;
- int syscall;
if(ptrace_getregs(pid, proc_regs) < 0)
tracer_panic("Couldn't read registers");
if(ptrace_getregs(pid, proc_regs) < 0)
tracer_panic("Couldn't read registers");
- syscall = PT_SYSCALL_NR(proc_regs);
- regs = TASK_REGS(task);
- UPT_SYSCALL_NR(regs) = syscall;
+ UPT_SYSCALL_NR(TASK_REGS(task)) = PT_SYSCALL_NR(proc_regs);
- if(syscall < 1) return(0);
-
- if((syscall != __NR_sigreturn) &&
- ((unsigned long *) PT_IP(proc_regs) >= &_stext) &&
+ if(((unsigned long *) PT_IP(proc_regs) >= &_stext) &&
((unsigned long *) PT_IP(proc_regs) <= &_etext))
tracer_panic("I'm tracing myself and I can't get out");
((unsigned long *) PT_IP(proc_regs) <= &_etext))
tracer_panic("I'm tracing myself and I can't get out");
+ /* advanced sysemu mode set syscall number to -1 automatically */
+ if (local_using_sysemu==2)
+ return;
+
+ /* syscall number -1 in sysemu skips syscall restarting in host */
if(ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET,
if(ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET,
- __NR_getpid) < 0)
+
local_using_sysemu ? -1 :
__NR_getpid) < 0)
tracer_panic("do_syscall : Nullifying syscall failed, "
"errno = %d", errno);
tracer_panic("do_syscall : Nullifying syscall failed, "
"errno = %d", errno);
- return(1);
}
/*
}
/*