OvmfPkg/QemuBootOrderLib: clean up translation of virtio-net over MMIO

The "/MAC(" suffix of the translated UEFI devpath prefix is unnecessary
for matching, because the virtio-mmio base address in VenHwString is
unique anyway. Furthermore, the partial string "MAC(" cannot be processed
by ConvertTextToDevicePath(), which will become relevant later in this
series. Remove "/MAC(".

While at it, remove a bogus comment on PCI.

Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: Xiang Zheng <xiang.zheng@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> # ArmVirtQemu
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Xiang Zheng <xiang.zheng@linaro.org>

diff --git a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
index b699970b12ab4603d1a2a1a68ea98216820b0c8f..a4213cf6d267660a56cc34c3e405a5c03e09ec96 100644 (file)
--- a/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
+++ b/OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.c
@@ -1217,14 +1217,14 @@ TranslateMmioOfwNodes (
     //                |                             fixed\r
     //                base address of virtio-mmio register block\r
     //\r
-    // UEFI device path prefix (dependent on presence of nonzero PCI function):\r
+    // UEFI device path prefix:\r
     //\r
-    //   <VenHwString>/MAC(\r
+    //   <VenHwString>\r
     //\r
     Written = UnicodeSPrintAsciiFormat (\r
                 Translated,\r
                 *TranslatedSize * sizeof (*Translated), // BufferSize in bytes\r
-                "%s/MAC(",\r
+                "%s",\r
                 VenHwString\r
                 );\r
   } else {\r