libs/devicemodel: Fix ABI breakage from xendevicemodel_set_irq_level()

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.cooper3@citrix.com>
Reviewed-by: Ian Jackson <iwj@xenproject.org>
Release-Acked-by: Ian Jackson <iwj@xenproject.org>

diff --git a/tools/libs/devicemodel/Makefile b/tools/libs/devicemodel/Makefile
index 500de7adc560b30d57e28d4de0b93dd1fb9087aa..3e50ff6d90ebdac6f930cda5f244149881473c71 100644 (file)
--- 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 a0c30125de96f73e6e776081774c21072df3f3e5..733549327ba3fc93cff34e5b7a6ceb21b96c87a9 100644 (file)
--- 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;