commit 094611b426b3b532a3ec72256cb4e958149269d3
author Kamil Rytarowski <n54@gmx.com> Sat Oct 28 21:48:33 2017 +0200
committer Peter Maydell <peter.maydell@linaro.org> Thu Nov 02 16:19:34 2017 +0000
tree c0d235ad0e5cbd7fc02523665ab8ebae3cd03583
parent fa73e146250181852c0915aa65df8d54d35485fa

oslib-posix: Use sysctl(2) call to resolve exec_dir on NetBSD

NetBSD 8.0(beta) ships with KERN_PROC_PATHNAME in sysctl(2).
Older NetBSD versions can use argv[0] parsing fallback.

This code section is partly shared with FreeBSD.

Signed-off-by: Kamil Rytarowski <n54@gmx.com>
Message-id: 20171028194833.23858-1-n54@gmx.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

util/oslib-posix.c

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 382bd4a..77369c9 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -49,6 +49,10 @@
 #include <libutil.h>
 #endif
 
+#ifdef __NetBSD__
+#include <sys/sysctl.h>
+#endif
+
 #include "qemu/mmap-alloc.h"
 
 #ifdef CONFIG_DEBUG_STACK_USAGE
@@ -250,9 +254,14 @@
             p = buf;
         }
     }
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) \
+      || (defined(__NetBSD__) && defined(KERN_PROC_PATHNAME))
     {
+#if defined(__FreeBSD__)
         static int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+#else
+        static int mib[4] = {CTL_KERN, KERN_PROC_ARGS, -1, KERN_PROC_PATHNAME};
+#endif
         size_t len = sizeof(buf) - 1;
 
         *buf = '\0';