RHEL-115784: [pvpanic] Combine ACPI and PCI device support into single INF

Merge PNP IDs from pvpanic.inf and pvpanic-pci.inf into unified pvpanic.inf.
Add PCI device ID to existing ACPI support and remove separate pvpanic-pci.inf
reference from package project.

Signed-off-by: Elizabeth Ashurov <eashurov@redhat.com>

Author: elizashurov

pvpanic/PVPanic Package/PVPanic Package.vcxproj

@@ -129,7 +129,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="..\pvpanic\pvpanic-pci.inf" />
     <Inf Include="..\pvpanic\pvpanic.inf" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

pvpanic/pvpanic/pvpanic-pci.inf

@@ -41,6 +41,7 @@ pvpanic.sys = 1,,
 
 [PVPanic.NT$ARCH$]
 %PVPanic.DeviceDesc% = PVPanic_Device, ACPI\QEMU0001
+%PVPanic.DeviceDesc% = PVPanic_Device, PCI\VEN_1B36&DEV_0011&SUBSYS_11001AF4&REV_01
 
 [PVPanic_Device.NT]
 CopyFiles = PVPanic_CopyFiles

pvpanic/pvpanic/pvpanic.inf

@@ -36,8 +36,6 @@
 .\pvpanic\Install\Win10\ARM64\pvpanic.inf
 .\pvpanic\Install\Win10\ARM64\pvpanic.pdb
 .\pvpanic\Install\Win10\ARM64\pvpanic.sys
-.\pvpanic\Install\Win10\ARM64\pvpanic-pci.cat
-.\pvpanic\Install\Win10\ARM64\pvpanic-pci.inf
 ; viofs driver
 .Set DestinationDir=viofs
 .\viofs\Install\Win10\ARM64\viofs.cat

win10_arm64.ddf

@@ -40,8 +40,6 @@
 .\pvpanic\Install\Win10\amd64\pvpanic.inf
 .\pvpanic\Install\Win10\amd64\pvpanic.pdb
 .\pvpanic\Install\Win10\amd64\pvpanic.sys
-.\pvpanic\Install\Win10\amd64\pvpanic-pci.cat
-.\pvpanic\Install\Win10\amd64\pvpanic-pci.inf
 ; viofs driver
 .Set DestinationDir=viofs
 .\viofs\Install\Win10\amd64\viofs.cat

win10_x64.ddf

@@ -40,8 +40,6 @@
 .\pvpanic\Install\Win10\x86\pvpanic.inf
 .\pvpanic\Install\Win10\x86\pvpanic.pdb
 .\pvpanic\Install\Win10\x86\pvpanic.sys
-.\pvpanic\Install\Win10\x86\pvpanic-pci.cat
-.\pvpanic\Install\Win10\x86\pvpanic-pci.inf
 ; viofs driver
 .Set DestinationDir=viofs
 .\viofs\Install\Win10\x86\viofs.cat

win10_x86.ddf

@@ -36,8 +36,6 @@
 .\pvpanic\Install\Win11\ARM64\pvpanic.inf
 .\pvpanic\Install\Win11\ARM64\pvpanic.pdb
 .\pvpanic\Install\Win11\ARM64\pvpanic.sys
-.\pvpanic\Install\Win11\ARM64\pvpanic-pci.cat
-.\pvpanic\Install\Win11\ARM64\pvpanic-pci.inf
 ; viofs driver
 .Set DestinationDir=viofs
 .\viofs\Install\Win11\ARM64\viofs.cat

win11_arm64.ddf

@@ -40,8 +40,6 @@
 .\pvpanic\Install\Win11\amd64\pvpanic.inf
 .\pvpanic\Install\Win11\amd64\pvpanic.pdb
 .\pvpanic\Install\Win11\amd64\pvpanic.sys
-.\pvpanic\Install\Win11\amd64\pvpanic-pci.cat
-.\pvpanic\Install\Win11\amd64\pvpanic-pci.inf
 ; viofs driver
 .Set DestinationDir=viofs
 .\viofs\Install\Win11\amd64\viofs.cat