xen-project/xen
1
0 Fork 0
mirror of https://github.com/xen-project/xen.git synced 2026-10-28 02:01:24 +01:00
Code Issues Activity

tools/libfsimage: Add `xen' to .h names and principal .so name

Browse Source 
`fsimage' is rather general.  And we do not expect this library to be
very useful out of tree because of its unstable ABI.

So add the word `xen'.  This will avoid naming conflicts with anyone
else's fsimage library.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
This commit is contained in:
Ian Jackson committed 2018-10-15 14:49:33 +01:00
1 parent c69a6aca85
commit 1a81471188
18 files changed
+36 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tools/libfsimage/Rules.mk
+1 -1
View File
@@ -26,7 +26,7 @@ fs-uninstall:
fi
$(FSLIB): $(PIC_OBJS)
$(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS)
$(CC) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $^ -lxenfsimage $(FS_LIBDEPS) $(APPEND_LDFLAGS)
clean distclean::
rm -f $(PIC_OBJS) $(FSLIB) $(DEPS_RM)
tools/libfsimage/common/Makefile
+17 -17
View File
@@ -15,7 +15,7 @@ LIB_SRCS-y = fsimage.c fsimage_plugin.c fsimage_grub.c
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
LIB = libfsimage.so libfsimage.so.$(MAJOR) libfsimage.so.$(MAJOR).$(MINOR)
LIB = libxenfsimage.so libxenfsimage.so.$(MAJOR) libxenfsimage.so.$(MAJOR).$(MINOR)
.PHONY: all
all: $(LIB)
@@ -24,32 +24,32 @@ all: $(LIB)
install: all
$(INSTALL_DIR) $(DESTDIR)$(libdir)
$(INSTALL_DIR) $(DESTDIR)$(includedir)
$(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR)
ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libfsimage.so
$(INSTALL_DATA) fsimage.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) fsimage_grub.h $(DESTDIR)$(includedir)
$(INSTALL_PROG) libxenfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)
ln -sf libxenfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR)
ln -sf libxenfsimage.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenfsimage.so
$(INSTALL_DATA) xenfsimage.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) xenfsimage_plugin.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) xenfsimage_grub.h $(DESTDIR)$(includedir)
.PHONY: uninstall
uninstall:
rm -f $(DESTDIR)$(includedir)/fsimage_grub.h
rm -f $(DESTDIR)$(includedir)/fsimage_plugin.h
rm -f $(DESTDIR)$(includedir)/fsimage.h
rm -f $(DESTDIR)$(libdir)/libfsimage.so
rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR)
rm -f $(DESTDIR)$(libdir)/libfsimage.so.$(MAJOR).$(MINOR)
rm -f $(DESTDIR)$(includedir)/xenfsimage_grub.h
rm -f $(DESTDIR)$(includedir)/xenfsimage_plugin.h
rm -f $(DESTDIR)$(includedir)/xenfsimage.h
rm -f $(DESTDIR)$(libdir)/libxenfsimage.so
rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR)
rm -f $(DESTDIR)$(libdir)/libxenfsimage.so.$(MAJOR).$(MINOR)
clean distclean::
rm -f $(LIB)
libfsimage.so: libfsimage.so.$(MAJOR)
libxenfsimage.so: libxenfsimage.so.$(MAJOR)
ln -sf $< $@
libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR)
libxenfsimage.so.$(MAJOR): libxenfsimage.so.$(MAJOR).$(MINOR)
ln -sf $< $@
libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
$(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
libxenfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
$(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenfsimage.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
-include $(DEPS_INCLUDE)
tools/libfsimage/common/fsimage_grub.c
+1 -1
View File
@@ -28,7 +28,7 @@
#include <strings.h>
#include <errno.h>
#include "fsimage_grub.h"
#include "xenfsimage_grub.h"
#include "fsimage_priv.h"
static char *disk_read_junk;
tools/libfsimage/common/fsimage_plugin.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include <dlfcn.h>
#include <errno.h>
#include "fsimage_plugin.h"
#include "xenfsimage_plugin.h"
#include "fsimage_priv.h"
static fsi_plugin_t *plugins;
tools/libfsimage/common/fsimage_priv.h
+2 -2
View File
@@ -30,8 +30,8 @@ extern C {
#include <sys/types.h>
#include "fsimage.h"
#include "fsimage_plugin.h"
#include "xenfsimage.h"
#include "xenfsimage_plugin.h"
struct fsi_plugin {
const char *fp_name;
tools/libfsimage/common/xenfsimage_grub.h
+2 -2
View File
@@ -33,8 +33,8 @@ extern C {
#include <stdlib.h>
#include <ctype.h>
#include "fsimage.h"
#include "fsimage_plugin.h"
#include "xenfsimage.h"
#include "xenfsimage_plugin.h"
typedef struct fsig_plugin_ops {
int fpo_version;
tools/libfsimage/common/xenfsimage_plugin.h
+1 -1
View File
@@ -30,7 +30,7 @@ extern C {
#include <sys/types.h>
#include "fsimage.h"
#include "xenfsimage.h"
#define FSIMAGE_PLUGIN_VERSION 1
tools/libfsimage/ext2fs-lib/ext2fs-lib.c
+1 -1
View File
@@ -21,7 +21,7 @@
* Use is subject to license terms.
*/
#include <fsimage_plugin.h>
#include <xenfsimage_plugin.h>
#include INCLUDE_EXTFS_H
#include <errno.h>
#include <inttypes.h>
tools/libfsimage/ext2fs/fsys_ext2fs.c
+1 -1
View File
@@ -16,7 +16,7 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>.
*/
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
#define mapblock1 (*fsig_int1(ffi))
#define mapblock2 (*fsig_int2(ffi))
tools/libfsimage/fat/fsys_fat.c
+1 -1
View File
@@ -17,7 +17,7 @@
*/
#include <limits.h>
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
#include "fat.h"
struct fat_superblock
tools/libfsimage/iso9660/fsys_iso9660.c
+1 -1
View File
@@ -28,7 +28,7 @@
* Leonid Lisovskiy <lly@pisem.net> 2003
*/
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
#include <limits.h>
#include "iso9660.h"
tools/libfsimage/reiserfs/fsys_reiserfs.c
+1 -1
View File
@@ -17,7 +17,7 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>.
*/
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
#undef REISERDEBUG
tools/libfsimage/ufs/fsys_ufs.c
+1 -1
View File
@@ -22,7 +22,7 @@
/* From Solaris usr/src/stand/lib/fs/ufs/ufsops.c */
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
#include "ufs.h"
tools/libfsimage/xfs/fsys_xfs.c
+1 -1
View File
@@ -17,7 +17,7 @@
* along with this program; If not, see <http://www.gnu.org/licenses/>.
*/
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
#include "xfs.h"
#define MAX_LINK_COUNT 8
tools/libfsimage/zfs/fsi_zfs.c
+1 -1
View File
@@ -22,7 +22,7 @@
#ifdef FSYS_ZFS
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
#include <fsimage_priv.h>
#include <stdio.h>
#include <inttypes.h>
tools/libfsimage/zfs/fsi_zfs.h
+1 -1
View File
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <stdio.h>
#include <string.h>
#include <fsimage_grub.h>
#include <xenfsimage_grub.h>
/*** START FROM shared.h ****/
tools/pygrub/setup.py
+1 -1
View File
@@ -11,7 +11,7 @@ fsimage = Extension("fsimage",
extra_compile_args = extra_compile_args,
include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
libraries = ["fsimage"],
libraries = ["xenfsimage"],
sources = ["src/fsimage/fsimage.c"])
pkgs = [ 'grub' ]
tools/pygrub/src/fsimage/fsimage.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include <Python.h>
#include <fsimage.h>
#include <xenfsimage.h>
#include <stdlib.h>
#if (PYTHON_API_VERSION >= 1011)
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.