From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41578) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu8MI-0004f7-5u for qemu-devel@nongnu.org; Thu, 27 Nov 2014 18:20:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xu8MB-0007UT-W3 for qemu-devel@nongnu.org; Thu, 27 Nov 2014 18:20:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41325) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xu8MB-0007UJ-NU for qemu-devel@nongnu.org; Thu, 27 Nov 2014 18:20:15 -0500 From: Laszlo Ersek Date: Fri, 28 Nov 2014 00:19:23 +0100 Message-Id: <1417130367-17777-9-git-send-email-lersek@redhat.com> In-Reply-To: <1417130367-17777-1-git-send-email-lersek@redhat.com> References: <5477B0FD.9040806@redhat.com> <1417130367-17777-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [edk2 PATCH 08/12] ArmVirtualizationPkg: VirtFdtDxe: use dedicated VIRTIO_MMIO_TRANSPORT_GUID List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, edk2-devel@lists.sourceforge.net, drjones@redhat.com, ard.biesheuvel@linaro.org, peter.maydell@linaro.org, imammedo@redhat.com, mst@redhat.com 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 --- ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf | 3 ++- ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.inf index daafe6c..514ce2f 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 diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c index f1b5283..2191078 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c +++ b/ArmPlatformPkg/ArmVirtualizationPkg/VirtFdtDxe/VirtFdtDxe.c @@ -27,6 +27,7 @@ #include #include +#include #pragma pack (1) typedef struct { @@ -201,7 +202,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)); -- 1.8.3.1