Index: user/ngie/more-tests/etc =================================================================== --- user/ngie/more-tests/etc (revision 282068) +++ user/ngie/more-tests/etc (revision 282069) Property changes on: user/ngie/more-tests/etc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/etc:r281925-282057,282060-282068 Index: user/ngie/more-tests/sys/boot/common/md.c =================================================================== --- user/ngie/more-tests/sys/boot/common/md.c (revision 282068) +++ user/ngie/more-tests/sys/boot/common/md.c (revision 282069) @@ -1,151 +1,151 @@ /*- * Copyright (c) 2009 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); +#include #include #include #include #include -#include #include "bootstrap.h" #define MD_BLOCK_SIZE 512 #ifndef MD_IMAGE_SIZE #error Must be compiled with MD_IMAGE_SIZE defined #endif #if (MD_IMAGE_SIZE == 0 || MD_IMAGE_SIZE % MD_BLOCK_SIZE) #error Image size must be a multiple of 512. #endif /* * Preloaded image gets put here. * Applications that patch the object with the image can determine * the size looking at the start and end markers (strings), * so we want them contiguous. */ static struct { u_char start[MD_IMAGE_SIZE]; u_char end[128]; } md_image = { .start = "MFS Filesystem goes here", .end = "MFS Filesystem had better STOP here", }; /* devsw I/F */ static int md_init(void); static int md_strategy(void *, int, daddr_t, size_t, char *, size_t *); static int md_open(struct open_file *, ...); static int md_close(struct open_file *); static void md_print(int); struct devsw md_dev = { "md", DEVT_DISK, md_init, md_strategy, md_open, md_close, noioctl, md_print }; static int md_init(void) { return (0); } static int md_strategy(void *devdata, int rw, daddr_t blk, size_t size, char *buf, size_t *rsize) { struct devdesc *dev = (struct devdesc *)devdata; size_t ofs; if (dev->d_unit != 0) return (ENXIO); if (blk < 0 || blk >= (MD_IMAGE_SIZE / MD_BLOCK_SIZE)) return (EIO); if (size % MD_BLOCK_SIZE) return (EIO); ofs = blk * MD_BLOCK_SIZE; if ((ofs + size) > MD_IMAGE_SIZE) size = MD_IMAGE_SIZE - ofs; if (rsize != 0) *rsize = size; switch (rw) { case F_READ: bcopy(md_image.start + ofs, buf, size); return (0); case F_WRITE: bcopy(buf, md_image.start + ofs, size); return (0); } return (ENODEV); } static int md_open(struct open_file *f, ...) { va_list ap; struct devdesc *dev; va_start(ap, f); dev = va_arg(ap, struct devdesc *); va_end(ap); if (dev->d_unit != 0) return (ENXIO); return (0); } static int md_close(struct open_file *f) { struct devdesc *dev; dev = (struct devdesc *)(f->f_devdata); return ((dev->d_unit != 0) ? ENXIO : 0); } static void md_print(int verbose) { printf("MD (%u bytes)\n", MD_IMAGE_SIZE); } Index: user/ngie/more-tests/sys/boot =================================================================== --- user/ngie/more-tests/sys/boot (revision 282068) +++ user/ngie/more-tests/sys/boot (revision 282069) Property changes on: user/ngie/more-tests/sys/boot ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/boot:r281925-282068 Index: user/ngie/more-tests/sys =================================================================== --- user/ngie/more-tests/sys (revision 282068) +++ user/ngie/more-tests/sys (revision 282069) Property changes on: user/ngie/more-tests/sys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys:r282055-282068 Index: user/ngie/more-tests/tests/sys/fifo =================================================================== --- user/ngie/more-tests/tests/sys/fifo (revision 282068) +++ user/ngie/more-tests/tests/sys/fifo (revision 282069) Property changes on: user/ngie/more-tests/tests/sys/fifo ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,20 ## Merged /projects/building-blocks/tests/sys/fifo:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673 Merged /projects/elftoolchain/tests/sys/fifo:r260687-261245 Merged /projects/multi-fibv6/head/tests/sys/fifo:r230929-231848 Merged /projects/ipfw/tests/sys/fifo:r267383-272837 Merged /projects/zfsd/head/tests/sys/fifo:r266519,269993 Merged /vendor/resolver/dist/tests/sys/fifo:r1540-186085 Merged /projects/clang350-import/tests/sys/fifo:r274961-275126,275128-275133,275135-276476 Merged /projects/clang360-import/tests/sys/fifo:r277327-280030 Merged /projects/quota64/tests/sys/fifo:r184125-207707 Merged /projects/release-embedded/tests/sys/fifo:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808 Merged /user/ngie/fix-progs/tests/sys/fifo:r281662 Merged /projects/clang-sparc64/tests/sys/fifo:r262258-262612 Merged /projects/random_number_generator/tests/sys/fifo:r254613-256243 Merged /head/tests/sys/fifo:r281414-282059 Merged /projects/largeSMP/tests/sys/fifo:r221273-222812,222815-223757 Merged /projects/head_mfi/tests/sys/fifo:r233621 Merged /projects/lldb-r201577/tests/sys/fifo:r262185-262527 Merged /projects/release-arm64/tests/sys/fifo:r281786,281788,281792 Merged /projects/pf/head/tests/sys/fifo:r263908 Merged /projects/elftoolchain-update-r3130/tests/sys/fifo:r276164,276167,276170-276172 Index: user/ngie/more-tests/tests/sys/file =================================================================== --- user/ngie/more-tests/tests/sys/file (revision 282068) +++ user/ngie/more-tests/tests/sys/file (revision 282069) Property changes on: user/ngie/more-tests/tests/sys/file ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,20 ## Merged /projects/pf/head/tests/sys/file:r263908 Merged /projects/zfsd/head/tests/sys/file:r266519,269993 Merged /projects/release-embedded/tests/sys/file:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808 Merged /projects/building-blocks/tests/sys/file:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673 Merged /projects/largeSMP/tests/sys/file:r221273-222812,222815-223757 Merged /projects/head_mfi/tests/sys/file:r233621 Merged /user/ngie/fix-progs/tests/sys/file:r281662 Merged /projects/clang-sparc64/tests/sys/file:r262258-262612 Merged /vendor/resolver/dist/tests/sys/file:r1540-186085 Merged /projects/clang350-import/tests/sys/file:r274961-275126,275128-275133,275135-276476 Merged /projects/clang360-import/tests/sys/file:r277327-280030 Merged /projects/quota64/tests/sys/file:r184125-207707 Merged /projects/lldb-r201577/tests/sys/file:r262185-262527 Merged /projects/random_number_generator/tests/sys/file:r254613-256243 Merged /head/tests/sys/file:r281414-282059 Merged /projects/release-arm64/tests/sys/file:r281786,281788,281792 Merged /projects/multi-fibv6/head/tests/sys/file:r230929-231848 Merged /projects/elftoolchain/tests/sys/file:r260687-261245 Merged /projects/ipfw/tests/sys/file:r267383-272837 Merged /projects/elftoolchain-update-r3130/tests/sys/file:r276164,276167,276170-276172 Index: user/ngie/more-tests/tests/sys/kern/execve =================================================================== --- user/ngie/more-tests/tests/sys/kern/execve (revision 282068) +++ user/ngie/more-tests/tests/sys/kern/execve (revision 282069) Property changes on: user/ngie/more-tests/tests/sys/kern/execve ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,20 ## Merged /projects/quota64/tests/sys/kern/execve:r184125-207707 Merged /projects/head_mfi/tests/sys/kern/execve:r233621 Merged /projects/elftoolchain-update-r3130/tests/sys/kern/execve:r276164,276167,276170-276172 Merged /projects/random_number_generator/tests/sys/kern/execve:r254613-256243 Merged /head/tests/sys/kern/execve:r281414-282059 Merged /projects/lldb-r201577/tests/sys/kern/execve:r262185-262527 Merged /projects/zfsd/head/tests/sys/kern/execve:r266519,269993 Merged /projects/elftoolchain/tests/sys/kern/execve:r260687-261245 Merged /projects/multi-fibv6/head/tests/sys/kern/execve:r230929-231848 Merged /projects/ipfw/tests/sys/kern/execve:r267383-272837 Merged /projects/pf/head/tests/sys/kern/execve:r263908 Merged /projects/clang-sparc64/tests/sys/kern/execve:r262258-262612 Merged /projects/building-blocks/tests/sys/kern/execve:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673 Merged /vendor/resolver/dist/tests/sys/kern/execve:r1540-186085 Merged /projects/release-embedded/tests/sys/kern/execve:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808 Merged /projects/clang350-import/tests/sys/kern/execve:r274961-275126,275128-275133,275135-276476 Merged /projects/clang360-import/tests/sys/kern/execve:r277327-280030 Merged /projects/release-arm64/tests/sys/kern/execve:r281786,281788,281792 Merged /projects/largeSMP/tests/sys/kern/execve:r221273-222812,222815-223757 Merged /user/ngie/fix-progs/tests/sys/kern/execve:r281662 Index: user/ngie/more-tests/tests/sys/kqueue =================================================================== --- user/ngie/more-tests/tests/sys/kqueue (revision 282068) +++ user/ngie/more-tests/tests/sys/kqueue (revision 282069) Property changes on: user/ngie/more-tests/tests/sys/kqueue ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +0,20 ## Merged /projects/release-embedded/tests/sys/kqueue:r262314,262504,262510-262511,262580,262660,262662,262700,262713,262774,262786-262788,262790-262792,262798,262802,262808 Merged /projects/zfsd/head/tests/sys/kqueue:r266519,269993 Merged /projects/largeSMP/tests/sys/kqueue:r221273-222812,222815-223757 Merged /projects/pf/head/tests/sys/kqueue:r263908 Merged /projects/building-blocks/tests/sys/kqueue:r275142-275143,275198,275297,275306-275307,275309,275311,275556,275558,275600,277445,277670,277673 Merged /projects/head_mfi/tests/sys/kqueue:r233621 Merged /projects/clang-sparc64/tests/sys/kqueue:r262258-262612 Merged /projects/lldb-r201577/tests/sys/kqueue:r262185-262527 Merged /vendor/resolver/dist/tests/sys/kqueue:r1540-186085 Merged /projects/clang350-import/tests/sys/kqueue:r274961-275126,275128-275133,275135-276476 Merged /projects/clang360-import/tests/sys/kqueue:r277327-280030 Merged /projects/quota64/tests/sys/kqueue:r184125-207707 Merged /projects/elftoolchain/tests/sys/kqueue:r260687-261245 Merged /projects/multi-fibv6/head/tests/sys/kqueue:r230929-231848 Merged /projects/random_number_generator/tests/sys/kqueue:r254613-256243 Merged /head/tests/sys/kqueue:r281414-282059 Merged /projects/release-arm64/tests/sys/kqueue:r281786,281788,281792 Merged /projects/ipfw/tests/sys/kqueue:r267383-272837 Merged /user/ngie/fix-progs/tests/sys/kqueue:r281662 Merged /projects/elftoolchain-update-r3130/tests/sys/kqueue:r276164,276167,276170-276172 Index: user/ngie/more-tests =================================================================== --- user/ngie/more-tests (revision 282068) +++ user/ngie/more-tests (revision 282069) Property changes on: user/ngie/more-tests ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r282060-282068