diff options
| author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-12 18:54:52 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-10-12 18:54:52 +0000 |
| commit | 9de0355b1ad7c8afaaf1dc0545438c9a6659d869 (patch) | |
| tree | 9f4c4ec63715ec3c9fccd48329d93139fd8bd227 | |
| parent | e371e7e545b266ce4ae8ff76da6c98616214599f (diff) | |
| download | edk2-9de0355b1ad7c8afaaf1dc0545438c9a6659d869.tar.gz edk2-9de0355b1ad7c8afaaf1dc0545438c9a6659d869.tar.bz2 edk2-9de0355b1ad7c8afaaf1dc0545438c9a6659d869.zip | |
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
| -rw-r--r-- | OvmfPkg/Include/Library/VirtioLib.h | 4 | ||||
| -rw-r--r-- | OvmfPkg/Library/VirtioLib/VirtioLib.c | 6 | ||||
| -rw-r--r-- | OvmfPkg/VirtioBlkDxe/VirtioBlk.c | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/OvmfPkg/Include/Library/VirtioLib.h b/OvmfPkg/Include/Library/VirtioLib.h index 07e4add784..448dd2b578 100644 --- a/OvmfPkg/Include/Library/VirtioLib.h +++ b/OvmfPkg/Include/Library/VirtioLib.h @@ -40,8 +40,8 @@ @return Status code returned by PciIo->Io.Write().
**/
-EFIAPI
EFI_STATUS
+EFIAPI
VirtioWrite (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINTN FieldOffset,
@@ -72,8 +72,8 @@ VirtioWrite ( @return Status code returned by PciIo->Io.Read().
**/
-EFIAPI
EFI_STATUS
+EFIAPI
VirtioRead (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINTN FieldOffset,
diff --git a/OvmfPkg/Library/VirtioLib/VirtioLib.c b/OvmfPkg/Library/VirtioLib/VirtioLib.c index 6ed977cd10..8398c9db4c 100644 --- a/OvmfPkg/Library/VirtioLib/VirtioLib.c +++ b/OvmfPkg/Library/VirtioLib/VirtioLib.c @@ -44,8 +44,8 @@ @return Status code returned by PciIo->Io.Write().
**/
-EFIAPI
EFI_STATUS
+EFIAPI
VirtioWrite (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINTN FieldOffset,
@@ -76,6 +76,7 @@ VirtioWrite ( default:
ASSERT (FALSE);
+ return EFI_INVALID_PARAMETER;
}
return PciIo->Io.Write (
@@ -111,8 +112,8 @@ VirtioWrite ( @return Status code returned by PciIo->Io.Read().
**/
-EFIAPI
EFI_STATUS
+EFIAPI
VirtioRead (
IN EFI_PCI_IO_PROTOCOL *PciIo,
IN UINTN FieldOffset,
@@ -146,6 +147,7 @@ VirtioRead ( default:
ASSERT (FALSE);
+ return EFI_INVALID_PARAMETER;
}
return PciIo->Io.Read (
diff --git a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c index 44a05cfb5f..86041f0caf 100644 --- a/OvmfPkg/VirtioBlkDxe/VirtioBlk.c +++ b/OvmfPkg/VirtioBlkDxe/VirtioBlk.c @@ -997,13 +997,13 @@ STATIC EFI_DRIVER_BINDING_PROTOCOL gDriverBinding = { // for unambiguous identification.
//
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED
+STATIC
EFI_UNICODE_STRING_TABLE mDriverNameTable[] = {
{ "eng;en", L"Virtio Block Driver" },
{ NULL, NULL }
};
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED
+STATIC
EFI_COMPONENT_NAME_PROTOCOL gComponentName;
EFI_STATUS
@@ -1036,14 +1036,14 @@ VirtioBlkGetDeviceName ( return EFI_UNSUPPORTED;
}
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED
+STATIC
EFI_COMPONENT_NAME_PROTOCOL gComponentName = {
&VirtioBlkGetDriverName,
&VirtioBlkGetDeviceName,
"eng" // SupportedLanguages, ISO 639-2 language codes
};
-STATIC GLOBAL_REMOVE_IF_UNREFERENCED
+STATIC
EFI_COMPONENT_NAME2_PROTOCOL gComponentName2 = {
(EFI_COMPONENT_NAME2_GET_DRIVER_NAME) &VirtioBlkGetDriverName,
(EFI_COMPONENT_NAME2_GET_CONTROLLER_NAME) &VirtioBlkGetDeviceName,
|