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

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
index 95e91eb82282ec7a829429926d792bae214384e8..751864d4db9cff1a33f3580bb0e88eeeafd568ec 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c
@@ -27,6 +27,7 @@
 #include <libfdt.h>\r
 \r
 #include <Guid/Fdt.h>\r
+#include <Guid/VirtioMmioTransport.h>\r
 \r
 #pragma pack (1)\r
 typedef struct {\r
@@ -209,7 +210,8 @@ InitializeVirtFdtDxe (
         break;\r
       }\r
 \r
-      CopyMem (&DevicePath->Vendor.Guid, &gEfiCallerIdGuid, sizeof (EFI_GUID));\r
+      CopyMem (&DevicePath->Vendor.Guid, &gVirtioMmioTransportGuid,\r
+        sizeof (EFI_GUID));\r
       DevicePath->PhysBase = RegBase;\r
       SetDevicePathNodeLength (&DevicePath->Vendor,\r
                                sizeof (*DevicePath) - sizeof (DevicePath->End));\r

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
index daafe6cb5a893215685b4a41db24441ad478fa6d..514ce2fdf658966997f01d00d57b0fb5617a507e 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf
@@ -16,7 +16,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = VirtFdtDxe\r
-  FILE_GUID                      = 837DCA9E-E874-4D82-B29A-23FE0E23D1E2\r
+  FILE_GUID                      = 9AD7DCB4-E6EC-472E-96BF-81C219A3F77E\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
 \r
@@ -43,6 +43,7 @@
 \r
 [Guids]\r
   gFdtTableGuid\r
+  gVirtioMmioTransportGuid\r
 \r
 [Pcd]\r
   gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeBaseAddress\r