[PATCH v2 0/5] Fix redefinition errors for toolstack libs

Costin Lupu posted 5 patches 2 years, 12 months ago
Test gitlab-ci failed
Patches applied successfully (tree, apply log)
git fetch https://gitlab.com/xen-project/patchew/xen tags/patchew/cover.1619781564.git.costin.lupu@cs.pub.ro
There is a newer version of this series
tools/debugger/kdd/kdd-xen.c                  | 15 ++++------
tools/debugger/kdd/kdd.c                      | 21 +++++++-------
tools/libfsimage/ext2fs/fsys_ext2fs.c         |  2 ++
tools/libfsimage/reiserfs/fsys_reiserfs.c     |  2 ++
tools/libs/foreignmemory/core.c               |  2 +-
tools/libs/foreignmemory/freebsd.c            | 10 +++----
tools/libs/foreignmemory/linux.c              | 23 +++++++--------
tools/libs/foreignmemory/minios.c             |  2 +-
tools/libs/foreignmemory/netbsd.c             | 10 +++----
tools/libs/foreignmemory/private.h            |  9 +-----
tools/libs/gnttab/freebsd.c                   | 28 +++++++++----------
tools/libs/gnttab/linux.c                     | 28 +++++++++----------
tools/libs/gnttab/netbsd.c                    | 23 +++++++--------
tools/ocaml/libs/xc/xenctrl_stubs.c           | 10 +++----
.../ocaml/libs/xentoollog/xentoollog_stubs.c  |  4 +++
tools/ocaml/libs/xl/xenlight_stubs.c          |  4 +++
16 files changed, 93 insertions(+), 100 deletions(-)
[PATCH v2 0/5] Fix redefinition errors for toolstack libs
Posted by Costin Lupu 2 years, 12 months ago
For replication I used gcc 10.3 on an Alpine system. In order to replicate the
redefinition error for PAGE_SIZE one should install the 'fortify-headers'
package which will change the chain of included headers by indirectly including
/usr/include/limits.h where PAGE_SIZE and PATH_MAX are defined.

Changes since v1:
- Use XC_PAGE_* macros instead of PAGE_* macros

Costin Lupu (5):
  tools/debugger: Fix PAGE_SIZE redefinition error
  tools/libfsimage: Fix PATH_MAX redefinition error
  tools/libs/foreignmemory: Fix PAGE_SIZE redefinition error
  tools/libs/gnttab: Fix PAGE_SIZE redefinition error
  tools/ocaml: Fix redefinition errors

 tools/debugger/kdd/kdd-xen.c                  | 15 ++++------
 tools/debugger/kdd/kdd.c                      | 21 +++++++-------
 tools/libfsimage/ext2fs/fsys_ext2fs.c         |  2 ++
 tools/libfsimage/reiserfs/fsys_reiserfs.c     |  2 ++
 tools/libs/foreignmemory/core.c               |  2 +-
 tools/libs/foreignmemory/freebsd.c            | 10 +++----
 tools/libs/foreignmemory/linux.c              | 23 +++++++--------
 tools/libs/foreignmemory/minios.c             |  2 +-
 tools/libs/foreignmemory/netbsd.c             | 10 +++----
 tools/libs/foreignmemory/private.h            |  9 +-----
 tools/libs/gnttab/freebsd.c                   | 28 +++++++++----------
 tools/libs/gnttab/linux.c                     | 28 +++++++++----------
 tools/libs/gnttab/netbsd.c                    | 23 +++++++--------
 tools/ocaml/libs/xc/xenctrl_stubs.c           | 10 +++----
 .../ocaml/libs/xentoollog/xentoollog_stubs.c  |  4 +++
 tools/ocaml/libs/xl/xenlight_stubs.c          |  4 +++
 16 files changed, 93 insertions(+), 100 deletions(-)

-- 
2.20.1