mirror of
https://github.com/checkpoint-restore/criu
synced 2025-08-22 01:51:51 +00:00
parasite: remove excessive header deps from parasite.h and friends
The task is not complete - this is just a part of what have to be done. I.e. looks like a lot of excessive deps can be fixed. Signed-off-by: Stanislav Kinsbursky <skinsbursky@openvz.org> Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
parent
df7dd55e10
commit
41195598cf
@ -15,6 +15,7 @@
|
||||
#include <sys/vfs.h>
|
||||
|
||||
#include <sys/sendfile.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include <linux/major.h>
|
||||
|
||||
|
1
files.c
1
files.c
@ -10,6 +10,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "crtools.h"
|
||||
|
||||
|
@ -1,14 +1,6 @@
|
||||
#ifndef PARASITE_SYSCALL_H_
|
||||
#define PARASITE_SYSCALL_H_
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include "compiler.h"
|
||||
#include "types.h"
|
||||
#include "list.h"
|
||||
#include "crtools.h"
|
||||
|
||||
#define BUILTIN_SYSCALL_SIZE 8
|
||||
|
||||
/* parasite control block */
|
||||
@ -29,6 +21,9 @@ struct parasite_ctl {
|
||||
void * addr_args; /* address for arguments */
|
||||
};
|
||||
|
||||
struct cr_fdset;
|
||||
struct list_head;
|
||||
|
||||
extern int parasite_dump_sigacts_seized(struct parasite_ctl *ctl, struct cr_fdset *cr_fdset);
|
||||
extern int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct cr_fdset *cr_fdset);
|
||||
|
||||
|
@ -8,11 +8,8 @@
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/un.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "compiler.h"
|
||||
#include "image.h"
|
||||
#include "sockets.h"
|
||||
|
||||
|
@ -8,13 +8,10 @@
|
||||
#ifndef SYSCALL_TYPES_H__
|
||||
#define SYSCALL_TYPES_H__
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/time.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "compiler.h"
|
||||
|
||||
#ifndef CONFIG_X86_64
|
||||
# error x86-32 bit mode not yet implemented
|
||||
|
@ -4,8 +4,6 @@
|
||||
/*
|
||||
* Some bits are stolen from perf and kvm tools
|
||||
*/
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <errno.h>
|
||||
|
@ -1,4 +1,5 @@
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include "types.h"
|
||||
#include "rbtree.h"
|
||||
#include "util.h"
|
||||
|
@ -1,6 +1,7 @@
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/wait.h>
|
||||
#include <stdlib.h>
|
||||
#include "util.h"
|
||||
#include "syscall.h"
|
||||
#include "uts_ns.h"
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <wait.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "util.h"
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
#include "syscall.h"
|
||||
#include "ptrace.h"
|
||||
@ -9,6 +10,10 @@
|
||||
#include "parasite-syscall.h"
|
||||
#include "parasite-blob.h"
|
||||
#include "parasite.h"
|
||||
#include "crtools.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef CONFIG_X86_64
|
||||
static const char code_syscall[] = {0x0f, 0x05, 0xcc, 0xcc,
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "parasite.h"
|
||||
#include "util.h"
|
||||
|
||||
#include <string.h>
|
||||
|
||||
/*
|
||||
* Some notes on parasite code overall. There are a few
|
||||
* calling convention specfics the caller must follow
|
||||
|
1
pipes.c
1
pipes.c
@ -2,6 +2,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "crtools.h"
|
||||
#include "image.h"
|
||||
|
@ -16,6 +16,8 @@
|
||||
|
||||
#include "proc_parse.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
struct buffer {
|
||||
char buf[PAGE_SIZE];
|
||||
char end; /* '\0' */
|
||||
|
1
shmem.c
1
shmem.c
@ -1,5 +1,6 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "shmem.h"
|
||||
#include "image.h"
|
||||
|
@ -3,6 +3,8 @@
|
||||
#include <unistd.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "libnetlink.h"
|
||||
|
1
sk-tcp.c
1
sk-tcp.c
@ -2,6 +2,7 @@
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/sockios.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "crtools.h"
|
||||
#include "util.h"
|
||||
|
@ -5,6 +5,7 @@
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/un.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "libnetlink.h"
|
||||
|
15
sockets.c
15
sockets.c
@ -1,25 +1,10 @@
|
||||
#include <sys/socket.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/net.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/vfs.h>
|
||||
#include <sys/stat.h>
|
||||
#include <fcntl.h>
|
||||
#include <netinet/tcp.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <sys/sendfile.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "libnetlink.h"
|
||||
#include "sockets.h"
|
||||
#include "sk-queue.h"
|
||||
#include "unix_diag.h"
|
||||
#include "image.h"
|
||||
#include "crtools.h"
|
||||
#include "util.h"
|
||||
#include "inet_diag.h"
|
||||
#include "files.h"
|
||||
#include "util-net.h"
|
||||
|
2
sysctl.c
2
sysctl.c
@ -1,6 +1,8 @@
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "types.h"
|
||||
#include "sysctl.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user