include/common: Move bug.h in

travis-ci: success for Common headers
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

criu/action-scripts.c

@@ -11,7 +11,7 @@
 #include "cr-service.h"
 #include "action-scripts.h"
 #include "pstree.h"
-#include "bug.h"
+#include "common/bug.h"
 
 static const char *action_names[ACT_MAX] = {
 	[ ACT_PRE_DUMP ]	= "pre-dump",

criu/arch/aarch64/vdso-pie.c

@@ -6,7 +6,7 @@
 #include "syscall.h"
 #include "parasite-vdso.h"
 #include "log.h"
-#include "bug.h"
+#include "common/bug.h"
 
 #ifdef LOG_PREFIX
 # undef LOG_PREFIX

criu/arch/ppc64/vdso-pie.c

@@ -6,7 +6,7 @@
 #include "syscall.h"
 #include "parasite-vdso.h"
 #include "log.h"
-#include "bug.h"
+#include "common/bug.h"
 
 #ifdef LOG_PREFIX
 # undef LOG_PREFIX

criu/arch/x86/vdso-pie.c

@@ -6,7 +6,7 @@
 #include "syscall.h"
 #include "parasite-vdso.h"
 #include "log.h"
-#include "bug.h"
+#include "common/bug.h"
 
 #ifdef LOG_PREFIX
 # undef LOG_PREFIX

criu/bfd.c

@@ -7,8 +7,9 @@
 #include <sys/uio.h>
 #include <errno.h>
 
-#include "bug.h"
+#include "int.h"
 #include "log.h"
+#include "common/bug.h"
 #include "bfd.h"
 #include "common/list.h"
 #include "util.h"

criu/cgroup-props.c

@@ -18,7 +18,7 @@
 #include "util.h"
 #include "common/list.h"
 #include "log.h"
-#include "bug.h"
+#include "common/bug.h"
 
 #undef	LOG_PREFIX
 #define LOG_PREFIX "cg-prop: "

criu/include/image.h

@@ -9,7 +9,8 @@
 #include "fcntl.h"
 #include "magic.h"
 #include "bfd.h"
-#include "bug.h"
+#include "log.h"
+#include "common/bug.h"
 
 #ifdef _ARCH_PPC64
 #define PAGE_IMAGE_SIZE	65536

criu/include/imgset.h

@@ -2,7 +2,8 @@
 #define __CR_IMGSET_H__
 
 #include "image-desc.h"
-#include "bug.h"
+#include "log.h"
+#include "common/bug.h"
 #include "image.h"
 
 struct cr_imgset {

criu/include/lock.h

@@ -7,7 +7,8 @@
 #include <errno.h>
 
 #include "atomic.h"
-#include "bug.h"
+#include "log.h"
+#include "common/bug.h"
 
 #ifdef CR_NOGLIBC
 # include "syscall.h"

criu/include/util.h

@@ -15,7 +15,7 @@
 #include "int.h"
 #include "common/compiler.h"
 #include "xmalloc.h"
-#include "bug.h"
+#include "common/bug.h"
 #include "log.h"
 #include "err.h"
 

criu/path.c

@@ -5,7 +5,8 @@
 #include "int.h"
 #include "mount.h"
 #include "path.h"
-#include "bug.h"
+#include "log.h"
+#include "common/bug.h"
 
 char *cut_root_for_bind(char *target_root, char *source_root)
 {

criu/pie/parasite-vdso.c

@@ -17,7 +17,7 @@
 #include "parasite-vdso.h"
 #include "vma.h"
 #include "log.h"
-#include "bug.h"
+#include "common/bug.h"
 
 #ifdef LOG_PREFIX
 # undef LOG_PREFIX

criu/pie/pie-relocs.c

@@ -14,9 +14,11 @@
 
 #include "asm-generic/int.h"
 
+#include "log.h"
+
 #include "common/compiler.h"
 #include "piegen/uapi/types.h"
-#include "bug.h"
+#include "common/bug.h"
 
 __maybe_unused void elf_relocs_apply(void *mem, void *vbase, size_t size, elf_reloc_t *elf_relocs, size_t nr_relocs)
 {

criu/pie/util-fd.c

@@ -20,7 +20,7 @@
 #include "util-pie.h"
 #include "fcntl.h"
 
-#include "bug.h"
+#include "common/bug.h"
 
 static void scm_fdset_init_chunk(struct scm_fdset *fdset, int nr_fds)
 {

criu/pie/util-vdso.c

@@ -15,7 +15,7 @@
 #include "util-vdso.h"
 #include "vma.h"
 #include "log.h"
-#include "bug.h"
+#include "common/bug.h"
 
 #ifdef LOG_PREFIX
 # undef LOG_PREFIX

criu/rst-malloc.c

@@ -4,7 +4,8 @@
 
 #include "page.h"
 #include "rst-malloc.h"
-#include "bug.h"
+#include "log.h"
+#include "common/bug.h"
 
 struct rst_mem_type_s {
 	bool remapable;

criu/timerfd.c

@@ -18,7 +18,7 @@
 #include "imgset.h"
 #include "util.h"
 #include "log.h"
-#include "bug.h"
+#include "common/bug.h"
 
 #undef	LOG_PREFIX
 #define LOG_PREFIX "timerfd: "

criu/include/bug.h → include/common/bug.h

@@ -5,7 +5,6 @@
 #include <stdbool.h>
 
 #include "common/compiler.h"
-#include "log.h"
 
 #ifndef BUG_ON_HANDLER
 
@@ -16,6 +15,9 @@
 #endif
 
 #ifndef __clang_analyzer__
+# ifndef pr_err
+#  error pr_err macro must be defined
+# endif
 # define BUG_ON_HANDLER(condition)							\
 	do {										\
 		if ((condition)) {							\