Update to the new version of the XENFILT_EMULATED interface

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/include/emulated_interface.h b/include/emulated_interface.h
index 9361f8d470ff8854610cdfc6d5fd7c5ae74a5ee4..fe93d72544790f3a58aa4ba4b3ad371793071595 100644 (file)
--- a/include/emulated_interface.h
+++ b/include/emulated_interface.h
@@ -78,22 +78,26 @@ typedef BOOLEAN
     IN  PCHAR   InstanceID OPTIONAL
     );
 
+typedef BOOLEAN
+(*XENFILT_EMULATED_IS_DISK_PRESENT_V1)(
+    IN  PVOID   Context,
+    IN  ULONG   Controller,
+    IN  ULONG   Target,
+    IN  ULONG   Lun
+    );
 /*! \typedef XENFILT_EMULATED_IS_DISK_PRESENT
-    \brief Determine whether a given disk is present in the VM
+    \brief Determine whether a given emulated disk is present in the VM
 
     \param Interface The interface header
-    \param Controller The controller index of the HBA
-    \param Target The target index of the disk
-    \param Lun The Logical Unit Number of the disk within the target
-    \return TRUE if the specified disk is present in the system or
-    FALSE if it is not
+    \param Index The disk number of the paravirtual disk which the
+                 emulated device is aliasing
+    \return TRUE if an emulated disk aliasing the specified paravirtual
+    disk index is present in the system or FALSE if not
 */  
 typedef BOOLEAN
 (*XENFILT_EMULATED_IS_DISK_PRESENT)(
     IN  PVOID   Context,
-    IN  ULONG   Controller,
-    IN  ULONG   Target,
-    IN  ULONG   Lun
+    IN  ULONG   Index
     );
 
 // {959027A1-FCCE-4E78-BCF4-637384F499C5}
@@ -105,6 +109,18 @@ DEFINE_GUID(GUID_XENFILT_EMULATED_INTERFACE,
     \ingroup interfaces
 */
 struct _XENFILT_EMULATED_INTERFACE_V1 {
+    INTERFACE                           Interface;
+    XENFILT_EMULATED_ACQUIRE            EmulatedAcquire;
+    XENFILT_EMULATED_RELEASE            EmulatedRelease;
+    XENFILT_EMULATED_IS_DEVICE_PRESENT  EmulatedIsDevicePresent;
+    XENFILT_EMULATED_IS_DISK_PRESENT_V1 EmulatedIsDiskPresentVersion1;
+};
+
+/*! \struct _XENFILT_EMULATED_INTERFACE_V2
+    \brief EMULATED interface version 2
+    \ingroup interfaces
+*/
+struct _XENFILT_EMULATED_INTERFACE_V2 {
     INTERFACE                           Interface;
     XENFILT_EMULATED_ACQUIRE            EmulatedAcquire;
     XENFILT_EMULATED_RELEASE            EmulatedRelease;
@@ -112,7 +128,7 @@ struct _XENFILT_EMULATED_INTERFACE_V1 {
     XENFILT_EMULATED_IS_DISK_PRESENT    EmulatedIsDiskPresent;
 };
 
-typedef struct _XENFILT_EMULATED_INTERFACE_V1 XENFILT_EMULATED_INTERFACE, *PXENFILT_EMULATED_INTERFACE;
+typedef struct _XENFILT_EMULATED_INTERFACE_V2 XENFILT_EMULATED_INTERFACE, *PXENFILT_EMULATED_INTERFACE;
 
 /*! \def XENFILT_EMULATED
     \brief Macro at assist in method invocation
@@ -123,7 +139,7 @@ typedef struct _XENFILT_EMULATED_INTERFACE_V1 XENFILT_EMULATED_INTERFACE, *PXENF
 #endif  // _WINDLL
 
 #define XENFILT_EMULATED_INTERFACE_VERSION_MIN  1
-#define XENFILT_EMULATED_INTERFACE_VERSION_MAX  1
+#define XENFILT_EMULATED_INTERFACE_VERSION_MAX  2
 
 #endif  // _XENFILT_EMULATED_INTERFACE_H
 

diff --git a/src/xenvbd.inf b/src/xenvbd.inf
index 6800d2e7e00934cc41a9b6eada4e2e0003f19fa5..0d575c3b0efca13f5cecc64fa6413b675265e95b 100644 (file)
--- a/src/xenvbd.inf
+++ b/src/xenvbd.inf
@@ -54,9 +54,9 @@ xenvbd_coinst.dll=0,,
 %Vendor%=Inst,NT@INF_ARCH@
 
 [Inst.NT@INF_ARCH@]
-%XenVbdName%=XenVbd_Inst,XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_VBD&REV_09000004
-%XenVbdName%=XenVbd_Inst,XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_VBD&REV_09000004
-%XenVbdName%=XenVbd_Inst,XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_VBD&REV_09000004
+%XenVbdName%=XenVbd_Inst,XENBUS\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_VBD&REV_09000007
+%XenVbdName%=XenVbd_Inst,XENBUS\VEN_@VENDOR_PREFIX@0001&DEV_VBD&REV_09000007
+%XenVbdName%=XenVbd_Inst,XENBUS\VEN_@VENDOR_PREFIX@0002&DEV_VBD&REV_09000007
 
 [XenVbd_Inst] 
 CopyFiles=XenVbd_Copyfiles

diff --git a/src/xenvbd/adapter.c b/src/xenvbd/adapter.c
index 2d8d65fdb7ca16ccdfb3c835ab69c960d5b196da..14bab4b2185140f0b817c5cdfe2be99f19deb47d 100644 (file)
--- a/src/xenvbd/adapter.c
+++ b/src/xenvbd/adapter.c
@@ -404,9 +404,7 @@ AdapterIsTargetEmulated(
     // Ask XenFilt if Ctrlr(0), Target(Target), Lun(0) is present
     Emulated = XENFILT_EMULATED(IsDiskPresent,
                                 &Adapter->EmulatedInterface,
-                                0,
-                                TargetId,
-                                0);
+                                TargetId);
 
     XENFILT_EMULATED(Release, &Adapter->EmulatedInterface);