On Thu, Oct 15, 2015 at 01:50:42PM +0200, Pino Toscano wrote:
Use the virProcessGetStartTime implementation also when only the kernel is FreeBSD, such as on GNU/kFreeBSD. --- src/util/virprocess.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index e6b78ef..43118f8 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -36,11 +36,11 @@ # include <sched.h> #endif -#if defined(__FreeBSD__) || HAVE_BSD_CPU_AFFINITY +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || HAVE_BSD_CPU_AFFINITY
I'm guessing __FreeBSD_kernel__ is not defined when compiling on pure FreeBSD, so we cannot use just __FreeBSD_kernel__, right? Weak ACK -- I have nowhere to try it and I'm lazy to install such machine just for trying out this patch, but I can clearly see it won't break anything that works right now, so... Also, if this works, then I believe there will be way more functions that could use this reasoning to make libvirt more Whatever/kFreeBSD friendly. Would you care to check some of those, like virSecurityDACGetProcessLabelInternal() etc.? I'm not pushing it if someone else has a chance to try it or review it since I'm not \kFreeBSD experienced.
# include <sys/param.h> #endif -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # include <sys/sysctl.h> # include <sys/user.h> #endif @@ -937,7 +937,7 @@ int virProcessGetStartTime(pid_t pid, VIR_FREE(buf); return ret; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { -- 2.1.0 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list