CVS commit: src/sys/kern
Module Name:src
Committed By: uebayasi
Date: Thu Nov 6 08:46:04 UTC 2014
Modified Files:
src/sys/kern: subr_autoconf.c
Log Message:
Make config_stdsubmatch() human-readable.
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/kern/subr_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.232 src/sys/kern/subr_autoconf.c:1.233
--- src/sys/kern/subr_autoconf.c:1.232 Fri Sep 5 05:57:21 2014
+++ src/sys/kern/subr_autoconf.c Thu Nov 6 08:46:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.232 2014/09/05 05:57:21 matt Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.233 2014/11/06 08:46:04 uebayasi Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.232 2014/09/05 05:57:21 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.233 2014/11/06 08:46:04 uebayasi Exp $);
#ifdef _KERNEL_OPT
#include opt_ddb.h
@@ -707,11 +707,12 @@ config_stdsubmatch(device_t parent, cfda
KASSERT(!nlocs || locs);
for (i = 0; i nlocs; i++) {
cl = ci-ci_locdesc[i];
- /* !cld_defaultstr means no default value */
- if ((!(cl-cld_defaultstr)
- || (cf-cf_loc[i] != cl-cld_default))
- cf-cf_loc[i] != locs[i])
- return 0;
+ if (cl-cld_defaultstr != NULL
+ cf-cf_loc[i] == cl-cld_default)
+ continue;
+ if (cf-cf_loc[i] == locs[i])
+ continue;
+ return 0;
}
return config_match(parent, cf, aux);
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Thu Nov 6 11:40:32 UTC 2014
Modified Files:
src/usr.bin/config: defs.h main.c mkmakefile.c
Log Message:
config(1): Rename internal flag to enable modular build
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/config/defs.h
cvs rdiff -u -r1.72 -r1.73 src/usr.bin/config/main.c
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/config/mkmakefile.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.61 src/usr.bin/config/defs.h:1.62
--- src/usr.bin/config/defs.h:1.61 Sat Nov 1 14:24:45 2014
+++ src/usr.bin/config/defs.h Thu Nov 6 11:40:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.61 2014/11/01 14:24:45 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.62 2014/11/06 11:40:32 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -587,6 +587,7 @@ void emit_options(void);
void emit_params(void);
/* main.c */
+extern int Mflag;
void addoption(const char *, const char *);
void addfsoption(const char *);
void addmkoption(const char *, const char *);
@@ -629,7 +630,6 @@ int emitioconfh(void);
int mkioconf(void);
/* mkmakefile.c */
-extern int usekobjs;
int mkmakefile(void);
/* mkswap.c */
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.72 src/usr.bin/config/main.c:1.73
--- src/usr.bin/config/main.c:1.72 Tue Nov 4 23:00:35 2014
+++ src/usr.bin/config/main.c Thu Nov 6 11:40:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.72 2014/11/04 23:00:35 joerg Exp $ */
+/* $NetBSD: main.c,v 1.73 2014/11/06 11:40:32 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: main.c,v 1.72 2014/11/04 23:00:35 joerg Exp $);
+__RCSID($NetBSD: main.c,v 1.73 2014/11/06 11:40:32 uebayasi Exp $);
#ifndef MAKE_BOOTSTRAP
#include sys/cdefs.h
@@ -89,6 +89,7 @@ COPYRIGHT(@(#) Copyright (c) 1992, 1993
int vflag;/* verbose output */
int Pflag;/* pack locators */
int Lflag;/* lint config generation */
+int Mflag;/* modular build */
int handling_cmdlineopts; /* currently processing -D/-U options */
int yyparse(void);
@@ -176,7 +177,7 @@ main(int argc, char **argv)
break;
case 'M':
- usekobjs = 1;
+ Mflag = 1;
break;
case 'L':
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.25 src/usr.bin/config/mkmakefile.c:1.26
--- src/usr.bin/config/mkmakefile.c:1.25 Wed Oct 29 17:14:50 2014
+++ src/usr.bin/config/mkmakefile.c Thu Nov 6 11:40:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.25 2014/10/29 17:14:50 christos Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.26 2014/11/06 11:40:32 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include sys/cdefs.h
-__RCSID($NetBSD: mkmakefile.c,v 1.25 2014/10/29 17:14:50 christos Exp $);
+__RCSID($NetBSD: mkmakefile.c,v 1.26 2014/11/06 11:40:32 uebayasi Exp $);
#include sys/param.h
#include ctype.h
@@ -85,9 +85,6 @@ static void emitappmkoptions(FILE *);
static void emitsubs(FILE *, const char *, const char *, int);
static int selectopt(const char *, void *);
-/* Generate Makefile to build things per-attribute *.ko (a.k.a modular build). */
-int usekobjs = 0;
-
int
mkmakefile(void)
{
@@ -132,7 +129,7 @@ mkmakefile(void)
continue;
}
if (strcmp(line, %OBJS\n) == 0)
- fn = usekobjs ? emitkobjs : emitobjs;
+ fn = Mflag ? emitkobjs : emitobjs;
else if (strcmp(line, %CFILES\n) == 0)
fn = emitcfiles;
else if (strcmp(line, %SFILES\n) == 0)
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Thu Nov 6 11:59:17 UTC 2014
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
More clean files.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.176 src/sys/conf/Makefile.kern.inc:1.177
--- src/sys/conf/Makefile.kern.inc:1.176 Fri Oct 10 08:13:52 2014
+++ src/sys/conf/Makefile.kern.inc Thu Nov 6 11:59:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.176 2014/10/10 08:13:52 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.177 2014/11/06 11:59:17 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -346,7 +346,7 @@ assym.h machdep.o: Makefile
.if !target(__CLEANKERNEL)
__CLEANKERNEL: .USE
${_MKMSG} ${.TARGET}ing the kernel objects
- rm -f ${KERNELS} eddep tags *.[io] *.ln [a-z]*.s vers.c \
+ rm -f ${KERNELS} *.map eddep tags *.[io] *.ko *.ln [a-z]*.s vers.c \
[Ee]rrs linterrs makelinks assym.h.tmp assym.h \
${EXTRA_KERNELS} ${EXTRA_CLEAN}
.endif
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Thu Nov 6 12:02:59 UTC 2014
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Leave .map when linking .ko in modular build.
To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.177 src/sys/conf/Makefile.kern.inc:1.178
--- src/sys/conf/Makefile.kern.inc:1.177 Thu Nov 6 11:59:17 2014
+++ src/sys/conf/Makefile.kern.inc Thu Nov 6 12:02:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.177 2014/11/06 11:59:17 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.178 2014/11/06 12:02:59 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -160,8 +160,8 @@ NORMAL_S?= @${_MKSHMSG} compile ${.CUR
# link rules:
LINK_O?= @${_MKSHMSG}link ${.CURDIR:T}/${.TARGET} \
${_MKSHECHO}\
- ${LD} -r -o ${.TARGET} ${.ALLSRC} \
- ${LD} -r -o ${.TARGET} ${.ALLSRC}
+ ${LD} -r -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC} \
+ ${LD} -r -Map=${.TARGET}.map -o ${.TARGET} ${.ALLSRC}
##
## (3) libkern and compat
CVS commit: src/share/mk
Module Name:src
Committed By: uebayasi
Date: Thu Nov 6 12:05:44 UTC 2014
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Leave .map when linking .kmod.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.45 src/share/mk/bsd.kmodule.mk:1.46
--- src/share/mk/bsd.kmodule.mk:1.45 Fri Sep 19 17:45:42 2014
+++ src/share/mk/bsd.kmodule.mk Thu Nov 6 12:05:44 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.45 2014/09/19 17:45:42 matt Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.46 2014/11/06 12:05:44 uebayasi Exp $
# We are not building this with PIE
MKPIE=no
@@ -103,6 +103,7 @@ ${XOBJS}: ${DPSRCS}
${PROG}: ${XOBJS} ${XSRCS} ${DPSRCS} ${DPADD}
${_MKTARGET_LINK}
${CC} ${LDFLAGS} -nostdlib -MD -combine -r -Wl,-T,${KMODSCRIPT},-d \
+ -Wl,-Map=${.TARGET}.map \
-o ${.TARGET} ${CFLAGS} ${CPPFLAGS} ${XOBJS} \
${XSRCS:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} \
echo '.-include ${KMOD}.d' .depend
@@ -137,18 +138,21 @@ ${KMOD}_tramp.S: ${KMOD}_tmp.o ${ARCHDIR
${PROG}: ${KMOD}_tmp.o ${KMOD}_tramp.o
${_MKTARGET_LINK}
.if exists(${ARCHDIR}/kmodhide.awk)
- ${LD} -r -o tmp.o ${KMOD}_tmp.o ${KMOD}_tramp.o
+ ${LD} -r -Map=${.TARGET}.map \
+ -o tmp.o ${KMOD}_tmp.o ${KMOD}_tramp.o
${OBJCOPY} \
`${NM} tmp.o | ${TOOL_AWK} -f ${ARCHDIR}/kmodhide.awk` \
tmp.o ${.TARGET} \
rm tmp.o
.else
- ${LD} -r -o ${.TARGET} ${KMOD}_tmp.o ${KMOD}_tramp.o
+ ${LD} -r -Map=${.TARGET}.map \
+ -o ${.TARGET} ${KMOD}_tmp.o ${KMOD}_tramp.o
.endif
.else
${PROG}: ${OBJS} ${DPADD}
${_MKTARGET_LINK}
${CC} ${LDFLAGS} -nostdlib -r -Wl,-T,${KMODSCRIPT},-d \
+ -Wl,-Map=${.TARGET}.map \
-o ${.TARGET} ${OBJS}
.endif
.endif
@@ -195,6 +199,7 @@ kmodinstall:: ${_PROG}
# Clean rules
CLEANFILES+= a.out [Ee]rrs mklog core *.core ${PROG} ${OBJS} ${LOBJS}
+CLEANFILES+= ${PROG}.map
# Custom rules
lint: ${LOBJS}
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Thu Nov 6 12:47:48 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem_tiling.c
intel_display.c intel_dp.c intel_overlay.c intel_tv.c
Log Message:
Fix little C issues in i915drmkms hindering the Clang build.
- Test `x == NULL', not `container_of(x, t, base)-base == NULL'.
- Fix format strings in intel_dp_probe_oui to use %hhx for uint8_t.
- Omit needless ioread32 in intel_overlay.c.
- Ifdef out unused definitions in intel_tv.c.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c \
src/sys/external/bsd/drm2/dist/drm/i915/intel_tv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c:1.3 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c:1.3 Wed Jul 16 20:03:56 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c Thu Nov 6 12:47:48 2014
@@ -295,12 +295,14 @@ i915_gem_set_tiling(struct drm_device *d
{
struct drm_i915_gem_set_tiling *args = data;
struct drm_i915_private *dev_priv = dev-dev_private;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
int ret = 0;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, args-handle));
- if (obj-base == NULL)
+ gobj = drm_gem_object_lookup(dev, file, args-handle);
+ if (gobj == NULL)
return -ENOENT;
+ obj = to_intel_bo(gobj);
if (!i915_tiling_ok(dev,
args-stride, obj-base.size, args-tiling_mode)) {
@@ -416,11 +418,13 @@ i915_gem_get_tiling(struct drm_device *d
{
struct drm_i915_gem_get_tiling *args = data;
struct drm_i915_private *dev_priv = dev-dev_private;
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, args-handle));
- if (obj-base == NULL)
+ gobj = drm_gem_object_lookup(dev, file, args-handle);
+ if (gobj == NULL)
return -ENOENT;
+ obj = to_intel_bo(gobj);
mutex_lock(dev-struct_mutex);
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.12 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.12 Sat Nov 1 21:45:05 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Thu Nov 6 12:47:48 2014
@@ -2082,7 +2082,8 @@ static bool intel_alloc_plane_obj(struct
{
struct drm_device *dev = crtc-base.dev;
struct drm_i915_gem_object *obj = NULL;
- struct drm_mode_fb_cmd2 mode_cmd = { .fb_id = 0 };
+ static const struct drm_mode_fb_cmd2 zero_mode_cmd;
+ struct drm_mode_fb_cmd2 mode_cmd = zero_mode_cmd;
u32 base = plane_config-base;
if (plane_config-size == 0)
@@ -7799,6 +7800,7 @@ static int intel_crtc_cursor_set(struct
struct drm_device *dev = crtc-dev;
struct drm_i915_private *dev_priv = dev-dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
unsigned old_width;
uint32_t addr;
@@ -7821,9 +7823,10 @@ static int intel_crtc_cursor_set(struct
return -EINVAL;
}
- obj = to_intel_bo(drm_gem_object_lookup(dev, file, handle));
- if (obj-base == NULL)
+ gobj = drm_gem_object_lookup(dev, file, handle);
+ if (gobj == NULL)
return -ENOENT;
+ obj = to_intel_bo(gobj);
if (obj-base.size width * height * 4) {
DRM_DEBUG_KMS(buffer is to small\n);
@@ -11031,12 +11034,13 @@ intel_user_framebuffer_create(struct drm
struct drm_file *filp,
struct drm_mode_fb_cmd2 *mode_cmd)
{
+ struct drm_gem_object *gobj;
struct drm_i915_gem_object *obj;
- obj = to_intel_bo(drm_gem_object_lookup(dev, filp,
- mode_cmd-handles[0]));
- if (obj-base == NULL)
+ gobj = drm_gem_object_lookup(dev, filp, mode_cmd-handles[0]);
+ if (gobj == NULL)
return ERR_PTR(-ENOENT);
+ obj = to_intel_bo(gobj);
return intel_framebuffer_create(dev, mode_cmd, obj);
}
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.9
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.8 Sun Sep 7 23:03:11 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c Thu Nov 6 12:47:48 2014
@@ -2907,11 +2907,11 @@ intel_dp_probe_oui(struct intel_dp *inte
intel_edp_panel_vdd_on(intel_dp);
if (intel_dp_dpcd_read_wake(intel_dp-aux, DP_SINK_OUI, buf, 3) == 3)
-
CVS commit: src/sys/external/bsd/drm2/ttm
Module Name:src Committed By: riastradh Date: Thu Nov 6 13:14:31 UTC 2014 Modified Files: src/sys/external/bsd/drm2/ttm: ttm_bo_vm.c Log Message: Update comment to reflect recent change to. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c diff -u src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.7 src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.8 --- src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c:1.7 Wed Nov 5 15:03:19 2014 +++ src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c Thu Nov 6 13:14:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ttm_bo_vm.c,v 1.7 2014/11/05 15:03:19 riastradh Exp $ */ +/* $NetBSD: ttm_bo_vm.c,v 1.8 2014/11/06 13:14:31 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.7 2014/11/05 15:03:19 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: ttm_bo_vm.c,v 1.8 2014/11/06 13:14:31 riastradh Exp $); #include sys/types.h @@ -107,9 +107,8 @@ ttm_bo_uvm_fault(struct uvm_faultinfo *u if (ret != -EBUSY) goto out0; /* - * It's currently locked. Unlock the fault (requires - * relocking uobj's vmobjlock first), wait for it, and - * start over. + * It's currently locked. Unlock the fault, wait for + * it, and start over. */ uvmfault_unlockall(ufi, ufi-entry-aref.ar_amap, NULL); (void)ttm_bo_wait_unreserved(bo);
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src Committed By: snj Date: Thu Nov 6 18:58:18 UTC 2014 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile Log Message: a single -DHAVE_GETLINE will suffice. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.17 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.18 --- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.17 Wed Nov 5 18:01:16 2014 +++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Nov 6 18:58:18 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/11/05 18:01:16 christos Exp $ +# $NetBSD: Makefile,v 1.18 2014/11/06 18:58:18 snj Exp $ .include bsd.own.mk @@ -156,7 +156,6 @@ CPPFLAGS+= -DHAVE_DRI2=1 CPPFLAGS+= -DHAVE_DRI2_H=1 CPPFLAGS+= -DHAVE_DRISTRUCT_H=1 CPPFLAGS+= -DHAVE_DRI_H=1 -CPPFLAGS+= -DHAVE_GETLINE CPPFLAGS+= -DHAVE_GETLINE=1 CPPFLAGS+= -DHAVE_INTTYPES_H=1 CPPFLAGS+= -DHAVE_MEMORY_H=1
CVS commit: src/sbin/route
Module Name:src
Committed By: christos
Date: Thu Nov 6 21:29:32 UTC 2014
Modified Files:
src/sbin/route: Makefile extern.h prog_ops.h route.c show.c
Added Files:
src/sbin/route: rtutil.c rtutil.h
Log Message:
Factor out the netstat route printing code and use it here. There is no
point in having 2 different copies; fixes PR/49371
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sbin/route/Makefile
cvs rdiff -u -r1.14 -r1.15 src/sbin/route/extern.h
cvs rdiff -u -r1.2 -r1.3 src/sbin/route/prog_ops.h
cvs rdiff -u -r1.144 -r1.145 src/sbin/route/route.c
cvs rdiff -u -r0 -r1.1 src/sbin/route/rtutil.c src/sbin/route/rtutil.h
cvs rdiff -u -r1.45 -r1.46 src/sbin/route/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/route/Makefile
diff -u src/sbin/route/Makefile:1.25 src/sbin/route/Makefile:1.26
--- src/sbin/route/Makefile:1.25 Mon Dec 13 12:39:47 2010
+++ src/sbin/route/Makefile Thu Nov 6 16:29:32 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2010/12/13 17:39:47 pooka Exp $
+# $NetBSD: Makefile,v 1.26 2014/11/06 21:29:32 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include bsd.own.mk
RUMPPRG=route
MAN= route.8
-SRCS= route.c show.c keywords.c
+SRCS= route.c show.c keywords.c rtutil.c
.if (${USE_INET6} != no)
CPPFLAGS+=-DINET6
Index: src/sbin/route/extern.h
diff -u src/sbin/route/extern.h:1.14 src/sbin/route/extern.h:1.15
--- src/sbin/route/extern.h:1.14 Tue Oct 20 21:07:46 2009
+++ src/sbin/route/extern.h Thu Nov 6 16:29:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.14 2009/10/21 01:07:46 snj Exp $ */
+/* $NetBSD: extern.h,v 1.15 2014/11/06 21:29:32 christos Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -30,15 +30,11 @@ struct sockaddr_ns;
void parse_show_opts(int, char * const *, int *, int *, const char **, bool);
/* show.c */
-void show(int, char * const *);
+void show(int, char * const *, int);
/* route.c */
extern int nflag, Sflag;
#define NOTDEFSTRING 0.0.0.0/xxx.xxx.xxx.xxx\0
int keyword(const char *);
-int netmask_length(struct sockaddr *, int);
-char *netmask_string(const struct sockaddr *, int, int);
-const char *routename(const struct sockaddr *, struct sockaddr *, int);
-const char *netname(const struct sockaddr *, struct sockaddr *);
const char *ns_print(struct sockaddr_ns *);
void usage(const char *)__attribute__((__noreturn__));
Index: src/sbin/route/prog_ops.h
diff -u src/sbin/route/prog_ops.h:1.2 src/sbin/route/prog_ops.h:1.3
--- src/sbin/route/prog_ops.h:1.2 Mon Dec 13 14:19:10 2010
+++ src/sbin/route/prog_ops.h Thu Nov 6 16:29:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: prog_ops.h,v 1.2 2010/12/13 19:19:10 pooka Exp $ */
+/* $NetBSD: prog_ops.h,v 1.3 2014/11/06 21:29:32 christos Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -32,9 +32,13 @@
#include sys/types.h
#ifndef CRUNCHOPS
+/* XXX: Keep same order with netstat! */
struct prog_ops {
int (*op_init)(void);
+ int (*op_sysctl)(const int *, u_int, void *, size_t *,
+ const void *, size_t);
+
int (*op_socket)(int, int, int);
int (*op_open)(const char *, int, ...);
pid_t (*op_getpid)(void);
@@ -42,8 +46,6 @@ struct prog_ops {
ssize_t (*op_read)(int, void *, size_t);
ssize_t (*op_write)(int, const void *, size_t);
- int (*op_sysctl)(const int *, u_int, void *, size_t *,
- const void *, size_t);
int (*op_shutdown)(int, int);
};
Index: src/sbin/route/route.c
diff -u src/sbin/route/route.c:1.144 src/sbin/route/route.c:1.145
--- src/sbin/route/route.c:1.144 Sat Oct 19 11:59:15 2013
+++ src/sbin/route/route.c Thu Nov 6 16:29:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: route.c,v 1.144 2013/10/19 15:59:15 christos Exp $ */
+/* $NetBSD: route.c,v 1.145 2014/11/06 21:29:32 christos Exp $ */
/*
* Copyright (c) 1983, 1989, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = @(#)route.c 8.6 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: route.c,v 1.144 2013/10/19 15:59:15 christos Exp $);
+__RCSID($NetBSD: route.c,v 1.145 2014/11/06 21:29:32 christos Exp $);
#endif
#endif /* not lint */
@@ -73,6 +73,7 @@ __RCSID($NetBSD: route.c,v 1.144 2013/1
#include keywords.h
#include extern.h
#include prog_ops.h
+#include rtutil.h
union sockunion {
struct sockaddr sa;
@@ -95,7 +96,6 @@ struct sou {
*so_ifp, *so_mpls;
};
-static char *any_ntoa(const struct sockaddr *);
static const char *route_strerror(int);
static void set_metric(const char *, int);
static int newroute(int, char *const *);
@@ -105,6 +105,7 @@ static int inet6_makenetandmask(const st
#endif
static int getaddr(int, const char *, struct hostent **, struct sou *);
static int flushroutes(int, char *const [], int);
+static char *netmask_string(const struct sockaddr *, int, int);
static int prefixlen(const char *, struct sou *);
#ifndef SMALL
static
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: christos
Date: Thu Nov 6 21:30:10 UTC 2014
Modified Files:
src/usr.bin/netstat: Makefile if.c main.c mroute.c mroute6.c netstat.h
route.c
Removed Files:
src/usr.bin/netstat: show.c
Log Message:
use the common code from route.c
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/netstat/Makefile
cvs rdiff -u -r1.79 -r1.80 src/usr.bin/netstat/if.c
cvs rdiff -u -r1.92 -r1.93 src/usr.bin/netstat/main.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/netstat/mroute.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/netstat/mroute6.c
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/netstat/netstat.h
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/netstat/route.c
cvs rdiff -u -r1.20 -r0 src/usr.bin/netstat/show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/Makefile
diff -u src/usr.bin/netstat/Makefile:1.39 src/usr.bin/netstat/Makefile:1.40
--- src/usr.bin/netstat/Makefile:1.39 Fri Mar 1 13:26:11 2013
+++ src/usr.bin/netstat/Makefile Thu Nov 6 16:30:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2013/03/01 18:26:11 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2014/11/06 21:30:09 christos Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/12/93
.include bsd.own.mk
@@ -7,20 +7,22 @@ USE_FORT?= yes # setgid
RUMPPRG=netstat
SRCS= atalk.c bpf.c fast_ipsec.c if.c inet.c inet6.c \
- main.c mbuf.c mroute.c mroute6.c pfkey.c pfsync.c show.c route.c \
- unix.c vtw.c
+ main.c mbuf.c mroute.c mroute6.c pfkey.c pfsync.c route.c \
+ unix.c vtw.c rtutil.c
BINGRP= kmem
BINMODE=2555
LDADD= -lkvm
DPADD= ${LIBKVM}
-CPPFLAGS+= -DIPSEC
+CPPFLAGS+= -DIPSEC -I${.CURDIR}
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/pf
+CPPFLAGS+= -I${NETBSDSRCDIR}/sbin/route
CWARNFLAGS.clang+= -Wno-format
COPTS.show.c += -Wno-format-nonliteral
.PATH: ${.CURDIR}/../../lib/libc/gen
.PATH: ${.CURDIR}/../../lib/libc/net
+.PATH: ${.CURDIR}/../../sbin/route
CPPFLAGS+= -DRUMP_ACTION
RUMPSRCS+= sysctlbyname.c sysctlgetmibinfo.c sysctlnametomib.c
RUMPSRCS+= if_indextoname.c getifaddrs.c
Index: src/usr.bin/netstat/if.c
diff -u src/usr.bin/netstat/if.c:1.79 src/usr.bin/netstat/if.c:1.80
--- src/usr.bin/netstat/if.c:1.79 Sat Oct 19 11:56:06 2013
+++ src/usr.bin/netstat/if.c Thu Nov 6 16:30:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.79 2013/10/19 15:56:06 christos Exp $ */
+/* $NetBSD: if.c,v 1.80 2014/11/06 21:30:09 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = from: @(#)if.c 8.2 (Berkeley) 2/21/94;
#else
-__RCSID($NetBSD: if.c,v 1.79 2013/10/19 15:56:06 christos Exp $);
+__RCSID($NetBSD: if.c,v 1.80 2014/11/06 21:30:09 christos Exp $);
#endif
#endif /* not lint */
@@ -63,6 +63,7 @@ __RCSID($NetBSD: if.c,v 1.79 2013/10/19
#include err.h
#include netstat.h
+#include rtutil.h
#include prog_ops.h
#define MAXIF 100
@@ -356,7 +357,7 @@ print_addr(struct sockaddr *sa, struct s
in = inet_makeaddr(ifaddr.in.ia_subnet,
INADDR_ANY);
cp = netname4(in.s_addr,
- ifaddr.in.ia_subnetmask);
+ ifaddr.in.ia_subnetmask, nflag);
#else
if (use_sysctl) {
netmask = ((struct sockaddr_in *)rtinfo[RTAX_NETMASK])-sin_addr.s_addr;
@@ -364,14 +365,14 @@ print_addr(struct sockaddr *sa, struct s
struct in_ifaddr *ifaddr_in = (void *)rtinfo;
netmask = ifaddr_in-ia_subnetmask;
}
- cp = netname4(sin-sin_addr.s_addr, netmask);
+ cp = netname4(sin-sin_addr.s_addr, netmask, nflag);
#endif
if (vflag)
n = strlen(cp) 13 ? 13 : strlen(cp);
else
n = 13;
printf(%-*.*s , n, n, cp);
- cp = routename4(sin-sin_addr.s_addr);
+ cp = routename4(sin-sin_addr.s_addr, nflag);
if (vflag)
n = strlen(cp) 17 ? 17 : strlen(cp);
else
@@ -390,7 +391,7 @@ print_addr(struct sockaddr *sa, struct s
sizeof inm);
printf(\n%25s %-17.17s , ,
routename4(
- inm.inm_addr.s_addr));
+ inm.inm_addr.s_addr, nflag));
multiaddr =
(u_long)inm.inm_list.le_next;
}
@@ -412,7 +413,7 @@ print_addr(struct sockaddr *sa, struct s
netmask6 = ifaddr_in6-ia_prefixmask;
}
- cp = netname6(sin6, netmask6);
+ cp = netname6(sin6, netmask6, nflag);
if (vflag)
n = strlen(cp) 13 ? 13 : strlen(cp);
else
Index: src/usr.bin/netstat/main.c
diff -u src/usr.bin/netstat/main.c:1.92 src/usr.bin/netstat/main.c:1.93
--- src/usr.bin/netstat/main.c:1.92 Thu Oct 9 19:45:47 2014
+++ src/usr.bin/netstat/main.c Thu Nov 6 16:30:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.92 2014/10/09 23:45:47 enami Exp $ */
+/* $NetBSD: main.c,v 1.93 2014/11/06 21:30:09 christos Exp $ */
/*
* Copyright (c) 1983, 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = from: @(#)main.c 8.4 (Berkeley) 3/1/94;
#else
-__RCSID($NetBSD: main.c,v 1.92 2014/10/09 23:45:47 enami Exp $);
+__RCSID($NetBSD: main.c,v 1.93 2014/11/06 21:30:09
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Thu Nov 6 23:19:39 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_gige.c
src/sys/arch/evbarm/awin: awin_machdep.c
Log Message:
extra (undocumented) clk init bits for bananapi gmac
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/allwinner/awin_gige.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/awin/awin_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.16 src/sys/arch/arm/allwinner/awin_gige.c:1.17
--- src/sys/arch/arm/allwinner/awin_gige.c:1.16 Mon Oct 20 20:02:16 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c Thu Nov 6 23:19:38 2014
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.16 2014/10/20 20:02:16 martin Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.17 2014/11/06 23:19:38 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -169,6 +169,13 @@ awin_gige_attach(device_t parent, device
phy_type = rgmii;
if (strcmp(phy_type, rgmii) == 0) {
clkreg = AWIN_GMAC_CLK_PIT | AWIN_GMAC_CLK_TCS_INT_RGMII;
+ } else if (strcmp(phy_type, rgmii-bpi) == 0) {
+ clkreg = AWIN_GMAC_CLK_PIT | AWIN_GMAC_CLK_TCS_INT_RGMII;
+ /*
+ * These magic bits seem to be necessary for RGMII at gigabit
+ * speeds on Banana Pi.
+ */
+ clkreg |= __BITS(11,10);
} else if (strcmp(phy_type, gmii) == 0) {
clkreg = AWIN_GMAC_CLK_TCS_INT_RGMII;
} else if (strcmp(phy_type, mii) == 0) {
Index: src/sys/arch/evbarm/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.23 src/sys/arch/evbarm/awin/awin_machdep.c:1.24
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.23 Thu Oct 30 00:32:55 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c Thu Nov 6 23:19:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_machdep.c,v 1.23 2014/10/30 00:32:55 jmcneill Exp $ */
+/* $NetBSD: awin_machdep.c,v 1.24 2014/11/06 23:19:38 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.23 2014/10/30 00:32:55 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.24 2014/11/06 23:19:38 jmcneill Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -742,6 +742,7 @@ awin_device_register(device_t self, void
#endif
#if AWIN_BOARD == AWIN_bpi
prop_dictionary_set_cstring(dict, phy-power, gmacpwren);
+ prop_dictionary_set_cstring(dict, phy-type, rgmii-bpi);
#endif
return;
}
CVS commit: src/sys/rump/net/lib/libvirtif
Module Name:src
Committed By: pooka
Date: Thu Nov 6 23:25:16 UTC 2014
Modified Files:
src/sys/rump/net/lib/libvirtif: if_virt.c
Log Message:
Ensure that no two VIRTIF's have the same modname, therefore
allowing them to coexist in the same rump kernel.
from Alexander Guy, via github
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/rump/net/lib/libvirtif/if_virt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/net/lib/libvirtif/if_virt.c
diff -u src/sys/rump/net/lib/libvirtif/if_virt.c:1.48 src/sys/rump/net/lib/libvirtif/if_virt.c:1.49
--- src/sys/rump/net/lib/libvirtif/if_virt.c:1.48 Sat Aug 9 09:47:02 2014
+++ src/sys/rump/net/lib/libvirtif/if_virt.c Thu Nov 6 23:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_virt.c,v 1.48 2014/08/09 09:47:02 ozaki-r Exp $ */
+/* $NetBSD: if_virt.c,v 1.49 2014/11/06 23:25:16 pooka Exp $ */
/*
* Copyright (c) 2008, 2013 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.48 2014/08/09 09:47:02 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_virt.c,v 1.49 2014/11/06 23:25:16 pooka Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -385,10 +385,16 @@ VIF_DELIVERPKT(struct virtif_sc *sc, str
m = NULL;
}
-MODULE(MODULE_CLASS_DRIVER, if_virt, NULL);
-
+/*
+ * The following ensures that no two modules using if_virt end up with
+ * the same module name. MODULE() and modcmd wrapped in ... bad mojo.
+ */
+#define VIF_MOJO(x) MODULE(MODULE_CLASS_DRIVER,x,NULL);
+#define VIF_MODULE() VIF_MOJO(VIF_BASENAME(if_virt_,VIRTIF_BASE))
+#define VIF_MODCMD VIF_BASENAME3(if_virt_,VIRTIF_BASE,_modcmd)
+VIF_MODULE();
static int
-if_virt_modcmd(modcmd_t cmd, void *opaque)
+VIF_MODCMD(modcmd_t cmd, void *opaque)
{
int error = 0;
CVS commit: src/distrib/utils/x_route
Module Name:src
Committed By: uebayasi
Date: Fri Nov 7 02:57:19 UTC 2014
Modified Files:
src/distrib/utils/x_route: Makefile
Log Message:
Fix build of crunched route.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/utils/x_route/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_route/Makefile
diff -u src/distrib/utils/x_route/Makefile:1.17 src/distrib/utils/x_route/Makefile:1.18
--- src/distrib/utils/x_route/Makefile:1.17 Mon Dec 13 19:19:10 2010
+++ src/distrib/utils/x_route/Makefile Fri Nov 7 02:57:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/12/13 19:19:10 pooka Exp $
+# $NetBSD: Makefile,v 1.18 2014/11/07 02:57:19 uebayasi Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
SRCDIR= ${.CURDIR}/../../../sbin/route
@@ -8,7 +8,7 @@ NOMAN= # defined
.include bsd.own.mk
-SRCS= route.c show.c keywords.c
+SRCS= keywords.c route.c rtutil.c show.c
CPPFLAGS+= -DSMALL -I${SRCDIR} -DCRUNCHOPS
.if defined(SMALLPROG_INET6) (${USE_INET6} != no)
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Fri Nov 7 05:37:05 UTC 2014
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Add code to detect hypervisor. The code was based from FreeBSD and ported
by Kengo Nakahara.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.59 src/usr.sbin/cpuctl/arch/i386.c:1.60
--- src/usr.sbin/cpuctl/arch/i386.c:1.59 Tue Sep 9 15:14:39 2014
+++ src/usr.sbin/cpuctl/arch/i386.c Fri Nov 7 05:37:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.59 2014/09/09 15:14:39 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.60 2014/11/07 05:37:05 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: i386.c,v 1.59 2014/09/09 15:14:39 msaitoh Exp $);
+__RCSID($NetBSD: i386.c,v 1.60 2014/11/07 05:37:05 msaitoh Exp $);
#endif /* not lint */
#include sys/types.h
@@ -220,6 +220,7 @@ static void tmx86_get_longrun_status(u_i
static void transmeta_cpu_info(struct cpu_info *);
/* Common functions */
static void cpu_probe_base_features(struct cpu_info *, const char *);
+static void cpu_probe_hv_features(struct cpu_info *, const char *);
static void cpu_probe_features(struct cpu_info *);
static void print_bits(const char *, const char *, const char *, uint32_t);
static void identifycpu_cpuids(struct cpu_info *);
@@ -1546,6 +1547,51 @@ cpu_probe_base_features(struct cpu_info
}
static void
+cpu_probe_hv_features(struct cpu_info *ci, const char *cpuname)
+{
+ uint32_t descs[4];
+ char hv_sig[13];
+ char *p;
+ const char *hv_name;
+ int i;
+
+ /*
+ * [RFC] CPUID usage for interaction between Hypervisors and Linux.
+ * http://lkml.org/lkml/2008/10/1/246
+ *
+ * KB1009458: Mechanisms to determine if software is running in
+ * a VMware virtual machine
+ * http://kb.vmware.com/kb/1009458
+ */
+ if ((ci-ci_feat_val[1] CPUID2_RAZ) != 0) {
+ x86_cpuid(0x4000, descs);
+ for (i = 1, p = hv_sig; i 4; i++, p += sizeof(descs) / 4)
+ memcpy(p, descs[i], sizeof(descs[i]));
+ *p = '\0';
+ /*
+ * HV vendor ID string
+ * +--
+ * KVM KVMKVMKVM
+ * Microsoft Microsoft Hv
+ * VMware VMwareVMware
+ * Xen XenVMMXenVMM
+ */
+ if (strncmp(hv_sig, KVMKVMKVM, 9) == 0)
+ hv_name = KVM;
+ else if (strncmp(hv_sig, Microsoft Hv, 12) == 0)
+ hv_name = Hypver-V;
+ else if (strncmp(hv_sig, VMwareVMware, 12) == 0)
+ hv_name = VMware;
+ else if (strncmp(hv_sig, XenVMMXenVMM, 12) == 0)
+ hv_name = Xen;
+ else
+ hv_name = unknown;
+
+ printf(%s: Running on hypervisor: %s\n, cpuname, hv_name);
+ }
+}
+
+static void
cpu_probe_features(struct cpu_info *ci)
{
const struct cpu_cpuid_nameclass *cpup = NULL;
@@ -1669,6 +1715,7 @@ identifycpu(int fd, const char *cpuname)
ci = cistore;
cpu_probe_base_features(ci, cpuname);
+ cpu_probe_hv_features(ci, cpuname);
cpu_probe_features(ci);
if (ci-ci_cpu_type = 0) {
CVS commit: [netbsd-5] src
Module Name:src
Committed By: msaitoh
Date: Fri Nov 7 07:58:37 UTC 2014
Modified Files:
src/distrib/common [netbsd-5]: Makefile.bootcd
src/distrib/notes/common [netbsd-5]: main
src/distrib/notes/macppc [netbsd-5]: prep.OPENFIRMWARE
src/distrib/notes/sparc [netbsd-5]: install
src/etc [netbsd-5]: Makefile
src/share/man/man7 [netbsd-5]: release.7
Log Message:
Pull up following revision(s) (requested by snj in ticket #1931):
share/man/man7/release.7: revision 1.32
distrib/common/Makefile.bootcd: revision 1.18
distrib/notes/macppc/prep.OPENFIRMWARE: revision 1.15
distrib/notes/sparc/install: revision 1.57
etc/Makefile: revision 1.394
distrib/notes/common/main: revision 1.484
PR# install/44593: Please give release ISO's more meaningful names
Change release ISO filenames, what was once 'i386cd.iso' will now look
like 'NetBSD-5.99.60-i386.iso'.
ok snj@
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.425.2.17 -r1.425.2.18 src/distrib/notes/common/main
cvs rdiff -u -r1.11.2.3 -r1.11.2.4 src/distrib/notes/macppc/prep.OPENFIRMWARE
cvs rdiff -u -r1.55 -r1.55.2.1 src/distrib/notes/sparc/install
cvs rdiff -u -r1.359.2.6 -r1.359.2.7 src/etc/Makefile
cvs rdiff -u -r1.25.4.2 -r1.25.4.3 src/share/man/man7/release.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.14.2.2 src/distrib/common/Makefile.bootcd:1.14.2.3
--- src/distrib/common/Makefile.bootcd:1.14.2.2 Wed Nov 5 13:11:12 2014
+++ src/distrib/common/Makefile.bootcd Fri Nov 7 07:58:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.14.2.2 2014/11/05 13:11:12 sborrill Exp $
+# $NetBSD: Makefile.bootcd,v 1.14.2.3 2014/11/07 07:58:37 msaitoh Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -52,6 +52,7 @@ CDRELEASE_EXCLUDE= -s ',./installation/c
.include bsd.own.mk # For PRINTOBJDIR
.include bsd.kernobj.mk # For KERNSRCDIR
+DISTRIBVER!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh
DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s
ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z
PUBLISHER?= The_NetBSD_Project
@@ -67,8 +68,13 @@ RM?= rm
MKDIR?= mkdir -p
CHMOD?= chmod
+.if ${CDRELEASE} == false
+CDIMAGE= ${CDBASE}.iso
+.else
+CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
+.endif
-CLEANFILES+= ${CDBASE}.iso
+CLEANFILES+= ${CDIMAGE}
CLEANFILES+= bootxx.${MACHINE}
@@ -109,7 +115,7 @@ prepare:
# XXX include more than one directory on the image - HF
#
copy-releasedir:
- ${RM} -f ${RELEASEDIR}/${CDROMS_RELEASEDIR}/${CDBASE}.iso
+ ${RM} -f ${RELEASEDIR}/${CDROMS_RELEASEDIR}/${CDIMAGE}
if ${CDRELEASE}; then \
if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \
echo Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting; \
@@ -176,12 +182,12 @@ copy-releasedir:
fi
image:
- ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDBASE}.iso cdrom
+ ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image .WAIT image_md_post
${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
- ${RELEASE_INSTALL} ${CDBASE}.iso ${RELEASEDIR}/${CDROMS_RELEASEDIR}
+ ${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
iso_image:
.else
@@ -189,7 +195,7 @@ release:
iso_image: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image .WAIT image_md_post
${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
- ${RELEASE_INSTALL} ${CDBASE}.iso ${RELEASEDIR}/${CDROMS_RELEASEDIR}
+ ${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
.endif
clean:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.17 src/distrib/notes/common/main:1.425.2.18
--- src/distrib/notes/common/main:1.425.2.17 Wed Nov 5 13:11:12 2014
+++ src/distrib/notes/common/main Fri Nov 7 07:58:37 2014
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.425.2.17 2014/11/05 13:11:12 sborrill Exp $
+.\ $NetBSD: main,v 1.425.2.18 2014/11/07 07:58:37 msaitoh Exp $
.\
.\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -171,18 +171,18 @@ bootloader
and the installation kernel
.Pa macppc/binary/kernel/netbsd-GENERIC_MD.gz .
If you have a CD-R, you can fetch the CD image,
-.Pa macppccd-\*V.iso .
+.Pa NetBSD-\*V-macppc.iso .
.\}
.if \n[sparc] \{\
Fetch a CD image,
-.Pa sparccd-\*V.iso
+.Pa NetBSD-\*V-sparc.iso
or the floppy disk images,
.Pa sparc/install/floppy/disk1.gz No and Pa sparc/install/floppy/disk2 .
You need either the pair of floppies or the CD to boot your system.
.\}
.if \n[sparc64] \{\
This is either a CD image,
-.Pa sparc64cd-\*V.iso
+.Pa NetBSD-\*V-sparc64.iso
or the installation kernel and bootloader,
.Pa
