MdeModulePkg: Change the default IPv4 config policy

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

diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c
index 1b7db329b9b3e585a6c3c8e1d66dfef436b403a7..18d0779896ca494c1765577cfede6ad428710a29 100644 (file)
--- a/OvmfPkg/QemuVideoDxe/Gop.c
+++ b/OvmfPkg/QemuVideoDxe/Gop.c
@@ -70,7 +70,8 @@ QemuVideoCompleteModeData (
   Mode->FrameBufferBase = FrameBufDesc->AddrRangeMin;\r
   Mode->FrameBufferSize = Info->HorizontalResolution * Info->VerticalResolution;\r
   Mode->FrameBufferSize = Mode->FrameBufferSize * ((ModeData->ColorDepth + 7) / 8);\r
-  DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%x, FrameBufferSize: 0x%x\n", Mode->FrameBufferBase, Mode->FrameBufferSize));\r
+  DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",\r
+    Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize));\r
 \r
   FreePool (FrameBufDesc);\r
   return EFI_SUCCESS;\r
@@ -114,10 +115,6 @@ Routine Description:
 \r
   Private = QEMU_VIDEO_PRIVATE_DATA_FROM_GRAPHICS_OUTPUT_THIS (This);\r
 \r
-  if (Private->HardwareNeedsStarting) {\r
-    return EFI_NOT_STARTED;\r
-  }\r
-\r
   if (Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -184,11 +181,11 @@ Routine Description:
   switch (Private->Variant) {\r
   case QEMU_VIDEO_CIRRUS_5430:\r
   case QEMU_VIDEO_CIRRUS_5446:\r
-    InitializeCirrusGraphicsMode (Private, &QemuVideoCirrusModes[ModeData->ModeNumber]);\r
+    InitializeCirrusGraphicsMode (Private, &QemuVideoCirrusModes[ModeData->InternalModeIndex]);\r
     break;\r
   case QEMU_VIDEO_BOCHS_MMIO:\r
   case QEMU_VIDEO_BOCHS:\r
-    InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->ModeNumber]);\r
+    InitializeBochsGraphicsMode (Private, &QemuVideoBochsModes[ModeData->InternalModeIndex]);\r
     break;\r
   default:\r
     ASSERT (FALSE);\r
@@ -209,8 +206,6 @@ Routine Description:
     This->Mode->Info\r
     );\r
 \r
-  Private->HardwareNeedsStarting  = FALSE;\r
-\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -331,7 +326,6 @@ QemuVideoGraphicsOutputConstructor (
   }\r
   Private->GraphicsOutput.Mode->MaxMode = (UINT32) Private->MaxMode;\r
   Private->GraphicsOutput.Mode->Mode    = GRAPHICS_OUTPUT_INVALIDE_MODE_NUMBER;\r
-  Private->HardwareNeedsStarting        = TRUE;\r
   Private->LineBuffer                   = NULL;\r
 \r
   //\r