Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/XenPvBlkDxe/BlockFront.h

Timestamp:

Apr 14, 2023 3:17:44 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156854

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• OvmfPkg/XenPvBlkDxe/BlockFront.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/XenPvBlkDxe/BlockFront.h

@@ -12 +12 @@
 #include <IndustryStandard/Xen/io/blkif.h>
 
-typedef struct _XEN_BLOCK_FRONT_DEVICE XEN_BLOCK_FRONT_DEVICE;
-typedef struct _XEN_BLOCK_FRONT_IO XEN_BLOCK_FRONT_IO;
+typedef struct _XEN_BLOCK_FRONT_DEVICE  XEN_BLOCK_FRONT_DEVICE;
+typedef struct _XEN_BLOCK_FRONT_IO      XEN_BLOCK_FRONT_IO;
 
-struct _XEN_BLOCK_FRONT_IO
-{
-  XEN_BLOCK_FRONT_DEVICE  *Dev;
-  UINT8                   *Buffer;
-  UINTN                   Size;
-  UINTN                   Sector; ///< 512 bytes sector.
+struct _XEN_BLOCK_FRONT_IO {
+  XEN_BLOCK_FRONT_DEVICE    *Dev;
+  UINT8                     *Buffer;
+  UINTN                     Size;
+  UINTN                     Sector; ///< 512 bytes sector.
 
-  grant_ref_t             GrantRef[BLKIF_MAX_SEGMENTS_PER_REQUEST];
-  INT32                   NumRef;
+  grant_ref_t               GrantRef[BLKIF_MAX_SEGMENTS_PER_REQUEST];
+  INT32                     NumRef;
 
-  EFI_STATUS              Status;
+  EFI_STATUS                Status;
 };
 
-typedef struct
-{
-  UINT64    Sectors;
-  UINT32    SectorSize;
-  UINT32    VDiskInfo;
-  BOOLEAN   ReadWrite;
-  BOOLEAN   CdRom;
-  BOOLEAN   FeatureBarrier;
-  BOOLEAN   FeatureFlushCache;
+typedef struct {
+  UINT64     Sectors;
+  UINT32     SectorSize;
+  UINT32     VDiskInfo;
+  BOOLEAN    ReadWrite;
+  BOOLEAN    CdRom;
+  BOOLEAN    FeatureBarrier;
+  BOOLEAN    FeatureFlushCache;
 } XEN_BLOCK_FRONT_MEDIA_INFO;
 
-#define XEN_BLOCK_FRONT_SIGNATURE SIGNATURE_32 ('X', 'p', 'v', 'B')
+#define XEN_BLOCK_FRONT_SIGNATURE  SIGNATURE_32 ('X', 'p', 'v', 'B')
 struct _XEN_BLOCK_FRONT_DEVICE {
-  UINT32                      Signature;
-  EFI_BLOCK_IO_PROTOCOL       BlockIo;
-  domid_t                     DomainId;
+  UINT32                        Signature;
+  EFI_BLOCK_IO_PROTOCOL         BlockIo;
+  domid_t                       DomainId;
 
-  blkif_front_ring_t          Ring;
-  grant_ref_t                 RingRef;
-  evtchn_port_t               EventChannel;
-  blkif_vdev_t                DeviceId;
+  blkif_front_ring_t            Ring;
+  grant_ref_t                   RingRef;
+  evtchn_port_t                 EventChannel;
+  blkif_vdev_t                  DeviceId;
 
-  CONST CHAR8                 *NodeName;
-  XEN_BLOCK_FRONT_MEDIA_INFO  MediaInfo;
+  CONST CHAR8                   *NodeName;
+  XEN_BLOCK_FRONT_MEDIA_INFO    MediaInfo;
 
-  VOID                        *StateWatchToken;
+  VOID                          *StateWatchToken;
 
-  XENBUS_PROTOCOL             *XenBusIo;
+  XENBUS_PROTOCOL               *XenBusIo;
 };
 
@@ -63 +61 @@
 EFI_STATUS
 XenPvBlockFrontInitialization (
-  IN  XENBUS_PROTOCOL  *XenBusIo,
-  IN  CONST CHAR8      *NodeName,
-  OUT XEN_BLOCK_FRONT_DEVICE **DevPtr
+  IN  XENBUS_PROTOCOL         *XenBusIo,
+  IN  CONST CHAR8             *NodeName,
+  OUT XEN_BLOCK_FRONT_DEVICE  **DevPtr
   );
 
 VOID
 XenPvBlockFrontShutdown (
-  IN XEN_BLOCK_FRONT_DEVICE *Dev
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev
   );
 
 VOID
 XenPvBlockAsyncIo (
-  IN OUT XEN_BLOCK_FRONT_IO *IoData,
-  IN     BOOLEAN            IsWrite
+  IN OUT XEN_BLOCK_FRONT_IO  *IoData,
+  IN     BOOLEAN             IsWrite
   );
 
 EFI_STATUS
 XenPvBlockIo (
-  IN OUT XEN_BLOCK_FRONT_IO *IoData,
-  IN     BOOLEAN            IsWrite
+  IN OUT XEN_BLOCK_FRONT_IO  *IoData,
+  IN     BOOLEAN             IsWrite
   );
 
 VOID
 XenPvBlockAsyncIoPoll (
-  IN XEN_BLOCK_FRONT_DEVICE *Dev
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev
   );
 
 VOID
 XenPvBlockSync (
-  IN XEN_BLOCK_FRONT_DEVICE *Dev
+  IN XEN_BLOCK_FRONT_DEVICE  *Dev
   );