[XENBUS PATCH v6 02/11] Merge all hardware IDs into one Models entry

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

This makes sure that on driver installation, all supported hardware IDs
will be populated into the driver database, thus allowing the device ID
to be freely switched without causing boot installation issues.

Bump the feature score to compensate for the resulting degradation of
identifier-match-type score.

Note that if the vendor device is disabled, merging hardware IDs will
cause the 0002 device to have a higher identifier score than 0001.
Still, omitting the hardware ID in the Models entry as documented in MS
docs will cause an Inf2Cat warning "22.9.3: Missing hardware ID (cannot
have just compatible ID)", so we just have to deal with the score
promotion in this case.

Signed-off-by: Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx>
---
 src/xenbus.inf | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/xenbus.inf b/src/xenbus.inf
index 7cc9ac2..7956af7 100644
--- a/src/xenbus.inf
+++ b/src/xenbus.inf
@@ -66,16 +66,15 @@ 
xenbus_monitor_@MAJOR_VERSION@_@MINOR_VERSION@_@MICRO_VERSION@_@BUILD_NUMBER@.dl
 %Vendor%=Inst,NT@INF_ARCH@
 
 [Inst.NT@INF_ARCH@]
-; DisplayName          Section         DeviceID
-; -----------          -------         --------
-
-%XenBusName_VEND%      =XenBus_Inst,   
PCI\VEN_5853&DEV_@VENDOR_DEVICE_ID@&SUBSYS_@VENDOR_DEVICE_ID@5853&REV_01
-%XenBusName_0002%      =XenBus_Inst,   PCI\VEN_5853&DEV_0002
-%XenBusName_0001%      =XenBus_Inst,   PCI\VEN_5853&DEV_0001
+%XenBusName%=XenBus_Inst,\
+PCI\VEN_5853&DEV_@VENDOR_DEVICE_ID@&SUBSYS_@VENDOR_DEVICE_ID@5853&REV_01,\
+PCI\VEN_5853&DEV_0002,\
+PCI\VEN_5853&DEV_0001
 
 [XenBus_Inst] 
 CopyFiles=XenBus_CopyFiles
 CopyFiles=Monitor_CopyFiles
+FeatureScore=0xFE
 
 [XenBus_Inst.Services]
 
AddService=xenbus_monitor,%SPSVCSINST_STARTSERVICE%,Monitor_Service,Monitor_EventLog
@@ -149,9 +148,6 @@ HKR,,TypesSupported,0x00010001,7
 Vendor="@VENDOR_NAME@" 
 DiskDesc="@PRODUCT_NAME@ PV Bus Package" 
 XenBusName="@PRODUCT_NAME@ PV Bus"
-XenBusName_VEND="@PRODUCT_NAME@ PV Bus (@VENDOR_DEVICE_ID@)"
-XenBusName_0002="@PRODUCT_NAME@ PV Bus (0002)"
-XenBusName_0001="@PRODUCT_NAME@ PV Bus (0001)"
 XenFiltName="@PRODUCT_NAME@ Generic Bus Filter"
 MonitorName="@PRODUCT_NAME@ PV Driver Monitor"
 MonitorDesc="Provides support for @PRODUCT_NAME@ PV drivers"
-- 
2.50.1.windows.1



Ngoc Tu Dinh | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech