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: [PATCH] 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 +++++++++++++--------
 OvmfPkg/VirtioBlkDxe/VirtioBlk.c          | 24 +++++++++++------------
 2 files changed, 26 insertions(+), 20 deletions(-)

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()
 
diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index 9969aab66f..178fe331a4 100644
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -538,7 +538,7 @@ SynchronousRequest (
   // OK. virtio-blk's only virtqueue is #0, called "requestq" (see Appendix D).
   //
   MemoryFence();
-  if (EFI_ERROR (VIRTIO_CFG_WRITE (Dev, VhdrQueueNotify, 0))) {
+  if (EFI_ERROR (VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueNotify, 0))) {
     return EFI_DEVICE_ERROR;
   }
 
@@ -984,19 +984,19 @@ VirtioBlkInit (
   // Execute virtio-0.9.5, 2.2.1 Device Initialization Sequence.
   //
   NextDevStat = 0;             // step 1 -- reset device
-  Status = VIRTIO_CFG_WRITE (Dev, VhdrDeviceStatus, NextDevStat);
+  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);
   if (EFI_ERROR (Status)) {
     goto Failed;
   }
 
   NextDevStat |= VSTAT_ACK;    // step 2 -- acknowledge device presence
-  Status = VIRTIO_CFG_WRITE (Dev, VhdrDeviceStatus, NextDevStat);
+  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);
   if (EFI_ERROR (Status)) {
     goto Failed;
   }
 
   NextDevStat |= VSTAT_DRIVER; // step 3 -- we know how to drive it
-  Status = VIRTIO_CFG_WRITE (Dev, VhdrDeviceStatus, NextDevStat);
+  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);
   if (EFI_ERROR (Status)) {
     goto Failed;
   }
@@ -1004,7 +1004,7 @@ VirtioBlkInit (
   //
   // step 4a -- retrieve and validate features
   //
-  Status = VIRTIO_CFG_READ (Dev, VhdrDeviceFeatureBits, &Features);
+  Status = VIRTIO_CFG_READ (Dev, Generic.VhdrDeviceFeatureBits, &Features);
   if (EFI_ERROR (Status)) {
     goto Failed;
   }
@@ -1039,11 +1039,11 @@ VirtioBlkInit (
   //
   // step 4b -- allocate virtqueue
   //
-  Status = VIRTIO_CFG_WRITE (Dev, VhdrQueueSelect, 0);
+  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueSelect, 0);
   if (EFI_ERROR (Status)) {
     goto Failed;
   }
-  Status = VIRTIO_CFG_READ (Dev, VhdrQueueSize, &QueueSize);
+  Status = VIRTIO_CFG_READ (Dev, Generic.VhdrQueueSize, &QueueSize);
   if (EFI_ERROR (Status)) {
     goto Failed;
   }
@@ -1061,7 +1061,7 @@ VirtioBlkInit (
   // step 4c -- Report GPFN (guest-physical frame number) of queue. If anything
   // fails from here on, we must release the ring resources.
   //
-  Status = VIRTIO_CFG_WRITE (Dev, VhdrQueueAddress,
+  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrQueueAddress,
              (UINTN) Dev->Ring.Base >> EFI_PAGE_SHIFT);
   if (EFI_ERROR (Status)) {
     goto ReleaseQueue;
@@ -1073,7 +1073,7 @@ VirtioBlkInit (
   // device-independent (known or unknown) VIRTIO_F_* capabilities (see
   // Appendix B).
   //
-  Status = VIRTIO_CFG_WRITE (Dev, VhdrGuestFeatureBits, 0);
+  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrGuestFeatureBits, 0);
   if (EFI_ERROR (Status)) {
     goto ReleaseQueue;
   }
@@ -1082,7 +1082,7 @@ VirtioBlkInit (
   // step 6 -- initialization complete
   //
   NextDevStat |= VSTAT_DRIVER_OK;
-  Status = VIRTIO_CFG_WRITE (Dev, VhdrDeviceStatus, NextDevStat);
+  Status = VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);
   if (EFI_ERROR (Status)) {
     goto ReleaseQueue;
   }
@@ -1118,7 +1118,7 @@ Failed:
   // Status. PCI IO access failure here should not mask the original error.
   //
   NextDevStat |= VSTAT_FAILED;
-  VIRTIO_CFG_WRITE (Dev, VhdrDeviceStatus, NextDevStat);
+  VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, NextDevStat);
 
   return Status; // reached only via Failed above
 }
@@ -1145,7 +1145,7 @@ VirtioBlkUninit (
   // VIRTIO_CFG_WRITE() returns, the host will have learned to stay away from
   // the old comms area.
   //
-  VIRTIO_CFG_WRITE (Dev, VhdrDeviceStatus, 0);
+  VIRTIO_CFG_WRITE (Dev, Generic.VhdrDeviceStatus, 0);
 
   VirtioRingUninit (&Dev->Ring);
 
-- 
2.39.2