From 7fcacd6c92616fd993a5befd93bcc9cad2610c90 Mon Sep 17 00:00:00 2001 From: jljusten Date: Fri, 12 Oct 2012 18:54:17 +0000 Subject: 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 Reviewed-by: Jordan Justen git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13843 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/Include/Library/VirtioLib.h | 2 +- OvmfPkg/Library/VirtioLib/VirtioLib.c | 2 +- OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/Include/Library/VirtioLib.h b/OvmfPkg/Include/Library/VirtioLib.h index 95657a7111..eff66da6b3 100644 --- a/OvmfPkg/Include/Library/VirtioLib.h +++ b/OvmfPkg/Include/Library/VirtioLib.h @@ -175,7 +175,7 @@ VirtioRingUninit ( **/ VOID EFIAPI -AppendDesc ( +VirtioAppendDesc ( IN OUT VRING *Ring, IN UINTN BufferPhysAddr, IN UINT32 BufferSize, diff --git a/OvmfPkg/Library/VirtioLib/VirtioLib.c b/OvmfPkg/Library/VirtioLib/VirtioLib.c index 580824261c..f0328ef4cd 100644 --- a/OvmfPkg/Library/VirtioLib/VirtioLib.c +++ b/OvmfPkg/Library/VirtioLib/VirtioLib.c @@ -314,7 +314,7 @@ VirtioRingUninit ( **/ VOID EFIAPI -AppendDesc ( +VirtioAppendDesc ( IN OUT VRING *Ring, IN UINTN BufferPhysAddr, IN UINT32 BufferSize, diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c index eeeb4bef6e..ce38ff7093 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c @@ -301,8 +301,8 @@ SynchronousRequest ( // // virtio-blk header in first desc // - AppendDesc (&Dev->Ring, (UINTN) &Request, sizeof Request, VRING_DESC_F_NEXT, - FirstAvailIdx, &NextAvailIdx); + VirtioAppendDesc (&Dev->Ring, (UINTN) &Request, sizeof Request, + VRING_DESC_F_NEXT, FirstAvailIdx, &NextAvailIdx); // // data buffer for read/write in second desc @@ -321,7 +321,7 @@ SynchronousRequest ( // // VRING_DESC_F_WRITE is interpreted from the host's point of view. // - AppendDesc (&Dev->Ring, (UINTN) Buffer, (UINT32) BufferSize, + VirtioAppendDesc (&Dev->Ring, (UINTN) Buffer, (UINT32) BufferSize, VRING_DESC_F_NEXT | (RequestIsWrite ? 0 : VRING_DESC_F_WRITE), FirstAvailIdx, &NextAvailIdx); } @@ -329,7 +329,7 @@ SynchronousRequest ( // // host status in last (second or third) desc // - AppendDesc (&Dev->Ring, (UINTN) &HostStatus, sizeof HostStatus, + VirtioAppendDesc (&Dev->Ring, (UINTN) &HostStatus, sizeof HostStatus, VRING_DESC_F_WRITE, FirstAvailIdx, &NextAvailIdx); // -- cgit v1.2.3