OvmfPkg: Make the VirtIo devices use the new VIRTIO_DEVICE_PROTOCOL

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

diff --git a/OvmfPkg/Include/IndustryStandard/VirtioScsi.h b/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
index 59ce97e070fbe5b322e9b29e288ca11ea99d922c..0c9b5209045016eb8a1f65a67a6ea65be0d82003 100644 (file)
--- a/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
@@ -26,22 +26,21 @@
 //\r
 #pragma pack(1)\r
 typedef struct {\r
-  VIRTIO_HDR Generic;\r
-  UINT32     VhdrNumQueues;\r
-  UINT32     VhdrSegMax;\r
-  UINT32     VhdrMaxSectors;\r
-  UINT32     VhdrCmdPerLun;\r
-  UINT32     VhdrEventInfoSize;\r
-  UINT32     VhdrSenseSize;\r
-  UINT32     VhdrCdbSize;\r
-  UINT16     VhdrMaxChannel;\r
-  UINT16     VhdrMaxTarget;\r
-  UINT32     VhdrMaxLun;\r
-} VSCSI_HDR;\r
+  UINT32     NumQueues;\r
+  UINT32     SegMax;\r
+  UINT32     MaxSectors;\r
+  UINT32     CmdPerLun;\r
+  UINT32     EventInfoSize;\r
+  UINT32     SenseSize;\r
+  UINT32     CdbSize;\r
+  UINT16     MaxChannel;\r
+  UINT16     MaxTarget;\r
+  UINT32     MaxLun;\r
+} VIRTIO_SCSI_CONFIG;\r
 #pragma pack()\r
 \r
-#define OFFSET_OF_VSCSI(Field) OFFSET_OF (VSCSI_HDR, Field)\r
-#define SIZE_OF_VSCSI(Field)   (sizeof ((VSCSI_HDR *) 0)->Field)\r
+#define OFFSET_OF_VSCSI(Field) OFFSET_OF (VIRTIO_SCSI_CONFIG, Field)\r
+#define SIZE_OF_VSCSI(Field)   (sizeof ((VIRTIO_SCSI_CONFIG *) 0)->Field)\r
 \r
 #define VIRTIO_SCSI_F_INOUT   BIT0\r
 #define VIRTIO_SCSI_F_HOTPLUG BIT1\r