OvmfPkg: Make the VirtIo devices use the new VIRTIO_DEVICE_PROTOCOL

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

diff --git a/OvmfPkg/Include/IndustryStandard/VirtioBlk.h b/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
index b71f224b651800a4e2626c53cf5e1e7eb9e7849b..ab11e6c8552abdc7986632d565cbecc8d7045e8f 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
@@ -26,19 +26,18 @@
 //\r
 #pragma pack(1)\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
+  UINT64     Capacity;\r
+  UINT32     SizeMax;\r
+  UINT32     SegMax;\r
+  UINT16     Cylinders;\r
+  UINT8      Heads;\r
+  UINT8      Sectors;\r
+  UINT32     BlkSize;\r
+} VIRTIO_BLK_CONFIG;\r
 #pragma pack()\r
 \r
-#define OFFSET_OF_VBLK(Field) OFFSET_OF (VBLK_HDR, Field)\r
-#define SIZE_OF_VBLK(Field)   (sizeof ((VBLK_HDR *) 0)->Field)\r
+#define OFFSET_OF_VBLK(Field) OFFSET_OF (VIRTIO_BLK_CONFIG, Field)\r
+#define SIZE_OF_VBLK(Field)   (sizeof ((VIRTIO_BLK_CONFIG *) 0)->Field)\r
 \r
 #define VIRTIO_BLK_F_BARRIER  BIT0\r
 #define VIRTIO_BLK_F_SIZE_MAX BIT1\r