[PATCH] Use BootFlags directive on build 25398 and later

["Tu Dinh" <ngoc-tu.dinh@xxxxxxxxxx>]

Setting BootFlags in an AddReg section is no longer allowed by INFVerif.

This requires duplication of some INF sections upstream from
XenNet_Service.

Link: 
https://techcommunity.microsoft.com/blog/hardware-dev-center/driver-isolation-ruleset-changes-for-whcp-and-attestation-submissions/4461580
Signed-off-by: Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>
---
 src/xennet.inf | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/xennet.inf b/src/xennet.inf
index 1f6f182..55e11a2 100644
--- a/src/xennet.inf
+++ b/src/xennet.inf
@@ -52,7 +52,7 @@ xennet.sys=0,,
 xennet.sys
 
 [Manufacturer] 
-%Vendor%=Inst,NT@INF_ARCH@
+%Vendor%=Inst,NT@INF_ARCH@,NT@INF_ARCH@.10.0...25398
 
 [Inst.NT@INF_ARCH@]
 %XenNetName%=XenNet_Inst,\
@@ -60,6 +60,12 @@ 
XENVIF\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_NET&REV_09000005,\
 XENVIF\VEN_@VENDOR_PREFIX@0001&DEV_NET&REV_09000005,\
 XENVIF\VEN_@VENDOR_PREFIX@0002&DEV_NET&REV_09000005
 
+[Inst.NT@INF_ARCH@.10.0...25398]
+%XenNetName%=XenNet_Inst_25H2,\
+XENVIF\VEN_@VENDOR_PREFIX@@VENDOR_DEVICE_ID@&DEV_NET&REV_09000005,\
+XENVIF\VEN_@VENDOR_PREFIX@0001&DEV_NET&REV_09000005,\
+XENVIF\VEN_@VENDOR_PREFIX@0002&DEV_NET&REV_09000005
+
 [XenNet_Inst] 
 Characteristics=0x84
 BusType=1
@@ -71,6 +77,17 @@ AddReg=Xennet_Inst_AddReg
 ; TODO: Remove during next PDO version bump
 FeatureScore=0xFE
 
+[XenNet_Inst_25H2]
+Characteristics=0x84
+BusType=1
+*IfType=6              ; IF_TYPE_ETHERNET_CSMACD
+*MediaType=0           ; NdisMedium802_3
+*PhysicalMediaType=14  ; NdisPhysicalMedium802_3
+CopyFiles=XenNet_Copyfiles
+AddReg=Xennet_Inst_AddReg
+; TODO: Remove during next PDO version bump
+FeatureScore=0xFE
+
 [XenNet_Inst_AddReg] 
 HKR, Ndi, Service, 0, "xennet"
 HKR, Ndi\Interfaces, UpperRange, 0, "ndis5"
@@ -172,6 +189,9 @@ HKR, Ndi\params\*NumRSSQueues,                    Max,      
  0, "8"
 [XenNet_Inst.Services] 
 AddService=xennet,0x02,XenNet_Service,XenNet_EventLog
 
+[XenNet_Inst_25H2.Services]
+AddService=xennet,0x02,XenNet_Service_25H2,XenNet_EventLog
+
 [XenNet_Service] 
 DisplayName=%XenNetName%
 ServiceType=%SERVICE_KERNEL_DRIVER% 
@@ -181,6 +201,16 @@ ServiceBinary=%12%\xennet.sys
 LoadOrderGroup="NDIS"
 AddReg = XenNet_BootFlags,XenNet_Unplug
 
+[XenNet_Service_25H2]
+DisplayName=%XenNetName%
+ServiceType=%SERVICE_KERNEL_DRIVER%
+StartType=%SERVICE_DEMAND_START%
+ErrorControl=%SERVICE_ERROR_NORMAL%
+ServiceBinary=%12%\xennet.sys
+LoadOrderGroup="NDIS"
+AddReg = XenNet_Unplug
+BootFlags = 0x81
+
 [XenNet_BootFlags]
 HKR,,"BootFlags",0x00010003,0x81
 
-- 
2.51.2.windows.1



--
Ngoc Tu Dinh | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech