Date: Mon, 8 Dec 2008 19:08:33 GMT From: Paolo Pisati <piso@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 154352 for review Message-ID: <200812081908.mB8J8XOa010248@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=154352 Change 154352 by piso@piso_newluxor on 2008/12/08 19:07:54 IFC@154349 Affected files ... .. //depot/projects/soc2005/libalias/UPDATING#31 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/test/main.c#9 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_subr.c#8 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_param.c#5 integrate Differences ... ==== //depot/projects/soc2005/libalias/UPDATING#31 (text+ko) ==== @@ -38,11 +38,11 @@ and thereby the code size); consult ath_hal(4) for details. 20081121: - __FreeBSD_version 800054 adds memory barriers to - <machine/atomic.h>, new interfaces to ifnet to facilitate + __FreeBSD_version 800054 adds memory barriers to + <machine/atomic.h>, new interfaces to ifnet to facilitate multiple hardware transmit queues for cards that support them, and a lock-less ring-buffer implementation to - enable drivers to more efficiently manage queueing of + enable drivers to more efficiently manage queueing of packets. 20081117: @@ -287,11 +287,11 @@ be recompiled; this includes the hal and xorg-server ports. 20070928: - The caching daemon (cached) was renamed to nscd. nscd.conf - configuration file should be used instead of cached.conf and - nscd_enable, nscd_pidfile and nscd_flags options should be used - instead of cached_enable, cached_pidfile and cached_flags in - rc.conf. + The caching daemon (cached) was renamed to nscd. nscd.conf + configuration file should be used instead of cached.conf and + nscd_enable, nscd_pidfile and nscd_flags options should be used + instead of cached_enable, cached_pidfile and cached_flags in + rc.conf. 20070921: The getfacl(1) utility now prints owning user and group name @@ -299,7 +299,7 @@ This is the same behavior as getfacl(1) on Solaris and Linux. 20070704: - The new IPsec code is now compiled in using the IPSEC option. The + The new IPsec code is now compiled in using the IPSEC option. The IPSEC option now requires "device crypto" be defined in your kernel configuration. The FAST_IPSEC kernel option is now deprecated. @@ -602,10 +602,10 @@ If you have such a file, you need old utility to decrypt it. 20060709: - The interface version of the i4b kernel part has changed. So - after updating the kernel sources and compiling a new kernel, - the i4b user space tools in "/usr/src/usr.sbin/i4b" must also - be rebuilt, and vice versa. + The interface version of the i4b kernel part has changed. So + after updating the kernel sources and compiling a new kernel, + the i4b user space tools in "/usr/src/usr.sbin/i4b" must also + be rebuilt, and vice versa. 20060627: The XBOX kernel now defaults to the nfe(4) driver instead of @@ -1071,7 +1071,7 @@ <reboot into current> <do a "native" rebuild/install as described in the previous section> <maybe install compatibility libraries from ports/misc/compat*> - <reboot> + <reboot> To upgrade in-place from 5.x-stable to current @@ -1178,4 +1178,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.551 2008/12/01 23:09:58 sam Exp $ +$FreeBSD: src/UPDATING,v 1.552 2008/12/08 17:12:40 schweikh Exp $ ==== //depot/projects/soc2005/libalias/lib/libarchive/test/main.c#9 (text+ko) ==== @@ -45,7 +45,7 @@ #define EXTRA_DUMP(x) archive_error_string((struct archive *)(x)) #define EXTRA_VERSION archive_version() #define KNOWNREF "test_compat_gtar_1.tgz.uu" -__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.14 2008/08/31 07:06:02 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/main.c,v 1.15 2008/12/08 17:22:44 kientzle Exp $"); /* * "list.h" is simply created by "grep DEFINE_TEST"; it has @@ -897,6 +897,7 @@ time_t now; char *refdir_alloc = NULL; char *progname, *p; + char *tmp; char tmpdir[256]; char tmpdir_timestamp[256]; @@ -916,6 +917,17 @@ testprog = getenv(ENVBASE); #endif + if (getenv("TMPDIR") != NULL) + tmp = getenv("TMPDIR"); + else if (getenv("TMP") != NULL) + tmp = getenv("TMP"); + else if (getenv("TEMP") != NULL) + tmp = getenv("TEMP"); + else if (getenv("TEMPDIR") != NULL) + tmp = getenv("TEMPDIR"); + else + tmp = "/tmp"; + /* Allow -d to be controlled through the environment. */ if (getenv(ENVBASE "_DEBUG") != NULL) dump_on_failure = 1; @@ -976,7 +988,8 @@ strftime(tmpdir_timestamp, sizeof(tmpdir_timestamp), "%Y-%m-%dT%H.%M.%S", localtime(&now)); - sprintf(tmpdir, "/tmp/%s.%s-%03d", progname, tmpdir_timestamp, i); + sprintf(tmpdir, "%s/%s.%s-%03d", tmp, progname, + tmpdir_timestamp, i); if (mkdir(tmpdir,0755) == 0) break; if (errno == EEXIST) ==== //depot/projects/soc2005/libalias/sys/geom/geom_subr.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.97 2008/08/09 11:14:05 des Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/geom_subr.c,v 1.98 2008/12/08 17:09:02 lulf Exp $"); #include "opt_ddb.h" @@ -370,7 +370,7 @@ } /* - * This function is called (repeatedly) until the has withered away. + * This function is called (repeatedly) until the geom has withered away. */ void g_wither_geom(struct g_geom *gp, int error) ==== //depot/projects/soc2005/libalias/sys/kern/subr_param.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.79 2008/10/27 08:09:05 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_param.c,v 1.80 2008/12/08 18:39:59 jkim Exp $"); #include "opt_param.h" #include "opt_maxusers.h" @@ -118,6 +118,13 @@ */ struct buf *swbuf; +static const char *const vm_bnames[] = { + "QEMU", /* QEMU */ + "Plex86", /* Plex86 */ + "Bochs", /* Bochs */ + NULL +}; + static const char *const vm_pnames[] = { "VMware Virtual Platform", /* VMWare VM */ "Virtual Machine", /* Microsoft VirtualPC */ @@ -132,14 +139,25 @@ char *sysenv; int i; + sysenv = getenv("smbios.bios.vendor"); + if (sysenv != NULL) { + for (i = 0; vm_bnames[i] != NULL; i++) + if (strcmp(sysenv, vm_bnames[i]) == 0) { + freeenv(sysenv); + return (1); + } + freeenv(sysenv); + } sysenv = getenv("smbios.system.product"); if (sysenv != NULL) { - for (i = 0; vm_pnames[i] != NULL; i++) { - if (strcmp(sysenv, vm_pnames[i]) == 0) - return 1; - } + for (i = 0; vm_pnames[i] != NULL; i++) + if (strcmp(sysenv, vm_pnames[i]) == 0) { + freeenv(sysenv); + return (1); + } + freeenv(sysenv); } - return 0; + return (0); } /* @@ -151,13 +169,8 @@ hz = -1; TUNABLE_INT_FETCH("kern.hz", &hz); - if (hz == -1) { - if (detect_virtual()) { - hz = HZ_VM; - } else { - hz = HZ; - } - } + if (hz == -1) + hz = detect_virtual() ? HZ_VM : HZ; tick = 1000000 / hz; #ifdef VM_SWZONE_SIZE_MAX
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812081908.mB8J8XOa010248>