OvmfPkg: Removed magic values for the Virtio Sub-System ID in the PCI device drivers

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14742 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index b2bfcdf7b72aecb2c66613b77933bc8c8aee772c..17b9f71d63beadcb434ea4bda2a0bf632a5e729f 100644 (file)
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -575,7 +575,7 @@ VirtioBlkDriverBindingSupported (
     Status = (Pci.Hdr.VendorId == 0x1AF4 &&\r
               Pci.Hdr.DeviceId >= 0x1000 && Pci.Hdr.DeviceId <= 0x103F &&\r
               Pci.Hdr.RevisionID == 0x00 &&\r
-              Pci.Device.SubsystemID == 0x02) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
+              Pci.Device.SubsystemID == VIRTIO_SUBSYSTEM_BLOCK_DEVICE) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
   }\r
 \r
   //\r

diff --git a/OvmfPkg/VirtioNetDxe/DriverBinding.c b/OvmfPkg/VirtioNetDxe/DriverBinding.c
index d9c0096d089a9b7c354696130f08ab8add4b4e58..c9259ab3397b2451d5100e4296bb40255e43afa2 100644 (file)
--- a/OvmfPkg/VirtioNetDxe/DriverBinding.c
+++ b/OvmfPkg/VirtioNetDxe/DriverBinding.c
@@ -369,7 +369,7 @@ VirtioNetDriverBindingSupported (
     Status = (Pci.Hdr.VendorId == 0x1AF4 &&\r
               Pci.Hdr.DeviceId >= 0x1000 && Pci.Hdr.DeviceId <= 0x103F &&\r
               Pci.Hdr.RevisionID == 0x00 &&\r
-              Pci.Device.SubsystemID == 0x01) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
+              Pci.Device.SubsystemID == VIRTIO_SUBSYSTEM_NETWORK_CARD) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
   }\r
 \r
   gBS->CloseProtocol (DeviceHandle, &gEfiPciIoProtocolGuid,\r

diff --git a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
index e58dd80df27e6406fd8ddbc8d2917e323e8f5e83..b836fb3e6ab2e4101202243a28b4b18c193c6959 100644 (file)
--- a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
+++ b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
@@ -1011,7 +1011,7 @@ VirtioScsiDriverBindingSupported (
     Status = (Pci.Hdr.VendorId == 0x1AF4 &&\r
               Pci.Hdr.DeviceId >= 0x1000 && Pci.Hdr.DeviceId <= 0x103F &&\r
               Pci.Hdr.RevisionID == 0x00 &&\r
-              Pci.Device.SubsystemID == 0x08) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
+              Pci.Device.SubsystemID == VIRTIO_SUBSYSTEM_SCSI_HOST) ? EFI_SUCCESS : EFI_UNSUPPORTED;\r
   }\r
 \r
   //\r