CRaC / criu

Other
28 stars 10 forks source link

cherry-picks from upstream to make it compilable on Fedora 38 x86_64 #6

Closed jankratochvil closed 1 year ago

jankratochvil commented 1 year ago
In file included from criu/pie/util.c:4:
/usr/include/unistd.h:1091:17: error: conflicting types for ‘syscall’; have ‘long int(long int, ...)’
 1091 | extern long int syscall (long int __sysno, ...) __THROW;
      |                 ^~~~~~~
In file included from /usr/include/sys/mount.h:32,
                 from criu/pie/util.c:3:
criu/include/linux/mount.h:24:16: note: previous implicit declaration of ‘syscall’ with type ‘int()’
   24 |         return syscall(__NR_fsopen, fsname, flags);
      |                ^~~~~~~
commit 4c86d6a7d54abb64fc5a15131f3351224e8c071b
Author: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date:   Sun Jul 31 16:07:30 2022 +0000
    criu: fix conflicting headers
In file included from criu/pie/util.c:3:
/usr/include/sys/mount.h:240:6: error: redeclaration of ‘enum fsconfig_command’
  240 | enum fsconfig_command
      |      ^~~~~~~~~~~~~~~~
In file included from /usr/include/sys/mount.h:32:
criu/include/linux/mount.h:11:6: note: originally defined here
   11 | enum fsconfig_command {
      |      ^~~~~~~~~~~~~~~~
commit 517c0947050e63aac72f63a3bf373d76264723b9
Author: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Date:   Wed Aug 24 21:20:30 2022 +0200
    mount: add definition for FSOPEN_CLOEXEC

Wouldn't it make sense to rather rebase/merge with upstream?

In file included from criu/include/cr_options.h:7,
                 from criu/mount.c:13:
In function ‘__list_add’,
    inlined from ‘list_add’ at include/common/list.h:41:2,
    inlined from ‘mnt_tree_for_each’ at criu/mount.c:1966:2:
include/common/list.h:35:19: error: storing the address of local variable ‘postpone’ in ‘((struct list_head *)((char *)start + 8))[24].prev’ [-Werror=dangling-pointer=]
   35 |         new->prev = prev;
      |         ~~~~~~~~~~^~~~~~
commit e6630607c9534bb74992569cc431c411a1ce7fcb
Author: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Date:   Tue Mar 7 15:33:59 2023 +0800
    make: disable '-Wdangling-pointer' warning with gcc 12
AntonKozlov commented 1 year ago

Thanks!