From 55c3443a4f9a7bba34f1c60c6121c6b73dd05241 Mon Sep 17 00:00:00 2001
From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 12 Oct 2012 18:53:06 +0000
Subject: 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
---
 OvmfPkg/Include/IndustryStandard/Virtio.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'OvmfPkg/Include/IndustryStandard')

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()
 
-- 
cgit v1.2.3