It is not permitted to edit the VERS clause for a version in a release of Xen.

Revert xendevicemodel_set_irq_level()'s inclusion in .so.1.2 and bump the the
library minor version to .so.1.4 instead.

Fixes: 5d752df85f ("xen/dm: Introduce xendevicemodel_set_irq_level DM op")
Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Ian Jackson <i...@xenproject.org>
CC: Wei Liu <w...@xen.org>
CC: Julien Grall <julien.gr...@arm.com>
CC: Oleksandr Tyshchenko <oleksandr_tyshche...@epam.com>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Wei Chen <wei.c...@arm.com>

Critical to include in 4.15, as this is an ABI breakage.  Reverting the broken
change doesn't look to be a practical option.
---
 tools/libs/devicemodel/Makefile              | 2 +-
 tools/libs/devicemodel/libxendevicemodel.map | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile
index 500de7adc5..3e50ff6d90 100644
--- a/tools/libs/devicemodel/Makefile
+++ b/tools/libs/devicemodel/Makefile
@@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 MAJOR    = 1
-MINOR    = 3
+MINOR    = 4
 
 SRCS-y                 += core.c
 SRCS-$(CONFIG_Linux)   += common.c
diff --git a/tools/libs/devicemodel/libxendevicemodel.map 
b/tools/libs/devicemodel/libxendevicemodel.map
index a0c30125de..733549327b 100644
--- a/tools/libs/devicemodel/libxendevicemodel.map
+++ b/tools/libs/devicemodel/libxendevicemodel.map
@@ -32,10 +32,14 @@ VERS_1.2 {
        global:
                xendevicemodel_relocate_memory;
                xendevicemodel_pin_memory_cacheattr;
-               xendevicemodel_set_irq_level;
 } VERS_1.1;
 
 VERS_1.3 {
        global:
                xendevicemodel_modified_memory_bulk;
 } VERS_1.2;
+
+VERS_1.4 {
+       global:
+               xendevicemodel_set_irq_level;
+} VERS_1.3;
-- 
2.11.0


Reply via email to