OvmfPkg: Make the VirtIo devices use the new VIRTIO_DEVICE_PROTOCOL

[mirror_edk2.git] / OvmfPkg / VirtioBlkDxe / VirtioBlk.h

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.h b/OvmfPkg/VirtioBlkDxe/VirtioBlk.h
index d22570def986b6b0b6894cd9e59588aeabd8e707..789caf9a37eeaebaa3fd5495da12e3561be9804b 100644 (file)
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.h
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.h
@@ -21,7 +21,6 @@
 #include <Protocol/BlockIo.h>\r
 #include <Protocol/ComponentName.h>\r
 #include <Protocol/DriverBinding.h>\r
-#include <Protocol/PciIo.h>\r
 \r
 #include <IndustryStandard/Virtio.h>\r
 \r
@@ -34,14 +33,13 @@ typedef struct {
   // at various call depths. The table to the right should make it easier to\r
   // track them.\r
   //\r
-  //                    field                     init function       init dpth\r
-  //                    ----------------------    ------------------  ---------\r
-  UINT32                Signature;             // DriverBindingStart  0\r
-  EFI_PCI_IO_PROTOCOL   *PciIo;                // DriverBindingStart  0\r
-  UINT64                OriginalPciAttributes; // DriverBindingStart  0\r
-  VRING                 Ring;                  // VirtioRingInit      2\r
-  EFI_BLOCK_IO_PROTOCOL BlockIo;               // VirtioBlkInit       1\r
-  EFI_BLOCK_IO_MEDIA    BlockIoMedia;          // VirtioBlkInit       1\r
+  //                     field                    init function       init dpth\r
+  //                     ---------------------    ------------------  ---------\r
+  UINT32                 Signature;            // DriverBindingStart  0\r
+  VIRTIO_DEVICE_PROTOCOL *VirtIo;              // DriverBindingStart  0\r
+  VRING                  Ring;                 // VirtioRingInit      2\r
+  EFI_BLOCK_IO_PROTOCOL  BlockIo;              // VirtioBlkInit       1\r
+  EFI_BLOCK_IO_MEDIA     BlockIoMedia;         // VirtioBlkInit       1\r
 } VBLK_DEV;\r
 \r
 #define VIRTIO_BLK_FROM_BLOCK_IO(BlockIoPointer) \\r
@@ -66,11 +64,6 @@ typedef struct {
       underlying device\r
     - 9 Driver Binding Protocol -- for exporting ourselves\r
 \r
-  Specs relevant in the specific sense:\r
-  - UEFI Spec 2.3.1 + Errata C, 13.4 EFI PCI I/O Protocol\r
-  - Driver Writer's Guide for UEFI 2.3.1 v1.01, 18 PCI Driver Design\r
-    Guidelines, 18.3 PCI drivers.\r
-\r
   @param[in]  This                The EFI_DRIVER_BINDING_PROTOCOL object\r
                                   incorporating this driver (independently of\r
                                   any device).\r
@@ -82,11 +75,10 @@ typedef struct {
 \r
   @retval EFI_SUCCESS      The driver supports the device being probed.\r
 \r
-  @retval EFI_UNSUPPORTED  Based on virtio-blk PCI discovery, we do not support\r
+  @retval EFI_UNSUPPORTED  Based on virtio-blk discovery, we do not support\r
                            the device.\r
 \r
-  @return                  Error codes from the OpenProtocol() boot service or\r
-                           the PciIo protocol.\r
+  @return                  Error codes from the OpenProtocol() boot service.\r
 \r
 **/\r
 \r
@@ -117,14 +109,14 @@ VirtioBlkDriverBindingSupported (
 \r
 \r
   @retval EFI_SUCCESS           Driver instance has been created and\r
-                                initialized  for the virtio-blk PCI device, it\r
+                                initialized  for the virtio-blk device, it\r
                                 is now accessibla via EFI_BLOCK_IO_PROTOCOL.\r
 \r
   @retval EFI_OUT_OF_RESOURCES  Memory allocation failed.\r
 \r
   @return                       Error codes from the OpenProtocol() boot\r
-                                service, the PciIo protocol, VirtioBlkInit(),\r
-                                or the InstallProtocolInterface() boot service.\r
+                                service, VirtioBlkInit(), or the\r
+                                InstallProtocolInterface() boot service.\r
 \r
 **/\r
 \r