[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [XENBUS PATCH v4 02/11] Merge all hardware IDs into one Models entry
Odd...
%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
parses correctly, but moving the commas from the end of the line, to the start of the next line fails to parse and generates the warning.
Putting all entries on the same line is fine, but that doesnt work when VENDOR_DEVICE_ID is null.
The commas may have to be at the end of lines, and just deal with the 'promotion' of 0002 to Hardware ID if VENDOR_DEVICE_ID is null.
Owen
On Wed, Aug 13, 2025 at 10:54 AM Tu Dinh <ngoc-tu.dinh@xxxxxxxxxx> wrote:
On 08/08/2025 16:03, Tu Dinh wrote:
> 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.
>
> 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..bbd22a0 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"
This ended up causing an Inf2Cat warning:
22.9.3: Missing hardware ID (cannot have just compatible ID) in line
%xenbusname%=xenbus_inst,,,pci\ven_5853&dev_0001 in section
[inst.ntamd64] of package\xenbus.inf
Ngoc Tu Dinh | Vates XCP-ng Developer
XCP-ng & Xen Orchestra - Vates solutions
web: https://vates.tech
|
