From 70d5086c3274b1a5b099d642d546581070374e6e Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 29 Apr 2020 15:53:27 -0600 Subject: OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones Generated mechanically with: find OvmfPkg -type f -exec sed -i -e 's/EFI_D_/DEBUG_/g' {} \; Signed-off-by: Rebecca Cran Cc: Philippe Mathieu-Daude Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Message-Id: <20200429215327.606467-1-rebecca@bsdio.com> Reviewed-by: Laszlo Ersek --- OvmfPkg/QemuVideoDxe/Driver.c | 10 +++++----- OvmfPkg/QemuVideoDxe/Gop.c | 4 ++-- OvmfPkg/QemuVideoDxe/Initialize.c | 8 ++++---- OvmfPkg/QemuVideoDxe/VbeShim.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'OvmfPkg/QemuVideoDxe') diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index 37bbbbe843..85edfcb1d6 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -153,7 +153,7 @@ QemuVideoControllerDriverSupported ( } Card = QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId); if (Card != NULL) { - DEBUG ((EFI_D_INFO, "QemuVideo: %s detected\n", Card->Name)); + DEBUG ((DEBUG_INFO, "QemuVideo: %s detected\n", Card->Name)); Status = EFI_SUCCESS; } @@ -324,10 +324,10 @@ QemuVideoControllerDriverStart ( ); if (EFI_ERROR (Status) || MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) { - DEBUG ((EFI_D_INFO, "QemuVideo: No mmio bar, fallback to port io\n")); + DEBUG ((DEBUG_INFO, "QemuVideo: No mmio bar, fallback to port io\n")); Private->Variant = QEMU_VIDEO_BOCHS; } else { - DEBUG ((EFI_D_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n", + DEBUG ((DEBUG_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n", MmioDesc->AddrRangeMin)); } @@ -352,7 +352,7 @@ QemuVideoControllerDriverStart ( UINT16 BochsId; BochsId = BochsRead(Private, VBE_DISPI_INDEX_ID); if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) { - DEBUG ((EFI_D_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId)); + DEBUG ((DEBUG_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId)); Status = EFI_DEVICE_ERROR; goto RestoreAttributes; } @@ -959,7 +959,7 @@ InitializeBochsGraphicsMode ( QEMU_VIDEO_BOCHS_MODES *ModeData ) { - DEBUG ((EFI_D_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n", + DEBUG ((DEBUG_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n", ModeData->Width, ModeData->Height, ModeData->ColorDepth)); /* unblank */ diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c index e49ec32cf1..a44917eb6b 100644 --- a/OvmfPkg/QemuVideoDxe/Gop.c +++ b/OvmfPkg/QemuVideoDxe/Gop.c @@ -30,7 +30,7 @@ QemuVideoCompleteModeInfo ( Info->PixelInformation.BlueMask = PIXEL24_BLUE_MASK; Info->PixelInformation.ReservedMask = 0; } else if (ModeData->ColorDepth == 32) { - DEBUG ((EFI_D_INFO, "PixelBlueGreenRedReserved8BitPerColor\n")); + DEBUG ((DEBUG_INFO, "PixelBlueGreenRedReserved8BitPerColor\n")); Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor; } Info->PixelsPerScanLine = Info->HorizontalResolution; @@ -65,7 +65,7 @@ QemuVideoCompleteModeData ( Mode->FrameBufferSize = EFI_PAGES_TO_SIZE ( EFI_SIZE_TO_PAGES (Mode->FrameBufferSize) ); - DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n", + DEBUG ((DEBUG_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n", Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize)); FreePool (FrameBufDesc); diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initialize.c index 6ee42fb8d9..b5a5660ed2 100644 --- a/OvmfPkg/QemuVideoDxe/Initialize.c +++ b/OvmfPkg/QemuVideoDxe/Initialize.c @@ -180,7 +180,7 @@ QemuVideoCirrusModeSetup ( ModeData->HorizontalResolution = VideoMode->Width; ModeData->VerticalResolution = VideoMode->Height; ModeData->ColorDepth = VideoMode->ColorDepth; - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "Adding Mode %d as Cirrus Internal Mode %d: %dx%d, %d-bit\n", (INT32) (ModeData - Private->ModeData), ModeData->InternalModeIndex, @@ -289,7 +289,7 @@ QemuVideoBochsModeSetup ( EFI_ERROR ( Private->PciIo->Mem.Read (Private->PciIo, EfiPciIoWidthUint32, PCI_BAR_IDX2, 40, 1, &AvailableFbSize))) { - DEBUG ((EFI_D_ERROR, "%a: can't read size of drawable buffer from QXL " + DEBUG ((DEBUG_ERROR, "%a: can't read size of drawable buffer from QXL " "ROM\n", __FUNCTION__)); return EFI_NOT_FOUND; } @@ -297,7 +297,7 @@ QemuVideoBochsModeSetup ( AvailableFbSize = BochsRead (Private, VBE_DISPI_INDEX_VIDEO_MEMORY_64K); AvailableFbSize *= SIZE_64KB; } - DEBUG ((EFI_D_INFO, "%a: AvailableFbSize=0x%x\n", __FUNCTION__, + DEBUG ((DEBUG_INFO, "%a: AvailableFbSize=0x%x\n", __FUNCTION__, AvailableFbSize)); // @@ -322,7 +322,7 @@ QemuVideoBochsModeSetup ( ModeData->HorizontalResolution = VideoMode->Width; ModeData->VerticalResolution = VideoMode->Height; ModeData->ColorDepth = VideoMode->ColorDepth; - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "Adding Mode %d as Bochs Internal Mode %d: %dx%d, %d-bit\n", (INT32) (ModeData - Private->ModeData), ModeData->InternalModeIndex, diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.c b/OvmfPkg/QemuVideoDxe/VbeShim.c index c23dc984d4..048ffa7058 100644 --- a/OvmfPkg/QemuVideoDxe/VbeShim.c +++ b/OvmfPkg/QemuVideoDxe/VbeShim.c @@ -114,7 +114,7 @@ InstallVbeShim ( // Handler = (Int0x10->Segment << 4) + Int0x10->Offset; if (Handler >= SegmentC && Handler < SegmentF) { - DEBUG ((EFI_D_INFO, "%a: Video BIOS handler found at %04x:%04x\n", + DEBUG ((DEBUG_INFO, "%a: Video BIOS handler found at %04x:%04x\n", __FUNCTION__, Int0x10->Segment, Int0x10->Offset)); return; } @@ -312,5 +312,5 @@ InstallVbeShim ( Int0x10->Segment = (UINT16) ((UINT32)SegmentC >> 4); Int0x10->Offset = (UINT16) ((UINTN) (VbeModeInfo + 1) - SegmentC); - DEBUG ((EFI_D_INFO, "%a: VBE shim installed\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: VBE shim installed\n", __FUNCTION__)); } -- cgit v1.2.3