OvmfPkg: rename AppendDesc to VirtioAppendDesc

AppendDesc() should have a prefix implying its containing library,
VirtioLib. Update its sole client VirtioBlkDxe.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13843 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Include/Library/VirtioLib.h b/OvmfPkg/Include/Library/VirtioLib.h
index 95657a7111efeb1a9c6762fe3dc00db5fab054b1..eff66da6b3d16c8ca7a01db91f9919dd31475c2f 100644 (file)
--- a/OvmfPkg/Include/Library/VirtioLib.h
+++ b/OvmfPkg/Include/Library/VirtioLib.h
@@ -175,7 +175,7 @@ VirtioRingUninit (
 **/\r
 VOID\r
 EFIAPI\r
-AppendDesc (\r
+VirtioAppendDesc (\r
   IN OUT VRING  *Ring,\r
   IN     UINTN  BufferPhysAddr,\r
   IN     UINT32 BufferSize,\r

diff --git a/OvmfPkg/Library/VirtioLib/VirtioLib.c b/OvmfPkg/Library/VirtioLib/VirtioLib.c
index 580824261c8291037ccc8a69454f8964d7fff85d..f0328ef4cd6e5aaac476bbc2cca123a852380bbd 100644 (file)
--- a/OvmfPkg/Library/VirtioLib/VirtioLib.c
+++ b/OvmfPkg/Library/VirtioLib/VirtioLib.c
@@ -314,7 +314,7 @@ VirtioRingUninit (
 **/\r
 VOID\r
 EFIAPI\r
-AppendDesc (\r
+VirtioAppendDesc (\r
   IN OUT VRING  *Ring,\r
   IN     UINTN  BufferPhysAddr,\r
   IN     UINT32 BufferSize,\r

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index eeeb4bef6e21ec7ef6434b066552030ae5f1a411..ce38ff70936ed1744020d12dc06af225fd4766e6 100644 (file)
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -301,8 +301,8 @@ SynchronousRequest (
   //\r
   // virtio-blk header in first desc\r
   //\r
-  AppendDesc (&Dev->Ring, (UINTN) &Request, sizeof Request, VRING_DESC_F_NEXT,\r
-    FirstAvailIdx, &NextAvailIdx);\r
+  VirtioAppendDesc (&Dev->Ring, (UINTN) &Request, sizeof Request,\r
+    VRING_DESC_F_NEXT, FirstAvailIdx, &NextAvailIdx);\r
 \r
   //\r
   // data buffer for read/write in second desc\r
@@ -321,7 +321,7 @@ SynchronousRequest (
     //\r
     // VRING_DESC_F_WRITE is interpreted from the host's point of view.\r
     //\r
-    AppendDesc (&Dev->Ring, (UINTN) Buffer, (UINT32) BufferSize,\r
+    VirtioAppendDesc (&Dev->Ring, (UINTN) Buffer, (UINT32) BufferSize,\r
       VRING_DESC_F_NEXT | (RequestIsWrite ? 0 : VRING_DESC_F_WRITE),\r
       FirstAvailIdx, &NextAvailIdx);\r
   }\r
@@ -329,7 +329,7 @@ SynchronousRequest (
   //\r
   // host status in last (second or third) desc\r
   //\r
-  AppendDesc (&Dev->Ring, (UINTN) &HostStatus, sizeof HostStatus,\r
+  VirtioAppendDesc (&Dev->Ring, (UINTN) &HostStatus, sizeof HostStatus,\r
     VRING_DESC_F_WRITE, FirstAvailIdx, &NextAvailIdx);\r
 \r
   //\r