* [PATCH 01/12] tools/Rules.mk: Honour PREPEND_LDFLAGS_XEN_TOOLS
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:38 ` Wei Liu
2018-10-12 15:12 ` [PATCH 02/12] INSTALL: Mention kconfig Ian Jackson
` (10 subsequent siblings)
11 siblings, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Jackson, Wei Liu
From: Ian Jackson <ian.jackson@citrix.com>
This allows the caller to provide some LDFLAGS to the Xen build
system.
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
---
tools/Rules.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 296b722372..68f2ed7ce1 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -9,6 +9,8 @@ include $(XEN_ROOT)/Config.mk
export _INSTALL := $(INSTALL)
INSTALL = $(XEN_ROOT)/tools/cross-install
+LDFLAGS += $(PREPEND_LDFLAGS_XEN_TOOLS)
+
XEN_INCLUDE = $(XEN_ROOT)/tools/include
XEN_LIBXENTOOLCORE = $(XEN_ROOT)/tools/libs/toolcore
XEN_LIBXENTOOLLOG = $(XEN_ROOT)/tools/libs/toollog
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 02/12] INSTALL: Mention kconfig
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
2018-10-12 15:12 ` [PATCH 01/12] tools/Rules.mk: Honour PREPEND_LDFLAGS_XEN_TOOLS Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:12 ` [PATCH 03/12] gdbsx: Honour LDFLAGS when linking Ian Jackson
` (9 subsequent siblings)
11 siblings, 0 replies; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel
Cc: Stefano Stabellini, Wei Liu, Konrad Rzeszutek Wilk, George Dunlap,
Tim Deegan, Ian Jackson, Julien Grall, Jan Beulich, Andrew Cooper,
Ian Jackson
From: Ian Jackson <ian.jackson@citrix.com>
Firstly, add a reference to the documentation for the kconfig system.
Secondly, warn the user about the XEN_CONFIG_EXPERT problem.
CC: Wei Liu <wei.liu2@citrix.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
Reviewed-by: Doug Goldstein <cardoe@cardoe.com>
---
v2: Fix typos
---
INSTALL | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/INSTALL b/INSTALL
index 9aa9ebdddc..e28348509f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -19,6 +19,26 @@ following compile process. Once configure is done, make(1) has to be
called. Also make(1) recognizes certain arguments. The following sections
will give an overview.
+Xen Hypervisor
+==============
+
+Xen itself is configured via a `kconfig' system borrowed from Linux.
+See docs/misc/kconfig.txt.
+
+Note that unlike with Linux, and contrary to that document, you cannot
+look at Kconfig files, or the default or generated config files etc.,
+to find available configuration options. This is because it is only
+supported (and security supported) by the Xen Project, to change a
+small subset of the options. Attempts to change other options will be
+silently overridden. The only way to find which configuration options
+are available is to run `make menuconfig' or the like.
+
+You can counter-override this behaviour by setting XEN_CONFIG_EXPERT=y
+in your environment. However, doing this is not supported and the
+resulting configurations do not receive security support. If you set
+this variable there is nothing stopping you setting dangerously
+experimental combinations of features - not even any warnings.
+
Options recognized by configure
===============================
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 03/12] gdbsx: Honour LDFLAGS when linking
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
2018-10-12 15:12 ` [PATCH 01/12] tools/Rules.mk: Honour PREPEND_LDFLAGS_XEN_TOOLS Ian Jackson
2018-10-12 15:12 ` [PATCH 02/12] INSTALL: Mention kconfig Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:38 ` Wei Liu
2018-10-12 17:15 ` Elena Ufimtseva
2018-10-12 15:12 ` [PATCH 04/12] pygrub fsimage.so: Honour LDFLAGS when building Ian Jackson
` (8 subsequent siblings)
11 siblings, 2 replies; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Elena Ufimtseva, Ian Jackson, Ian Jackson, Wei Liu
From: Ian Jackson <ian.jackson@citrix.com>
This command does the link, so it needs LDFLAGS.
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
---
tools/debugger/gdbsx/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile
index 723a2743cc..8d7cd94a31 100644
--- a/tools/debugger/gdbsx/Makefile
+++ b/tools/debugger/gdbsx/Makefile
@@ -26,7 +26,7 @@ uninstall:
rm -f $(DESTDIR)$(sbindir)/gdbsx
gdbsx: gx/gx_all.a xg/xg_all.a
- $(CC) -o $@ $^
+ $(CC) $(LDFLAGS) -o $@ $^
xg/xg_all.a:
$(MAKE) -C xg
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 03/12] gdbsx: Honour LDFLAGS when linking
2018-10-12 15:12 ` [PATCH 03/12] gdbsx: Honour LDFLAGS when linking Ian Jackson
@ 2018-10-12 15:38 ` Wei Liu
2018-10-12 17:15 ` Elena Ufimtseva
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2018-10-12 15:38 UTC (permalink / raw)
To: Ian Jackson; +Cc: Elena Ufimtseva, xen-devel, Wei Liu, Ian Jackson
On Fri, Oct 12, 2018 at 04:12:06PM +0100, Ian Jackson wrote:
> From: Ian Jackson <ian.jackson@citrix.com>
>
> This command does the link, so it needs LDFLAGS.
>
> Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
I think this needs an ack from Elena as well.
> ---
> tools/debugger/gdbsx/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile
> index 723a2743cc..8d7cd94a31 100644
> --- a/tools/debugger/gdbsx/Makefile
> +++ b/tools/debugger/gdbsx/Makefile
> @@ -26,7 +26,7 @@ uninstall:
> rm -f $(DESTDIR)$(sbindir)/gdbsx
>
> gdbsx: gx/gx_all.a xg/xg_all.a
> - $(CC) -o $@ $^
> + $(CC) $(LDFLAGS) -o $@ $^
>
> xg/xg_all.a:
> $(MAKE) -C xg
> --
> 2.11.0
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 03/12] gdbsx: Honour LDFLAGS when linking
2018-10-12 15:12 ` [PATCH 03/12] gdbsx: Honour LDFLAGS when linking Ian Jackson
2018-10-12 15:38 ` Wei Liu
@ 2018-10-12 17:15 ` Elena Ufimtseva
1 sibling, 0 replies; 26+ messages in thread
From: Elena Ufimtseva @ 2018-10-12 17:15 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Wei Liu, Ian Jackson
On Fri, Oct 12, 2018 at 04:12:06PM +0100, Ian Jackson wrote:
> From: Ian Jackson <ian.jackson@citrix.com>
>
> This command does the link, so it needs LDFLAGS.
>
> Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
Acked-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
> ---
> tools/debugger/gdbsx/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/debugger/gdbsx/Makefile b/tools/debugger/gdbsx/Makefile
> index 723a2743cc..8d7cd94a31 100644
> --- a/tools/debugger/gdbsx/Makefile
> +++ b/tools/debugger/gdbsx/Makefile
> @@ -26,7 +26,7 @@ uninstall:
> rm -f $(DESTDIR)$(sbindir)/gdbsx
>
> gdbsx: gx/gx_all.a xg/xg_all.a
> - $(CC) -o $@ $^
> + $(CC) $(LDFLAGS) -o $@ $^
>
> xg/xg_all.a:
> $(MAKE) -C xg
> --
> 2.11.0
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 04/12] pygrub fsimage.so: Honour LDFLAGS when building
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (2 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 03/12] gdbsx: Honour LDFLAGS when linking Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:38 ` Wei Liu
2018-10-12 15:12 ` [PATCH 05/12] xenmon: Install as xenmon, not xenmon.py Ian Jackson
` (7 subsequent siblings)
11 siblings, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Jackson, Wei Liu
From: Ian Jackson <ian.jackson@citrix.com>
This seems to have been simply omitted. Obviously this is needed when
building and not just when installing. Passing only when installing
is ineffective.
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
---
tools/pygrub/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
index 536af07932..3063c4998f 100644
--- a/tools/pygrub/Makefile
+++ b/tools/pygrub/Makefile
@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt
all: build
.PHONY: build
build:
- CC="$(CC)" CFLAGS="$(PY_CFLAGS)" $(PYTHON) setup.py build
+ CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
.PHONY: install
install: all
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 05/12] xenmon: Install as xenmon, not xenmon.py
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (3 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 04/12] pygrub fsimage.so: Honour LDFLAGS when building Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:12 ` [PATCH 06/12] tools/debugger/kdd: Install as `xen-kdd', not just `kdd' Ian Jackson
` (6 subsequent siblings)
11 siblings, 0 replies; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Ian Jackson, Wei Liu
From: Ian Jackson <ian.jackson@citrix.com>
Adding the implementation language as a suffix to a program name is
poor practice.
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/xenmon/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index e45c5b8c14..e1712304d0 100644
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -32,13 +32,13 @@ install: build
$(INSTALL_DIR) $(DESTDIR)$(sbindir)
$(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
$(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask
- $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py
+ $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon
.PHONY: uninstall
uninstall:
rm -f $(DESTDIR)$(sbindir)/xenbaked
rm -f $(DESTDIR)$(sbindir)/xentrace_setmask
- rm -f $(DESTDIR)$(sbindir)/xenmon.py
+ rm -f $(DESTDIR)$(sbindir)/xenmon
.PHONY: clean
clean:
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 06/12] tools/debugger/kdd: Install as `xen-kdd', not just `kdd'
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (4 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 05/12] xenmon: Install as xenmon, not xenmon.py Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:12 ` [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI Ian Jackson
` (5 subsequent siblings)
11 siblings, 0 replies; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Tim Deegan, Ian Jackson, Wei Liu
From: Ian Jackson <ian.jackson@citrix.com>
`kdd' is an unfortunate namespace landgrab.
Signed-off-by: Ian Jackson <ian.jackson@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
---
tools/debugger/kdd/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/debugger/kdd/Makefile b/tools/debugger/kdd/Makefile
index 5509eee68c..26116949d4 100644
--- a/tools/debugger/kdd/Makefile
+++ b/tools/debugger/kdd/Makefile
@@ -24,8 +24,8 @@ distclean: clean
.PHONY: install
install: all
[ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
- $(INSTALL_PROG) kdd $(DESTDIR)$(sbindir)/kdd
+ $(INSTALL_PROG) kdd $(DESTDIR)$(sbindir)/xen-kdd
.PHONY: uninstall
uninstall:
- rm -f $(DESTDIR)$(sbindir)/kdd
+ rm -f $(DESTDIR)$(sbindir)/xen-kdd
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (5 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 06/12] tools/debugger/kdd: Install as `xen-kdd', not just `kdd' Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:38 ` Wei Liu
2018-10-12 21:47 ` Hans van Kranenburg
2018-10-12 15:12 ` [PATCH 08/12] xenstore.h: Put ( ) around XS_* define shifts Ian Jackson
` (4 subsequent siblings)
11 siblings, 2 replies; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Hans van Kranenburg, Wei Liu, Ian Jackson
From: Hans van Kranenburg <hans@knorrie.org>
libxenstore3.0 in Xen 4.8 had this function. We don't really want to
bump the ABI version (soname) just for this, since we don't think
there are actual callers anywhere. But tools complain about the
symbol going away.
So, provide a function xs_restrict which conforms to the original
semantics, although it always fails.
Gbp-Pq: Topic xenstore
Gbp-Pq: Name tools-fake-xs-restrict.patch
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New in this version of the series
---
tools/xenstore/include/xenstore.h | 5 +++++
tools/xenstore/xs.c | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h
index f460b8c5e5..0d95bb0e5c 100644
--- a/tools/xenstore/include/xenstore.h
+++ b/tools/xenstore/include/xenstore.h
@@ -132,6 +132,11 @@ bool xs_mkdir(struct xs_handle *h, xs_transaction_t t,
bool xs_rm(struct xs_handle *h, xs_transaction_t t,
const char *path);
+/* Fake function which will always return false (required to let
+ * libxenstore remain at 3.0 version.
+ */
+bool xs_restrict(struct xs_handle *h, unsigned domid);
+
/* Get permissions of node (first element is owner, first perms is "other").
* Returns malloced array, or NULL: call free() after use.
*/
diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
index 77700bff2b..cbcebb2bce 100644
--- a/tools/xenstore/xs.c
+++ b/tools/xenstore/xs.c
@@ -796,6 +796,12 @@ unwind:
return false;
}
+/* Always return false a functionality has been removed in Xen 4.9 */
+bool xs_restrict(struct xs_handle *h, unsigned domid)
+{
+ return false;
+}
+
/* Watch a node for changes (poll on fd to detect, or call read_watch()).
* When the node (or any child) changes, fd will become readable.
* Token is returned when watch is read, to allow matching.
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI
2018-10-12 15:12 ` [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI Ian Jackson
@ 2018-10-12 15:38 ` Wei Liu
2018-10-12 21:47 ` Hans van Kranenburg
1 sibling, 0 replies; 26+ messages in thread
From: Wei Liu @ 2018-10-12 15:38 UTC (permalink / raw)
To: Ian Jackson; +Cc: Hans van Kranenburg, xen-devel, Wei Liu
On Fri, Oct 12, 2018 at 04:12:10PM +0100, Ian Jackson wrote:
> From: Hans van Kranenburg <hans@knorrie.org>
>
> libxenstore3.0 in Xen 4.8 had this function. We don't really want to
> bump the ABI version (soname) just for this, since we don't think
> there are actual callers anywhere. But tools complain about the
> symbol going away.
>
> So, provide a function xs_restrict which conforms to the original
> semantics, although it always fails.
>
> Gbp-Pq: Topic xenstore
> Gbp-Pq: Name tools-fake-xs-restrict.patch
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI
2018-10-12 15:12 ` [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI Ian Jackson
2018-10-12 15:38 ` Wei Liu
@ 2018-10-12 21:47 ` Hans van Kranenburg
2018-10-15 13:47 ` Ian Jackson
1 sibling, 1 reply; 26+ messages in thread
From: Hans van Kranenburg @ 2018-10-12 21:47 UTC (permalink / raw)
To: Ian Jackson, xen-devel; +Cc: Wei Liu
On 10/12/2018 05:12 PM, Ian Jackson wrote:
> From: Hans van Kranenburg <hans@knorrie.org>
No, this was in the changes that I copied back from Ubuntu, it was
written by Stefan Bader:
---- >8 ----
Description: Re-introduce fake xs_restrict API call
libxenstore cannot remove an API function without changing its version
number. As long as we want to remain with 3.0 we have to keep it around.
Debian might decide to increment the version at some point but we do not
know how and when. So for now keep the version stable.
Author: Stefan Bader <stefan.bader@canonical.com>
---- >8 ----
> libxenstore3.0 in Xen 4.8 had this function. We don't really want to
> bump the ABI version (soname) just for this, since we don't think
> there are actual callers anywhere. But tools complain about the
> symbol going away.
>
> So, provide a function xs_restrict which conforms to the original
> semantics, although it always fails.
>
> Gbp-Pq: Topic xenstore
> Gbp-Pq: Name tools-fake-xs-restrict.patch
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
> v2: New in this version of the series
> ---
> tools/xenstore/include/xenstore.h | 5 +++++
> tools/xenstore/xs.c | 6 ++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h
> index f460b8c5e5..0d95bb0e5c 100644
> --- a/tools/xenstore/include/xenstore.h
> +++ b/tools/xenstore/include/xenstore.h
> @@ -132,6 +132,11 @@ bool xs_mkdir(struct xs_handle *h, xs_transaction_t t,
> bool xs_rm(struct xs_handle *h, xs_transaction_t t,
> const char *path);
>
> +/* Fake function which will always return false (required to let
> + * libxenstore remain at 3.0 version.
> + */
> +bool xs_restrict(struct xs_handle *h, unsigned domid);
> +
> /* Get permissions of node (first element is owner, first perms is "other").
> * Returns malloced array, or NULL: call free() after use.
> */
> diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
> index 77700bff2b..cbcebb2bce 100644
> --- a/tools/xenstore/xs.c
> +++ b/tools/xenstore/xs.c
> @@ -796,6 +796,12 @@ unwind:
> return false;
> }
>
> +/* Always return false a functionality has been removed in Xen 4.9 */
> +bool xs_restrict(struct xs_handle *h, unsigned domid)
> +{
> + return false;
> +}
> +
> /* Watch a node for changes (poll on fd to detect, or call read_watch()).
> * When the node (or any child) changes, fd will become readable.
> * Token is returned when watch is read, to allow matching.
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread* Re: [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI
2018-10-12 21:47 ` Hans van Kranenburg
@ 2018-10-15 13:47 ` Ian Jackson
0 siblings, 0 replies; 26+ messages in thread
From: Ian Jackson @ 2018-10-15 13:47 UTC (permalink / raw)
To: Hans van Kranenburg; +Cc: xen-devel, Wei Liu, Stefan Bader
Hans van Kranenburg writes ("Re: [Xen-devel] [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI"):
> On 10/12/2018 05:12 PM, Ian Jackson wrote:
> > From: Hans van Kranenburg <hans@knorrie.org>
>
> No, this was in the changes that I copied back from Ubuntu, it was
> written by Stefan Bader:
>
> ---- >8 ----
>
> Description: Re-introduce fake xs_restrict API call
> libxenstore cannot remove an API function without changing its version
> number. As long as we want to remain with 3.0 we have to keep it around.
> Debian might decide to increment the version at some point but we do not
> know how and when. So for now keep the version stable.
>
> Author: Stefan Bader <stefan.bader@canonical.com>
Hrm. Thanks for pointing that out. I have fixed the commit author in
my upstream branch. I think this lossage is due to a bug in gbp pq
:-/.
And, CCing Stefan for form's sake. Stefan, I'm upstreaming this
patch.
Regards,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 08/12] xenstore.h: Put ( ) around XS_* define shifts
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (6 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 07/12] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:38 ` Wei Liu
2018-10-12 15:12 ` [PATCH 09/12] tools/libfsimage: Bump soname to 4.12 Ian Jackson
` (3 subsequent siblings)
11 siblings, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson
These definitions were not properly protected from unwanted operator
precedence interactions.
Existing use sites in-tree all use & or |, so this does not change any
actual behaviour in-tree.
The same seems likely to be true in external callers.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New in this version of the series
---
tools/xenstore/include/xenstore.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h
index 0d95bb0e5c..996b75ab0d 100644
--- a/tools/xenstore/include/xenstore.h
+++ b/tools/xenstore/include/xenstore.h
@@ -23,8 +23,8 @@
#define XBT_NULL 0
-#define XS_OPEN_READONLY 1UL<<0
-#define XS_OPEN_SOCKETONLY 1UL<<1
+#define XS_OPEN_READONLY (1UL<<0)
+#define XS_OPEN_SOCKETONLY (1UL<<1)
/*
* Setting XS_UNWATCH_FILTER arranges that after xs_unwatch, no
@@ -45,7 +45,7 @@
* xs_unwatch for the first watch
* has returned.
*/
-#define XS_UNWATCH_FILTER 1UL<<2
+#define XS_UNWATCH_FILTER (1UL<<2)
struct xs_handle;
typedef uint32_t xs_transaction_t;
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 09/12] tools/libfsimage: Bump soname to 4.12
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (7 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 08/12] xenstore.h: Put ( ) around XS_* define shifts Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:35 ` Wei Liu
2018-10-12 15:12 ` [PATCH 10/12] tools/libfsimage: Add `xen' to .h names and principal .so name Ian Jackson
` (2 subsequent siblings)
11 siblings, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson
This library does not have a stable ABI promise. As far as we know it
is used only by pygrub. Bump its soname to the Xen version (and
intend to change it each time).
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New in this version of the series
---
tools/libfsimage/common/Makefile | 4 ++--
tools/libfsimage/common/fsimage.c | 2 +-
tools/libfsimage/common/{fsimage.h => xenfsimage.h} | 0
tools/libfsimage/common/{fsimage_grub.h => xenfsimage_grub.h} | 0
tools/libfsimage/common/{fsimage_plugin.h => xenfsimage_plugin.h} | 0
5 files changed, 3 insertions(+), 3 deletions(-)
rename tools/libfsimage/common/{fsimage.h => xenfsimage.h} (100%)
rename tools/libfsimage/common/{fsimage_grub.h => xenfsimage_grub.h} (100%)
rename tools/libfsimage/common/{fsimage_plugin.h => xenfsimage_plugin.h} (100%)
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index a4655c421c..beda8f5f3a 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,8 +1,8 @@
XEN_ROOT = $(CURDIR)/../../..
include $(XEN_ROOT)/tools/libfsimage/Rules.mk
-MAJOR = 1.0
-MINOR = 0
+MAJOR = 0
+MINOR = 4.12
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
LDFLAGS-$(CONFIG_Linux) = -Wl,mapfile-GNU
diff --git a/tools/libfsimage/common/fsimage.c b/tools/libfsimage/common/fsimage.c
index 21d6c38ac6..5cfa56a84d 100644
--- a/tools/libfsimage/common/fsimage.c
+++ b/tools/libfsimage/common/fsimage.c
@@ -31,7 +31,7 @@
#include <errno.h>
#include <pthread.h>
-#include "fsimage_plugin.h"
+#include "xenfsimage_plugin.h"
#include "fsimage_priv.h"
static pthread_mutex_t fsi_lock = PTHREAD_MUTEX_INITIALIZER;
diff --git a/tools/libfsimage/common/fsimage.h b/tools/libfsimage/common/xenfsimage.h
similarity index 100%
rename from tools/libfsimage/common/fsimage.h
rename to tools/libfsimage/common/xenfsimage.h
diff --git a/tools/libfsimage/common/fsimage_grub.h b/tools/libfsimage/common/xenfsimage_grub.h
similarity index 100%
rename from tools/libfsimage/common/fsimage_grub.h
rename to tools/libfsimage/common/xenfsimage_grub.h
diff --git a/tools/libfsimage/common/fsimage_plugin.h b/tools/libfsimage/common/xenfsimage_plugin.h
similarity index 100%
rename from tools/libfsimage/common/fsimage_plugin.h
rename to tools/libfsimage/common/xenfsimage_plugin.h
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 10/12] tools/libfsimage: Add `xen' to .h names and principal .so name
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (8 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 09/12] tools/libfsimage: Bump soname to 4.12 Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:38 ` Wei Liu
2018-10-12 15:12 ` [PATCH 11/12] tools/pygrub: Add `xen' to fsimage python module name Ian Jackson
2018-10-12 15:12 ` [PATCH 12/12] tools/libfsimage: Rename /usr/lib/fs to /usr/lib/xenfsimage Ian Jackson
11 siblings, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson
`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>
---
v2: New in this version of the series
---
tools/libfsimage/Rules.mk | 2 +-
tools/libfsimage/common/Makefile | 34 ++++++++++++++---------------
tools/libfsimage/common/fsimage_grub.c | 2 +-
tools/libfsimage/common/fsimage_plugin.c | 2 +-
tools/libfsimage/common/fsimage_priv.h | 4 ++--
tools/libfsimage/common/xenfsimage_grub.h | 4 ++--
tools/libfsimage/common/xenfsimage_plugin.h | 2 +-
tools/libfsimage/ext2fs-lib/ext2fs-lib.c | 2 +-
tools/libfsimage/ext2fs/fsys_ext2fs.c | 2 +-
tools/libfsimage/fat/fsys_fat.c | 2 +-
tools/libfsimage/iso9660/fsys_iso9660.c | 2 +-
tools/libfsimage/reiserfs/fsys_reiserfs.c | 2 +-
tools/libfsimage/ufs/fsys_ufs.c | 2 +-
tools/libfsimage/xfs/fsys_xfs.c | 2 +-
tools/libfsimage/zfs/fsi_zfs.c | 2 +-
tools/libfsimage/zfs/fsi_zfs.h | 2 +-
tools/pygrub/setup.py | 2 +-
tools/pygrub/src/fsimage/fsimage.c | 2 +-
18 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index eab4ecb35e..2a29d9ef2b 100644
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -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)
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index beda8f5f3a..f20e1394a8 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -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)
diff --git a/tools/libfsimage/common/fsimage_grub.c b/tools/libfsimage/common/fsimage_grub.c
index ef71d6cceb..258d48bfbb 100644
--- a/tools/libfsimage/common/fsimage_grub.c
+++ b/tools/libfsimage/common/fsimage_grub.c
@@ -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;
diff --git a/tools/libfsimage/common/fsimage_plugin.c b/tools/libfsimage/common/fsimage_plugin.c
index 0744e7b3ca..44ebcf3142 100644
--- a/tools/libfsimage/common/fsimage_plugin.c
+++ b/tools/libfsimage/common/fsimage_plugin.c
@@ -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;
diff --git a/tools/libfsimage/common/fsimage_priv.h b/tools/libfsimage/common/fsimage_priv.h
index 57a0826dee..2274403557 100644
--- a/tools/libfsimage/common/fsimage_priv.h
+++ b/tools/libfsimage/common/fsimage_priv.h
@@ -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;
diff --git a/tools/libfsimage/common/xenfsimage_grub.h b/tools/libfsimage/common/xenfsimage_grub.h
index 534c346b23..38fb4f620e 100644
--- a/tools/libfsimage/common/xenfsimage_grub.h
+++ b/tools/libfsimage/common/xenfsimage_grub.h
@@ -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;
diff --git a/tools/libfsimage/common/xenfsimage_plugin.h b/tools/libfsimage/common/xenfsimage_plugin.h
index a682719a63..4135769018 100644
--- a/tools/libfsimage/common/xenfsimage_plugin.h
+++ b/tools/libfsimage/common/xenfsimage_plugin.h
@@ -30,7 +30,7 @@ extern C {
#include <sys/types.h>
-#include "fsimage.h"
+#include "xenfsimage.h"
#define FSIMAGE_PLUGIN_VERSION 1
diff --git a/tools/libfsimage/ext2fs-lib/ext2fs-lib.c b/tools/libfsimage/ext2fs-lib/ext2fs-lib.c
index 84b6d1e9c3..864a15b349 100644
--- a/tools/libfsimage/ext2fs-lib/ext2fs-lib.c
+++ b/tools/libfsimage/ext2fs-lib/ext2fs-lib.c
@@ -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>
diff --git a/tools/libfsimage/ext2fs/fsys_ext2fs.c b/tools/libfsimage/ext2fs/fsys_ext2fs.c
index ba53ff4ca6..a4ed10419c 100644
--- a/tools/libfsimage/ext2fs/fsys_ext2fs.c
+++ b/tools/libfsimage/ext2fs/fsys_ext2fs.c
@@ -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))
diff --git a/tools/libfsimage/fat/fsys_fat.c b/tools/libfsimage/fat/fsys_fat.c
index b8129a8c04..b89354a872 100644
--- a/tools/libfsimage/fat/fsys_fat.c
+++ b/tools/libfsimage/fat/fsys_fat.c
@@ -17,7 +17,7 @@
*/
#include <limits.h>
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
#include "fat.h"
struct fat_superblock
diff --git a/tools/libfsimage/iso9660/fsys_iso9660.c b/tools/libfsimage/iso9660/fsys_iso9660.c
index 5dbf100dfe..6e767357bf 100644
--- a/tools/libfsimage/iso9660/fsys_iso9660.c
+++ b/tools/libfsimage/iso9660/fsys_iso9660.c
@@ -28,7 +28,7 @@
* Leonid Lisovskiy <lly@pisem.net> 2003
*/
-#include <fsimage_grub.h>
+#include <xenfsimage_grub.h>
#include <limits.h>
#include "iso9660.h"
diff --git a/tools/libfsimage/reiserfs/fsys_reiserfs.c b/tools/libfsimage/reiserfs/fsys_reiserfs.c
index 92c3b2bbfb..916eb15292 100644
--- a/tools/libfsimage/reiserfs/fsys_reiserfs.c
+++ b/tools/libfsimage/reiserfs/fsys_reiserfs.c
@@ -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
diff --git a/tools/libfsimage/ufs/fsys_ufs.c b/tools/libfsimage/ufs/fsys_ufs.c
index cf7e22ad0b..a545bc9f65 100644
--- a/tools/libfsimage/ufs/fsys_ufs.c
+++ b/tools/libfsimage/ufs/fsys_ufs.c
@@ -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"
diff --git a/tools/libfsimage/xfs/fsys_xfs.c b/tools/libfsimage/xfs/fsys_xfs.c
index f39d096ba2..d735a88e55 100644
--- a/tools/libfsimage/xfs/fsys_xfs.c
+++ b/tools/libfsimage/xfs/fsys_xfs.c
@@ -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
diff --git a/tools/libfsimage/zfs/fsi_zfs.c b/tools/libfsimage/zfs/fsi_zfs.c
index 75145875fd..187a8bc6b2 100644
--- a/tools/libfsimage/zfs/fsi_zfs.c
+++ b/tools/libfsimage/zfs/fsi_zfs.c
@@ -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>
diff --git a/tools/libfsimage/zfs/fsi_zfs.h b/tools/libfsimage/zfs/fsi_zfs.h
index fb4dc23bbf..980ce8f304 100644
--- a/tools/libfsimage/zfs/fsi_zfs.h
+++ b/tools/libfsimage/zfs/fsi_zfs.h
@@ -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 ****/
diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py
index 711bbbd499..b58cc1c4e6 100644
--- a/tools/pygrub/setup.py
+++ b/tools/pygrub/setup.py
@@ -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' ]
diff --git a/tools/pygrub/src/fsimage/fsimage.c b/tools/pygrub/src/fsimage/fsimage.c
index 8ec0dec346..47940572a8 100644
--- a/tools/pygrub/src/fsimage/fsimage.c
+++ b/tools/pygrub/src/fsimage/fsimage.c
@@ -23,7 +23,7 @@
#include <Python.h>
-#include <fsimage.h>
+#include <xenfsimage.h>
#include <stdlib.h>
#if (PYTHON_API_VERSION >= 1011)
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* Re: [PATCH 10/12] tools/libfsimage: Add `xen' to .h names and principal .so name
2018-10-12 15:12 ` [PATCH 10/12] tools/libfsimage: Add `xen' to .h names and principal .so name Ian Jackson
@ 2018-10-12 15:38 ` Wei Liu
2018-10-12 16:34 ` Ian Jackson
0 siblings, 1 reply; 26+ messages in thread
From: Wei Liu @ 2018-10-12 15:38 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Wei Liu
On Fri, Oct 12, 2018 at 04:12:13PM +0100, Ian Jackson wrote:
> `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>
I think we will need another upgrade note for 4.12.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PATCH 10/12] tools/libfsimage: Add `xen' to .h names and principal .so name
2018-10-12 15:38 ` Wei Liu
@ 2018-10-12 16:34 ` Ian Jackson
0 siblings, 0 replies; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 16:34 UTC (permalink / raw)
To: Juergen Gross; +Cc: xen-devel, Wei Liu
Wei Liu writes ("Re: [PATCH 10/12] tools/libfsimage: Add `xen' to .h names and principal .so name"):
> On Fri, Oct 12, 2018 at 04:12:13PM +0100, Ian Jackson wrote:
> > `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>
>
> I think we will need another upgrade note for 4.12.
Sure, if you think so.
Juergen, something like:
* The fsimage library used by pygrub, which does not have a stable
ABI, and the corresponding python module, have been renamed to
`xenfsimage' (to reduce namespace pollution). Any out-of-tree
users of this library will have to be updated.
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 26+ messages in thread
* [PATCH 11/12] tools/pygrub: Add `xen' to fsimage python module name
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (9 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 10/12] tools/libfsimage: Add `xen' to .h names and principal .so name Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:39 ` Wei Liu
2018-10-12 15:12 ` [PATCH 12/12] tools/libfsimage: Rename /usr/lib/fs to /usr/lib/xenfsimage Ian Jackson
11 siblings, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson
This module should be called `libxenfsimage' for the same reasons that
the C library should.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New in this version of the series
---
tools/pygrub/setup.py | 4 ++--
tools/pygrub/src/fsimage/fsimage.c | 8 ++++----
tools/pygrub/src/pygrub | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/pygrub/setup.py b/tools/pygrub/setup.py
index b58cc1c4e6..b8f1dc4590 100644
--- a/tools/pygrub/setup.py
+++ b/tools/pygrub/setup.py
@@ -7,7 +7,7 @@ extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ]
XEN_ROOT = "../.."
-fsimage = Extension("fsimage",
+xenfsimage = Extension("xenfsimage",
extra_compile_args = extra_compile_args,
include_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
library_dirs = [ XEN_ROOT + "/tools/libfsimage/common/" ],
@@ -25,5 +25,5 @@ setup(name='pygrub',
package_dir={'grub': 'src', 'fsimage': 'src'},
scripts = ["src/pygrub"],
packages=pkgs,
- ext_modules = [ fsimage ]
+ ext_modules = [ xenfsimage ]
)
diff --git a/tools/pygrub/src/fsimage/fsimage.c b/tools/pygrub/src/fsimage/fsimage.c
index 47940572a8..743a3fb7b8 100644
--- a/tools/pygrub/src/fsimage/fsimage.c
+++ b/tools/pygrub/src/fsimage/fsimage.c
@@ -132,7 +132,7 @@ static char fsimage_file_type__doc__[] = "Filesystem image file";
PyTypeObject fsimage_file_type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
- "fsimage.file", /* tp_name */
+ "xenfsimage.file", /* tp_name */
sizeof(fsimage_file_t), /* tp_size */
0, /* tp_itemsize */
(destructor) fsimage_file_dealloc, /* tp_dealloc */
@@ -234,7 +234,7 @@ PyDoc_STRVAR(fsimage_fs_type__doc__, "Filesystem image");
PyTypeObject fsimage_fs_type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
- "fsimage.fs", /* tp_name */
+ "xenfsimage.fs", /* tp_name */
sizeof(fsimage_fs_t), /* tp_size */
0, /* tp_itemsize */
(destructor) fsimage_fs_dealloc, /* tp_dealloc */
@@ -317,7 +317,7 @@ static struct PyMethodDef fsimage_module_methods[] = {
};
PyMODINIT_FUNC
-initfsimage(void)
+initxenfsimage(void)
{
- Py_InitModule("fsimage", fsimage_module_methods);
+ Py_InitModule("xenfsimage", fsimage_module_methods);
}
diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index dd0c8f77df..52a8965ad9 100755
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -21,7 +21,7 @@ import xen.lowlevel.xc
import curses, _curses, curses.wrapper, curses.textpad, curses.ascii
import getopt
-import fsimage
+import xenfsimage
import grub.GrubConf
import grub.LiloConf
import grub.ExtLinuxConf
@@ -897,7 +897,7 @@ if __name__ == "__main__":
for offset in part_offs:
try:
- fs = fsimage.open(file, offset, bootfsoptions)
+ fs = xenfsimage.open(file, offset, bootfsoptions)
chosencfg = sniff_solaris(fs, incfg)
@@ -945,7 +945,7 @@ if __name__ == "__main__":
args = None
if chosencfg["args"]:
- zfsinfo = fsimage.getbootstring(fs)
+ zfsinfo = xenfsimage.getbootstring(fs)
if zfsinfo is not None:
e = re.compile("zfs-bootfs=[\w\-\.\:@/]+" )
(chosencfg["args"],count) = e.subn(zfsinfo, chosencfg["args"])
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread* [PATCH 12/12] tools/libfsimage: Rename /usr/lib/fs to /usr/lib/xenfsimage
2018-10-12 15:12 [PATCH v2 00/12] Miscellaneous fixes from Debian Ian Jackson
` (10 preceding siblings ...)
2018-10-12 15:12 ` [PATCH 11/12] tools/pygrub: Add `xen' to fsimage python module name Ian Jackson
@ 2018-10-12 15:12 ` Ian Jackson
2018-10-12 15:40 ` Wei Liu
11 siblings, 1 reply; 26+ messages in thread
From: Ian Jackson @ 2018-10-12 15:12 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, Ian Jackson
Again, avoid namespace pollution. These paths are purely internal to
libfsimage and its fs-specific modules, so no visible change from the
outside.
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: New in this version of the series
---
tools/libfsimage/Rules.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/libfsimage/Rules.mk b/tools/libfsimage/Rules.mk
index 2a29d9ef2b..bb6d42abb4 100644
--- a/tools/libfsimage/Rules.mk
+++ b/tools/libfsimage/Rules.mk
@@ -6,7 +6,7 @@ LDFLAGS += -L../common/
PIC_OBJS := $(patsubst %.c,%.opic,$(LIB_SRCS-y))
-FSDIR = $(libdir)/fs
+FSDIR = $(libdir)/xenfsimage
FSLIB = fsimage.so
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 26+ messages in thread