mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

crtools: don't include image.h in crtools.h

Browse Source 
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2013-11-06 14:34:30 +04:00
committed by Pavel Emelyanov
parent 4cb211c094
commit 07fc6cf394
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/crtools.h
View File

@@ -7,7 +7,6 @@
#include "asm/types.h"
#include "list.h"
#include "util.h"
#include "image.h"
#include "lock.h"
#include "cr-show.h"
#include "servicefd.h"
@@ -58,15 +57,6 @@ void kill_inventory(void);
extern void print_data(unsigned long addr, unsigned char *data, size_t size);
extern void print_image_data(int fd, unsigned int length, int show);
extern int open_image_dir(void);
extern void close_image_dir(void);
int open_image_at(int dfd, int type, unsigned long flags, ...);
#define open_image(typ, flags, ...) open_image_at(get_service_fd(IMG_FD_OFF), typ, flags, ##__VA_ARGS__)
int open_pages_image(unsigned long flags, int pm_fd);
int open_pages_image_at(int dfd, unsigned long flags, int pm_fd);
void up_page_ids_base(void);
#define LAST_PID_PATH "/proc/sys/kernel/ns_last_pid"
int cr_dump_tasks(pid_t pid);
@@ -77,10 +67,6 @@ int convert_to_elf(char *elf_path, int fd_core);
int cr_check(void);
int cr_exec(int pid, char **opts);
#define O_DUMP (O_RDWR | O_CREAT | O_EXCL)
#define O_SHOW (O_RDONLY)
#define O_RSTR (O_RDONLY)
/*
* When we have to restore a shared resource, we mush select which
* task should do it, and make other(s) wait for it. In order to

13
include/image.h
View File

@@ -63,4 +63,17 @@
extern bool fdinfo_per_id;
extern bool ns_per_id;
#define O_DUMP (O_RDWR | O_CREAT | O_EXCL)
#define O_SHOW (O_RDONLY)
#define O_RSTR (O_RDONLY)
extern int open_image_dir(void);
extern void close_image_dir(void);
int open_image_at(int dfd, int type, unsigned long flags, ...);
#define open_image(typ, flags, ...) open_image_at(get_service_fd(IMG_FD_OFF), typ, flags, ##__VA_ARGS__)
int open_pages_image(unsigned long flags, int pm_fd);
int open_pages_image_at(int dfd, unsigned long flags, int pm_fd);
void up_page_ids_base(void);
#endif /* __CR_IMAGE_H__ */

4
page-read.c
View File

@@ -2,7 +2,7 @@
#include <stdio.h>
#include <unistd.h>
#include "crtools.h"
#include "image.h"
#include "servicefd.h"
#include "page-read.h"
@@ -12,7 +12,7 @@
static int get_page_vaddr(struct page_read *pr, struct iovec *iov)
{
int ret;
__u64 img_va;
u64 img_va;
ret = read_img_eof(pr->fd_pg, &img_va);
if (ret <= 0)

1
page-xfer.c
View File

@@ -4,6 +4,7 @@
#include <unistd.h>
#include "crtools.h"
#include "image.h"
#include "page-xfer.h"
#include "page-pipe.h"

3
protobuf.c
View File

@@ -8,7 +8,8 @@
#include <google/protobuf-c/protobuf-c.h>
#include "crtools.h"
#include "image.h"
#include "servicefd.h"
#include "compiler.h"
#include "asm/types.h"
#include "log.h"

1
stats.c
View File

@@ -3,6 +3,7 @@
#include "protobuf.h"
#include "stats.h"
#include "crtools.h"
#include "image.h"
#include "protobuf/stats.pb-c.h"
struct timing {