tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
jljusten 2012-10-12 18:54:52 +00:00
parent e371e7e545
commit 9de0355b1a
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OvmfPkg/Include/Library/VirtioLib.h
View File

@ -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,

6
OvmfPkg/Library/VirtioLib/VirtioLib.c
View File

@ -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 (

8
OvmfPkg/VirtioBlkDxe/VirtioBlk.c
View File

@ -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,