From b29150aa3e9157908052c212d3afacbff8dbab1b Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 6 Jul 2023 14:30:09 +0200
Subject: [PATCH] ArmVirtPkg: use PcdTerminalTypeGuidBuffer for VirtioSerial
 console

Be consistent with pl011-based serial console setup.

Suggested-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
---
 ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index b92a916f7e..85c01351b0 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -606,7 +606,7 @@ SetupVirtioSerial (
     1
   };
 
-  STATIC CONST VENDOR_DEVICE_PATH  TerminalNode = {
+  STATIC VENDOR_DEVICE_PATH  TerminalNode = {
     {
       MESSAGING_DEVICE_PATH,
       MSG_VENDOR_DP,
@@ -615,7 +615,7 @@ SetupVirtioSerial (
         (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)
       },
     },
-    DEVICE_PATH_MESSAGING_VT_UTF8
+    // copy from PcdTerminalTypeGuidBuffer
   };
 
   EFI_STATUS                Status;
@@ -634,6 +634,11 @@ SetupVirtioSerial (
     return;
   }
 
+  CopyGuid (
+    &TerminalNode.Guid,
+    PcdGetPtr (PcdTerminalTypeGuidBuffer)
+    );
+
   DevicePath = AppendDevicePathNode (
                  DevicePath,
                  &SerialNode.Header