Changeset 80625 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/VirtioScsiDxe/VirtioScsi.c

Timestamp:

Sep 6, 2019 10:13:17 AM (6 years ago)

Author:

vboxsync

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

133154

Message:

Devices/EFI/FirmwareNew: Enable building of the VirtioScsiDxe driver, bugref:9440

File:

• trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/VirtioScsiDxe/VirtioScsi.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/VirtioScsiDxe/VirtioScsi.c

@@ -444 +444 @@
   VOID                      *ResponseBuffer;
   DESC_INDICES              Indices;
+#ifndef VBOX
   VOID                      *RequestMapping;
   VOID                      *ResponseMapping;
   VOID                      *InDataMapping;
   VOID                      *OutDataMapping;
+#else
+  VOID                      *RequestMapping  = NULL; /**< Initialize or cl.exe fails (gets confused by goto's). */
+  VOID                      *ResponseMapping = NULL;
+  VOID                      *InDataMapping   = NULL;
+  VOID                      *OutDataMapping  = NULL;
+#endif
   EFI_PHYSICAL_ADDRESS      RequestDeviceAddress;
   EFI_PHYSICAL_ADDRESS      ResponseDeviceAddress;
+#ifndef VBOX
   EFI_PHYSICAL_ADDRESS      InDataDeviceAddress;
   EFI_PHYSICAL_ADDRESS      OutDataDeviceAddress;
+#else
+  EFI_PHYSICAL_ADDRESS      InDataDeviceAddress = 0; /**< Initialize or cl.exe fails (gets confused by goto's). */
+  EFI_PHYSICAL_ADDRESS      OutDataDeviceAddress = 0;
+#endif
   VOID                      *InDataBuffer;
   UINTN                     InDataNumPages;