[win-pv-devel] [PATCH v2] Update driver version from 8.2.0 to 9.0.0

[Paul Durrant <paul.durrant@xxxxxxxxxx>]

Signed-off-by: Paul Durrant <paul.durrant@xxxxxxxxxx>
---
 build.py           |  4 ++--
 include/revision.h |  3 ++-
 src/xenvif.inf     |  6 +++---
 src/xenvif/pdo.c   | 26 +++++++++++---------------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/build.py b/build.py
index bdb0e3c..8ebc340 100755
--- a/build.py
+++ b/build.py
@@ -407,8 +407,8 @@ if __name__ == '__main__':
     if 'PRODUCT_NAME' not in os.environ.keys():
         os.environ['PRODUCT_NAME'] = 'Xen'
 
-    os.environ['MAJOR_VERSION'] = '8'
-    os.environ['MINOR_VERSION'] = '2'
+    os.environ['MAJOR_VERSION'] = '9'
+    os.environ['MINOR_VERSION'] = '0'
     os.environ['MICRO_VERSION'] = '0'
 
     if 'BUILD_NUMBER' not in os.environ.keys():
diff --git a/include/revision.h b/include/revision.h
index b1bacab..d8c1cd9 100644
--- a/include/revision.h
+++ b/include/revision.h
@@ -51,6 +51,7 @@
     DEFINE_REVISION(0x0800000A,  1,  5,  1,  1),    \
     DEFINE_REVISION(0x0800000B,  1,  6,  2,  1),    \
     DEFINE_REVISION(0x0800000C,  1,  7,  2,  1),    \
-    DEFINE_REVISION(0x0800000D,  1,  8,  2,  1)
+    DEFINE_REVISION(0x0800000D,  1,  8,  2,  1),    \
+    DEFINE_REVISION(0x09000000,  1,  8,  2,  1)
 
 #endif  // _REVISION_H
diff --git a/src/xenvif.inf b/src/xenvif.inf
index 03f0f53..4ba1ef5 100644
--- a/src/xenvif.inf
+++ b/src/xenvif.inf
@@ -59,9 +59,9 @@ 
xenvif_coinst_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dll
 ; DisplayName          Section         DeviceID
 ; -----------          -------         --------
 
-%XenVifName%           =XenVif_Inst,   
XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_VIF&REV_0800000B
-%XenVifName%           =XenVif_Inst,   
XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_VIF&REV_0800000B
-%XenVifName%           =XenVif_Inst,   
XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_VIF&REV_0800000B
+%XenVifName%           =XenVif_Inst,   
XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_VIF&REV_09000000
+%XenVifName%           =XenVif_Inst,   
XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_VIF&REV_09000000
+%XenVifName%           =XenVif_Inst,   
XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_VIF&REV_09000000
 
 [XenVif_Inst] 
 CopyFiles=XenVif_Copyfiles
diff --git a/src/xenvif/pdo.c b/src/xenvif/pdo.c
index 812622e..e6ffbc3 100644
--- a/src/xenvif/pdo.c
+++ b/src/xenvif/pdo.c
@@ -572,23 +572,19 @@ PdoDumpRevisions(
         ASSERT(IMPLY(Index == ARRAYSIZE(PdoRevision) - 1,
                      Revision->VifInterfaceVersion == 
XENVIF_VIF_INTERFACE_VERSION_MAX));
 
-        if (Revision->StoreInterfaceVersion == 0) { // not-supported
-            ASSERT(Index != ARRAYSIZE(PdoRevision) - 1);
-            goto show_revision;
+        if (Revision->StoreInterfaceVersion != 0) {
+            ASSERT3U(Revision->StoreInterfaceVersion, >=, 
XENBUS_STORE_INTERFACE_VERSION_MIN);
+            ASSERT3U(Revision->StoreInterfaceVersion, <=, 
XENBUS_STORE_INTERFACE_VERSION_MAX);
+            ASSERT(IMPLY(Index == ARRAYSIZE(PdoRevision) - 1,
+                         Revision->StoreInterfaceVersion == 
XENBUS_STORE_INTERFACE_VERSION_MAX));
         }
 
-        ASSERT3U(Revision->StoreInterfaceVersion, >=, 
XENBUS_STORE_INTERFACE_VERSION_MIN);
-        ASSERT3U(Revision->StoreInterfaceVersion, <=, 
XENBUS_STORE_INTERFACE_VERSION_MAX);
-        ASSERT(IMPLY(Index == ARRAYSIZE(PdoRevision) - 1,
-                     Revision->StoreInterfaceVersion == 
XENBUS_STORE_INTERFACE_VERSION_MAX));
-
-        ASSERT3U(Revision->SuspendInterfaceVersion, >=, 
XENBUS_SUSPEND_INTERFACE_VERSION_MIN);
-        ASSERT3U(Revision->SuspendInterfaceVersion, <=, 
XENBUS_SUSPEND_INTERFACE_VERSION_MAX);
-        ASSERT(IMPLY(Index == ARRAYSIZE(PdoRevision) - 1,
-                     Revision->SuspendInterfaceVersion == 
XENBUS_SUSPEND_INTERFACE_VERSION_MAX));
-
-show_revision:
-        ASSERT3U(Revision->Number >> 24, ==, MAJOR_VERSION);
+        if (Revision->SuspendInterfaceVersion != 0) {
+            ASSERT3U(Revision->SuspendInterfaceVersion, >=, 
XENBUS_SUSPEND_INTERFACE_VERSION_MIN);
+            ASSERT3U(Revision->SuspendInterfaceVersion, <=, 
XENBUS_SUSPEND_INTERFACE_VERSION_MAX);
+            ASSERT(IMPLY(Index == ARRAYSIZE(PdoRevision) - 1,
+                         Revision->SuspendInterfaceVersion == 
XENBUS_SUSPEND_INTERFACE_VERSION_MAX));
+        }
 
         Info("%08X -> "
              "CACHE v%u "
-- 
2.5.3


_______________________________________________
win-pv-devel mailing list
win-pv-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/cgi-bin/mailman/listinfo/win-pv-devel