[edk2] [PATCH v3 08/10] OvmfPkg: Removed magic values for the Virtio Sub-System ID in the PCI device drivers

[Olivier Martin]

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.mar...@arm.com>
---
 OvmfPkg/VirtioBlkDxe/VirtioBlk.c     |    4 ++--
 OvmfPkg/VirtioNetDxe/DriverBinding.c |    4 ++--
 OvmfPkg/VirtioScsiDxe/VirtioScsi.c   |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index 2b65fc4..1814df8 100644
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -548,7 +548,7 @@ VirtioBlkDriverBindingSupported (
     return Status;
   }
 
-  if (VirtIo->SubSystemDeviceId != 0x02) {
+  if (VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_BLOCK_DEVICE) {
     Status = EFI_UNSUPPORTED;
   }
 
@@ -829,7 +829,7 @@ VirtioBlkDriverBindingStart (
     goto FreeVirtioBlk;
   }
 
-  if (Dev->VirtIo->SubSystemDeviceId != 0x02) {
+  if (Dev->VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_BLOCK_DEVICE) {
     return EFI_UNSUPPORTED;
   }
 
diff --git a/OvmfPkg/VirtioNetDxe/DriverBinding.c 
b/OvmfPkg/VirtioNetDxe/DriverBinding.c
index cf92d78..6e02f32 100644
--- a/OvmfPkg/VirtioNetDxe/DriverBinding.c
+++ b/OvmfPkg/VirtioNetDxe/DriverBinding.c
@@ -372,7 +372,7 @@ VirtioNetDriverBindingSupported (
     return Status;
   }
 
-  if (VirtIo->SubSystemDeviceId != 0x01) {
+  if (VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_NETWORK_CARD) {
     Status = EFI_UNSUPPORTED;
   }
 
@@ -464,7 +464,7 @@ VirtioNetDriverBindingStart (
     goto FreeVirtioBlk;
   }
 
-  if (Dev->VirtIo->SubSystemDeviceId != 0x01) {
+  if (Dev->VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_NETWORK_CARD) {
     return EFI_UNSUPPORTED;
   }
 
diff --git a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c 
b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
index fe56532..00cbc41 100644
--- a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
+++ b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c
@@ -984,7 +984,7 @@ VirtioScsiDriverBindingSupported (
     return Status;
   }
 
-  if (VirtIo->SubSystemDeviceId != 0x08) {
+  if (VirtIo->SubSystemDeviceId != VIRTIO_SUBSYSTEM_SCSI_HOST) {
     Status = EFI_UNSUPPORTED;
   }
 
-- 
1.7.0.4


------------------------------------------------------------------------------
LIMITED TIME SALE - Full Year of Microsoft Training For Just $49.99!
1,500+ hours of tutorials including VisualStudio 2012, Windows 8, SharePoint
2013, SQL 2012, MVC 4, more. BEST VALUE: New Multi-Library Power Pack includes
Mobile, Cloud, Java, and UX Design. Lowest price ever! Ends 9/20/13. 
http://pubads.g.doubleclick.net/gampad/clk?id=58041151&iu=/4140/ostg.clktrk
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel