OvmfPkg/QemuVideoDxe: child handles should have open parent protocol BY_CHILD_CONTROLLER

[mirror_edk2.git] / OvmfPkg / QemuVideoDxe / Driver.c

diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c
index 1dd8899fcf8c0b10a32b61f629bcc8b7dd5be74c..b253ec734edf9e214a916ad58930622f6a81124e 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Driver.c
+++ b/OvmfPkg/QemuVideoDxe/Driver.c
@@ -209,6 +209,7 @@ QemuVideoControllerDriverStart (
   PCI_TYPE00                        Pci;\r
   QEMU_VIDEO_CARD                   *Card;\r
   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *MmioDesc;\r
+  EFI_PCI_IO_PROTOCOL               *ChildPciIo;\r
 \r
   PciAttributesSaved = FALSE;\r
   //\r
@@ -305,6 +306,10 @@ QemuVideoControllerDriverStart (
       DEBUG ((EFI_D_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n",\r
               MmioDesc->AddrRangeMin));\r
     }\r
+\r
+    if (!EFI_ERROR (Status)) {\r
+      FreePool (MmioDesc);\r
+    }\r
   }\r
 \r
   //\r
@@ -415,6 +420,22 @@ QemuVideoControllerDriverStart (
                     &Private->GraphicsOutput,\r
                     NULL\r
                     );\r
+    if (EFI_ERROR (Status)) {\r
+      goto Error;\r
+    }\r
+\r
+    Status = gBS->OpenProtocol (\r
+                  Controller,\r
+                  &gEfiPciIoProtocolGuid,\r
+                  (VOID **) &ChildPciIo,\r
+                  This->DriverBindingHandle,\r
+                  Private->Handle,\r
+                  EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER\r
+                  );\r
+\r
+    if (EFI_ERROR (Status)) {\r
+      goto Error;\r
+    }\r
   }\r
 \r
 Error:\r
@@ -436,7 +457,14 @@ Error:
         // Close the PCI I/O Protocol\r
         //\r
         gBS->CloseProtocol (\r
-              Private->Handle,\r
+              Controller,\r
+              &gEfiPciIoProtocolGuid,\r
+              This->DriverBindingHandle,\r
+              Controller\r
+              );\r
+\r
+        gBS->CloseProtocol (\r
+              Controller,\r
               &gEfiPciIoProtocolGuid,\r
               This->DriverBindingHandle,\r
               Private->Handle\r
@@ -529,6 +557,13 @@ QemuVideoControllerDriverStop (
         Controller\r
         );\r
 \r
+  gBS->CloseProtocol (\r
+        Controller,\r
+        &gEfiPciIoProtocolGuid,\r
+        This->DriverBindingHandle,\r
+        Private->Handle\r
+        );\r
+\r
   //\r
   // Free our instance data\r
   //\r