diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-12 18:53:20 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-12 18:53:20 +0000 |
| commit | a9624f945e37047196e825fcbe170772373fdae9 (patch) | |
| tree | 82d1a4b15a2266814ca292f7346efd40a3232ff8 | |
| parent | 55c3443a4f9a7bba34f1c60c6121c6b73dd05241 (diff) | |
| download | edk2-a9624f945e37047196e825fcbe170772373fdae9.zip edk2-a9624f945e37047196e825fcbe170772373fdae9.tar.gz edk2-a9624f945e37047196e825fcbe170772373fdae9.tar.bz2 | |
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
| -rw-r--r-- | OvmfPkg/Include/IndustryStandard/Virtio.h | 4 | ||||
| -rw-r--r-- | OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OvmfPkg/Include/IndustryStandard/Virtio.h b/OvmfPkg/Include/IndustryStandard/Virtio.h index f55994e..a330738 100644 --- a/OvmfPkg/Include/IndustryStandard/Virtio.h +++ b/OvmfPkg/Include/IndustryStandard/Virtio.h @@ -124,8 +124,8 @@ typedef struct { } VBLK_HDR;
#pragma pack()
-#define OFFSET_OF_VHDR(Field) OFFSET_OF (VBLK_HDR, Field)
-#define SIZE_OF_VHDR(Field) (sizeof ((VBLK_HDR *) 0)->Field)
+#define OFFSET_OF_VBLK(Field) OFFSET_OF (VBLK_HDR, Field)
+#define SIZE_OF_VBLK(Field) (sizeof ((VBLK_HDR *) 0)->Field)
//
diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c index 178fe33..01a562d 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c @@ -197,15 +197,15 @@ VirtioRead ( #define VIRTIO_CFG_WRITE(Dev, Field, Value) (VirtioWrite ( \
(Dev)->PciIo, \
- OFFSET_OF_VHDR (Field), \
- SIZE_OF_VHDR (Field), \
+ OFFSET_OF_VBLK (Field), \
+ SIZE_OF_VBLK (Field), \
(Value) \
))
#define VIRTIO_CFG_READ(Dev, Field, Pointer) (VirtioRead ( \
(Dev)->PciIo, \
- OFFSET_OF_VHDR (Field), \
- SIZE_OF_VHDR (Field), \
+ OFFSET_OF_VBLK (Field), \
+ SIZE_OF_VBLK (Field), \
sizeof *(Pointer), \
(Pointer) \
))
|