From: Mark Wielaard <mark@klomp.org>
To: Ulf Hermann <ulf.hermann@qt.io>
Cc: elfutils-devel@sourceware.org
Subject: Re: [PATCH] Don't look for kernel version if not running on linux
Date: Wed, 03 May 2017 10:50:00 -0000 [thread overview]
Message-ID: <20170502212852.GG3321@stream> (raw)
In-Reply-To: <f27a4c07-d22f-54a4-9d6e-77fab710455f@qt.io>
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
On Tue, May 02, 2017 at 12:17:24PM +0200, Ulf Hermann wrote:
> > You can get uname() on Windows through gnulib, but at the cost at
> > linking to additional windows DLLs. It calls gethostname and for that
> > we need to link against ws2_32.dll. That's an unreasonable dependency
> > for getting something we cannot use anyway. I suggest we just set
> > errno to ENOTSUP then.
>
> I should clarify this a bit. We only use uname() to obtain the kernel
> version and we only use the kernel version to search for directories
> containing kernel modules. The only operating system where this makes sense
> is linux as we cannot handle anything but linux kernel modules there.
> Therefore there is no point in retrieving the kernel version on any other
> OS.
Agreed. So committed as attached.
Thanks,
Mark
[-- Attachment #2: 0001-Don-t-look-for-kernel-version-if-not-running-on-linu.patch --]
[-- Type: text/plain, Size: 1669 bytes --]
From e88787f9cd2af5be00aa6f53320cf85f7c08f1f2 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 20 Apr 2017 16:08:48 +0200
Subject: [PATCH] Don't look for kernel version if not running on linux
We don't want to use it, even if it exists.
Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
libdwfl/ChangeLog | 6 ++++++
libdwfl/linux-kernel-modules.c | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index 1fc9da6..859b2ff 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,4 +1,10 @@
2017-04-20 Ulf Hermann <ulf.hermann@qt.io>
+ Mark Wielaard <mark@klomp.org>
+
+ * linux-kernel-modules.c: Always return NULL from kernel_release() on
+ non-linux systems and set errno to ENOTSUP.
+
+2017-04-20 Ulf Hermann <ulf.hermann@qt.io>
* libdwflP.h: Don't include config.h.
* argp-std.c: Include config.h.
diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c
index 893110a..9d0fef2 100644
--- a/libdwfl/linux-kernel-modules.c
+++ b/libdwfl/linux-kernel-modules.c
@@ -156,11 +156,18 @@ try_kernel_name (Dwfl *dwfl, char **fname, bool try_debug)
static inline const char *
kernel_release (void)
{
+#ifdef __linux__
/* Cache the `uname -r` string we'll use. */
static struct utsname utsname;
if (utsname.release[0] == '\0' && uname (&utsname) != 0)
return NULL;
return utsname.release;
+#else
+ /* Used for finding the running linux kernel, which isn't supported
+ on non-linux kernel systems. */
+ errno = ENOTSUP;
+ return NULL;
+#endif
}
static int
--
2.9.3
prev parent reply other threads:[~2017-05-02 21:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-20 14:08 Ulf Hermann
2017-04-27 19:41 ` Mark Wielaard
2017-04-28 11:10 ` Ulf Hermann
2017-05-02 11:49 ` Ulf Hermann
2017-05-03 10:50 ` Mark Wielaard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170502212852.GG3321@stream \
--to=mark@klomp.org \
--cc=elfutils-devel@sourceware.org \
--cc=ulf.hermann@qt.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).