svn commit: r221361 - stable/8/usr.sbin/mfiutil
Author: pluknet
Date: Tue May 3 07:24:47 2011
New Revision: 221361
URL: http://svn.freebsd.org/changeset/base/221361
Log:
MFC r221119:
Fix typo in continuously argument used in patrol auto command.
Unlike the version in head, this one preserves a misspelled version.
Modified:
stable/8/usr.sbin/mfiutil/mfi_patrol.c
Directory Properties:
stable/8/usr.sbin/mfiutil/ (props changed)
Modified: stable/8/usr.sbin/mfiutil/mfi_patrol.c
==
--- stable/8/usr.sbin/mfiutil/mfi_patrol.c Tue May 3 05:42:50 2011
(r221360)
+++ stable/8/usr.sbin/mfiutil/mfi_patrol.c Tue May 3 07:24:47 2011
(r221361)
@@ -252,7 +252,8 @@ patrol_config(int ac, char **av)
if (strcasecmp(av[1], auto) == 0) {
op_mode = MFI_PR_OPMODE_AUTO;
if (ac 2) {
- if (strcasecmp(av[2], continously) == 0)
+ if (strcasecmp(av[2], continously) == 0 ||
+ strcasecmp(av[2], continuously) == 0)
exec_freq = 0x;
else {
val = strtol(av[2], cp, 0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221362 - in head: sys/kern sys/sys usr.bin/rctl
Author: trasz
Date: Tue May 3 07:32:58 2011
New Revision: 221362
URL: http://svn.freebsd.org/changeset/base/221362
Log:
Change the way rctl interfaces with jails by introducing prison_racct
structure, which acts as a proxy between them. This makes jail rules
persistent, i.e. they can be added before jail gets created, and they
don't disappear when the jail gets destroyed.
Modified:
head/sys/kern/kern_jail.c
head/sys/kern/kern_racct.c
head/sys/kern/kern_rctl.c
head/sys/sys/jail.h
head/sys/sys/rctl.h
head/usr.bin/rctl/rctl.8
Modified: head/sys/kern/kern_jail.c
==
--- head/sys/kern/kern_jail.c Tue May 3 07:24:47 2011(r221361)
+++ head/sys/kern/kern_jail.c Tue May 3 07:32:58 2011(r221362)
@@ -50,7 +50,7 @@ __FBSDID($FreeBSD$);
#include sys/lock.h
#include sys/mutex.h
#include sys/racct.h
-#include sys/rctl.h
+#include sys/refcount.h
#include sys/sx.h
#include sys/sysent.h
#include sys/namei.h
@@ -78,6 +78,7 @@ __FBSDID($FreeBSD$);
#defineDEFAULT_HOSTUUID----
MALLOC_DEFINE(M_PRISON, prison, Prison structures);
+MALLOC_DEFINE(M_PRISON_RACCT, prison_racct, Prison racct structures);
/* Keep struct prison prison0 and some code in kern_jail_set() readable. */
#ifdef INET
@@ -114,10 +115,11 @@ struct prison prison0 = {
};
MTX_SYSINIT(prison0, prison0.pr_mtx, jail mutex, MTX_DEF);
-/* allprison and lastprid are protected by allprison_lock. */
+/* allprison, allprison_racct and lastprid are protected by allprison_lock. */
struct sx allprison_lock;
SX_SYSINIT(allprison_lock, allprison_lock, allprison);
struct prisonlist allprison = TAILQ_HEAD_INITIALIZER(allprison);
+LIST_HEAD(, prison_racct) allprison_racct;
intlastprid = 0;
static int do_jail_attach(struct thread *td, struct prison *pr);
@@ -125,6 +127,10 @@ static void prison_complete(void *contex
static void prison_deref(struct prison *pr, int flags);
static char *prison_path(struct prison *pr1, struct prison *pr2);
static void prison_remove_one(struct prison *pr);
+#ifdef RACCT
+static void prison_racct_attach(struct prison *pr);
+static void prison_racct_detach(struct prison *pr);
+#endif
#ifdef INET
static int _prison_check_ip4(struct prison *pr, struct in_addr *ia);
static int prison_restrict_ip4(struct prison *pr, struct in_addr *newip4);
@@ -1197,7 +1203,6 @@ kern_jail_set(struct thread *td, struct
root = mypr-pr_root;
vref(root);
}
- racct_create(pr-pr_racct);
strlcpy(pr-pr_hostuuid, DEFAULT_HOSTUUID, HOSTUUIDLEN);
pr-pr_flags |= PR_HOST;
#if defined(INET) || defined(INET6)
@@ -1657,6 +1662,11 @@ kern_jail_set(struct thread *td, struct
pr-pr_flags = (pr-pr_flags ~ch_flags) | pr_flags;
mtx_unlock(pr-pr_mtx);
+#ifdef RACCT
+ if (created)
+ prison_racct_attach(pr);
+#endif
+
/* Locks may have prevented a complete restriction of child IP
* addresses. If so, allocate some more memory and try again.
*/
@@ -2533,10 +2543,9 @@ prison_deref(struct prison *pr, int flag
if (pr-pr_cpuset != NULL)
cpuset_rel(pr-pr_cpuset);
osd_jail_exit(pr);
-#ifdef RCTL
- rctl_racct_release(pr-pr_racct);
+#ifdef RACCT
+ prison_racct_detach(pr);
#endif
- racct_destroy(pr-pr_racct);
free(pr, M_PRISON);
/* Removing a prison frees a reference on its parent. */
@@ -4277,14 +4286,103 @@ void
prison_racct_foreach(void (*callback)(struct racct *racct,
void *arg2, void *arg3), void *arg2, void *arg3)
{
- struct prison *pr;
+ struct prison_racct *prr;
sx_slock(allprison_lock);
- TAILQ_FOREACH(pr, allprison, pr_list)
- (callback)(pr-pr_racct, arg2, arg3);
+ LIST_FOREACH(prr, allprison_racct, prr_next)
+ (callback)(prr-prr_racct, arg2, arg3);
sx_sunlock(allprison_lock);
}
+static struct prison_racct *
+prison_racct_find_locked(const char *name)
+{
+ struct prison_racct *prr;
+
+ sx_assert(allprison_lock, SA_XLOCKED);
+
+ if (name[0] == '\0' || strlen(name) = MAXHOSTNAMELEN)
+ return (NULL);
+
+ LIST_FOREACH(prr, allprison_racct, prr_next) {
+ if (strcmp(name, prr-prr_name) != 0)
+ continue;
+
+ /* Found prison_racct with a matching name? */
+ prison_racct_hold(prr);
+ return (prr);
+ }
+
+ /* Add new prison_racct. */
+ prr = malloc(sizeof(*prr), M_PRISON_RACCT, M_ZERO | M_WAITOK);
+ racct_create(prr-prr_racct);
+
+ strcpy(prr-prr_name, name);
+ refcount_init(prr-prr_refcount, 1);
+ LIST_INSERT_HEAD(allprison_racct, prr, prr_next);
+
+ return (prr);
+}
svn commit: r221363 - head/sbin/geom/class/part
Author: ae
Date: Tue May 3 07:33:39 2011
New Revision: 221363
URL: http://svn.freebsd.org/changeset/base/221363
Log:
Add -a alignment option to gpart(8). When it specified gpart(8)
tries to align partition start offset and size to be multiple of
alignment value.
MFC after:2 weeks
Modified:
head/sbin/geom/class/part/geom_part.c
head/sbin/geom/class/part/gpart.8
Modified: head/sbin/geom/class/part/geom_part.c
==
--- head/sbin/geom/class/part/geom_part.c Tue May 3 07:32:58 2011
(r221362)
+++ head/sbin/geom/class/part/geom_part.c Tue May 3 07:33:39 2011
(r221363)
@@ -93,6 +93,7 @@ static void gpart_restore(struct gctl_re
struct g_command PUBSYM(class_commands)[] = {
{ add, 0, gpart_issue, {
+ { 'a', alignment, GPART_AUTOFILL, G_TYPE_STRING },
{ 'b', start, GPART_AUTOFILL, G_TYPE_STRING },
{ 's', size, GPART_AUTOFILL, G_TYPE_STRING },
{ 't', type, NULL, G_TYPE_STRING },
@@ -100,7 +101,8 @@ struct g_command PUBSYM(class_commands)[
{ 'l', label, G_VAL_OPTIONAL, G_TYPE_STRING },
{ 'f', flags, GPART_FLAGS, G_TYPE_STRING },
G_OPT_SENTINEL },
- [-b start] [-s size] -t type [-i index] [-l label] [-f flags] geom
+ [-a alignment] [-b start] [-s size] -t type [-i index]
+ [-l label] [-f flags] geom
},
{ backup, 0, gpart_backup, G_NULL_OPTS,
geom
@@ -168,11 +170,12 @@ struct g_command PUBSYM(class_commands)[
-a attrib -i index [-f flags] geom
},
{ resize, 0, gpart_issue, {
+ { 'a', alignment, GPART_AUTOFILL, G_TYPE_STRING },
{ 's', size, GPART_AUTOFILL, G_TYPE_STRING },
{ 'i', GPART_PARAM_INDEX, NULL, G_TYPE_NUMBER },
{ 'f', flags, GPART_FLAGS, G_TYPE_STRING },
G_OPT_SENTINEL },
- [-s size] -i index [-f flags] geom
+ [-a alignment] [-s size] -i index [-f flags] geom
},
{ restore, 0, gpart_restore, {
{ 'F', force, NULL, G_TYPE_BOOL },
@@ -298,6 +301,9 @@ fmtattrib(struct gprovider *pp)
return (buf);
}
+#defineALIGNDOWN(d, a) (-(a) (d))
+#defineALIGNUP(d, a) (-(-(a) -(d)))
+
static int
gpart_autofill_resize(struct gctl_req *req)
{
@@ -306,7 +312,7 @@ gpart_autofill_resize(struct gctl_req *r
struct ggeom *gp;
struct gprovider *pp;
off_t last, size, start, new_size;
- off_t lba, new_lba;
+ off_t lba, new_lba, alignment;
const char *s;
int error, idx;
@@ -333,6 +339,19 @@ gpart_autofill_resize(struct gctl_req *r
if (pp == NULL)
errx(EXIT_FAILURE, Provider for geom %s not found., s);
+ s = gctl_get_ascii(req, alignment);
+ alignment = 1;
+ if (*s != '*') {
+ error = g_parse_lba(s, pp-lg_sectorsize, alignment);
+ if (error)
+ errc(EXIT_FAILURE, error, Invalid alignment param);
+ if (alignment == 0)
+ errx(EXIT_FAILURE, Invalid alignment param);
+ }
+ error = gctl_delete_param(req, alignment);
+ if (error)
+ errc(EXIT_FAILURE, error, internal error);
+
s = gctl_get_ascii(req, size);
if (*s == '*')
new_size = 0;
@@ -341,10 +360,14 @@ gpart_autofill_resize(struct gctl_req *r
if (error)
errc(EXIT_FAILURE, error, Invalid size param);
/* no autofill necessary. */
- goto done;
+ if (alignment == 1)
+ goto done;
+ if (new_size alignment)
+ new_size = ALIGNDOWN(new_size, alignment);
}
last = (off_t)strtoimax(find_geomcfg(gp, last), NULL, 0);
+ last = ALIGNDOWN(last, alignment);
LIST_FOREACH(pp, gp-lg_provider, lg_provider) {
s = find_provcfg(pp, index);
if (s == NULL)
@@ -376,7 +399,7 @@ gpart_autofill_resize(struct gctl_req *r
size = lba - start;
pp = find_provider(gp, lba);
if (pp == NULL)
- new_size = last - start + 1;
+ new_size = ALIGNDOWN(last - start + 1, alignment);
else {
s = find_provcfg(pp, start);
if (s == NULL) {
@@ -389,6 +412,7 @@ gpart_autofill_resize(struct gctl_req *r
* Is there any free space between current and
* next providers?
*/
+ new_lba = ALIGNUP(new_lba, alignment);
if (new_lba lba)
new_size = new_lba - start;
else {
@@ -410,12 +434,12 @@ gpart_autofill(struct gctl_req *req)
struct gclass *cp;
struct ggeom *gp;
struct
svn commit: r221365 - head/lib/libstand
Author: rodrigc
Date: Tue May 3 07:43:47 2011
New Revision: 221365
URL: http://svn.freebsd.org/changeset/base/221365
Log:
- Comment out unused variable.
- Add parentheses around expression to eliminate compiler warning.
Modified:
head/lib/libstand/dosfs.c
Modified: head/lib/libstand/dosfs.c
==
--- head/lib/libstand/dosfs.c Tue May 3 07:39:54 2011(r221364)
+++ head/lib/libstand/dosfs.c Tue May 3 07:43:47 2011(r221365)
@@ -358,7 +358,7 @@ dos_stat(struct open_file *fd, struct st
static int
dos_readdir(struct open_file *fd, struct dirent *d)
{
-DOS_FILE *f = (DOS_FILE *)fd-f_fsdata;
+/* DOS_FILE *f = (DOS_FILE *)fd-f_fsdata; */
u_char fn[261];
DOS_DIR dd;
size_t res;
@@ -414,7 +414,7 @@ dos_readdir(struct open_file *fd, struct
}
}
-d-d_fileno = dd.de.clus[1] 8 + dd.de.clus[0];
+d-d_fileno = (dd.de.clus[1] 8) + dd.de.clus[0];
d-d_reclen = sizeof(*d);
d-d_type = (dd.de.attr FA_DIR) ? DT_DIR : DT_REG;
memcpy(d-d_name, fn, sizeof(d-d_name));
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221366 - head/lib/libstand
Author: rodrigc
Date: Tue May 3 07:46:02 2011
New Revision: 221366
URL: http://svn.freebsd.org/changeset/base/221366
Log:
Rename DEBUG macro to TFTP_DEBUG, to be more consistent with
debug macros in other files.
Modified:
head/lib/libstand/tftp.c
Modified: head/lib/libstand/tftp.c
==
--- head/lib/libstand/tftp.cTue May 3 07:43:47 2011(r221365)
+++ head/lib/libstand/tftp.cTue May 3 07:46:02 2011(r221366)
@@ -148,14 +148,14 @@ recvtftp(struct iodesc *d, void *pkt, ss
printf(illegal tftp error %d\n, ntohs(t-th_code));
errno = EIO;
} else {
-#ifdef DEBUG
+#ifdef TFTP_DEBUG
printf(tftp-error %d\n, ntohs(t-th_code));
#endif
errno = tftperrors[ntohs(t-th_code)];
}
return (-1);
default:
-#ifdef DEBUG
+#ifdef TFTP_DEBUG
printf(tftp type %d not handled\n, ntohs(t-th_opcode));
#endif
return (-1);
@@ -303,7 +303,7 @@ tftp_read(struct open_file *f, void *add
res = tftp_getnextblock(tftpfile);
if (res) { /* no answer */
-#ifdef DEBUG
+#ifdef TFTP_DEBUG
printf(tftp: read error\n);
#endif
return (res);
@@ -319,7 +319,7 @@ tftp_read(struct open_file *f, void *add
inbuffer = tftpfile-validsize - offinblock;
if (inbuffer 0) {
-#ifdef DEBUG
+#ifdef TFTP_DEBUG
printf(tftp: invalid offset %d\n,
tftpfile-off);
#endif
@@ -336,7 +336,7 @@ tftp_read(struct open_file *f, void *add
if ((tftpfile-islastblock) (count == inbuffer))
break; /* EOF */
} else {
-#ifdef DEBUG
+#ifdef TFTP_DEBUG
printf(tftp: block %d not found\n, needblock);
#endif
return (EINVAL);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r220954 - head
Hi David E. O'Brien!
On Fri, 22 Apr 2011 17:10:51 + (UTC); David E. O'Brien obr...@freebsd.org
wrote:
Author: obrien
Date: Fri Apr 22 17:10:51 2011
New Revision: 220954
URL: http://svn.freebsd.org/changeset/base/220954
Log:
Note which of the built kernels is being installed.
PR: 156579
Submitted by: dhw
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1Fri Apr 22 14:42:42 2011(r220953)
+++ head/Makefile.inc1Fri Apr 22 17:10:51 2011(r220954)
@@ -868,7 +868,7 @@ reinstallkernel reinstallkernel.debug: i
false
.endif
@echo --
- @echo Installing kernel
+ @echo Installing kernel ${KERNCONF}
@echo --
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH} \
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
I have lines like the following in /etc/make.conf on some hosts:
# build specified kernels by default and install first of them
KERNCONF?=ROUTER GENERIC
and do just cd /usr/src make buildkernel
Will this patch print the correct first kernel, or this will be entire list?
--
WBR, Vadim Goncharov. ICQ#166852181 mailto:vadim_nucli...@mail.ru
[Moderator of RU.ANTI-ECOLOGY][FreeBSD][http://antigreen.org][LJ:/nuclight]
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221368 - stable/8/contrib/gcc
Author: mm Date: Tue May 3 08:39:57 2011 New Revision: 221368 URL: http://svn.freebsd.org/changeset/base/221368 Log: MFC r221282: Add ChangeLog.gcc43 for backported changes from gcc 4.3 Added: stable/8/contrib/gcc/ChangeLog.gcc43 - copied unchanged from r221282, head/contrib/gcc/ChangeLog.gcc43 Modified: Directory Properties: stable/8/contrib/gcc/ (props changed) Copied: stable/8/contrib/gcc/ChangeLog.gcc43 (from r221282, head/contrib/gcc/ChangeLog.gcc43) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/contrib/gcc/ChangeLog.gcc43Tue May 3 08:39:57 2011 (r221368, copy of r221282, head/contrib/gcc/ChangeLog.gcc43) @@ -0,0 +1,163 @@ +2007-05-01 Dwarakanath Rajagopal dwarak.rajago...@amd.com (r124339) + + * config/i386/i386.c (override_options): Accept k8-sse3, opteron-sse3 + and athlon64-sse3 as improved versions of k8, opteron and athlon64 + with SSE3 instruction set support. + * doc/invoke.texi: Likewise. + +2007-04-07 H.J. Lu hongjiu...@intel.com (r123639) + + * config/i386/i386.c (ix86_handle_option): Handle SSSE3. + +2007-02-08 Harsha Jagasia harsha.jaga...@amd.com (r121726) + + * config/i386/xmmintrin.h: Make inclusion of emmintrin.h + conditional to __SSE2__. + (Entries below should have been added to first ChangeLog + entry for amdfam10 dated 2007-02-05) + * config/i386/emmintrin.h: Generate #error if __SSE2__ is not + defined. + * config/i386/pmmintrin.h: Generate #error if __SSE3__ is not + defined. + * config/i386/tmmintrin.h: Generate #error if __SSSE3__ is not + defined. + +2007-02-07 Jakub Jelinek ja...@redhat.com (r121687) + + * config/i386/i386.c (override_options): Set PTA_SSSE3 for core2. + +2007-01-17 Eric Christopher echri...@apple.com (r120846) + + * config.gcc: Support core2 processor. + +2006-12-02 H.J. Lu hongjiu...@intel.com (r119454 - partial) + + PR target/30040 + * config/i386/driver-i386.c (bit_SSSE3): New. + +2006-11-18 Vladimir Makarov vmaka...@redhat.com (r118973) + + * doc/invoke.texi (core2): Add item. + + * config/i386/i386.h (TARGET_CORE2, TARGET_CPU_DEFAULT_core2): New + macros. + (TARGET_CPU_CPP_BUILTINS): Add code for core2. + (TARGET_CPU_DEFAULT_generic): Change value. + (TARGET_CPU_DEFAULT_NAMES): Add core2. + (processor_type): Add new constant PROCESSOR_CORE2. + + * config/i386/i386.md (cpu): Add core2. + + * config/i386/i386.c (core2_cost): New initialized variable. + (m_CORE2): New macro. + (x86_use_leave, x86_push_memory, x86_movx, x86_unroll_strlen, + x86_deep_branch, x86_partial_reg_stall, x86_use_simode_fiop, + x86_use_cltd, x86_promote_QImode, x86_sub_esp_4, x86_sub_esp_8, + x86_add_esp_4, x86_add_esp_8, x86_integer_DFmode_moves, + x86_partial_reg_dependency, x86_memory_mismatch_stall, + x86_accumulate_outgoing_args, x86_prologue_using_move, + x86_epilogue_using_move, x86_arch_always_fancy_math_387, + x86_sse_partial_reg_dependency, x86_rep_movl_optimal, + x86_use_incdec, x86_four_jump_limit, x86_schedule, + x86_pad_returns): Add m_CORE2. + (override_options): Add entries for Core2. + (ix86_issue_rate): Add case for Core2. + +2006-10-27 Vladimir Makarov vmaka...@redhat.com (r118090) + + * config/i386/i386.h (TARGET_GEODE): + (TARGET_CPU_CPP_BUILTINS): Add code for geode. + (TARGET_CPU_DEFAULT_geode): New macro. + (TARGET_CPU_DEFAULT_k6, TARGET_CPU_DEFAULT_k6_2, + TARGET_CPU_DEFAULT_k6_3, TARGET_CPU_DEFAULT_athlon, + TARGET_CPU_DEFAULT_athlon_sse, TARGET_CPU_DEFAULT_k8, + TARGET_CPU_DEFAULT_pentium_m, TARGET_CPU_DEFAULT_prescott, + TARGET_CPU_DEFAULT_nocona, TARGET_CPU_DEFAULT_generic): Increase + the macro values. + (TARGET_CPU_DEFAULT_NAMES): Add geode. + (processor_type): Add PROCESSOR_GEODE. + + * config/i386/i386.md: Include geode.md. + (cpu): Add geode. + + * config/i386/i386.c (geode_cost): New initialized global + variable. + (m_GEODE, m_K6_GEODE): New macros. + (x86_use_leave, x86_push_memory, x86_deep_branch, x86_use_sahf, + x86_use_himode_fiop, x86_promote_QImode, x86_add_esp_4, + x86_add_esp_8, x86_rep_movl_optimal, x86_ext_80387_constants, + x86_schedule): Use m_K6_GEODE instead of m_K6. + (x86_movx, x86_cmove): Set up m_GEODE. + (x86_integer_DFmode_moves): Clear m_GEODE. + (processor_target_table): Add entry for geode. + (processor_alias_table): Ditto. + + * config/i386/geode.md: New file. + + * doc/invoke.texi: Add entry about geode processor. + +2006-10-22 H.J. Lu hongjiu...@intel.com (r117958) + + * config.gcc (i[34567]86-*-*): Add tmmintrin.h to extra_headers. +
svn commit: r221369 - stable/7/contrib/gcc
Author: mm Date: Tue May 3 08:40:55 2011 New Revision: 221369 URL: http://svn.freebsd.org/changeset/base/221369 Log: MFC r221282: Add ChangeLog.gcc43 for backported changes from gcc 4.3 Added: stable/7/contrib/gcc/ChangeLog.gcc43 - copied unchanged from r221282, head/contrib/gcc/ChangeLog.gcc43 Modified: Directory Properties: stable/7/contrib/gcc/ (props changed) Copied: stable/7/contrib/gcc/ChangeLog.gcc43 (from r221282, head/contrib/gcc/ChangeLog.gcc43) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/7/contrib/gcc/ChangeLog.gcc43Tue May 3 08:40:55 2011 (r221369, copy of r221282, head/contrib/gcc/ChangeLog.gcc43) @@ -0,0 +1,163 @@ +2007-05-01 Dwarakanath Rajagopal dwarak.rajago...@amd.com (r124339) + + * config/i386/i386.c (override_options): Accept k8-sse3, opteron-sse3 + and athlon64-sse3 as improved versions of k8, opteron and athlon64 + with SSE3 instruction set support. + * doc/invoke.texi: Likewise. + +2007-04-07 H.J. Lu hongjiu...@intel.com (r123639) + + * config/i386/i386.c (ix86_handle_option): Handle SSSE3. + +2007-02-08 Harsha Jagasia harsha.jaga...@amd.com (r121726) + + * config/i386/xmmintrin.h: Make inclusion of emmintrin.h + conditional to __SSE2__. + (Entries below should have been added to first ChangeLog + entry for amdfam10 dated 2007-02-05) + * config/i386/emmintrin.h: Generate #error if __SSE2__ is not + defined. + * config/i386/pmmintrin.h: Generate #error if __SSE3__ is not + defined. + * config/i386/tmmintrin.h: Generate #error if __SSSE3__ is not + defined. + +2007-02-07 Jakub Jelinek ja...@redhat.com (r121687) + + * config/i386/i386.c (override_options): Set PTA_SSSE3 for core2. + +2007-01-17 Eric Christopher echri...@apple.com (r120846) + + * config.gcc: Support core2 processor. + +2006-12-02 H.J. Lu hongjiu...@intel.com (r119454 - partial) + + PR target/30040 + * config/i386/driver-i386.c (bit_SSSE3): New. + +2006-11-18 Vladimir Makarov vmaka...@redhat.com (r118973) + + * doc/invoke.texi (core2): Add item. + + * config/i386/i386.h (TARGET_CORE2, TARGET_CPU_DEFAULT_core2): New + macros. + (TARGET_CPU_CPP_BUILTINS): Add code for core2. + (TARGET_CPU_DEFAULT_generic): Change value. + (TARGET_CPU_DEFAULT_NAMES): Add core2. + (processor_type): Add new constant PROCESSOR_CORE2. + + * config/i386/i386.md (cpu): Add core2. + + * config/i386/i386.c (core2_cost): New initialized variable. + (m_CORE2): New macro. + (x86_use_leave, x86_push_memory, x86_movx, x86_unroll_strlen, + x86_deep_branch, x86_partial_reg_stall, x86_use_simode_fiop, + x86_use_cltd, x86_promote_QImode, x86_sub_esp_4, x86_sub_esp_8, + x86_add_esp_4, x86_add_esp_8, x86_integer_DFmode_moves, + x86_partial_reg_dependency, x86_memory_mismatch_stall, + x86_accumulate_outgoing_args, x86_prologue_using_move, + x86_epilogue_using_move, x86_arch_always_fancy_math_387, + x86_sse_partial_reg_dependency, x86_rep_movl_optimal, + x86_use_incdec, x86_four_jump_limit, x86_schedule, + x86_pad_returns): Add m_CORE2. + (override_options): Add entries for Core2. + (ix86_issue_rate): Add case for Core2. + +2006-10-27 Vladimir Makarov vmaka...@redhat.com (r118090) + + * config/i386/i386.h (TARGET_GEODE): + (TARGET_CPU_CPP_BUILTINS): Add code for geode. + (TARGET_CPU_DEFAULT_geode): New macro. + (TARGET_CPU_DEFAULT_k6, TARGET_CPU_DEFAULT_k6_2, + TARGET_CPU_DEFAULT_k6_3, TARGET_CPU_DEFAULT_athlon, + TARGET_CPU_DEFAULT_athlon_sse, TARGET_CPU_DEFAULT_k8, + TARGET_CPU_DEFAULT_pentium_m, TARGET_CPU_DEFAULT_prescott, + TARGET_CPU_DEFAULT_nocona, TARGET_CPU_DEFAULT_generic): Increase + the macro values. + (TARGET_CPU_DEFAULT_NAMES): Add geode. + (processor_type): Add PROCESSOR_GEODE. + + * config/i386/i386.md: Include geode.md. + (cpu): Add geode. + + * config/i386/i386.c (geode_cost): New initialized global + variable. + (m_GEODE, m_K6_GEODE): New macros. + (x86_use_leave, x86_push_memory, x86_deep_branch, x86_use_sahf, + x86_use_himode_fiop, x86_promote_QImode, x86_add_esp_4, + x86_add_esp_8, x86_rep_movl_optimal, x86_ext_80387_constants, + x86_schedule): Use m_K6_GEODE instead of m_K6. + (x86_movx, x86_cmove): Set up m_GEODE. + (x86_integer_DFmode_moves): Clear m_GEODE. + (processor_target_table): Add entry for geode. + (processor_alias_table): Ditto. + + * config/i386/geode.md: New file. + + * doc/invoke.texi: Add entry about geode processor. + +2006-10-22 H.J. Lu hongjiu...@intel.com (r117958) + + * config.gcc (i[34567]86-*-*): Add tmmintrin.h to extra_headers. +
svn commit: r221370 - stable/8/usr.bin/xargs
Author: ru Date: Tue May 3 09:59:33 2011 New Revision: 221370 URL: http://svn.freebsd.org/changeset/base/221370 Log: MFC r219958: Discourage from using cp -r. Modified: stable/8/usr.bin/xargs/xargs.1 Directory Properties: stable/8/usr.bin/xargs/ (props changed) Modified: stable/8/usr.bin/xargs/xargs.1 == --- stable/8/usr.bin/xargs/xargs.1 Tue May 3 08:40:55 2011 (r221369) +++ stable/8/usr.bin/xargs/xargs.1 Tue May 3 09:59:33 2011 (r221370) @@ -37,7 +37,7 @@ .\ $FreeBSD$ .\ $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $ .\ -.Dd January 26, 2008 +.Dd March 24, 2011 .Dt XARGS 1 .Os .Sh NAME @@ -167,7 +167,7 @@ directories which start with an uppercas directory to .Pa destdir : .Pp -.Dl /bin/ls -1d [A-Z]* | xargs -J % cp -rp % destdir +.Dl /bin/ls -1d [A-Z]* | xargs -J % cp -Rp % destdir .Pp .It Fl L Ar number Call ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221371 - stable/8/sbin/umount
Author: ru
Date: Tue May 3 10:01:08 2011
New Revision: 221371
URL: http://svn.freebsd.org/changeset/base/221371
Log:
MFC r219955: It's possible to unmount multiple items at once, make it clear.
Modified:
stable/8/sbin/umount/umount.8
stable/8/sbin/umount/umount.c
Directory Properties:
stable/8/sbin/umount/ (props changed)
Modified: stable/8/sbin/umount/umount.8
==
--- stable/8/sbin/umount/umount.8 Tue May 3 09:59:33 2011
(r221370)
+++ stable/8/sbin/umount/umount.8 Tue May 3 10:01:08 2011
(r221371)
@@ -37,7 +37,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl fv
-.Ar special | node | fsid
+.Ar special ... | node ... | fsid ...
.Nm
.Fl a | A
.Op Fl F Ar fstab
Modified: stable/8/sbin/umount/umount.c
==
--- stable/8/sbin/umount/umount.c Tue May 3 09:59:33 2011
(r221370)
+++ stable/8/sbin/umount/umount.c Tue May 3 10:01:08 2011
(r221371)
@@ -599,7 +599,7 @@ usage()
{
(void)fprintf(stderr, %s\n%s\n,
- usage: umount [-fv] special | node | fsid,
+ usage: umount [-fv] special ... | node ... | fsid ...,
umount -a | -A [-F fstab] [-fv] [-h host] [-t type]);
exit(1);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221372 - head/bin/stty
Author: ru Date: Tue May 3 10:08:11 2011 New Revision: 221372 URL: http://svn.freebsd.org/changeset/base/221372 Log: Don't call -f option's argument stdin. MFC after:3 days Modified: head/bin/stty/stty.c Modified: head/bin/stty/stty.c == --- head/bin/stty/stty.cTue May 3 10:01:08 2011(r221371) +++ head/bin/stty/stty.cTue May 3 10:08:11 2011(r221372) @@ -61,9 +61,11 @@ main(int argc, char *argv[]) struct info i; enum FMT fmt; int ch; + const char *file; fmt = NOTSET; i.fd = STDIN_FILENO; + file = stdin; opterr = 0; while (optind argc @@ -79,6 +81,7 @@ main(int argc, char *argv[]) case 'f': if ((i.fd = open(optarg, O_RDONLY | O_NONBLOCK)) 0) err(1, %s, optarg); + file = optarg; break; case 'g': fmt = GFLAG; @@ -92,7 +95,7 @@ args: argc -= optind; argv += optind; if (tcgetattr(i.fd, i.t) 0) - errx(1, stdin isn't a terminal); + errx(1, %s isn't a terminal, file); if (ioctl(i.fd, TIOCGETD, i.ldisc) 0) err(1, TIOCGETD); if (ioctl(i.fd, TIOCGWINSZ, i.win) 0) ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221373 - head/contrib/bsnmp/snmp_mibII
Author: ru
Date: Tue May 3 10:11:44 2011
New Revision: 221373
URL: http://svn.freebsd.org/changeset/base/221373
Log:
Properly detect interface's state in the LINK_STATE_UNKNOWN case.
MFC after:1 week
Modified:
head/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
Modified: head/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
==
--- head/contrib/bsnmp/snmp_mibII/mibII_interfaces.cTue May 3 10:08:11
2011(r221372)
+++ head/contrib/bsnmp/snmp_mibII/mibII_interfaces.cTue May 3 10:11:44
2011(r221373)
@@ -289,8 +289,7 @@ op_ifentry(struct snmp_context *ctx, str
* cable) and hence return 'dormant'.
*/
if (ifp-mib.ifmd_flags IFF_RUNNING) {
- if (ifp-mib.ifmd_data.ifi_link_state ==
- LINK_STATE_DOWN)
+ if (ifp-mib.ifmd_data.ifi_link_state != LINK_STATE_UP)
value-v.integer = 5; /* state dormant */
else
value-v.integer = 1; /* state up */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221374 - head/usr.bin/login
Author: dfr
Date: Tue May 3 10:18:27 2011
New Revision: 221374
URL: http://svn.freebsd.org/changeset/base/221374
Log:
Call pam_setcred() before login_getpwclass to support home directories
on GSS-API authenticated NFS where the kerberos credentials need to be
saved so that the kernel can authenticate to the NFS server.
Modified:
head/usr.bin/login/login.c
Modified: head/usr.bin/login/login.c
==
--- head/usr.bin/login/login.c Tue May 3 10:11:44 2011(r221373)
+++ head/usr.bin/login/login.c Tue May 3 10:18:27 2011(r221374)
@@ -380,6 +380,19 @@ main(int argc, char *argv[])
au_login_success();
#endif
+/*
+ * This needs to happen before login_getpwclass to support
+ * home directories on GSS-API authenticated NFS where the
+ * kerberos credentials need to be saved so that the kernel
+ * can authenticate to the NFS server.
+ */
+ pam_err = pam_setcred(pamh, pam_silent|PAM_ESTABLISH_CRED);
+ if (pam_err != PAM_SUCCESS) {
+ pam_syslog(pam_setcred());
+ bail(NO_SLEEP_EXIT, 1);
+ }
+ pam_cred_established = 1;
+
/*
* Establish the login class.
*/
@@ -513,12 +526,11 @@ main(int argc, char *argv[])
bail(NO_SLEEP_EXIT, 1);
}
- pam_err = pam_setcred(pamh, pam_silent|PAM_ESTABLISH_CRED);
+ pam_err = pam_setcred(pamh, pam_silent|PAM_REINITIALIZE_CRED);
if (pam_err != PAM_SUCCESS) {
pam_syslog(pam_setcred());
bail(NO_SLEEP_EXIT, 1);
}
- pam_cred_established = 1;
pam_err = pam_open_session(pamh, pam_silent);
if (pam_err != PAM_SUCCESS) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221375 - stable/8/sys/netinet/ipfw
Author: ae Date: Tue May 3 11:00:31 2011 New Revision: 221375 URL: http://svn.freebsd.org/changeset/base/221375 Log: MFC r206428 (by luigi): This commit enables partial operation of dummynet with kernels compiled with options VIMAGE. As it is now, there is still a single instance of the pipes, and it is only usable from vnet0 (the main instance). Trying to use a pipe from a different vimage does not crash the system as it did before, but the traffic coming out from the pipe goes to the wrong place, and i still need to figure out where. Support for per-vimage pipes is almost there (just a matter of uncommenting the VNET_* definitions for dn_cfg, plus putting into the structure the remaining static variables), however i need first to figure out how init/uninit work, and also to understand where packets are ending up on exit from a pipe. In summary: vimage support for dummynet is not complete yet, but we are getting there. MFC r206461 (by bz): Try to help with a virtualized dummynet after r206428. This adds the explicit include (so far probably included through one of the few hidden includes in other header files) for vnet.h and adds a cast to unbreak LINT-VIMAGE. Modified: stable/8/sys/netinet/ipfw/ip_dn_io.c stable/8/sys/netinet/ipfw/ip_dn_private.h stable/8/sys/netinet/ipfw/ip_dummynet.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/netinet/ipfw/ip_dn_io.c == --- stable/8/sys/netinet/ipfw/ip_dn_io.cTue May 3 10:18:27 2011 (r221374) +++ stable/8/sys/netinet/ipfw/ip_dn_io.cTue May 3 11:00:31 2011 (r221375) @@ -45,8 +45,11 @@ __FBSDID($FreeBSD$); #include sys/socket.h #include sys/time.h #include sys/sysctl.h + #include net/if.h/* IFNAMSIZ, struct ifaddr, ifq head, lock.h mutex.h */ #include net/netisr.h +#include net/vnet.h + #include netinet/in.h #include netinet/ip.h/* ip_len, ip_off */ #include netinet/ip_var.h/* ip_output(), IP_FORWARDING */ @@ -69,6 +72,7 @@ __FBSDID($FreeBSD$); */ struct dn_parms dn_cfg; +//VNET_DEFINE(struct dn_parms, _base_dn_cfg); static long tick_last; /* Last tick duration (usec). */ static long tick_delta;/* Last vs standard tick diff (usec). */ @@ -100,31 +104,34 @@ SYSCTL_DECL(_net_inet); SYSCTL_DECL(_net_inet_ip); SYSCTL_NODE(_net_inet_ip, OID_AUTO, dummynet, CTLFLAG_RW, 0, Dummynet); +/* wrapper to pass dn_cfg fields to SYSCTL_* */ +//#define DC(x)((VNET_NAME(_base_dn_cfg).x)) +#define DC(x) ((dn_cfg.x)) /* parameters */ SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, hash_size, -CTLFLAG_RW, dn_cfg.hash_size, 0, Default hash table size); +CTLFLAG_RW, DC(hash_size), 0, Default hash table size); SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_slot_limit, -CTLFLAG_RW, dn_cfg.slot_limit, 0, +CTLFLAG_RW, DC(slot_limit), 0, Upper limit in slots for pipe queue.); SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_byte_limit, -CTLFLAG_RW, dn_cfg.byte_limit, 0, +CTLFLAG_RW, DC(byte_limit), 0, Upper limit in bytes for pipe queue.); SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, io_fast, -CTLFLAG_RW, dn_cfg.io_fast, 0, Enable fast dummynet io.); +CTLFLAG_RW, DC(io_fast), 0, Enable fast dummynet io.); SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, debug, -CTLFLAG_RW, dn_cfg.debug, 0, Dummynet debug level); +CTLFLAG_RW, DC(debug), 0, Dummynet debug level); SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, expire, -CTLFLAG_RW, dn_cfg.expire, 0, Expire empty queues/pipes); +CTLFLAG_RW, DC(expire), 0, Expire empty queues/pipes); SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, expire_cycle, -CTLFLAG_RD, dn_cfg.expire_cycle, 0, Expire cycle for queues/pipes); +CTLFLAG_RD, DC(expire_cycle), 0, Expire cycle for queues/pipes); /* RED parameters */ SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, red_lookup_depth, -CTLFLAG_RD, dn_cfg.red_lookup_depth, 0, Depth of RED lookup table); +CTLFLAG_RD, DC(red_lookup_depth), 0, Depth of RED lookup table); SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, red_avg_pkt_size, -CTLFLAG_RD, dn_cfg.red_avg_pkt_size, 0, RED Medium packet size); +CTLFLAG_RD, DC(red_avg_pkt_size), 0, RED Medium packet size); SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, red_max_pkt_size, -CTLFLAG_RD, dn_cfg.red_max_pkt_size, 0, RED Max packet size); +CTLFLAG_RD, DC(red_max_pkt_size), 0, RED Max packet size); /* time adjustment */ SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_delta, @@ -142,13 +149,13 @@ SYSCTL_LONG(_net_inet_ip_dummynet, OID_A
svn commit: r221376 - stable/8/sys/netinet/ipfw
Author: ae
Date: Tue May 3 11:07:46 2011
New Revision: 221376
URL: http://svn.freebsd.org/changeset/base/221376
Log:
MFC r220832:
Add sysctl handlers for net.inet.ip.dummynet.hash_size, .pipe_byte_limit
and .pipe_slot_limit oids to prevent to set incorrect values.
Modified:
stable/8/sys/netinet/ipfw/ip_dn_io.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/netinet/ipfw/ip_dn_io.c
==
--- stable/8/sys/netinet/ipfw/ip_dn_io.cTue May 3 11:00:31 2011
(r221375)
+++ stable/8/sys/netinet/ipfw/ip_dn_io.cTue May 3 11:07:46 2011
(r221376)
@@ -108,14 +108,58 @@ SYSCTL_NODE(_net_inet_ip, OID_AUTO, dumm
//#define DC(x)((VNET_NAME(_base_dn_cfg).x))
#define DC(x) ((dn_cfg.x))
/* parameters */
-SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, hash_size,
-CTLFLAG_RW, DC(hash_size), 0, Default hash table size);
-SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_slot_limit,
-CTLFLAG_RW, DC(slot_limit), 0,
-Upper limit in slots for pipe queue.);
-SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, pipe_byte_limit,
-CTLFLAG_RW, DC(byte_limit), 0,
-Upper limit in bytes for pipe queue.);
+
+static int
+sysctl_hash_size(SYSCTL_HANDLER_ARGS)
+{
+ int error, value;
+
+ value = dn_cfg.hash_size;
+ error = sysctl_handle_int(oidp, value, 0, req);
+ if (error != 0 || req-newptr == NULL)
+ return (error);
+ if (value 16 || value 65536)
+ return (EINVAL);
+ dn_cfg.hash_size = value;
+ return (0);
+}
+
+SYSCTL_PROC(_net_inet_ip_dummynet, OID_AUTO, hash_size,
+CTLTYPE_INT | CTLFLAG_RW, 0, 0, sysctl_hash_size,
+I, Default hash table size);
+
+static int
+sysctl_limits(SYSCTL_HANDLER_ARGS)
+{
+ int error;
+ long value;
+
+ if (arg2 != 0)
+ value = dn_cfg.slot_limit;
+ else
+ value = dn_cfg.byte_limit;
+ error = sysctl_handle_long(oidp, value, 0, req);
+
+ if (error != 0 || req-newptr == NULL)
+ return (error);
+ if (arg2 != 0) {
+ if (value 1)
+ return (EINVAL);
+ dn_cfg.slot_limit = value;
+ } else {
+ if (value 1500)
+ return (EINVAL);
+ dn_cfg.byte_limit = value;
+ }
+ return (0);
+}
+
+SYSCTL_PROC(_net_inet_ip_dummynet, OID_AUTO, pipe_slot_limit,
+CTLTYPE_LONG | CTLFLAG_RW, 0, 1, sysctl_limits,
+L, Upper limit in slots for pipe queue.);
+SYSCTL_PROC(_net_inet_ip_dummynet, OID_AUTO, pipe_byte_limit,
+CTLTYPE_LONG | CTLFLAG_RW, 0, 0, sysctl_limits,
+L, Upper limit in bytes for pipe queue.);
SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, io_fast,
CTLFLAG_RW, DC(io_fast), 0, Enable fast dummynet io.);
SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, debug,
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221377 - in vendor-crypto/openssh/dist: . contrib/caldera contrib/cygwin contrib/redhat contrib/suse openbsd-compat
Author: des
Date: Tue May 3 11:22:37 2011
New Revision: 221377
URL: http://svn.freebsd.org/changeset/base/221377
Log:
Vendor import of OpenSSH 5.8p2
Modified:
vendor-crypto/openssh/dist/ChangeLog
vendor-crypto/openssh/dist/README
vendor-crypto/openssh/dist/contrib/caldera/openssh.spec
vendor-crypto/openssh/dist/contrib/cygwin/ssh-host-config
vendor-crypto/openssh/dist/contrib/cygwin/ssh-user-config
vendor-crypto/openssh/dist/contrib/redhat/openssh.spec
vendor-crypto/openssh/dist/contrib/suse/openssh.spec
vendor-crypto/openssh/dist/entropy.c
vendor-crypto/openssh/dist/openbsd-compat/port-linux.c
Modified: vendor-crypto/openssh/dist/ChangeLog
==
--- vendor-crypto/openssh/dist/ChangeLogTue May 3 11:07:46 2011
(r221376)
+++ vendor-crypto/openssh/dist/ChangeLogTue May 3 11:22:37 2011
(r221377)
@@ -1,3 +1,29 @@
+20110403
+ - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+ [contrib/suse/openssh.spec] Prepare for 5.8p2 release.
+ - Release 5.8p2
+
+20110329
+ - (djm) [entropy.c] closefrom() before running ssh-rand-helper; leftover fds
+ noticed by tmraz AT redhat.com
+
+20110221
+ - (dtucker) [contrib/cygwin/ssh-host-config] From Corinna: revamp of the
+ Cygwin-specific service installer script ssh-host-config. The actual
+ functionality is the same, the revisited version is just more
+ exact when it comes to check for problems which disallow to run
+ certain aspects of the script. So, part of this script and the also
+ rearranged service helper script library csih is to check if all
+ the tools required to run the script are available on the system.
+ The new script also is more thorough to inform the user why the
+ script failed. Patch from vinschen at redhat com.
+
+20110206
+ - (dtucker) [openbsd-compat/port-linux.c] Bug #1851: fix syntax error in
+ selinux code. Patch from Leonardo Chiquitto
+ - (dtucker) [contrib/cygwin/ssh-{host,user}-config] Add ECDSA key
+ generation and simplify. Patch from Corinna Vinschen.
+
20110204
- OpenBSD CVS Sync
- d...@cvs.openbsd.org 2011/01/31 21:42:15
Modified: vendor-crypto/openssh/dist/README
==
--- vendor-crypto/openssh/dist/README Tue May 3 11:07:46 2011
(r221376)
+++ vendor-crypto/openssh/dist/README Tue May 3 11:22:37 2011
(r221377)
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-5.8 for the release notes.
+See http://www.openssh.com/txt/release-5.8p2 for the release notes.
- A Japanese translation of this document and of the OpenSSH FAQ is
- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=stylesektion=9
[7] http://www.openssh.com/faq.html
-$Id: README,v 1.75.4.1 2011/02/04 00:57:50 djm Exp $
+$Id: README,v 1.75.4.2 2011/05/03 00:04:21 djm Exp $
Modified: vendor-crypto/openssh/dist/contrib/caldera/openssh.spec
==
--- vendor-crypto/openssh/dist/contrib/caldera/openssh.spec Tue May 3
11:07:46 2011(r221376)
+++ vendor-crypto/openssh/dist/contrib/caldera/openssh.spec Tue May 3
11:22:37 2011(r221377)
@@ -16,7 +16,7 @@
#old cvs stuff. please update before use. may be deprecated.
%define use_stable 1
-%define version5.8p1
+%define version5.8p2
%if %{use_stable}
%define cvs %{nil}
%define release 1
@@ -363,4 +363,4 @@ fi
* Mon Jan 01 1998 ...
Template Version: 1.31
-$Id: openssh.spec,v 1.73.4.1 2011/02/04 00:57:54 djm Exp $
+$Id: openssh.spec,v 1.73.4.2 2011/05/03 00:04:23 djm Exp $
Modified: vendor-crypto/openssh/dist/contrib/cygwin/ssh-host-config
==
--- vendor-crypto/openssh/dist/contrib/cygwin/ssh-host-config Tue May 3
11:07:46 2011(r221376)
+++ vendor-crypto/openssh/dist/contrib/cygwin/ssh-host-config Tue May 3
11:22:37 2011(r221377)
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# ssh-host-config, Copyright 2000-2009 Red Hat Inc.
+# ssh-host-config, Copyright 2000-2011 Red Hat Inc.
#
# This file is part of the Cygwin port of OpenSSH.
#
@@ -19,12 +19,39 @@
# ==
# Initialization
# ==
-PROGNAME=$(basename $0)
-_tdir=$(dirname $0)
-PROGDIR=$(cd $_tdir pwd)
CSIH_SCRIPT=/usr/share/csih/cygwin-service-installation-helper.sh
+# List of apps used. This is checkad for existance in csih_sanity_check
+# Don't use *any* transient commands before sourcing the csih helper script,
+# otherwise the sanity checks are short-circuited.
+declare -a csih_required_commands=(
+ /usr/bin/basename
svn commit: r221378 - vendor-crypto/openssh/5.8p2
Author: des Date: Tue May 3 11:23:40 2011 New Revision: 221378 URL: http://svn.freebsd.org/changeset/base/221378 Log: Tag OpenSSH 5.8p2 Added: vendor-crypto/openssh/5.8p2/ - copied from r221377, vendor-crypto/openssh/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221379 - vendor/one-true-awk/dist
Author: ru
Date: Tue May 3 11:37:03 2011
New Revision: 221379
URL: http://svn.freebsd.org/changeset/base/221379
Log:
Vendor import of bwk's 1-May-2011 release.
Modified:
vendor/one-true-awk/dist/FIXES
vendor/one-true-awk/dist/README
vendor/one-true-awk/dist/b.c
vendor/one-true-awk/dist/lib.c
vendor/one-true-awk/dist/main.c
vendor/one-true-awk/dist/makefile
vendor/one-true-awk/dist/run.c
Modified: vendor/one-true-awk/dist/FIXES
==
--- vendor/one-true-awk/dist/FIXES Tue May 3 11:23:40 2011
(r221378)
+++ vendor/one-true-awk/dist/FIXES Tue May 3 11:37:03 2011
(r221379)
@@ -25,6 +25,32 @@ THIS SOFTWARE.
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+May 1, 2011:
+ after advice from todd miller, kevin lo, ruslan ermilov,
+ and arnold robbins, changed srand() to return the previous
+ seed (which is 1 on the first call of srand). the seed is
+ an Awkfloat internally though converted to unsigned int to
+ pass to the library srand(). thanks, everyone.
+
+ fixed a subtle (and i hope low-probability) overflow error
+ in fldbld, by adding space for one extra \0. thanks to
+ robert bassett for spotting this one and providing a fix.
+
+ removed the files related to compilation on windows. i no
+ longer have anything like a current windows environment, so
+ i can't test any of it.
+
+May 23, 2010:
+ fixed long-standing overflow bug in run.c; many thanks to
+ nelson beebe for spotting it and providing the fix.
+
+ fixed bug that didn't parse -vd=1 properly; thanks to santiago
+ vila for spotting it.
+
+Feb 8, 2010:
+ i give up. replaced isblank with isspace in b.c; there are
+ no consistent header files.
+
Nov 26, 2009:
fixed a long-standing issue with when FS takes effect. a
change to FS is now noticed immediately for subsequent splits.
Modified: vendor/one-true-awk/dist/README
==
--- vendor/one-true-awk/dist/README Tue May 3 11:23:40 2011
(r221378)
+++ vendor/one-true-awk/dist/README Tue May 3 11:37:03 2011
(r221379)
@@ -29,7 +29,7 @@ by Al Aho, Brian Kernighan, and Peter We
Changes, mostly bug fixes and occasional enhancements, are listed
in FIXES. If you distribute this code further, please please please
distribute FIXES with it. If you find errors, please report them
-to b...@bell-labs.com. Thanks.
+to b...@cs.princeton.edu. Thanks.
The program itself is created by
make
Modified: vendor/one-true-awk/dist/b.c
==
--- vendor/one-true-awk/dist/b.cTue May 3 11:23:40 2011
(r221378)
+++ vendor/one-true-awk/dist/b.cTue May 3 11:37:03 2011
(r221379)
@@ -734,7 +734,7 @@ Node *unary(Node *np)
/* #define HAS_ISBLANK */
#ifndef HAS_ISBLANK
-int (isblank)(int c)
+int (xisblank)(int c)
{
return c==' ' || c=='\t';
}
@@ -748,7 +748,7 @@ struct charclass {
} charclasses[] = {
{ alnum, 5, isalnum },
{ alpha, 5, isalpha },
- { blank, 5, isblank },
+ { blank, 5, isspace }, /* was isblank */
{ cntrl, 5, iscntrl },
{ digit, 5, isdigit },
{ graph, 5, isgraph },
Modified: vendor/one-true-awk/dist/lib.c
==
--- vendor/one-true-awk/dist/lib.c Tue May 3 11:23:40 2011
(r221378)
+++ vendor/one-true-awk/dist/lib.c Tue May 3 11:37:03 2011
(r221379)
@@ -256,6 +256,7 @@ void fldbld(void) /* create fields from
{
/* this relies on having fields[] the same length as $0 */
/* the fields are all stored in this one array with \0's */
+ /* possibly with a final trailing \0 not associated with any field */
char *r, *fr, sep;
Cell *p;
int i, j, n;
@@ -268,7 +269,7 @@ void fldbld(void) /* create fields from
n = strlen(r);
if (n fieldssize) {
xfree(fields);
- if ((fields = (char *) malloc(n+1)) == NULL)
+ if ((fields = (char *) malloc(n+2)) == NULL) /* possibly 2
final \0s */
FATAL(out of space for fields in fldbld %d, n);
fieldssize = n;
}
Modified: vendor/one-true-awk/dist/main.c
==
--- vendor/one-true-awk/dist/main.c Tue May 3 11:23:40 2011
(r221378)
+++ vendor/one-true-awk/dist/main.c Tue May 3 11:37:03 2011
(r221379)
@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE
THIS SOFTWARE.
svn commit: r221380 - vendor/one-true-awk/20110501
Author: ru Date: Tue May 3 11:39:00 2011 New Revision: 221380 URL: http://svn.freebsd.org/changeset/base/221380 Log: Tag a 20110501 release. Added: vendor/one-true-awk/20110501/ - copied from r221379, vendor/one-true-awk/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221381 - head/contrib/one-true-awk
Author: ru
Date: Tue May 3 11:47:19 2011
New Revision: 221381
URL: http://svn.freebsd.org/changeset/base/221381
Log:
Update to a 1-May-2011 release (except for the isblank change).
Modified:
head/contrib/one-true-awk/FIXES
head/contrib/one-true-awk/README
head/contrib/one-true-awk/b.c
head/contrib/one-true-awk/lib.c
head/contrib/one-true-awk/main.c
head/contrib/one-true-awk/makefile
head/contrib/one-true-awk/run.c
Directory Properties:
head/contrib/one-true-awk/ (props changed)
Modified: head/contrib/one-true-awk/FIXES
==
--- head/contrib/one-true-awk/FIXES Tue May 3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/FIXES Tue May 3 11:47:19 2011
(r221381)
@@ -25,6 +25,32 @@ THIS SOFTWARE.
This file lists all bug fixes, changes, etc., made since the AWK book
was sent to the printers in August, 1987.
+May 1, 2011:
+ after advice from todd miller, kevin lo, ruslan ermilov,
+ and arnold robbins, changed srand() to return the previous
+ seed (which is 1 on the first call of srand). the seed is
+ an Awkfloat internally though converted to unsigned int to
+ pass to the library srand(). thanks, everyone.
+
+ fixed a subtle (and i hope low-probability) overflow error
+ in fldbld, by adding space for one extra \0. thanks to
+ robert bassett for spotting this one and providing a fix.
+
+ removed the files related to compilation on windows. i no
+ longer have anything like a current windows environment, so
+ i can't test any of it.
+
+May 23, 2010:
+ fixed long-standing overflow bug in run.c; many thanks to
+ nelson beebe for spotting it and providing the fix.
+
+ fixed bug that didn't parse -vd=1 properly; thanks to santiago
+ vila for spotting it.
+
+Feb 8, 2010:
+ i give up. replaced isblank with isspace in b.c; there are
+ no consistent header files.
+
Nov 26, 2009:
fixed a long-standing issue with when FS takes effect. a
change to FS is now noticed immediately for subsequent splits.
Modified: head/contrib/one-true-awk/README
==
--- head/contrib/one-true-awk/READMETue May 3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/READMETue May 3 11:47:19 2011
(r221381)
@@ -29,7 +29,7 @@ by Al Aho, Brian Kernighan, and Peter We
Changes, mostly bug fixes and occasional enhancements, are listed
in FIXES. If you distribute this code further, please please please
distribute FIXES with it. If you find errors, please report them
-to b...@bell-labs.com. Thanks.
+to b...@cs.princeton.edu. Thanks.
The program itself is created by
make
Modified: head/contrib/one-true-awk/b.c
==
--- head/contrib/one-true-awk/b.c Tue May 3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/b.c Tue May 3 11:47:19 2011
(r221381)
@@ -752,7 +752,7 @@ Node *unary(Node *np)
/* #define HAS_ISBLANK */
#ifndef HAS_ISBLANK
-int (isblank)(int c)
+int (xisblank)(int c)
{
return c==' ' || c=='\t';
}
@@ -766,7 +766,11 @@ struct charclass {
} charclasses[] = {
{ alnum, 5, isalnum },
{ alpha, 5, isalpha },
+#ifndef HAS_ISBLANK
+ { blank, 5, isspace }, /* was isblank */
+#else
{ blank, 5, isblank },
+#endif
{ cntrl, 5, iscntrl },
{ digit, 5, isdigit },
{ graph, 5, isgraph },
Modified: head/contrib/one-true-awk/lib.c
==
--- head/contrib/one-true-awk/lib.c Tue May 3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/lib.c Tue May 3 11:47:19 2011
(r221381)
@@ -256,6 +256,7 @@ void fldbld(void) /* create fields from
{
/* this relies on having fields[] the same length as $0 */
/* the fields are all stored in this one array with \0's */
+ /* possibly with a final trailing \0 not associated with any field */
char *r, *fr, sep;
Cell *p;
int i, j, n;
@@ -268,7 +269,7 @@ void fldbld(void) /* create fields from
n = strlen(r);
if (n fieldssize) {
xfree(fields);
- if ((fields = (char *) malloc(n+1)) == NULL)
+ if ((fields = (char *) malloc(n+2)) == NULL) /* possibly 2
final \0s */
FATAL(out of space for fields in fldbld %d, n);
fieldssize = n;
}
Modified: head/contrib/one-true-awk/main.c
==
--- head/contrib/one-true-awk/main.cTue May 3 11:39:00 2011
(r221380)
+++ head/contrib/one-true-awk/main.cTue
Re: svn commit: r221365 - head/lib/libstand
On Tuesday, May 03, 2011 3:43:47 am Craig Rodrigues wrote:
Author: rodrigc
Date: Tue May 3 07:43:47 2011
New Revision: 221365
URL: http://svn.freebsd.org/changeset/base/221365
Log:
- Comment out unused variable.
- Add parentheses around expression to eliminate compiler warning.
Modified:
head/lib/libstand/dosfs.c
Modified: head/lib/libstand/dosfs.c
==
--- head/lib/libstand/dosfs.c Tue May 3 07:39:54 2011(r221364)
+++ head/lib/libstand/dosfs.c Tue May 3 07:43:47 2011(r221365)
@@ -358,7 +358,7 @@ dos_stat(struct open_file *fd, struct st
static int
dos_readdir(struct open_file *fd, struct dirent *d)
{
-DOS_FILE *f = (DOS_FILE *)fd-f_fsdata;
+/* DOS_FILE *f = (DOS_FILE *)fd-f_fsdata; */
Err, wouldn't it be better to just remove it if it is unused?
--
John Baldwin
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221382 - head/etc
Author: ru Date: Tue May 3 12:22:46 2011 New Revision: 221382 URL: http://svn.freebsd.org/changeset/base/221382 Log: Updated `flags' field description. Modified: head/etc/newsyslog.conf Modified: head/etc/newsyslog.conf == --- head/etc/newsyslog.conf Tue May 3 11:47:19 2011(r221381) +++ head/etc/newsyslog.conf Tue May 3 12:22:46 2011(r221382) @@ -8,7 +8,7 @@ # is no process which needs to be signalled when a given log file is # rotated, then the entry for that file should include the 'N' flag. # -# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. +# The 'flags' field is one or more of the letters: BCDGJNUXZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221383 - head/usr.bin/calendar/calendars
Author: ru Date: Tue May 3 12:29:03 2011 New Revision: 221383 URL: http://svn.freebsd.org/changeset/base/221383 Log: Fixed bad format and misorder. Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdTue May 3 12:22:46 2011(r221382) +++ head/usr.bin/calendar/calendars/calendar.freebsdTue May 3 12:29:03 2011(r221383) @@ -45,8 +45,8 @@ 02/01 Juli Mallett jmall...@freebsd.org born in Washington, Pennsylvania, United States, 1985 02/02 Diomidis D. Spinellis d...@freebsd.org born in Athens, Greece, 1967 02/02 Michael W Lucas mwlu...@freebsd.org born in Detroit, Michigan, United States, 1967 -02/02 Yoichi Nakayama yoi...@freebsd.org born in Tsu, Mie, Japan, 1976 02/02 Dmitry Chagin dcha...@freebsd.org born in Stalingrad, USSR, 1976 +02/02 Yoichi Nakayama yoi...@freebsd.org born in Tsu, Mie, Japan, 1976 02/05 Frank Laszlo lasz...@freebsd.org born in Howell, Michigan, United States, 1983 02/10 David Greenman d...@freebsd.org born in Portland, Oregon, United States, 1968 02/10 Paul Richards p...@freebsd.org born in Ammanford, Carmarthenshire, United Kingdom, 1968 @@ -68,7 +68,6 @@ 02/24 Johan Karlsson jo...@freebsd.org born in Mariannelund, Sweden, 1974 02/24 Colin Percival cperc...@freebsd.org born in Burnaby, Canada, 1981 02/26 Pietro Cerutti g...@freebsd.org born in Faido, Switzerland, 1984 -05/19 Sofian Brabez s...@freebsd.org born in Toulouse, France, 1984 02/28 Daichi GOTO dai...@freebsd.org born in Shimizu Suntou, Shizuoka, Japan, 1980 03/01 Hye-Shik Chang pe...@freebsd.org born in Daejeon, Republic of Korea, 1980 03/02 Cy Schubert c...@freebsd.org born in Edmonton, Alberta, Canada, 1956 @@ -151,7 +150,8 @@ 05/17 Thomas Abthorpe tabtho...@freebsd.org born in Port Arthur, Ontario, Canada, 1968 05/19 Philippe Charnier charn...@freebsd.org born in Fontainebleau, France, 1966 05/19 Ian Dowse iedo...@freebsd.org born in Dublin, Ireland, 1975 -05/20 Dan Moschuk d...@freebsd.org died in Burlington, Ontario, Canada, 2010 +05/19 Sofian Brabez s...@freebsd.org born in Toulouse, France, 1984 +05/20 Dan Moschuk d...@freebsd.org died in Burlington, Ontario, Canada, 2010 05/21 Kris Kennaway k...@freebsd.org born in Winnipeg, Manitoba, Canada, 1978 05/22 Clive Tong-I Lin cl...@freebsd.org born in Changhua, Taiwan, Republic of China, 1978 05/22 Michael Bushkov bush...@freebsd.org born in Rostov-on-Don, Russian Federation, 1985 @@ -175,7 +175,7 @@ 06/04 Justin Gibbs gi...@freebsd.org born in San Pedro, California, United States, 1973 06/04 Jason Evans jas...@freebsd.org born in Greeley, Colorado, United States, 1973 06/04 Thomas Moestl t...@freebsd.org born in Braunschweig, Niedersachsen, Germany, 1980 -06/04 Zack Kirsch z...@freebsd.org born in Memphis, Tennessee, United States, 1982 +06/04 Zack Kirsch z...@freebsd.org born in Memphis, Tennessee, United States, 1982 06/06 Sergei Kolobov ser...@freebsd.org born in Karpinsk, Russian Federation, 1972 06/06 Alan Eldridge al...@freebsd.org died in Denver, Colorado, 2003 06/07 Jimmy Olgeni olg...@freebsd.org born in Milano, Italy, 1976 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221384 - head/sys/cam
Author: mav
Date: Tue May 3 13:16:02 2011
New Revision: 221384
URL: http://svn.freebsd.org/changeset/base/221384
Log:
Do not report legacy unit numbers (do not create legacy aliases) for disks
on port multiplier ports above first two. They don't fit into ATA_STATIC_ID
scheme and so can't be mapped properly. No need to pollute dev.
Modified:
head/sys/cam/cam_xpt.c
Modified: head/sys/cam/cam_xpt.c
==
--- head/sys/cam/cam_xpt.c Tue May 3 12:29:03 2011(r221383)
+++ head/sys/cam/cam_xpt.c Tue May 3 13:16:02 2011(r221384)
@@ -3600,9 +3600,12 @@ xpt_path_legacy_ata_id(struct cam_path *
}
xpt_unlock_buses();
}
- if (path-target != NULL)
- return (bus_id * 2 + path-target-target_id);
- else
+ if (path-target != NULL) {
+ if (path-target-target_id 2)
+ return (bus_id * 2 + path-target-target_id);
+ else
+ return (-1);
+ } else
return (bus_id * 2);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221385 - head/share/man/man4
Author: ru Date: Tue May 3 13:34:40 2011 New Revision: 221385 URL: http://svn.freebsd.org/changeset/base/221385 Log: Fixed the HISTORY section which was copied without editing from aio(4). Submitted by: Igor Sysoev Modified: head/share/man/man4/sem.4 Modified: head/share/man/man4/sem.4 == --- head/share/man/man4/sem.4 Tue May 3 13:16:02 2011(r221384) +++ head/share/man/man4/sem.4 Tue May 3 13:34:40 2011(r221385) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd November 11, 2006 +.Dd May 3, 2011 .Dt SEM 4 .Os .Sh NAME @@ -73,9 +73,5 @@ dynamic kernel module. .Sh HISTORY The .Nm -facility appeared as a kernel option in -.Fx 3.0 . -The -.Nm -kernel module appeared in +facility appeared in .Fx 5.0 . ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221348 - head/sys/boot/i386/boot2
With the recent libobjc removal this means that we can compile
all (no exceptions) of FreeBSD/{i386,amd64} with clang.
Quite a milestone in my opinion :)
On Mon, May 02, 2011 at 09:13:08PM +, Dimitry Andric wrote:
Author: dim
Date: Mon May 2 21:13:08 2011
New Revision: 221348
URL: http://svn.freebsd.org/changeset/base/221348
Log:
Clang r130700 can now compile sys/boot/i386/boot2 with room to spare.
Modified:
head/sys/boot/i386/boot2/Makefile
Modified: head/sys/boot/i386/boot2/Makefile
==
--- head/sys/boot/i386/boot2/Makefile Mon May 2 21:10:13 2011
(r221347)
+++ head/sys/boot/i386/boot2/Makefile Mon May 2 21:13:08 2011
(r221348)
@@ -2,9 +2,6 @@
.include bsd.own.mk
-# XXX: clang can compile the boot code just fine, but boot2 gets too big
-CC:=${CC:C/^(.*\/)?clang$/gcc/1}
-
FILES= boot boot1 boot2
NM?= nm
@@ -45,6 +42,12 @@ CFLAGS=-Os \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
+.if ${CC:T:Mclang} == clang
+CFLAGS+= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+= ${.IMPSRC:T:Mboot1.S:C/^.+$/-no-integrated-as/}
+.endif
+
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221386 - head/contrib/texinfo/makeinfo
Author: dim
Date: Tue May 3 14:43:16 2011
New Revision: 221386
URL: http://svn.freebsd.org/changeset/base/221386
Log:
Fix stack smash problem in makeinfo, by increasing buffer sizes in
current_chapter_number().
Modified:
head/contrib/texinfo/makeinfo/sectioning.c
Modified: head/contrib/texinfo/makeinfo/sectioning.c
==
--- head/contrib/texinfo/makeinfo/sectioning.c Tue May 3 13:34:40 2011
(r221385)
+++ head/contrib/texinfo/makeinfo/sectioning.c Tue May 3 14:43:16 2011
(r221386)
@@ -256,13 +256,13 @@ current_chapter_number (void)
return xstrdup ();
else if (enum_marker == APPENDIX_MAGIC)
{
- char s[1];
+ char s[2];
sprintf (s, %c, numbers[0] + 64);
return xstrdup (s);
}
else
{
- char s[5];
+ char s[11];
sprintf (s, %d, numbers[0]);
return xstrdup (s);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221387 - head/usr.sbin/makefs/cd9660
Author: nwhitehorn
Date: Tue May 3 15:12:01 2011
New Revision: 221387
URL: http://svn.freebsd.org/changeset/base/221387
Log:
Add support for synthesizing an APM partition map to map Mac PowerPC
bootstrap partitions from the ISO9660 boot catalog. This preserves OS X's
ability to mount the CD, while allowing us a way to provide HFS-ified
bootstrap code for Open Firmware.
Modified:
head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
Modified: head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
==
--- head/usr.sbin/makefs/cd9660/cd9660_eltorito.c Tue May 3 14:43:16
2011(r221386)
+++ head/usr.sbin/makefs/cd9660/cd9660_eltorito.c Tue May 3 15:12:01
2011(r221387)
@@ -31,6 +31,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*/
+
+#include netinet/in.h
+
#include cd9660.h
#include cd9660_eltorito.h
@@ -497,11 +500,43 @@ cd9660_setup_boot_volume_descriptor(volu
return 1;
}
+static int
+cd9660_write_apm_partition_entry(FILE *fd, int index, int total_partitions,
+off_t sector_start, off_t nsectors, off_t sector_size,
+const char *part_name, const char *part_type) {
+ uint32_t apm32;
+ uint16_t apm16;
+
+ fseeko(fd, (off_t)(index + 1) * sector_size, SEEK_SET);
+
+ /* Signature */
+ apm16 = htons(0x504d);
+ fwrite(apm16, sizeof(apm16), 1, fd);
+ apm16 = 0;
+ fwrite(apm16, sizeof(apm16), 1, fd);
+
+ /* Total number of partitions */
+ apm32 = htonl(total_partitions);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+ /* Bounds */
+ apm32 = htonl(sector_start);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+ apm32 = htonl(nsectors);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+
+ fwrite(part_name, strlen(part_name) + 1, 1, fd);
+ fseek(fd, 32 - strlen(part_name) - 1, SEEK_CUR);
+ fwrite(part_type, strlen(part_type) + 1, 1, fd);
+
+ return 0;
+}
+
int
cd9660_write_boot(FILE *fd)
{
struct boot_catalog_entry *e;
struct cd9660_boot_image *t;
+ int apm_partitions = 0;
/* write boot catalog */
if (fseeko(fd, (off_t)diskStructure.boot_catalog_sector *
@@ -533,7 +568,51 @@ cd9660_write_boot(FILE *fd)
t-filename, t-sector);
}
cd9660_copy_file(fd, t-sector, t-filename);
+
+ if (t-system == ET_SYS_MAC)
+ apm_partitions++;
+ }
+
+ if (apm_partitions 0) {
+ /* Write DDR and global APM info */
+ uint32_t apm32;
+ uint16_t apm16;
+ int total_parts;
+
+ fseek(fd, 0, SEEK_SET);
+ apm16 = htons(0x4552);
+ fwrite(apm16, sizeof(apm16), 1, fd);
+ apm16 = htons(diskStructure.sectorSize);
+ fwrite(apm16, sizeof(apm16), 1, fd);
+ apm32 = htonl(diskStructure.totalSectors);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+
+ /* Count total needed entries */
+ total_parts = 2 + apm_partitions; /* Self + ISO9660 */
+
+ /* Write self-descriptor */
+ cd9660_write_apm_partition_entry(fd, 0,
+ total_parts, 1, total_parts, diskStructure.sectorSize,
+ Apple, Apple_partition_map);
+
+ /* Write ISO9660 descriptor, enclosing the whole disk */
+ cd9660_write_apm_partition_entry(fd, 1,
+ total_parts, 0, diskStructure.totalSectors,
+ diskStructure.sectorSize, , CD_ROM_Mode_1);
+
+ /* Write all partition entries */
+ apm_partitions = 0;
+ TAILQ_FOREACH(t, diskStructure.boot_images, image_list) {
+ if (t-system != ET_SYS_MAC)
+ continue;
+
+ cd9660_write_apm_partition_entry(fd,
+ 2 + apm_partitions++, total_parts,
+ t-sector, t-num_sectors, diskStructure.sectorSize,
+ CD Boot, Apple_Bootstrap);
+ }
}
return 0;
}
+
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221348 - head/sys/boot/i386/boot2
Quoting Roman Divacky rdiva...@freebsd.org (from Tue, 3 May 2011
15:39:27 +0200):
With the recent libobjc removal this means that we can compile
all (no exceptions) of FreeBSD/{i386,amd64} with clang.
Quite a milestone in my opinion :)
Newsflash?
Bye,
Alexander.
--
Alas, how love can trifle with itself!
-- William Shakespeare, The Two Gentlemen of Verona
http://www.Leidinger.netAlexander @ Leidinger.net: PGP ID = B0063FE7
http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221387 - head/usr.sbin/makefs/cd9660
2011/5/3 Nathan Whitehorn nwhiteh...@freebsd.org:
Author: nwhitehorn
Date: Tue May  3 15:12:01 2011
New Revision: 221387
URL: http://svn.freebsd.org/changeset/base/221387
Log:
 Add support for synthesizing an APM partition map to map Mac PowerPC
 bootstrap partitions from the ISO9660 boot catalog. This preserves OS X's
 ability to mount the CD, while allowing us a way to provide HFS-ified
 bootstrap code for Open Firmware.
Modified:
 head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
Modified: head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
==
--- head/usr.sbin/makefs/cd9660/cd9660_eltorito.c    Tue May  3 14:43:16
2011 Â Â Â Â (r221386)
+++ head/usr.sbin/makefs/cd9660/cd9660_eltorito.c    Tue May  3 15:12:01
2011 Â Â Â Â (r221387)
@@ -31,6 +31,9 @@
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 * OF SUCH DAMAGE.
 */
+
+#include netinet/in.h
+
 #include cd9660.h
 #include cd9660_eltorito.h
@@ -497,11 +500,43 @@ cd9660_setup_boot_volume_descriptor(volu
    return 1;
 }
+static int
+cd9660_write_apm_partition_entry(FILE *fd, int index, int total_partitions,
+ Â Â off_t sector_start, off_t nsectors, off_t sector_size,
+ Â Â const char *part_name, const char *part_type) {
+ Â Â Â uint32_t apm32;
+ Â Â Â uint16_t apm16;
+
+ Â Â Â fseeko(fd, (off_t)(index + 1) * sector_size, SEEK_SET);
+
+ Â Â Â /* Signature */
+ Â Â Â apm16 = htons(0x504d);
+ Â Â Â fwrite(apm16, sizeof(apm16), 1, fd);
+ Â Â Â apm16 = 0;
+ Â Â Â fwrite(apm16, sizeof(apm16), 1, fd);
+
+ Â Â Â /* Total number of partitions */
+ Â Â Â apm32 = htonl(total_partitions);
+ Â Â Â fwrite(apm32, sizeof(apm32), 1, fd);
+ Â Â Â /* Bounds */
+ Â Â Â apm32 = htonl(sector_start);
+ Â Â Â fwrite(apm32, sizeof(apm32), 1, fd);
+ Â Â Â apm32 = htonl(nsectors);
+ Â Â Â fwrite(apm32, sizeof(apm32), 1, fd);
+
+ Â Â Â fwrite(part_name, strlen(part_name) + 1, 1, fd);
+ Â Â Â fseek(fd, 32 - strlen(part_name) - 1, SEEK_CUR);
+ Â Â Â fwrite(part_type, strlen(part_type) + 1, 1, fd);
+
+ Â Â Â return 0;
+}
+
 int
 cd9660_write_boot(FILE *fd)
 {
    struct boot_catalog_entry *e;
    struct cd9660_boot_image *t;
+ Â Â Â int apm_partitions = 0;
    /* write boot catalog */
    if (fseeko(fd, (off_t)diskStructure.boot_catalog_sector *
@@ -533,7 +568,51 @@ cd9660_write_boot(FILE *fd)
              t-filename, t-sector);
        }
        cd9660_copy_file(fd, t-sector, t-filename);
+
+ Â Â Â Â Â Â Â if (t-system == ET_SYS_MAC)
+ Â Â Â Â Â Â Â Â Â Â Â apm_partitions++;
+ Â Â Â }
+
+ Â Â Â if (apm_partitions 0) {
+ Â Â Â Â Â Â Â /* Write DDR and global APM info */
+ Â Â Â Â Â Â Â uint32_t apm32;
+ Â Â Â Â Â Â Â uint16_t apm16;
+ Â Â Â Â Â Â Â int total_parts;
+
+ Â Â Â Â Â Â Â fseek(fd, 0, SEEK_SET);
+ Â Â Â Â Â Â Â apm16 = htons(0x4552);
+ Â Â Â Â Â Â Â fwrite(apm16, sizeof(apm16), 1, fd);
+ Â Â Â Â Â Â Â apm16 = htons(diskStructure.sectorSize);
+ Â Â Â Â Â Â Â fwrite(apm16, sizeof(apm16), 1, fd);
+ Â Â Â Â Â Â Â apm32 = htonl(diskStructure.totalSectors);
+ Â Â Â Â Â Â Â fwrite(apm32, sizeof(apm32), 1, fd);
+
+ Â Â Â Â Â Â Â /* Count total needed entries */
+ Â Â Â Â Â Â Â total_parts = 2 + apm_partitions; /* Self + ISO9660 */
+
+ Â Â Â Â Â Â Â /* Write self-descriptor */
+ Â Â Â Â Â Â Â cd9660_write_apm_partition_entry(fd, 0,
+ Â Â Â Â Â Â Â Â Â total_parts, 1, total_parts, diskStructure.sectorSize,
+ Â Â Â Â Â Â Â Â Â Apple, Apple_partition_map);
+
+ Â Â Â Â Â Â Â /* Write ISO9660 descriptor, enclosing the whole disk */
+ Â Â Â Â Â Â Â cd9660_write_apm_partition_entry(fd, 1,
+ Â Â Â Â Â Â Â Â Â total_parts, 0, diskStructure.totalSectors,
+ Â Â Â Â Â Â Â Â Â diskStructure.sectorSize, , CD_ROM_Mode_1);
+
+ Â Â Â Â Â Â Â /* Write all partition entries */
+ Â Â Â Â Â Â Â apm_partitions = 0;
+ Â Â Â Â Â Â Â TAILQ_FOREACH(t, diskStructure.boot_images, image_list) {
+ Â Â Â Â Â Â Â Â Â Â Â if (t-system != ET_SYS_MAC)
+ Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â continue;
+
+ Â Â Â Â Â Â Â Â Â Â Â cd9660_write_apm_partition_entry(fd,
+ Â Â Â Â Â Â Â Â Â Â Â Â Â 2 + apm_partitions++, total_parts,
+ Â Â Â Â Â Â Â Â Â Â Â Â Â t-sector, t-num_sectors,
diskStructure.sectorSize,
+ Â Â Â Â Â Â Â Â Â Â Â Â Â CD Boot, Apple_Bootstrap);
+ Â Â Â Â Â Â Â }
    }
    return 0;
 }
+
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Nice,
Do not forget to send this to the netbsd folks so that both makefs
keep as in sync as possible, chris...@netbsd.org should be interested
by this.
if you already did this, sorry for the noise.
regards,
Bapt
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To
svn commit: r221388 - head/sys/dev/sound/pcm
Author: avg Date: Tue May 3 15:50:22 2011 New Revision: 221388 URL: http://svn.freebsd.org/changeset/base/221388 Log: SNDCTL_DSP_GETIPTR: set pointer to sndbuf_getfreeptr() Rationale: - unlike current behavior this seems to be compliant with OSS specification: http://manuals.opensound.com/developer/SNDCTL_DSP_GETIPTR.html - this seems to meet expectations of some OSS programs compiled for or ported from Linux, e.g. ALSA OSS plugin - this doesn't seem to break any programs as far as current testing shows Tested by:nox, hselasky MFC after:4 days Modified: head/sys/dev/sound/pcm/dsp.c Modified: head/sys/dev/sound/pcm/dsp.c == --- head/sys/dev/sound/pcm/dsp.cTue May 3 15:12:01 2011 (r221387) +++ head/sys/dev/sound/pcm/dsp.cTue May 3 15:50:22 2011 (r221388) @@ -1655,7 +1655,7 @@ dsp_ioctl(struct cdev *i_dev, u_long cmd /* XXX abusive DMA update: chn_rdupdate(rdch); */ a-bytes = sndbuf_gettotal(bs); a-blocks = sndbuf_getblocks(bs) - rdch-blocks; - a-ptr = sndbuf_getreadyptr(bs); + a-ptr = sndbuf_getfreeptr(bs); rdch-blocks = sndbuf_getblocks(bs); CHN_UNLOCK(rdch); } else ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221389 - in head/sys/dev/vxge: . include
Author: gnn
Date: Tue May 3 15:58:24 2011
New Revision: 221389
URL: http://svn.freebsd.org/changeset/base/221389
Log:
Add in support for multicast.
Submitted by: Sriram Rapuru at @ Wipro for Exar Inc.
MFC after:2 weeks
Modified:
head/sys/dev/vxge/include/build-version.h
head/sys/dev/vxge/vxge.c
head/sys/dev/vxge/vxge.h
Modified: head/sys/dev/vxge/include/build-version.h
==
--- head/sys/dev/vxge/include/build-version.h Tue May 3 15:50:22 2011
(r221388)
+++ head/sys/dev/vxge/include/build-version.h Tue May 3 15:58:24 2011
(r221389)
@@ -3,5 +3,5 @@
#ifndefBUILD_VERSION_H
#defineBUILD_VERSION_H
/* Do not edit! Automatically generated when released. */
-#defineGENERATED_BUILD_VERSION 22708
+#defineGENERATED_BUILD_VERSION 22770
#endif /* BUILD_VERSION_H */
Modified: head/sys/dev/vxge/vxge.c
==
--- head/sys/dev/vxge/vxge.cTue May 3 15:50:22 2011(r221388)
+++ head/sys/dev/vxge/vxge.cTue May 3 15:58:24 2011(r221389)
@@ -357,6 +357,9 @@ vxge_init_locked(vxge_dev_t *vdev)
if (!vpath_handle)
continue;
+ /* Enabling mcast for all vpath */
+ vxge_hal_vpath_mcast_enable(vpath_handle);
+
/* Enabling bcast for all vpath */
status = vxge_hal_vpath_bcast_enable(vpath_handle);
if (status != VXGE_HAL_OK)
@@ -2879,26 +2882,6 @@ vxge_promisc_set(vxge_dev_t *vdev)
ifp = vdev-ifp;
- if ((ifp-if_flags IFF_ALLMULTI) (!vdev-all_multi_flag)) {
- for (i = 0; i vdev-no_of_vpath; i++) {
- vpath_handle = vxge_vpath_handle_get(vdev, i);
- if (!vpath_handle)
- continue;
-
- vxge_hal_vpath_mcast_enable(vpath_handle);
- vdev-all_multi_flag = 1;
- }
-
- } else if (!(ifp-if_flags IFF_ALLMULTI) (vdev-all_multi_flag)) {
- for (i = 0; i vdev-no_of_vpath; i++) {
- vpath_handle = vxge_vpath_handle_get(vdev, i);
- if (!vpath_handle)
- continue;
-
- vxge_hal_vpath_mcast_disable(vpath_handle);
- vdev-all_multi_flag = 0;
- }
- }
for (i = 0; i vdev-no_of_vpath; i++) {
vpath_handle = vxge_vpath_handle_get(vdev, i);
if (!vpath_handle)
Modified: head/sys/dev/vxge/vxge.h
==
--- head/sys/dev/vxge/vxge.hTue May 3 15:50:22 2011(r221388)
+++ head/sys/dev/vxge/vxge.hTue May 3 15:58:24 2011(r221389)
@@ -406,7 +406,6 @@ struct vxge_dev_t {
int no_of_vpath;
u64 active_port;
u32 no_of_func;
- u32 all_multi_flag;
u32 hw_fw_version;
u32 max_supported_vpath;
int rx_mbuf_sz;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221391 - head/tools/tools/vxge
Author: gnn
Date: Tue May 3 16:00:36 2011
New Revision: 221391
URL: http://svn.freebsd.org/changeset/base/221391
Log:
Give some sort of message when the program is not run as root.
Root privileges are required to talk to the device.
Submitted by: Sriram Rapuru at Wipro for Exar Inc.
MFC after:2 weeks
Modified:
head/tools/tools/vxge/vxge_info.c
Modified: head/tools/tools/vxge/vxge_info.c
==
--- head/tools/tools/vxge/vxge_info.c Tue May 3 16:00:26 2011
(r221390)
+++ head/tools/tools/vxge/vxge_info.c Tue May 3 16:00:36 2011
(r221391)
@@ -31,6 +31,7 @@
/*$FreeBSD$*/
#include vxge_info.h
+#include unistd.h
static int sockfd;
static struct ifreq ifr;
@@ -38,6 +39,15 @@ static struct ifreq ifr;
int
main(int argc, char *argv[])
{
+ uid_t uid;
+
+ uid = getuid();
+
+ if (uid) {
+ printf(vxge-manage: Operation not permitted.\nExiting...\n);
+ goto _exit0;
+ }
+
if (argc = 4) {
if (!((strcasecmp(argv[2], regs) == 0) ||
(strcasecmp(argv[2], stats) == 0) ||
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221392 - stable/8/sbin/newfs
Author: cperciva
Date: Tue May 3 16:36:39 2011
New Revision: 221392
URL: http://svn.freebsd.org/changeset/base/221392
Log:
MFC r221049: Stop zeroing UFS1 superblocks if we fall off the end of the
disk, in order to avoid wasting time (potentially many hours) in the event
that we find a partially-overwritten UFS1 superblock.
Modified:
stable/8/sbin/newfs/mkfs.c
Directory Properties:
stable/8/sbin/newfs/ (props changed)
Modified: stable/8/sbin/newfs/mkfs.c
==
--- stable/8/sbin/newfs/mkfs.c Tue May 3 16:00:36 2011(r221391)
+++ stable/8/sbin/newfs/mkfs.c Tue May 3 16:36:39 2011(r221392)
@@ -517,9 +517,12 @@ restart:
fsdummy.fs_magic = 0;
bwrite(disk, part_ofs + SBLOCK_UFS1 / disk.d_bsize,
chdummy, SBLOCKSIZE);
- for (cg = 0; cg fsdummy.fs_ncg; cg++)
+ for (cg = 0; cg fsdummy.fs_ncg; cg++) {
+ if (fsbtodb(fsdummy, cgsblock(fsdummy, cg))
fssize)
+ break;
bwrite(disk, part_ofs + fsbtodb(fsdummy,
cgsblock(fsdummy, cg)), chdummy, SBLOCKSIZE);
+ }
}
}
if (!Nflag)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221348 - head/sys/boot/i386/boot2
On Tue, May 03, 2011 at 03:39:27PM +0200, Roman Divacky wrote:
With the recent libobjc removal this means that we can compile
all (no exceptions) of FreeBSD/{i386,amd64} with clang.
Quite a milestone in my opinion :)
Great news! Thanks for all the work to make this happen!
Has boot2 been submitted to LLVM as a clang regression test?
Thanks,
Brooks
On Mon, May 02, 2011 at 09:13:08PM +, Dimitry Andric wrote:
Author: dim
Date: Mon May 2 21:13:08 2011
New Revision: 221348
URL: http://svn.freebsd.org/changeset/base/221348
Log:
Clang r130700 can now compile sys/boot/i386/boot2 with room to spare.
Modified:
head/sys/boot/i386/boot2/Makefile
Modified: head/sys/boot/i386/boot2/Makefile
==
--- head/sys/boot/i386/boot2/Makefile Mon May 2 21:10:13 2011
(r221347)
+++ head/sys/boot/i386/boot2/Makefile Mon May 2 21:13:08 2011
(r221348)
@@ -2,9 +2,6 @@
.include bsd.own.mk
-# XXX: clang can compile the boot code just fine, but boot2 gets too big
-CC:=${CC:C/^(.*\/)?clang$/gcc/1}
-
FILES= boot boot1 boot2
NM?= nm
@@ -45,6 +42,12 @@ CFLAGS= -Os \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
-Winline --param max-inline-insns-single=100
+.if ${CC:T:Mclang} == clang
+CFLAGS+= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3
+# XXX: clang integrated-as doesn't grok .codeNN directives yet
+CFLAGS+= ${.IMPSRC:T:Mboot1.S:C/^.+$/-no-integrated-as/}
+.endif
+
LDFLAGS=-static -N --gc-sections
# Pick up ../Makefile.inc early.
pgpomAXJodmw2.pgp
Description: PGP signature
Re: svn commit: r221348 - head/sys/boot/i386/boot2
On Tue, May 03, 2011 at 04:27:57AM -0500, Brooks Davis wrote:
On Tue, May 03, 2011 at 03:39:27PM +0200, Roman Divacky wrote:
With the recent libobjc removal this means that we can compile
all (no exceptions) of FreeBSD/{i386,amd64} with clang.
Quite a milestone in my opinion :)
Great news! Thanks for all the work to make this happen!
Has boot2 been submitted to LLVM as a clang regression test?
No, but we are setting up a testing environment to track the code
size changes in boot2.
Pawel, can you comment on this?
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221393 - in head/sys: amd64/pci conf dev/acpica dev/pci i386/pci sparc64/pci x86/pci x86/x86
Author: jhb Date: Tue May 3 17:37:24 2011 New Revision: 221393 URL: http://svn.freebsd.org/changeset/base/221393 Log: Reimplement how PCI-PCI bridges manage their I/O windows. Previously the driver would verify that requests for child devices were confined to any existing I/O windows, but the driver relied on the firmware to initialize the windows and would never grow the windows for new requests. Now the driver actively manages the I/O windows. This is implemented by allocating a bus resource for each I/O window from the parent PCI bus and suballocating that resource to child devices. The suballocations are managed by creating an rman for each I/O window. The suballocated resources are mapped by passing the bus_activate_resource() call up to the parent PCI bus. Windows are grown when needed by using bus_adjust_resource() to adjust the resource allocated from the parent PCI bus. If the adjust request succeeds, the window is adjusted and the suballocation request for the child device is retried. When growing a window, the rman_first_free_region() and rman_last_free_region() routines are used to determine if the front or end of the existing I/O window is free. From using that, the smallest ranges that need to be added to either the front or back of the window are computed. The driver will first try to grow the window in whichever direction requires the smallest growth first followed by the other direction if that fails. Subtractive bridges will first attempt to satisfy requests for child resources from I/O windows (including attempts to grow the windows). If that fails, the request is passed up to the parent PCI bus directly however. The PCI-PCI bridge driver will try to use firmware-assigned ranges for child BARs first and only allocate a fresh range if that specific range cannot be accommodated in the I/O window. This allows systems where the firmware assigns resources during boot but later wipes the I/O windows (some ACPI BIOSen are known to do this) to rediscover the original I/O window ranges. The ACPI Host-PCI bridge driver has been adjusted to correctly honor hw.acpi.host_mem_start and the I/O port equivalent when a PCI-PCI bridge makes a wildcard request for an I/O window range. The new PCI-PCI bridge driver is only enabled if the NEW_PCIB kernel option is enabled. This is a transition aide to allow platforms that do not yet support bus_activate_resource() and bus_adjust_resource() in their Host-PCI bridge drivers (and possibly other drivers as needed) to use the old driver for now. Once all platforms support the new driver, the kernel option and old driver will be removed. PR: kern/143874 kern/149306 Tested by:mav Modified: head/sys/amd64/pci/pci_bus.c head/sys/conf/options head/sys/dev/acpica/acpi_pcib_acpi.c head/sys/dev/acpica/acpi_pcib_pci.c head/sys/dev/pci/pci.c head/sys/dev/pci/pci_pci.c head/sys/dev/pci/pcib_private.h head/sys/i386/pci/pci_bus.c head/sys/sparc64/pci/apb.c head/sys/sparc64/pci/ofw_pcib.c head/sys/x86/pci/qpi.c head/sys/x86/x86/mptable_pci.c Modified: head/sys/amd64/pci/pci_bus.c == --- head/sys/amd64/pci/pci_bus.cTue May 3 16:36:39 2011 (r221392) +++ head/sys/amd64/pci/pci_bus.cTue May 3 17:37:24 2011 (r221393) @@ -35,6 +35,7 @@ __FBSDID($FreeBSD$); #include sys/kernel.h #include sys/malloc.h #include sys/module.h +#include sys/rman.h #include sys/sysctl.h #include dev/pci/pcivar.h Modified: head/sys/conf/options == --- head/sys/conf/options Tue May 3 16:36:39 2011(r221392) +++ head/sys/conf/options Tue May 3 17:37:24 2011(r221393) @@ -136,6 +136,7 @@ MFI_DEBUG opt_mfi.h MFI_DECODE_LOG opt_mfi.h MPROF_BUFFERS opt_mprof.h MPROF_HASH_SIZEopt_mprof.h +NEW_PCIB opt_global.h NO_ADAPTIVE_MUTEXESopt_adaptive_mutexes.h NO_ADAPTIVE_RWLOCKS NO_ADAPTIVE_SX Modified: head/sys/dev/acpica/acpi_pcib_acpi.c == --- head/sys/dev/acpica/acpi_pcib_acpi.cTue May 3 16:36:39 2011 (r221392) +++ head/sys/dev/acpica/acpi_pcib_acpi.cTue May 3 17:37:24 2011 (r221393) @@ -34,6 +34,7 @@ __FBSDID($FreeBSD$); #include sys/kernel.h #include sys/malloc.h #include sys/module.h +#include sys/rman.h #include sys/sysctl.h #include contrib/dev/acpica/include/acpi.h @@ -370,11 +371,17 @@ acpi_pcib_acpi_alloc_resource(device_t d * Hardcoding like this sucks, so a more MD/MI way needs to be * found to do it. This is typically only used on older laptops * that don't have pci busses behind pci bridge, so assuming 32MB - * is liekly OK. + * is likely OK. + * + *
svn commit: r221394 - in head/sys: amd64/conf i386/conf
Author: jhb Date: Tue May 3 18:23:11 2011 New Revision: 221394 URL: http://svn.freebsd.org/changeset/base/221394 Log: Enable the new PCI-PCI bridge driver on amd64 and i386 by default. It can be disabled via 'nooptions NEW_PCIB'. Modified: head/sys/amd64/conf/DEFAULTS head/sys/i386/conf/DEFAULTS Modified: head/sys/amd64/conf/DEFAULTS == --- head/sys/amd64/conf/DEFAULTSTue May 3 17:37:24 2011 (r221393) +++ head/sys/amd64/conf/DEFAULTSTue May 3 18:23:11 2011 (r221394) @@ -20,3 +20,5 @@ options GEOM_PART_BSD optionsGEOM_PART_EBR optionsGEOM_PART_EBR_COMPAT optionsGEOM_PART_MBR + +optionsNEW_PCIB Modified: head/sys/i386/conf/DEFAULTS == --- head/sys/i386/conf/DEFAULTS Tue May 3 17:37:24 2011(r221393) +++ head/sys/i386/conf/DEFAULTS Tue May 3 18:23:11 2011(r221394) @@ -28,3 +28,5 @@ options GEOM_PART_MBR # enable support for native hardware optionsNATIVE device atpic + +optionsNEW_PCIB ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221397 - in head/sys: kern sys
Author: ae
Date: Tue May 3 18:54:18 2011
New Revision: 221397
URL: http://svn.freebsd.org/changeset/base/221397
Log:
Add make_dev_alias_p() function. It is similar to make_dev_alias(),
but it may return an error like make_dev_p() does.
Reviewed by: kib (previous version)
MFC after:2 weeks
Modified:
head/sys/kern/kern_conf.c
head/sys/sys/conf.h
Modified: head/sys/kern/kern_conf.c
==
--- head/sys/kern/kern_conf.c Tue May 3 18:48:06 2011(r221396)
+++ head/sys/kern/kern_conf.c Tue May 3 18:54:18 2011(r221397)
@@ -893,23 +893,34 @@ dev_depends(struct cdev *pdev, struct cd
dev_unlock();
}
-struct cdev *
-make_dev_alias(struct cdev *pdev, const char *fmt, ...)
+static int
+make_dev_alias_v(int flags, struct cdev **cdev, struct cdev *pdev,
+const char *fmt, va_list ap)
{
struct cdev *dev;
- va_list ap;
int error;
- KASSERT(pdev != NULL, (NULL pdev));
- dev = devfs_alloc(MAKEDEV_WAITOK);
+ KASSERT(pdev != NULL, (make_dev_alias_v: pdev is NULL));
+ KASSERT((flags MAKEDEV_WAITOK) == 0 || (flags MAKEDEV_NOWAIT) == 0,
+ (make_dev_alias_v: both WAITOK and NOWAIT specified));
+ KASSERT((flags ~(MAKEDEV_WAITOK | MAKEDEV_NOWAIT |
+ MAKEDEV_CHECKNAME)) == 0,
+ (make_dev_alias_v: invalid flags specified (flags=%02x), flags));
+
+ dev = devfs_alloc(flags);
+ if (dev == NULL)
+ return (ENOMEM);
dev_lock();
dev-si_flags |= SI_ALIAS;
- va_start(ap, fmt);
error = prep_devname(dev, fmt, ap);
- va_end(ap);
if (error != 0) {
- panic(make_dev_alias: bad si_name (error=%d, si_name=%s),
- error, dev-si_name);
+ if ((flags MAKEDEV_CHECKNAME) == 0) {
+ panic(make_dev_alias_v: bad si_name
+ (error=%d, si_name=%s), error, dev-si_name);
+ }
+ dev_unlock();
+ devfs_free(dev);
+ return (error);
}
dev-si_flags |= SI_NAMED;
devfs_create(dev);
@@ -917,11 +928,41 @@ make_dev_alias(struct cdev *pdev, const
clean_unrhdrl(devfs_inos);
dev_unlock();
- notify_create(dev, MAKEDEV_WAITOK);
+ notify_create(dev, flags);
+ *cdev = dev;
+
+ return (0);
+}
+struct cdev *
+make_dev_alias(struct cdev *pdev, const char *fmt, ...)
+{
+ struct cdev *dev;
+ va_list ap;
+ int res;
+
+ va_start(ap, fmt);
+ res = make_dev_alias_v(MAKEDEV_WAITOK, dev, pdev, fmt, ap);
+ va_end(ap);
+
+ KASSERT(res == 0 dev != NULL,
+ (make_dev_alias: failed make_dev_alias_v (error=%d), res));
return (dev);
}
+int
+make_dev_alias_p(int flags, struct cdev **cdev, struct cdev *pdev,
+const char *fmt, ...)
+{
+ va_list ap;
+ int res;
+
+ va_start(ap, fmt);
+ res = make_dev_alias_v(flags, cdev, pdev, fmt, ap);
+ va_end(ap);
+ return (res);
+}
+
static void
destroy_devl(struct cdev *dev)
{
Modified: head/sys/sys/conf.h
==
--- head/sys/sys/conf.h Tue May 3 18:48:06 2011(r221396)
+++ head/sys/sys/conf.h Tue May 3 18:54:18 2011(r221397)
@@ -278,6 +278,8 @@ int make_dev_p(int _flags, struct cdev *
const char *_fmt, ...) __printflike(8, 9);
struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...)
__printflike(2, 3);
+intmake_dev_alias_p(int _flags, struct cdev **_cdev, struct cdev *_pdev,
+ const char *_fmt, ...) __printflike(4, 5);
void dev_lock(void);
void dev_unlock(void);
void setconf(void);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221398 - head/share/man/man9
Author: ae Date: Tue May 3 18:55:16 2011 New Revision: 221398 URL: http://svn.freebsd.org/changeset/base/221398 Log: Document make_dev_alias_p(). MFC after:2 weeks Modified: head/share/man/man9/make_dev.9 Modified: head/share/man/man9/make_dev.9 == --- head/share/man/man9/make_dev.9 Tue May 3 18:54:18 2011 (r221397) +++ head/share/man/man9/make_dev.9 Tue May 3 18:55:16 2011 (r221398) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd October 24, 2010 +.Dd May 03, 2011 .Dt MAKE_DEV 9 .Os .Sh NAME @@ -33,6 +33,7 @@ .Nm make_dev_credf , .Nm make_dev_p , .Nm make_dev_alias , +.Nm make_dev_alias_p , .Nm destroy_dev , .Nm destroy_dev_sched , .Nm destroy_dev_sched_cb , @@ -54,6 +55,8 @@ and DEVFS registration for devices .Fn make_dev_p int flags struct cdev **cdev struct cdevsw *devsw struct ucred *cr uid_t uid gid_t gid int mode const char *fmt ... .Ft struct cdev * .Fn make_dev_alias struct cdev *pdev const char *fmt ... +.Ft int +.Fn make_dev_alias_p int flags struct cdev **cdev struct cdev *pdev const char *fmt ... .Ft void .Fn destroy_dev struct cdev *dev .Ft void @@ -149,6 +152,15 @@ created device will be never destroyed return an error if the device name is invalid or already exists .El .Pp +Only +.Dv MAKEDEV_NOWAIT , +.Dv MAKEDEV_WAITOK +and +.Dv MAKEDEV_CHECKNAME +values are accepted for the +.Fn make_dev_alias_p +function. +.Pp The .Dv MAKEDEV_WAITOK flag is assumed if none of @@ -214,6 +226,13 @@ It is an error to call prior to calling .Fn make_dev . .Pp +.Fn make_dev_alias_p +function is similar to +.Fn make_dev_alias +but it takes a pointer to the resulting +.Ft *cdev +as an argument and may return an error. +.Pp The .Fa cdev returned by @@ -321,6 +340,8 @@ pointer, otherwise it will return .Sh ERRORS The .Fn make_dev_p +and +.Fn make_dev_alias_p call will fail and the device will be not registered if: .Bl -tag -width Er .It Bq Er ENOMEM ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221400 - head/sys/geom
Author: mav Date: Tue May 3 19:12:42 2011 New Revision: 221400 URL: http://svn.freebsd.org/changeset/base/221400 Log: Use make_dev_alias_p() added in r221397 to create alias dev entry. It removes panic in case if alias name is already busy for some reason. Modified: head/sys/geom/geom_dev.c Modified: head/sys/geom/geom_dev.c == --- head/sys/geom/geom_dev.cTue May 3 18:57:46 2011(r221399) +++ head/sys/geom/geom_dev.cTue May 3 19:12:42 2011(r221400) @@ -148,7 +148,8 @@ g_dev_taste(struct g_class *mp, struct g snprintf(buf, sizeof(buf), %s%s, val, gp-name + len); freeenv(val); - adev = make_dev_alias(dev, buf); + make_dev_alias_p(MAKEDEV_CHECKNAME | MAKEDEV_WAITOK, + adev, dev, %s, buf); break; } } ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221401 - head/lib/libc/string
Author: delphij Date: Tue May 3 19:33:06 2011 New Revision: 221401 URL: http://svn.freebsd.org/changeset/base/221401 Log: Fix prototype for ffsll(3) and fls(3). PR: docs/156796 Submitted by: Jean-Yves Migeon jeanyves.migeon free.fr MFC after:3 days Modified: head/lib/libc/string/ffs.3 Modified: head/lib/libc/string/ffs.3 == --- head/lib/libc/string/ffs.3 Tue May 3 19:12:42 2011(r221400) +++ head/lib/libc/string/ffs.3 Tue May 3 19:33:06 2011(r221401) @@ -30,7 +30,7 @@ .\ @(#)ffs.3 8.2 (Berkeley) 4/19/94 .\ $FreeBSD$ .\ -.Dd October 26, 2008 +.Dd May 3, 2011 .Dt FFS 3 .Os .Sh NAME @@ -50,8 +50,8 @@ .Ft int .Fn ffsl long value .Ft int -.Ft int .Fn ffsll long long value +.Ft int .Fn fls int value .Ft int .Fn flsl long value ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221403 - vendor/tre/0.8.0
Author: gabor Date: Tue May 3 19:35:50 2011 New Revision: 221403 URL: http://svn.freebsd.org/changeset/base/221403 Log: - Tag TRE 0.8.0 Added: vendor/tre/0.8.0/ - copied from r221402, vendor/tre/dist/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221402 - in vendor/tre: . dist dist/doc dist/lib dist/lib/.deps dist/m4 dist/po dist/python dist/src dist/src/.deps dist/tests dist/tests/.deps dist/tests/agrep dist/utils dist/win32
On Tue, May 03, 2011 at 07:33:10PM +, Gabor Kovesdan wrote: Author: gabor Date: Tue May 3 19:33:09 2011 New Revision: 221402 URL: http://svn.freebsd.org/changeset/base/221402 Log: - Vendor import of TRE 0.8.0 What is this ? Why we do need it in base ? vendor/tre/dist/lib/.deps/ vendor/tre/dist/lib/.deps/regcomp.Plo vendor/tre/dist/lib/.deps/regerror.Plo vendor/tre/dist/lib/.deps/regexec.Plo vendor/tre/dist/lib/.deps/tre-ast.Plo vendor/tre/dist/lib/.deps/tre-compile.Plo vendor/tre/dist/lib/.deps/tre-match-approx.Plo vendor/tre/dist/lib/.deps/tre-match-backtrack.Plo vendor/tre/dist/lib/.deps/tre-match-parallel.Plo vendor/tre/dist/lib/.deps/tre-mem.Plo vendor/tre/dist/lib/.deps/tre-parse.Plo vendor/tre/dist/lib/.deps/tre-stack.Plo I am sure that all .deps dirs are garbage. pgpEg0AtyKOMr.pgp Description: PGP signature
svn commit: r221406 - in vendor/tre/dist: lib/.deps src/.deps tests/.deps
Author: gabor Date: Tue May 3 19:50:39 2011 New Revision: 221406 URL: http://svn.freebsd.org/changeset/base/221406 Log: - Delete unnecessary garbage files Deleted: vendor/tre/dist/lib/.deps/ vendor/tre/dist/src/.deps/ vendor/tre/dist/tests/.deps/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221407 - in head/sys: dev/ae dev/age dev/alc dev/ale dev/bce dev/bfe dev/bge dev/dc dev/ed dev/et dev/fxp dev/hme dev/jme dev/lge dev/mii dev/nfe dev/nge dev/nve dev/pcn dev/sf dev/sge...
Author: marius Date: Tue May 3 19:51:29 2011 New Revision: 221407 URL: http://svn.freebsd.org/changeset/base/221407 Log: - Remove attempts to implement setting of BMCR_LOOP/MIIF_NOLOOP (reporting IFM_LOOP based on BMCR_LOOP is left in place though as it might provide useful for debugging). For most mii(4) drivers it was unclear whether the PHYs driven by them actually support loopback or not. Moreover, typically loopback mode also needs to be activated on the MAC, which none of the Ethernet drivers using mii(4) implements. Given that loopback media has no real use (and obviously hardly had a chance to actually work) besides for driver development (which just loopback mode should be sufficient for though, i.e one doesn't necessary need support for loopback media) support for it is just dropped as both NetBSD and OpenBSD already did quite some time ago. - Let mii_phy_add_media() also announce the support of IFM_NONE. - Restructure the PHY entry points to use a structure of entry points instead of discrete function pointers, and extend this to include a reset entry point. Make sure any PHY-specific reset routine is always used, and provide one for lxtphy(4) which disables MII interrupts (as is done for a few other PHYs we have drivers for). This includes changing NIC drivers which previously just called the generic mii_phy_reset() to now actually call the PHY-specific reset routine, which might be crucial in some cases. While at it, the redundant checks in these NIC drivers for mii-mii_instance not being zero before calling the reset routines were removed because as soon as one PHY driver attaches mii-mii_instance is incremented and we hardly can end up in their media change callbacks etc if no PHY driver has attached as mii_attach() would have failed in that case and not attach a miibus(4) instance. Consequently, NIC drivers now no longer should call mii_phy_reset() directly, so it was removed from EXPORT_SYMS. - Add a mii_phy_dev_attach() as a companion helper to mii_phy_dev_probe(). The purpose of that function is to perform the common steps to attach a PHY driver instance and to hook it up to the miibus(4) instance and to optionally also handle the probing, addition and initialization of the supported media. So all a PHY driver without any special requirements has to do in its bus attach method is to call mii_phy_dev_attach() along with PHY-specific MIIF_* flags, a pointer to its PHY functions and the add_media set to one. All PHY drivers were updated to take advantage of mii_phy_dev_attach() as appropriate. Along with these changes the capability mask was added to the mii_softc structure so PHY drivers taking advantage of mii_phy_dev_attach() but still handling media on their own do not need to fiddle with the MII attach arguments anyway. - Keep track of the PHY offset in the mii_softc structure. This is done for compatibility with NetBSD/OpenBSD. - Keep track of the PHY's OUI, model and revision in the mii_softc structure. Several PHY drivers require this information also after attaching and previously had to wrap their own softc around mii_softc. NetBSD/OpenBSD also keep track of the model and revision on their mii_softc structure. All PHY drivers were updated to take advantage as appropriate. - Convert the mebers of the MII data structure to unsigned where appropriate. This is partly inspired by NetBSD/OpenBSD. - According to IEEE 802.3-2002 the bits actually have to be reversed when mapping an OUI to the MII ID registers. All PHY drivers and miidevs where changed as necessary. Actually this now again allows to largely share miidevs with NetBSD, which fixed this problem already 9 years ago. Consequently miidevs was synced as far as possible. - Add MIIF_NOMANPAUSE and mii_phy_flowstatus() calls to drivers that weren't explicitly converted to support flow control before. It's unclear whether flow control actually works with these but typically it should and their net behavior should be more correct with these changes in place than without if the MAC driver sets MIIF_DOPAUSE. Obtained from:NetBSD (partially) Reviewed by: yongari (earlier version), silence on arch@ and net@ Modified: head/sys/dev/ae/if_ae.c head/sys/dev/age/if_age.c head/sys/dev/alc/if_alc.c head/sys/dev/ale/if_ale.c head/sys/dev/bce/if_bce.c head/sys/dev/bfe/if_bfe.c head/sys/dev/bge/if_bge.c head/sys/dev/dc/dcphy.c head/sys/dev/dc/pnphy.c head/sys/dev/ed/if_ed_pccard.c head/sys/dev/et/if_et.c head/sys/dev/fxp/if_fxp.c head/sys/dev/hme/if_hme.c head/sys/dev/jme/if_jme.c head/sys/dev/lge/if_lge.c head/sys/dev/mii/acphy.c head/sys/dev/mii/amphy.c head/sys/dev/mii/atphy.c head/sys/dev/mii/axphy.c head/sys/dev/mii/bmtphy.c head/sys/dev/mii/brgphy.c
Re: svn commit: r221402 - in vendor/tre: . dist dist/doc dist/lib dist/lib/.deps dist/m4 dist/po dist/python dist/src dist/src/.deps dist/tests dist/tests/.deps dist/tests/agrep dist/utils dist/win32
Em 03-05-2011 20:40, Kostik Belousov escreveu: On Tue, May 03, 2011 at 07:33:10PM +, Gabor Kovesdan wrote: Author: gabor Date: Tue May 3 19:33:09 2011 New Revision: 221402 URL: http://svn.freebsd.org/changeset/base/221402 Log: - Vendor import of TRE 0.8.0 What is this ? Why we do need it in base ? This is for SoC 2011. With my SoC mentor (brooks), we discussed that it can go directly into /vendor and I can create my branch from there. I am sure that all .deps dirs are garbage. Yes, I'll clean it up now. Gabor ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221409 - in head/sys/cddl: compat/opensolaris/sys contrib/opensolaris/uts/common/fs/zfs
Author: marius
Date: Tue May 3 20:13:27 2011
New Revision: 221409
URL: http://svn.freebsd.org/changeset/base/221409
Log:
Convert the last use of xcopyout() to ddi_copyout() and remove the now
unused xcopyin() as well as xcopyout().
MFC together with r219089.
Approved by: mm
Modified:
head/sys/cddl/compat/opensolaris/sys/systm.h
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
Modified: head/sys/cddl/compat/opensolaris/sys/systm.h
==
--- head/sys/cddl/compat/opensolaris/sys/systm.hTue May 3 19:51:56
2011(r221408)
+++ head/sys/cddl/compat/opensolaris/sys/systm.hTue May 3 20:13:27
2011(r221409)
@@ -42,9 +42,6 @@
#definedelay(x)pause(soldelay, (x))
-#definexcopyin(u, k, s)copyin(u, k, s)
-#definexcopyout(k, u, s) copyout(k, u, s)
-
#endif /* _KERNEL */
#endif /* _OPENSOLARIS_SYS_SYSTM_H_ */
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Tue May
3 19:51:56 2011(r221408)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c Tue May
3 20:13:27 2011(r221409)
@@ -4068,9 +4068,9 @@ zfs_ioc_userspace_many(zfs_cmd_t *zc)
buf, zc-zc_nvlist_dst_size);
if (error == 0) {
- error = xcopyout(buf,
+ error = ddi_copyout(buf,
(void *)(uintptr_t)zc-zc_nvlist_dst,
- zc-zc_nvlist_dst_size);
+ zc-zc_nvlist_dst_size, zc-zc_iflags);
}
kmem_free(buf, bufsize);
zfsvfs_rele(zfsvfs, FTAG);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221410 - head/sys/netinet
Author: tuexen Date: Tue May 3 20:32:21 2011 New Revision: 221410 URL: http://svn.freebsd.org/changeset/base/221410 Log: Add a missing break. This bug was introduced in r221249. MFC after: 1 week Modified: head/sys/netinet/sctp_asconf.c Modified: head/sys/netinet/sctp_asconf.c == --- head/sys/netinet/sctp_asconf.c Tue May 3 20:13:27 2011 (r221409) +++ head/sys/netinet/sctp_asconf.c Tue May 3 20:32:21 2011 (r221410) @@ -2930,6 +2930,7 @@ sctp_process_initack_addresses(struct sc } sin.sin_addr.s_addr = a4p-addr; sa = (struct sockaddr *)sin; + break; } #endif default: ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221411 - in head/sys: netinet netinet6
Author: tuexen
Date: Tue May 3 20:34:02 2011
New Revision: 221411
URL: http://svn.freebsd.org/changeset/base/221411
Log:
Remove code with any effect.
Modified:
head/sys/netinet/sctp_asconf.c
head/sys/netinet/sctp_auth.c
head/sys/netinet/sctputil.c
head/sys/netinet6/sctp6_usrreq.c
Modified: head/sys/netinet/sctp_asconf.c
==
--- head/sys/netinet/sctp_asconf.c Tue May 3 20:32:21 2011
(r221410)
+++ head/sys/netinet/sctp_asconf.c Tue May 3 20:34:02 2011
(r221411)
@@ -2813,7 +2813,6 @@ sctp_compose_asconf(struct sctp_tcb *stc
lookup-ph.param_length = htons(SCTP_SIZE32(p_size));
memcpy(lookup-addr, addr_ptr, addr_size);
SCTP_BUF_LEN(m_asconf_chk) += SCTP_SIZE32(p_size);
- lookup_used = 1;
} else {
/* uh oh... don't have any address?? */
SCTPDBG(SCTP_DEBUG_ASCONF1,
@@ -2823,7 +2822,6 @@ sctp_compose_asconf(struct sctp_tcb *stc
lookup-ph.param_length =
htons(SCTP_SIZE32(sizeof(struct sctp_ipv4addr_param)));
bzero(lookup-addr, sizeof(struct in_addr));
SCTP_BUF_LEN(m_asconf_chk) += SCTP_SIZE32(sizeof(struct
sctp_ipv4addr_param));
- lookup_used = 1;
}
}
/* chain it all together */
Modified: head/sys/netinet/sctp_auth.c
==
--- head/sys/netinet/sctp_auth.cTue May 3 20:32:21 2011
(r221410)
+++ head/sys/netinet/sctp_auth.cTue May 3 20:34:02 2011
(r221411)
@@ -1949,9 +1949,6 @@ sctp_validate_init_auth_params(struct mb
case SCTP_ASCONF_ACK:
peer_supports_asconf = 1;
break;
- case SCTP_AUTHENTICATION:
- peer_supports_auth = 1;
- break;
default:
/* one we don't care about */
break;
Modified: head/sys/netinet/sctputil.c
==
--- head/sys/netinet/sctputil.c Tue May 3 20:32:21 2011(r221410)
+++ head/sys/netinet/sctputil.c Tue May 3 20:34:02 2011(r221411)
@@ -3850,8 +3850,6 @@ sctp_abort_an_association(struct sctp_in
#endif
)
{
- uint32_t vtag;
-
#if defined (__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
struct socket *so;
@@ -3872,7 +3870,6 @@ sctp_abort_an_association(struct sctp_in
} else {
stcb-asoc.state |= SCTP_STATE_WAS_ABORTED;
}
- vtag = stcb-asoc.peer_vtag;
/* notify the ulp */
if ((inp-sctp_flags SCTP_PCB_FLAGS_SOCKET_GONE) == 0)
sctp_abort_notification(stcb, error, so_locked);
Modified: head/sys/netinet6/sctp6_usrreq.c
==
--- head/sys/netinet6/sctp6_usrreq.cTue May 3 20:32:21 2011
(r221410)
+++ head/sys/netinet6/sctp6_usrreq.cTue May 3 20:34:02 2011
(r221411)
@@ -1066,10 +1066,8 @@ sctp6_connect(struct socket *so, struct
SCTP_LTRACE_ERR_RET(inp, NULL, NULL,
SCTP_FROM_SCTP6_USRREQ, EINVAL);
return EINVAL;
}
- } else
+ }
#endif /* INET */
- addr = addr;/* for true v6 address case */
-
/* Now do we connect? */
if (inp-sctp_flags SCTP_PCB_FLAGS_CONNECTED) {
stcb = LIST_FIRST(inp-sctp_asoc_list);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221365 - head/lib/libstand
On Tue, May 03, 2011 at 07:43:47AM +, Craig Rodrigues wrote: Author: rodrigc Date: Tue May 3 07:43:47 2011 New Revision: 221365 URL: http://svn.freebsd.org/changeset/base/221365 Log: - Add parentheses around expression to eliminate compiler warning. Modified: head/lib/libstand/dosfs.c -d-d_fileno = dd.de.clus[1] 8 + dd.de.clus[0]; +d-d_fileno = (dd.de.clus[1] 8) + dd.de.clus[0]; This certainly seems an improvement, however not because it avoids a compiler warning but because the original code was wrong. For some strange reason, + binds more strongly than , so fewer different d_fileno values were generated than likely intended. -- Jilles Tjoelker ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221416 - stable/8/sys/fs/nfsclient
Author: rmacklem
Date: Wed May 4 01:24:03 2011
New Revision: 221416
URL: http://svn.freebsd.org/changeset/base/221416
Log:
MFC: r220876
Modify the offset + size checks for read and write in the
experimental NFS client to take care of overflows. Thanks
go to dillon at apollo.backplane.com for providing the
snippet of code that does this.
Modified:
stable/8/sys/fs/nfsclient/nfs_clrpcops.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/fs/nfsclient/nfs_clrpcops.c
==
--- stable/8/sys/fs/nfsclient/nfs_clrpcops.cWed May 4 01:07:32 2011
(r221415)
+++ stable/8/sys/fs/nfsclient/nfs_clrpcops.cWed May 4 01:24:03 2011
(r221416)
@@ -1285,12 +1285,13 @@ nfsrpc_readrpc(vnode_t vp, struct uio *u
struct nfsmount *nmp = VFSTONFS(vnode_mount(vp));
struct nfsrv_descript *nd = nfsd;
int rsize;
+ off_t tmp_off;
*attrflagp = 0;
tsiz = uio_uio_resid(uiop);
+ tmp_off = uiop-uio_offset + tsiz;
NFSLOCKMNT(nmp);
- if (uiop-uio_offset + tsiz nmp-nm_maxfilesize) {
- /* XXX Needs overflow/negative check for uio_offset */
+ if (tmp_off nmp-nm_maxfilesize || tmp_off uiop-uio_offset) {
NFSUNLOCKMNT(nmp);
return (EFBIG);
}
@@ -1458,12 +1459,14 @@ nfsrpc_writerpc(vnode_t vp, struct uio *
struct nfsrv_descript nfsd;
struct nfsrv_descript *nd = nfsd;
nfsattrbit_t attrbits;
+ off_t tmp_off;
KASSERT(uiop-uio_iovcnt == 1, (nfs: writerpc iovcnt 1));
*attrflagp = 0;
tsiz = uio_uio_resid(uiop);
+ tmp_off = uiop-uio_offset + tsiz;
NFSLOCKMNT(nmp);
- if (uiop-uio_offset + tsiz nmp-nm_maxfilesize) {
+ if (tmp_off nmp-nm_maxfilesize || tmp_off uiop-uio_offset) {
NFSUNLOCKMNT(nmp);
return (EFBIG);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221417 - stable/8/sys/fs/nfsclient
Author: rmacklem
Date: Wed May 4 01:39:44 2011
New Revision: 221417
URL: http://svn.freebsd.org/changeset/base/221417
Log:
MFC: r220877
Modify the offset + size checks for read and write in the
experimental NFS client to take care of overflows for the calls
above the buffer cache layer in a manner similar to r220876.
Thanks go to dillon at apollo.backplane.com for providing the
snippet of code that does this.
Modified:
stable/8/sys/fs/nfsclient/nfs_clbio.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/fs/nfsclient/nfs_clbio.c
==
--- stable/8/sys/fs/nfsclient/nfs_clbio.c Wed May 4 01:24:03 2011
(r221416)
+++ stable/8/sys/fs/nfsclient/nfs_clbio.c Wed May 4 01:39:44 2011
(r221417)
@@ -448,6 +448,7 @@ ncl_bioread(struct vnode *vp, struct uio
int bcount;
int seqcount;
int nra, error = 0, n = 0, on = 0;
+ off_t tmp_off;
KASSERT(uio-uio_rw == UIO_READ, (ncl_read mode));
if (uio-uio_resid == 0)
@@ -465,11 +466,14 @@ ncl_bioread(struct vnode *vp, struct uio
}
if (nmp-nm_rsize == 0 || nmp-nm_readdirsize == 0)
(void) newnfs_iosize(nmp);
- mtx_unlock(nmp-nm_mtx);
+ tmp_off = uio-uio_offset + uio-uio_resid;
if (vp-v_type != VDIR
- (uio-uio_offset + uio-uio_resid) nmp-nm_maxfilesize)
+ (tmp_off nmp-nm_maxfilesize || tmp_off uio-uio_offset)) {
+ mtx_unlock(nmp-nm_mtx);
return (EFBIG);
+ }
+ mtx_unlock(nmp-nm_mtx);
if (newnfs_directio_enable (ioflag IO_DIRECT) (vp-v_type ==
VREG))
/* No caching/ no readaheads. Just read data into the user
buffer */
@@ -871,6 +875,7 @@ ncl_write(struct vop_write_args *ap)
int bcount;
int n, on, error = 0;
struct proc *p = td?td-td_proc:NULL;
+ off_t tmp_off;
KASSERT(uio-uio_rw == UIO_WRITE, (ncl_write mode));
KASSERT(uio-uio_segflg != UIO_USERSPACE || uio-uio_td == curthread,
@@ -937,8 +942,13 @@ flush_and_restart:
if (uio-uio_offset 0)
return (EINVAL);
- if ((uio-uio_offset + uio-uio_resid) nmp-nm_maxfilesize)
+ tmp_off = uio-uio_offset + uio-uio_resid;
+ mtx_lock(nmp-nm_mtx);
+ if (tmp_off nmp-nm_maxfilesize || tmp_off uio-uio_offset) {
+ mtx_unlock(nmp-nm_mtx);
return (EFBIG);
+ }
+ mtx_unlock(nmp-nm_mtx);
if (uio-uio_resid == 0)
return (0);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r221418 - head/sys/net80211
Author: adrian
Date: Wed May 4 02:23:59 2011
New Revision: 221418
URL: http://svn.freebsd.org/changeset/base/221418
Log:
Fix some corner cases in the net80211 sequence number retransmission
handling.
The current sequence number code does a few things incorrectly:
* It didn't try eliminating duplications from HT nodes. I guess it's assumed
that out of order / retransmission handling would be handled by the AMPDU RX
routines. If a HT node isn't doing AMPDU RX, then retransmissions need to
be eliminated. Since most of my debugging is based on this (as AMPDU TX
software packet aggregation isn't yet handled), handle this corner case.
* When a sequence number of 4095 was received, any subsequent sequence number
is going to be (by definition) less than 4095. So if the following sequence
number (0) doesn't initially occur and the retransmit is received, it's
incorrectly eliminated by the IEEE80211_FC1_RETRY SEQ_LEQ() check.
Try to handle this better.
This almost completely eliminates out of order TCP statistics showing up
during
iperf testing for the 11a, 11g and non-aggregate 11n AMPDU RX case. The only
other packet loss conditions leading to this are due to baseband resets or
heavy interference.
Modified:
head/sys/net80211/ieee80211_adhoc.c
head/sys/net80211/ieee80211_hostap.c
head/sys/net80211/ieee80211_input.h
head/sys/net80211/ieee80211_mesh.c
head/sys/net80211/ieee80211_sta.c
head/sys/net80211/ieee80211_wds.c
Modified: head/sys/net80211/ieee80211_adhoc.c
==
--- head/sys/net80211/ieee80211_adhoc.c Wed May 4 01:39:44 2011
(r221417)
+++ head/sys/net80211/ieee80211_adhoc.c Wed May 4 02:23:59 2011
(r221418)
@@ -285,7 +285,6 @@ doprint(struct ieee80211vap *vap, int su
static int
adhoc_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
{
-#defineSEQ_LEQ(a,b)((int)((a)-(b)) = 0)
#defineHAS_SEQ(type) ((type 0x4) == 0)
struct ieee80211vap *vap = ni-ni_vap;
struct ieee80211com *ic = ni-ni_ic;
@@ -412,9 +411,7 @@ adhoc_input(struct ieee80211_node *ni, s
TID_TO_WME_AC(tid) = WME_AC_VI)
ic-ic_wme.wme_hipri_traffic++;
rxseq = le16toh(*(uint16_t *)wh-i_seq);
- if ((ni-ni_flags IEEE80211_NODE_HT) == 0
- (wh-i_fc[1] IEEE80211_FC1_RETRY)
- SEQ_LEQ(rxseq, ni-ni_rxseqs[tid])) {
+ if (! ieee80211_check_rxseq(ni, wh)) {
/* duplicate, discard */
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
bssid, duplicate,
@@ -660,7 +657,6 @@ out:
m_freem(m);
}
return type;
-#undef SEQ_LEQ
}
static int
Modified: head/sys/net80211/ieee80211_hostap.c
==
--- head/sys/net80211/ieee80211_hostap.cWed May 4 01:39:44 2011
(r221417)
+++ head/sys/net80211/ieee80211_hostap.cWed May 4 02:23:59 2011
(r221418)
@@ -472,7 +472,6 @@ doprint(struct ieee80211vap *vap, int su
static int
hostap_input(struct ieee80211_node *ni, struct mbuf *m, int rssi, int nf)
{
-#defineSEQ_LEQ(a,b)((int)((a)-(b)) = 0)
#defineHAS_SEQ(type) ((type 0x4) == 0)
struct ieee80211vap *vap = ni-ni_vap;
struct ieee80211com *ic = ni-ni_ic;
@@ -572,9 +571,7 @@ hostap_input(struct ieee80211_node *ni,
TID_TO_WME_AC(tid) = WME_AC_VI)
ic-ic_wme.wme_hipri_traffic++;
rxseq = le16toh(*(uint16_t *)wh-i_seq);
- if ((ni-ni_flags IEEE80211_NODE_HT) == 0
- (wh-i_fc[1] IEEE80211_FC1_RETRY)
- SEQ_LEQ(rxseq, ni-ni_rxseqs[tid])) {
+ if (! ieee80211_check_rxseq(ni, wh)) {
/* duplicate, discard */
IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
bssid, duplicate,
@@ -914,7 +911,6 @@ out:
m_freem(m);
}
return type;
-#undef SEQ_LEQ
}
static void
Modified: head/sys/net80211/ieee80211_input.h
==
--- head/sys/net80211/ieee80211_input.h Wed May 4 01:39:44 2011
(r221417)
+++ head/sys/net80211/ieee80211_input.h Wed May 4 02:23:59 2011
(r221418)
@@ -142,6 +142,104 @@ ishtinfooui(const uint8_t *frm)
return frm[1] 3 LE_READ_4(frm+2) == ((BCM_OUI_HTINFO24)|BCM_OUI);
}
+#include sys/endian.h/* For le16toh() */
+
+/*
+ * Check the current frame sequence number against the current TID
+ * state
svn commit: r221419 - head/release
Author: nwhitehorn Date: Wed May 4 02:52:41 2011 New Revision: 221419 URL: http://svn.freebsd.org/changeset/base/221419 Log: Make sure to run make obj before release. Trying to run them in one step doesn't always work reliably. Modified: head/release/generate-release.sh Modified: head/release/generate-release.sh == --- head/release/generate-release.shWed May 4 02:23:59 2011 (r221418) +++ head/release/generate-release.shWed May 4 02:52:41 2011 (r221419) @@ -60,6 +60,7 @@ if [ -d $2/usr/doc ]; then fi chroot $2 /bin/sh -c cd /usr/src make $MAKE_FLAGS buildworld buildkernel || exit 1 +chroot $2 /bin/sh -c cd /usr/src/release make obj || exit 1 chroot $2 /bin/sh -c cd /usr/src/release make release || exit 1 chroot $2 /bin/sh -c cd /usr/src/release make install DESTDIR=/R || exit 1 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r221387 - head/usr.sbin/makefs/cd9660
On 05/03/11 10:27, Baptiste Daroussin wrote:
2011/5/3 Nathan Whitehornnwhiteh...@freebsd.org:
Author: nwhitehorn
Date: Tue May 3 15:12:01 2011
New Revision: 221387
URL: http://svn.freebsd.org/changeset/base/221387
Log:
Add support for synthesizing an APM partition map to map Mac PowerPC
bootstrap partitions from the ISO9660 boot catalog. This preserves OS X's
ability to mount the CD, while allowing us a way to provide HFS-ified
bootstrap code for Open Firmware.
Modified:
head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
Modified: head/usr.sbin/makefs/cd9660/cd9660_eltorito.c
==
--- head/usr.sbin/makefs/cd9660/cd9660_eltorito.c Tue May 3 14:43:16
2011(r221386)
+++ head/usr.sbin/makefs/cd9660/cd9660_eltorito.c Tue May 3 15:12:01
2011(r221387)
@@ -31,6 +31,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
*/
+
+#includenetinet/in.h
+
#include cd9660.h
#include cd9660_eltorito.h
@@ -497,11 +500,43 @@ cd9660_setup_boot_volume_descriptor(volu
return 1;
}
+static int
+cd9660_write_apm_partition_entry(FILE *fd, int index, int total_partitions,
+off_t sector_start, off_t nsectors, off_t sector_size,
+const char *part_name, const char *part_type) {
+ uint32_t apm32;
+ uint16_t apm16;
+
+ fseeko(fd, (off_t)(index + 1) * sector_size, SEEK_SET);
+
+ /* Signature */
+ apm16 = htons(0x504d);
+ fwrite(apm16, sizeof(apm16), 1, fd);
+ apm16 = 0;
+ fwrite(apm16, sizeof(apm16), 1, fd);
+
+ /* Total number of partitions */
+ apm32 = htonl(total_partitions);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+ /* Bounds */
+ apm32 = htonl(sector_start);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+ apm32 = htonl(nsectors);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+
+ fwrite(part_name, strlen(part_name) + 1, 1, fd);
+ fseek(fd, 32 - strlen(part_name) - 1, SEEK_CUR);
+ fwrite(part_type, strlen(part_type) + 1, 1, fd);
+
+ return 0;
+}
+
int
cd9660_write_boot(FILE *fd)
{
struct boot_catalog_entry *e;
struct cd9660_boot_image *t;
+ int apm_partitions = 0;
/* write boot catalog */
if (fseeko(fd, (off_t)diskStructure.boot_catalog_sector *
@@ -533,7 +568,51 @@ cd9660_write_boot(FILE *fd)
t-filename, t-sector);
}
cd9660_copy_file(fd, t-sector, t-filename);
+
+ if (t-system == ET_SYS_MAC)
+ apm_partitions++;
+ }
+
+ if (apm_partitions 0) {
+ /* Write DDR and global APM info */
+ uint32_t apm32;
+ uint16_t apm16;
+ int total_parts;
+
+ fseek(fd, 0, SEEK_SET);
+ apm16 = htons(0x4552);
+ fwrite(apm16, sizeof(apm16), 1, fd);
+ apm16 = htons(diskStructure.sectorSize);
+ fwrite(apm16, sizeof(apm16), 1, fd);
+ apm32 = htonl(diskStructure.totalSectors);
+ fwrite(apm32, sizeof(apm32), 1, fd);
+
+ /* Count total needed entries */
+ total_parts = 2 + apm_partitions; /* Self + ISO9660 */
+
+ /* Write self-descriptor */
+ cd9660_write_apm_partition_entry(fd, 0,
+ total_parts, 1, total_parts, diskStructure.sectorSize,
+ Apple, Apple_partition_map);
+
+ /* Write ISO9660 descriptor, enclosing the whole disk */
+ cd9660_write_apm_partition_entry(fd, 1,
+ total_parts, 0, diskStructure.totalSectors,
+ diskStructure.sectorSize, , CD_ROM_Mode_1);
+
+ /* Write all partition entries */
+ apm_partitions = 0;
+ TAILQ_FOREACH(t,diskStructure.boot_images, image_list) {
+ if (t-system != ET_SYS_MAC)
+ continue;
+
+ cd9660_write_apm_partition_entry(fd,
+ 2 + apm_partitions++, total_parts,
+ t-sector, t-num_sectors, diskStructure.sectorSize,
+ CD Boot, Apple_Bootstrap);
+ }
}
return 0;
}
+
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Nice,
Do not forget to send this to the netbsd folks so that both makefs
keep as in sync as possible, chris...@netbsd.org should be interested
by this.
if you already did this, sorry for the noise.
regards,
Bapt
Will do. I have some more testing to do with this, and possibly some
more changes, which I was planning on sending upstream as a batch when
finished.
-Nathan
