3 files changed, 29 insertions, 33 deletions
diff --git a/OvmfPkg/Include/IndustryStandard/VirtioBlk.h b/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
index b71f224b65..ab11e6c855 100644
--- a/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
@@ -26,19 +26,18 @@
 //
 #pragma pack(1)
 typedef struct {
-  VIRTIO_HDR Generic;
-  UINT64     VhdrCapacity;
-  UINT32     VhdrSizeMax;
-  UINT32     VhdrSegMax;
-  UINT16     VhdrCylinders;
-  UINT8      VhdrHeads;
-  UINT8      VhdrSectors;
-  UINT32     VhdrBlkSize;
-} VBLK_HDR;
+  UINT64     Capacity;
+  UINT32     SizeMax;
+  UINT32     SegMax;
+  UINT16     Cylinders;
+  UINT8      Heads;
+  UINT8      Sectors;
+  UINT32     BlkSize;
+} VIRTIO_BLK_CONFIG;
 #pragma pack()
 
-#define OFFSET_OF_VBLK(Field) OFFSET_OF (VBLK_HDR, Field)
-#define SIZE_OF_VBLK(Field)   (sizeof ((VBLK_HDR *) 0)->Field)
+#define OFFSET_OF_VBLK(Field) OFFSET_OF (VIRTIO_BLK_CONFIG, Field)
+#define SIZE_OF_VBLK(Field)   (sizeof ((VIRTIO_BLK_CONFIG *) 0)->Field)
 
 #define VIRTIO_BLK_F_BARRIER  BIT0
 #define VIRTIO_BLK_F_SIZE_MAX BIT1
diff --git a/OvmfPkg/Include/IndustryStandard/VirtioNet.h b/OvmfPkg/Include/IndustryStandard/VirtioNet.h
index 03dfeb2c59..34bf15a588 100644
--- a/OvmfPkg/Include/IndustryStandard/VirtioNet.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioNet.h
@@ -1,5 +1,4 @@
 /** @file
-
   Virtio Network Device specific type and macro definitions corresponding to
   the virtio-0.9.5 specification.
 
@@ -25,14 +24,13 @@
 //
 #pragma pack(1)
 typedef struct {
-  VIRTIO_HDR Generic;
-  UINT8      VhdrMac[6];
-  UINT16     VhdrLinkStatus;
-} VNET_HDR;
+  UINT8      Mac[6];
+  UINT16     LinkStatus;
+} VIRTIO_NET_CONFIG;
 #pragma pack()
 
-#define OFFSET_OF_VNET(Field) OFFSET_OF (VNET_HDR, Field)
-#define SIZE_OF_VNET(Field)   (sizeof ((VNET_HDR *) 0)->Field)
+#define OFFSET_OF_VNET(Field) OFFSET_OF (VIRTIO_NET_CONFIG, Field)
+#define SIZE_OF_VNET(Field)   (sizeof ((VIRTIO_NET_CONFIG *) 0)->Field)
 
 //
 // Queue Identifiers
@@ -91,7 +89,7 @@ typedef struct {
 #define VIRTIO_NET_HDR_GSO_ECN   BIT7
 
 //
-// Link Status Bits in VNET_HDR.VhdrLinkStatus
+// Link Status Bits in VIRTIO_NET_CONFIG.LinkStatus
 //
 #define VIRTIO_NET_S_LINK_UP  BIT0
 #define VIRTIO_NET_S_ANNOUNCE BIT1
diff --git a/OvmfPkg/Include/IndustryStandard/VirtioScsi.h b/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
index 59ce97e070..0c9b520904 100644
--- a/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
@@ -26,22 +26,21 @@
 //
 #pragma pack(1)
 typedef struct {
-  VIRTIO_HDR Generic;
-  UINT32     VhdrNumQueues;
-  UINT32     VhdrSegMax;
-  UINT32     VhdrMaxSectors;
-  UINT32     VhdrCmdPerLun;
-  UINT32     VhdrEventInfoSize;
-  UINT32     VhdrSenseSize;
-  UINT32     VhdrCdbSize;
-  UINT16     VhdrMaxChannel;
-  UINT16     VhdrMaxTarget;
-  UINT32     VhdrMaxLun;
-} VSCSI_HDR;
+  UINT32     NumQueues;
+  UINT32     SegMax;
+  UINT32     MaxSectors;
+  UINT32     CmdPerLun;
+  UINT32     EventInfoSize;
+  UINT32     SenseSize;
+  UINT32     CdbSize;
+  UINT16     MaxChannel;
+  UINT16     MaxTarget;
+  UINT32     MaxLun;
+} VIRTIO_SCSI_CONFIG;
 #pragma pack()
 
-#define OFFSET_OF_VSCSI(Field) OFFSET_OF (VSCSI_HDR, Field)
-#define SIZE_OF_VSCSI(Field)   (sizeof ((VSCSI_HDR *) 0)->Field)
+#define OFFSET_OF_VSCSI(Field) OFFSET_OF (VIRTIO_SCSI_CONFIG, Field)
+#define SIZE_OF_VSCSI(Field)   (sizeof ((VIRTIO_SCSI_CONFIG *) 0)->Field)
 
 #define VIRTIO_SCSI_F_INOUT   BIT0
 #define VIRTIO_SCSI_F_HOTPLUG BIT1