OvmfPkg: MSVC build fixes for VirtioLib and VirtioBlkDxe

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Mike Lee <leemiketw@gmail.com>
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@13845 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Include/Library/VirtioLib.h b/OvmfPkg/Include/Library/VirtioLib.h
index 07e4add7844cd29a63bbc4346cb7df41cc97c379..448dd2b578bfc74ec28f47de5d467a7da5351b63 100644 (file)
--- a/OvmfPkg/Include/Library/VirtioLib.h
+++ b/OvmfPkg/Include/Library/VirtioLib.h
@@ -40,8 +40,8 @@
   @return  Status code returned by PciIo->Io.Write().\r
 \r
 **/\r
-EFIAPI\r
 EFI_STATUS\r
+EFIAPI\r
 VirtioWrite (\r
   IN EFI_PCI_IO_PROTOCOL *PciIo,\r
   IN UINTN               FieldOffset,\r
@@ -72,8 +72,8 @@ VirtioWrite (
   @return  Status code returned by PciIo->Io.Read().\r
 \r
 **/\r
-EFIAPI\r
 EFI_STATUS\r
+EFIAPI\r
 VirtioRead (\r
   IN  EFI_PCI_IO_PROTOCOL *PciIo,\r
   IN  UINTN               FieldOffset,\r

diff --git a/OvmfPkg/Library/VirtioLib/VirtioLib.c b/OvmfPkg/Library/VirtioLib/VirtioLib.c
index 6ed977cd1019b1c3d155c2e89399bd4caedef634..8398c9db4c51c4f77b407ed5aa4a1e24a50e2123 100644 (file)
--- a/OvmfPkg/Library/VirtioLib/VirtioLib.c
+++ b/OvmfPkg/Library/VirtioLib/VirtioLib.c
@@ -44,8 +44,8 @@
   @return  Status code returned by PciIo->Io.Write().\r
 \r
 **/\r
-EFIAPI\r
 EFI_STATUS\r
+EFIAPI\r
 VirtioWrite (\r
   IN EFI_PCI_IO_PROTOCOL *PciIo,\r
   IN UINTN               FieldOffset,\r
@@ -76,6 +76,7 @@ VirtioWrite (
 \r
     default:\r
       ASSERT (FALSE);\r
+      return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   return PciIo->Io.Write (\r
@@ -111,8 +112,8 @@ VirtioWrite (
   @return  Status code returned by PciIo->Io.Read().\r
 \r
 **/\r
-EFIAPI\r
 EFI_STATUS\r
+EFIAPI\r
 VirtioRead (\r
   IN  EFI_PCI_IO_PROTOCOL *PciIo,\r
   IN  UINTN               FieldOffset,\r
@@ -146,6 +147,7 @@ VirtioRead (
 \r
     default:\r
       ASSERT (FALSE);\r
+      return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   return PciIo->Io.Read (\r

diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
index 44a05cfb5f8be21a546ed48deb95605fed21ea95..86041f0cafe9a4e3f89844cb1ddda2c07996ee10 100644 (file)
--- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
+++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c
@@ -997,13 +997,13 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = {
 // for unambiguous identification.\r
 //\r
 \r
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED\r
+STATIC\r
 EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {\r
   { "eng;en", L"Virtio Block Driver" },\r
   { NULL,     NULL                   }\r
 };\r
 \r
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED\r
+STATIC\r
 EFI_COMPONENT_NAME_PROTOCOL gComponentName;\r
 \r
 EFI_STATUS\r
@@ -1036,14 +1036,14 @@ VirtioBlkGetDeviceName (
   return EFI_UNSUPPORTED;\r
 }\r
 \r
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED\r
+STATIC\r
 EFI_COMPONENT_NAME_PROTOCOL gComponentName = {\r
   &VirtioBlkGetDriverName,\r
   &VirtioBlkGetDeviceName,\r
   "eng" // SupportedLanguages, ISO 639-2 language codes\r
 };\r
 \r
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED\r
+STATIC\r
 EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {\r
   (EFI_COMPONENT_NAME2_GET_DRIVER_NAME)     &VirtioBlkGetDriverName,\r
   (EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioBlkGetDeviceName,\r