Commit 41195598 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by Pavel Emelyanov

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: 's avatarStanislav Kinsbursky <skinsbursky@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent df7dd55e
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <sys/vfs.h> #include <sys/vfs.h>
#include <sys/sendfile.h> #include <sys/sendfile.h>
#include <sys/mman.h>
#include <linux/major.h> #include <linux/major.h>
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <stdlib.h>
#include "crtools.h" #include "crtools.h"
......
#ifndef PARASITE_SYSCALL_H_ #ifndef PARASITE_SYSCALL_H_
#define 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 #define BUILTIN_SYSCALL_SIZE 8
/* parasite control block */ /* parasite control block */
...@@ -29,6 +21,9 @@ struct parasite_ctl { ...@@ -29,6 +21,9 @@ struct parasite_ctl {
void * addr_args; /* address for arguments */ 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_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); extern int parasite_dump_itimers_seized(struct parasite_ctl *ctl, struct cr_fdset *cr_fdset);
......
...@@ -8,11 +8,8 @@ ...@@ -8,11 +8,8 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <sys/types.h>
#include <sys/un.h> #include <sys/un.h>
#include <limits.h>
#include "compiler.h"
#include "image.h" #include "image.h"
#include "sockets.h" #include "sockets.h"
......
...@@ -8,13 +8,10 @@ ...@@ -8,13 +8,10 @@
#ifndef SYSCALL_TYPES_H__ #ifndef SYSCALL_TYPES_H__
#define SYSCALL_TYPES_H__ #define SYSCALL_TYPES_H__
#include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <fcntl.h>
#include "types.h" #include "types.h"
#include "compiler.h"
#ifndef CONFIG_X86_64 #ifndef CONFIG_X86_64
# error x86-32 bit mode not yet implemented # error x86-32 bit mode not yet implemented
......
...@@ -4,8 +4,6 @@ ...@@ -4,8 +4,6 @@
/* /*
* Some bits are stolen from perf and kvm tools * Some bits are stolen from perf and kvm tools
*/ */
#include <string.h>
#include <stdlib.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
......
#include <unistd.h> #include <unistd.h>
#include <stdlib.h>
#include "types.h" #include "types.h"
#include "rbtree.h" #include "rbtree.h"
#include "util.h" #include "util.h"
......
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <stdlib.h>
#include "util.h" #include "util.h"
#include "syscall.h" #include "syscall.h"
#include "uts_ns.h" #include "uts_ns.h"
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <wait.h> #include <wait.h>
#include <stdlib.h>
#include "types.h" #include "types.h"
#include "util.h" #include "util.h"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <sys/mman.h>
#include "syscall.h" #include "syscall.h"
#include "ptrace.h" #include "ptrace.h"
...@@ -9,6 +10,10 @@ ...@@ -9,6 +10,10 @@
#include "parasite-syscall.h" #include "parasite-syscall.h"
#include "parasite-blob.h" #include "parasite-blob.h"
#include "parasite.h" #include "parasite.h"
#include "crtools.h"
#include <string.h>
#include <stdlib.h>
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
static const char code_syscall[] = {0x0f, 0x05, 0xcc, 0xcc, static const char code_syscall[] = {0x0f, 0x05, 0xcc, 0xcc,
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include "parasite.h" #include "parasite.h"
#include "util.h" #include "util.h"
#include <string.h>
/* /*
* Some notes on parasite code overall. There are a few * Some notes on parasite code overall. There are a few
* calling convention specfics the caller must follow * calling convention specfics the caller must follow
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h>
#include "crtools.h" #include "crtools.h"
#include "image.h" #include "image.h"
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
#include "proc_parse.h" #include "proc_parse.h"
#include <stdlib.h>
struct buffer { struct buffer {
char buf[PAGE_SIZE]; char buf[PAGE_SIZE];
char end; /* '\0' */ char end; /* '\0' */
......
#include <unistd.h> #include <unistd.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <stdlib.h>
#include "shmem.h" #include "shmem.h"
#include "image.h" #include "image.h"
......
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
#include <unistd.h> #include <unistd.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <string.h>
#include <stdlib.h>
#include "types.h" #include "types.h"
#include "libnetlink.h" #include "libnetlink.h"
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/sockios.h> #include <linux/sockios.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h>
#include "crtools.h" #include "crtools.h"
#include "util.h" #include "util.h"
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/un.h> #include <sys/un.h>
#include <stdlib.h>
#include "types.h" #include "types.h"
#include "libnetlink.h" #include "libnetlink.h"
......
#include <sys/socket.h> #include <sys/socket.h>
#include <linux/netlink.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 <netinet/tcp.h>
#include <errno.h>
#include <unistd.h>
#include <limits.h>
#include <sys/sendfile.h>
#include "types.h"
#include "libnetlink.h" #include "libnetlink.h"
#include "sockets.h" #include "sockets.h"
#include "sk-queue.h"
#include "unix_diag.h" #include "unix_diag.h"
#include "image.h"
#include "crtools.h"
#include "util.h"
#include "inet_diag.h" #include "inet_diag.h"
#include "files.h" #include "files.h"
#include "util-net.h" #include "util-net.h"
......
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <ctype.h> #include <ctype.h>
#include <string.h>
#include <stdlib.h>
#include "types.h" #include "types.h"
#include "sysctl.h" #include "sysctl.h"
......
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <string.h>
#include "util.h" #include "util.h"
#include "crtools.h" #include "crtools.h"
......
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