From 73bb8e6895080f07ece26b0db0f50048713c2b93 Mon Sep 17 00:00:00 2001
From: Laszlo Ersek <lersek@redhat.com>
Date: Fri, 2 Jan 2015 12:08:11 +0000
Subject: [PATCH] ArmVirtualizationPkg: VirtFdtDxe: use dedicated
 VIRTIO_MMIO_TRANSPORT_GUID

Installing VenHw() device paths with this GUID, for the virtio-mmio
transports that we detect, enables other modules to recognize those
VenHw() nodes. (Note that the actual value doesn't change.)

In addition, to avoid reusing GUIDs in unrelated contexts, detach the
driver's FILE_GUID from its previous value.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16573 6f19259b-4bc3-4df7-8a09-765794883524
---
 ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c   | 4 +++-
 ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
index 95e91eb822..751864d4db 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
@@ -27,6 +27,7 @@
 #include <libfdt.h>
 
 #include <Guid/Fdt.h>
+#include <Guid/VirtioMmioTransport.h>
 
 #pragma pack (1)
 typedef struct {
@@ -209,7 +210,8 @@ InitializeVirtFdtDxe (
         break;
       }
 
-      CopyMem (&DevicePath->Vendor.Guid, &gEfiCallerIdGuid, sizeof (EFI_GUID));
+      CopyMem (&DevicePath->Vendor.Guid, &gVirtioMmioTransportGuid,
+        sizeof (EFI_GUID));
       DevicePath->PhysBase = RegBase;
       SetDevicePathNodeLength (&DevicePath->Vendor,
                                sizeof (*DevicePath) - sizeof (DevicePath->End));
diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
index daafe6cb5a..514ce2fdf6 100644
--- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
@@ -16,7 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VirtFdtDxe
-  FILE_GUID                      = 837DCA9E-E874-4D82-B29A-23FE0E23D1E2
+  FILE_GUID                      = 9AD7DCB4-E6EC-472E-96BF-81C219A3F77E
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
 
@@ -43,6 +43,7 @@
 
 [Guids]
   gFdtTableGuid
+  gVirtioMmioTransportGuid
 
 [Pcd]
   gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeBaseAddress
-- 
2.39.5