[edk2-devel] [PATCH 1/1 v3] EmulatorPkg: fixes for NetBSD compilation

[Pedro Falcato]

On Mon, Jan 9, 2023 at 5:03 PM <tlaronde at polynum.com> wrote:
>
> EmulatorPkg: fixes for NetBSD compilation.
>
> Note: generated against today (2023-01-09) master.
>
> v3:
> - Macro __NetBSD__ used instead of lower level _NETBSD_SOURCE;
> - The required fd value (-1) for mmap(3) under *BSD is given as is
>   with a comment indicating why this particular value for MAP_ANON;
> - Supplementary: mapFd0() is using mmap(3) also, with MAP_ANON, and the
>   fd was not corrected as above in the previous versions of the patch.
>
> From 708079397bb35eb50cfb12f7d5f2c66b64177a76 Mon Sep 17 00:00:00 2001
> From: Thierry LARONDE <tlaronde at polynum.com>
> Date: Mon, 9 Jan 2023 17:49:59 +0100
> Subject: [PATCH] EmulatorPkg: fixes for NetBSD compilation
>
> Signed-off-by: Thierry LARONDE <tlaronde at polynum.com>
> ---
>  EmulatorPkg/Unix/Host/BlockIo.c | 16 +++++++++++++++-
>  EmulatorPkg/Unix/Host/Host.c    |  7 ++++---
>  EmulatorPkg/Unix/Host/Host.h    |  7 ++++++-
>  3 files changed, 25 insertions(+), 5 deletions(-)
>
> diff --git a/EmulatorPkg/Unix/Host/BlockIo.c b/EmulatorPkg/Unix/Host/BlockIo.c
> index cf2d6b4cda..2eb062b03d 100644
> --- a/EmulatorPkg/Unix/Host/BlockIo.c
> +++ b/EmulatorPkg/Unix/Host/BlockIo.c
> @@ -133,6 +133,20 @@ EmuBlockIoOpenDevice (
>
>        ioctl (Private->fd, DKIOCGETMAXBLOCKCOUNTWRITE, &Private->Media->OptimalTransferLengthGranularity);
>      }
> + #elif __NetBSD__
> +    {
> +      UINTN  BlockSize;
> +      off_t  DiskSize;
> +
> +      if (ioctl (Private->fd,  DIOCGSECTORSIZE, &BlockSize) == 0) {
> +        Private->Media->BlockSize = BlockSize;
> +      }
> +
> +      if (ioctl (Private->fd, DIOCGMEDIASIZE, &DiskSize) == 0) {
> +        Private->NumberOfBlocks   = DivU64x32 (DiskSize, (UINT32)BlockSize);
> +        Private->Media->LastBlock = Private->NumberOfBlocks - 1;
> +      }
> +    }
>   #else
>      {
>        size_t  BlockSize;
> @@ -154,7 +168,7 @@ EmuBlockIoOpenDevice (
>      Private->Media->LastBlock = Private->NumberOfBlocks - 1;
>
>      if (fstatfs (Private->fd, &buf) == 0) {
> - #if __APPLE__
> + #if __APPLE__ || __NetBSD__
>        Private->Media->OptimalTransferLengthGranularity = buf.f_iosize/buf.f_bsize;
>   #else
>        Private->Media->OptimalTransferLengthGranularity = buf.f_bsize/buf.f_bsize;
> diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
> index 1f29dd00a3..6a338b81a1 100644
> --- a/EmulatorPkg/Unix/Host/Host.c
> +++ b/EmulatorPkg/Unix/Host/Host.c
> @@ -199,7 +199,7 @@ main (
>    //
>    InitialStackMemorySize = STACK_SIZE;
>    InitialStackMemory     = (UINTN)MapMemory (
> -                                    0,
> +                                    -1, // This value required by *BSD for MAP_ANON
>                                      (UINT32)InitialStackMemorySize,
>                                      PROT_READ | PROT_WRITE | PROT_EXEC,
>                                      MAP_ANONYMOUS | MAP_PRIVATE
> @@ -360,6 +360,7 @@ MapMemory (
>    while ((!isAligned) && (base != 0)) {
>      res = mmap ((void *)base, length, prot, flags, fd, 0);
>      if (res == MAP_FAILED) {
> +      perror("MapMemory");
>        return NULL;
>      }
>
> @@ -511,7 +512,7 @@ MapFd0 (
>                4096,
>                PROT_READ | PROT_WRITE,
>                MAP_PRIVATE | MAP_ANONYMOUS,
> -              0,
> +              -1, // This value required by *BSD for MAP_ANON
>                0
>                );
>      if (res3 != EmuMagicPage) {
> @@ -652,7 +653,7 @@ SecUnixPeiAutoScan (
>
>    *MemoryBase = 0;
>    res         = MapMemory (
> -                  0,
> +                  -1, // This value required by *BSD for MAP_ANON
>                    gSystemMemory[Index].Size,
>                    PROT_READ | PROT_WRITE | PROT_EXEC,
>                    MAP_PRIVATE | MAP_ANONYMOUS
> diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
> index 0c81cdfc01..d6b70e8320 100644
> --- a/EmulatorPkg/Unix/Host/Host.h
> +++ b/EmulatorPkg/Unix/Host/Host.h
> @@ -31,6 +31,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>
>  #if __CYGWIN__
>    #include <sys/dirent.h>
> +#elif __NetBSD__
> +  #include <dirent.h>
>  #else
>    #include <sys/dir.h>
>  #endif
> @@ -55,7 +57,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <net/if.h>
>  #include <ifaddrs.h>
>
> -#ifdef __APPLE__
> +#if defined(__APPLE__)
>    #include <net/if_dl.h>
>    #include <net/bpf.h>
>    #include <sys/param.h>
> @@ -65,6 +67,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>    #ifndef _Bool
>  #define _Bool  char  // for clang debug
>    #endif
> +#elif defined(__NetBSD__)
> +  #define statfs statvfs
> +  #define fstatfs fstatvfs
>  #else
>    #include <termio.h>
>    #include <sys/vfs.h>
> --
> 2.39.0
>
> --
>         Thierry Laronde <tlaronde +AT+ polynum +dot+ com>
>                      http://www.kergis.com/
>                     http://kertex.kergis.com/
> Key fingerprint = 0FF7 E906 FBAF FE95 FD89  250D 52B1 AE95 6006 F40C

Hi,

I do not have any authority in EmulatorPkg but

Reviewed-by: Pedro Falcato <pedro.falcato at gmail.com>

Can one of the maintainers please give their feedback and/or merge?

This patch has been soaking up for way too long for no good reason.
The feedback has been addressed. I don't think there are any other
issues and there has been 0 feedback from the actual maintainers.

-- 
Pedro


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#99193): https://edk2.groups.io/g/devel/message/99193
Mute This Topic: https://groups.io/mt/96156940/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-