OvmfPkg: regroup virtio config fields into generic & specific structs

[mirror_edk2.git] / OvmfPkg / Include / IndustryStandard / Virtio.h

diff --git a/OvmfPkg/Include/IndustryStandard/Virtio.h b/OvmfPkg/Include/IndustryStandard/Virtio.h
index 600d3d272b6a1865d5a348b1a91517415b6351d0..f55994ecb1583718b2b9f0f087d586ec35ad5449 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/Virtio.h
+++ b/OvmfPkg/Include/IndustryStandard/Virtio.h
@@ -96,7 +96,6 @@ typedef struct {
 \r
 //\r
 // virtio-0.9.5, 2.2.2 Virtio Header -- no MSI-X\r
-// virtio-0.9.5, Appendix D\r
 //\r
 #pragma pack(1)\r
 typedef struct {\r
@@ -108,13 +107,20 @@ typedef struct {
   UINT16 VhdrQueueNotify;\r
   UINT8  VhdrDeviceStatus;\r
   UINT8  VhdrISR;\r
-  UINT64 VhdrCapacity;\r
-  UINT32 VhdrSizeMax;\r
-  UINT32 VhdrSegMax;\r
-  UINT16 VhdrCylinders;\r
-  UINT8  VhdrHeads;\r
-  UINT8  VhdrSectors;\r
-  UINT32 VhdrBlkSize;\r
+} VIRTIO_HDR;\r
+\r
+//\r
+// virtio-0.9.5, Appendix D: Block Device\r
+//\r
+typedef struct {\r
+  VIRTIO_HDR Generic;\r
+  UINT64     VhdrCapacity;\r
+  UINT32     VhdrSizeMax;\r
+  UINT32     VhdrSegMax;\r
+  UINT16     VhdrCylinders;\r
+  UINT8      VhdrHeads;\r
+  UINT8      VhdrSectors;\r
+  UINT32     VhdrBlkSize;\r
 } VBLK_HDR;\r
 #pragma pack()\r
 \r