[Xen-changelog] [xen master] tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI

[patchbot@xxxxxxx]

commit 960dd83213d8798e939f1805c8a29d0086fedb5d
Author:     Stefan Bader <stefan.bader@xxxxxxxxxxxxx>
AuthorDate: Tue Feb 4 09:34:23 2020 +0000
Commit:     Wei Liu <wl@xxxxxxx>
CommitDate: Tue Feb 4 11:31:07 2020 +0000

    tools/xenstore: Re-introduce (fake) xs_restrict call to preserve ABI
    
    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@xxxxxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 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 254f556a0b..25b31881c8 100644
--- a/tools/xenstore/include/xenstore.h
+++ b/tools/xenstore/include/xenstore.h
@@ -134,6 +134,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 f823abe737..aa1d24b8b9 100644
--- a/tools/xenstore/xs.c
+++ b/tools/xenstore/xs.c
@@ -797,6 +797,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.
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog