diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-12 18:53:06 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-12 18:53:06 +0000 |
| commit | 55c3443a4f9a7bba34f1c60c6121c6b73dd05241 (patch) | |
| tree | 7013f254c8d5a28e7946795678667188f5769b57 /OvmfPkg/Include/IndustryStandard | |
| parent | 2c3239f305e6d3cab32cb408cdde97fed6bc639c (diff) | |
| download | edk2-platforms-55c3443a4f9a7bba34f1c60c6121c6b73dd05241.tar.xz | |
OvmfPkg: regroup virtio config fields into generic & specific structs
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@13839 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg/Include/IndustryStandard')
| -rw-r--r-- | OvmfPkg/Include/IndustryStandard/Virtio.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/OvmfPkg/Include/IndustryStandard/Virtio.h b/OvmfPkg/Include/IndustryStandard/Virtio.h index 600d3d272b..f55994ecb1 100644 --- a/OvmfPkg/Include/IndustryStandard/Virtio.h +++ b/OvmfPkg/Include/IndustryStandard/Virtio.h @@ -96,7 +96,6 @@ typedef struct { //
// virtio-0.9.5, 2.2.2 Virtio Header -- no MSI-X
-// virtio-0.9.5, Appendix D
//
#pragma pack(1)
typedef struct {
@@ -108,13 +107,20 @@ typedef struct { UINT16 VhdrQueueNotify;
UINT8 VhdrDeviceStatus;
UINT8 VhdrISR;
- UINT64 VhdrCapacity;
- UINT32 VhdrSizeMax;
- UINT32 VhdrSegMax;
- UINT16 VhdrCylinders;
- UINT8 VhdrHeads;
- UINT8 VhdrSectors;
- UINT32 VhdrBlkSize;
+} VIRTIO_HDR;
+
+//
+// virtio-0.9.5, Appendix D: Block Device
+//
+typedef struct {
+ VIRTIO_HDR Generic;
+ UINT64 VhdrCapacity;
+ UINT32 VhdrSizeMax;
+ UINT32 VhdrSegMax;
+ UINT16 VhdrCylinders;
+ UINT8 VhdrHeads;
+ UINT8 VhdrSectors;
+ UINT32 VhdrBlkSize;
} VBLK_HDR;
#pragma pack()
|