[PATCH v2 1/1] Add missing EFIAPI to VirtioMmioSetQueueAddress

[PATCH v2 1/1] Add missing EFIAPI to VirtioMmioSetQueueAddress

[Gerd Hoffmann]

This error was found while compiling VirtioMmioDeviceLib for X64
with the GCC5 toolchain, where EFIAPI makes a difference.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h          | 1 +
 OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
index 785876c75f82..ab53b90d51c9 100644
--- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
+++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
@@ -107,6 +107,7 @@ VirtioMmioSetQueueSel (
   );
 
 EFI_STATUS
+EFIAPI
 VirtioMmioSetQueueAddress (
   IN VIRTIO_DEVICE_PROTOCOL  *This,
   IN VRING                   *Ring,
diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
index 454f008827be..b0d75fb1dd24 100644
--- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
+++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
@@ -173,6 +173,7 @@ VirtioMmioSetQueueSel (
 }
 
 EFI_STATUS
+EFIAPI
 VirtioMmioSetQueueAddress (
   IN VIRTIO_DEVICE_PROTOCOL  *This,
   IN VRING                   *Ring,
-- 
2.31.1

Re: [edk2-devel] [PATCH v2 1/1] Add missing EFIAPI to VirtioMmioSetQueueAddress

[Laszlo Ersek]

On 06/02/21 06:59, Gerd Hoffmann wrote:
> This error was found while compiling VirtioMmioDeviceLib for X64
> with the GCC5 toolchain, where EFIAPI makes a difference.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h          | 1 +
>  OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
> index 785876c75f82..ab53b90d51c9 100644
> --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
> +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
> @@ -107,6 +107,7 @@ VirtioMmioSetQueueSel (
>    );
>
>  EFI_STATUS
> +EFIAPI
>  VirtioMmioSetQueueAddress (
>    IN VIRTIO_DEVICE_PROTOCOL  *This,
>    IN VRING                   *Ring,
> diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
> index 454f008827be..b0d75fb1dd24 100644
> --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
> +++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceFunctions.c
> @@ -173,6 +173,7 @@ VirtioMmioSetQueueSel (
>  }
>
>  EFI_STATUS
> +EFIAPI
>  VirtioMmioSetQueueAddress (
>    IN VIRTIO_DEVICE_PROTOCOL  *This,
>    IN VRING                   *Ring,
>

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Merged as commit 75e9154f818a, via <https://github.com/tianocore/edk2/pull/1685>, with the following tweak (as shown with git-range-diff):

1:  2abeb914c87e ! 1:  f9e70d9c0f8a Add missing EFIAPI to VirtioMmioSetQueueAddress
    @@ -1,12 +1,15 @@
     Author: Gerd Hoffmann <kraxel@redhat.com>

    -    Add missing EFIAPI to VirtioMmioSetQueueAddress
    +    OvmfPkg/VirtioMmioDeviceLib: Add EFIAPI to VirtioMmioSetQueueAddress

         This error was found while compiling VirtioMmioDeviceLib for X64
         with the GCC5 toolchain, where EFIAPI makes a difference.

         Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
         Message-Id: <20210602045935.762211-1-kraxel@redhat.com>
    +    [lersek@redhat.com: prepend module name to subject, trim subject back to
    +     allowed length]
    +    Reviewed-by: Laszlo Ersek <lersek@redhat.com>

     diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h
     --- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.h

Thanks!
Laszlo