OvmfPkg: rename OFFSET_OF_VHDR() / SIZE_OF_VHDR() to *_OF_VBLK()

since they are in fact virtio-blk specific.

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@13840 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Include/IndustryStandard/Virtio.h b/OvmfPkg/Include/IndustryStandard/Virtio.h
index f55994ecb1583718b2b9f0f087d586ec35ad5449..a3307389991eb0e7cf043de4e9a2773c19d1dfcd 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Virtio.h
+++ b/OvmfPkg/Include/IndustryStandard/Virtio.h
@@ -124,8 +124,8 @@ typedef struct {
 } VBLK_HDR;\r
 #pragma pack()\r
 \r
-#define OFFSET_OF_VHDR(Field) OFFSET_OF (VBLK_HDR, Field)\r
-#define SIZE_OF_VHDR(Field)   (sizeof ((VBLK_HDR *) 0)->Field)\r
+#define OFFSET_OF_VBLK(Field) OFFSET_OF (VBLK_HDR, Field)\r
+#define SIZE_OF_VBLK(Field)   (sizeof ((VBLK_HDR *) 0)->Field)\r
 \r
 \r
 //\r

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index 178fe331a42a52e261959903c3054650cd89c1a9..01a562d1655e1d9a5525cef83fef8d0c31ae9dff 100644 (file)
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -197,15 +197,15 @@ VirtioRead (
 \r
 #define VIRTIO_CFG_WRITE(Dev, Field, Value)  (VirtioWrite (             \\r
                                                 (Dev)->PciIo,           \\r
-                                                OFFSET_OF_VHDR (Field), \\r
-                                                SIZE_OF_VHDR (Field),   \\r
+                                                OFFSET_OF_VBLK (Field), \\r
+                                                SIZE_OF_VBLK (Field),   \\r
                                                 (Value)                 \\r
                                                 ))\r
 \r
 #define VIRTIO_CFG_READ(Dev, Field, Pointer) (VirtioRead (              \\r
                                                 (Dev)->PciIo,           \\r
-                                                OFFSET_OF_VHDR (Field), \\r
-                                                SIZE_OF_VHDR (Field),   \\r
+                                                OFFSET_OF_VBLK (Field), \\r
+                                                SIZE_OF_VBLK (Field),   \\r
                                                 sizeof *(Pointer),      \\r
                                                 (Pointer)               \\r
                                                 ))\r