svn commit: r319801 - in projects/clang500-import: cddl/usr.sbin/dtrace/tests/tools contrib/ipfilter/tools sys/boot/forth sys/dev/ixl sys/kern sys/sys tools/regression/geom_gpt
Dimitry Andric
dim at FreeBSD.org
Sat Jun 10 20:23:52 UTC 2017
Author: dim
Date: Sat Jun 10 20:23:49 2017
New Revision: 319801
URL: https://svnweb.freebsd.org/changeset/base/319801
Log:
Merge ^/head r319779 through r319800.
Modified:
projects/clang500-import/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
projects/clang500-import/contrib/ipfilter/tools/ippool.c
projects/clang500-import/sys/boot/forth/loader.conf
projects/clang500-import/sys/dev/ixl/ixl_txrx.c
projects/clang500-import/sys/kern/subr_blist.c
projects/clang500-import/sys/sys/blist.h
projects/clang500-import/tools/regression/geom_gpt/gctl_test.t
projects/clang500-import/tools/regression/geom_gpt/gctl_test_helper.c
Directory Properties:
projects/clang500-import/ (props changed)
projects/clang500-import/cddl/ (props changed)
projects/clang500-import/contrib/ipfilter/ (props changed)
Modified: projects/clang500-import/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- projects/clang500-import/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Sat Jun 10 20:23:49 2017 (r319801)
@@ -89,6 +89,8 @@ if [ $# -ne 0 ]; then
usage
fi
+export LC_ALL=C
+
readonly ORIGINDIR=$(realpath $(dirname $0))
readonly TOPDIR=$(realpath ${ORIGINDIR}/../../../../..)
readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common
Modified: projects/clang500-import/contrib/ipfilter/tools/ippool.c
==============================================================================
--- projects/clang500-import/contrib/ipfilter/tools/ippool.c Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/contrib/ipfilter/tools/ippool.c Sat Jun 10 20:23:49 2017 (r319801)
@@ -79,7 +79,7 @@ usage(prog)
fprintf(stderr, "\t-A [-dnv] [-m <name>] [-o <role>] [-S <seed>] [-t <type>]\n");
fprintf(stderr, "\t-f <file> [-dnuv]\n");
fprintf(stderr, "\t-F [-dv] [-o <role>] [-t <type>]\n");
- fprintf(stderr, "\t-l [-dv] [-m <name>] [-t <type>] [-O <fields>]\n");
+ fprintf(stderr, "\t-l [-dv] [-m <name>] [-t <type>]\n");
fprintf(stderr, "\t-r [-dnv] [-m <name>] [-o <role>] [-t type] -i <ipaddr>[/netmask]\n");
fprintf(stderr, "\t-R [-dnv] [-m <name>] [-o <role>] [-t <type>]\n");
fprintf(stderr, "\t-s [-dtv] [-M <core>] [-N <namelist>]\n");
@@ -687,9 +687,16 @@ poollist(argc, argv)
return -1;
}
break;
+#if 0
case 'O' :
+ /* XXX This option does not work. This function as */
+ /* XXX used by state and nat can be used to format */
+ /* XXX output especially useful for scripting. It */
+ /* XXX is left here with the intention of making */
+ /* XXX it work for the same purpose at some point. */
pool_fields = parsefields(poolfields, optarg);
break;
+#endif
case 't' :
type = gettype(optarg, NULL);
if (type == IPLT_NONE) {
@@ -700,7 +707,13 @@ poollist(argc, argv)
case 'v' :
opts |= OPT_VERBOSE;
break;
+ default :
+ usage(argv[0]);
+ break; /* keep compiler happy */
}
+
+ if (argc - optind > 0)
+ usage(argv[0]);
if (opts & OPT_DEBUG)
fprintf(stderr, "poollist: opts = %#x\n", opts);
Modified: projects/clang500-import/sys/boot/forth/loader.conf
==============================================================================
--- projects/clang500-import/sys/boot/forth/loader.conf Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/sys/boot/forth/loader.conf Sat Jun 10 20:23:49 2017 (r319801)
@@ -70,9 +70,9 @@ ram_blacklist_type="ram_blacklist" # Required for the
### Initial memory disk settings ###########################
##############################################################
-#initmd_load="YES" # The "initmd" prefix is arbitrary.
-#initmd_type="md_image" # Create md(4) disk at boot.
-#initmd_name="/boot/root.img" # Path to a file containing the image.
+#mdroot_load="YES" # The "mdroot" prefix is arbitrary.
+#mdroot_type="md_image" # Create md(4) disk at boot.
+#mdroot_name="/boot/root.img" # Path to a file containing the image.
#rootdev="ufs:/dev/md0" # Set the root filesystem to md(4) device.
Modified: projects/clang500-import/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- projects/clang500-import/sys/dev/ixl/ixl_txrx.c Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/sys/dev/ixl/ixl_txrx.c Sat Jun 10 20:23:49 2017 (r319801)
@@ -431,7 +431,7 @@ ixl_allocate_tx_data(struct ixl_queue *que)
/*
* Setup DMA descriptor areas.
*/
- if ((error = bus_dma_tag_create(NULL, /* parent */
+ if ((error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
1, 0, /* alignment, bounds */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
@@ -448,7 +448,7 @@ ixl_allocate_tx_data(struct ixl_queue *que)
}
/* Make a special tag for TSO */
- if ((error = bus_dma_tag_create(NULL, /* parent */
+ if ((error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
1, 0, /* alignment, bounds */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
@@ -933,7 +933,6 @@ ixl_txeof(struct ixl_queue *que)
buf->map);
m_freem(buf->m_head);
buf->m_head = NULL;
- buf->map = NULL;
}
buf->eop_index = -1;
@@ -1096,7 +1095,7 @@ ixl_allocate_rx_data(struct ixl_queue *que)
return (error);
}
- if ((error = bus_dma_tag_create(NULL, /* parent */
+ if ((error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
1, 0, /* alignment, bounds */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
@@ -1112,7 +1111,7 @@ ixl_allocate_rx_data(struct ixl_queue *que)
return (error);
}
- if ((error = bus_dma_tag_create(NULL, /* parent */
+ if ((error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
1, 0, /* alignment, bounds */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
Modified: projects/clang500-import/sys/kern/subr_blist.c
==============================================================================
--- projects/clang500-import/sys/kern/subr_blist.c Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/sys/kern/subr_blist.c Sat Jun 10 20:23:49 2017 (r319801)
@@ -156,7 +156,7 @@ blist_t
blist_create(daddr_t blocks, int flags)
{
blist_t bl;
- int radix;
+ daddr_t nodes, radix;
int skip = 0;
/*
@@ -170,13 +170,19 @@ blist_create(daddr_t blocks, int flags)
}
bl = malloc(sizeof(struct blist), M_SWAP, flags | M_ZERO);
+ if (bl == NULL)
+ return (NULL);
bl->bl_blocks = blocks;
bl->bl_radix = radix;
bl->bl_skip = skip;
- bl->bl_rootblks = 1 +
- blst_radix_init(NULL, bl->bl_radix, bl->bl_skip, blocks);
- bl->bl_root = malloc(sizeof(blmeta_t) * bl->bl_rootblks, M_SWAP, flags);
+ nodes = 1 + blst_radix_init(NULL, radix, bl->bl_skip, blocks);
+ bl->bl_root = malloc(nodes * sizeof(blmeta_t), M_SWAP, flags);
+ if (bl->bl_root == NULL) {
+ free(bl, M_SWAP);
+ return (NULL);
+ }
+ blst_radix_init(bl->bl_root, radix, bl->bl_skip, blocks);
#if defined(BLIST_DEBUG)
printf(
@@ -184,14 +190,13 @@ blist_create(daddr_t blocks, int flags)
", requiring %lldK of ram\n",
(long long)bl->bl_blocks,
(long long)bl->bl_blocks * 4 / 1024,
- (long long)(bl->bl_rootblks * sizeof(blmeta_t) + 1023) / 1024
+ (long long)(nodes * sizeof(blmeta_t) + 1023) / 1024
);
printf("BLIST raw radix tree contains %lld records\n",
- (long long)bl->bl_rootblks);
+ (long long)nodes);
#endif
- blst_radix_init(bl->bl_root, bl->bl_radix, bl->bl_skip, blocks);
- return(bl);
+ return (bl);
}
void
Modified: projects/clang500-import/sys/sys/blist.h
==============================================================================
--- projects/clang500-import/sys/sys/blist.h Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/sys/sys/blist.h Sat Jun 10 20:23:49 2017 (r319801)
@@ -84,7 +84,6 @@ typedef struct blist {
daddr_t bl_skip; /* starting skip */
daddr_t bl_free; /* number of free blocks */
blmeta_t *bl_root; /* root of radix tree */
- daddr_t bl_rootblks; /* daddr_t blks allocated for tree */
} *blist_t;
#define BLIST_META_RADIX 16
Modified: projects/clang500-import/tools/regression/geom_gpt/gctl_test.t
==============================================================================
--- projects/clang500-import/tools/regression/geom_gpt/gctl_test.t Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/tools/regression/geom_gpt/gctl_test.t Sat Jun 10 20:23:49 2017 (r319801)
@@ -35,48 +35,48 @@ my $disk = "/tmp/disk-$$";
my $mntpt_prefix = "/tmp/mount-$$";
my %steps = (
- "000" => "gctl",
- "001" => "gctl verb=bogus",
- "010" => "gctl verb=create",
- "011" => "gctl verb=create provider=bogus",
+ "000" => "gctl class=PART",
+ "001" => "gctl class=PART verb=bogus",
+ "010" => "gctl class=PART verb=create",
+ "011" => "gctl class=PART verb=create provider=bogus",
"020" => "mdcfg create pristine",
- "021" => "gctl verb=create provider=%dev% entries=-1",
- "022" => "gctl verb=create provider=%dev% entries=128",
- "023" => "gctl verb=create provider=%dev%",
- "024" => "gctl verb=modify geom=%dev%",
+ "021" => "gctl class=PART verb=create provider=%dev% entries=-1",
+ "022" => "gctl class=PART verb=create provider=%dev% entries=128",
+ "023" => "gctl class=PART verb=create provider=%dev%",
+ "024" => "gctl class=PART verb=modify geom=%dev%",
"025" => "conf",
- "030" => "gctl verb=add",
- "031" => "gctl verb=add geom=bogus",
- "032" => "gctl verb=add geom=%dev%",
- "033" => "gctl verb=add geom=%dev% type=bogus",
- "034" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace",
- "035" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=1",
- "036" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34",
- "037" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34 end=12345678",
- "038" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry=129",
- "039" => "gctl verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry:8=5",
- "040" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry=5",
- "041" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=546",
- "042" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=162 end=417",
- "043" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=100 end=300",
- "044" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=300 end=500",
- "045" => "gctl verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry:8",
- "046" => "gctl verb=add geom=%dev% type=d2bd4509-c4ff-11da-b4cc-00306e39b62f start=418 end=546 entry:8",
+ "030" => "gctl class=PART verb=add",
+ "031" => "gctl class=PART verb=add geom=bogus",
+ "032" => "gctl class=PART verb=add geom=%dev%",
+ "033" => "gctl class=PART verb=add geom=%dev% type=bogus",
+ "034" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace",
+ "035" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=1",
+ "036" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34",
+ "037" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=34 end=12345678",
+ "038" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry=129",
+ "039" => "gctl class=PART verb=add geom=%dev% type=ed0101b0-2a71-11da-ba81-003048416ace start=162 end=417 entry:8=5",
+ "040" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry=5",
+ "041" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=546",
+ "042" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=162 end=417",
+ "043" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=100 end=300",
+ "044" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=300 end=500",
+ "045" => "gctl class=PART verb=add geom=%dev% type=83d34ed5-c4ff-11da-b65b-000347c5d7f3 start=34 end=161 entry:8",
+ "046" => "gctl class=PART verb=add geom=%dev% type=d2bd4509-c4ff-11da-b4cc-00306e39b62f start=418 end=546 entry:8",
"047" => "conf",
- "050" => "gctl verb=remove geom=%dev% entry=5",
- "051" => "gctl verb=remove geom=%dev% entry=2",
- "052" => "gctl verb=remove geom=%dev% entry=1",
- "053" => "gctl verb=remove geom=%dev% entry=1",
+ "050" => "gctl class=PART verb=remove geom=%dev% entry=5",
+ "051" => "gctl class=PART verb=remove geom=%dev% entry=2",
+ "052" => "gctl class=PART verb=remove geom=%dev% entry=1",
+ "053" => "gctl class=PART verb=remove geom=%dev% entry=1",
"054" => "conf",
- "060" => "gctl verb=add geom=%dev% type=516e7cb6-6ecf-11d6-8ff8-00022d09712b start=34 end=546 entry:8=1",
+ "060" => "gctl class=PART verb=add geom=%dev% type=516e7cb6-6ecf-11d6-8ff8-00022d09712b start=34 end=546 entry:8=1",
"061" => "mount %dev%p1",
- "062" => "gctl verb=delete geom=%dev% entry=1",
+ "062" => "gctl class=PART verb=delete geom=%dev% entry=1",
"063" => "umount %dev%p1",
- "064" => "gctl verb=delete geom=%dev% entry=1",
+ "064" => "gctl class=PART verb=delete geom=%dev% entry=1",
"065" => "conf",
"100" => "mdcfg destroy",
"110" => "mdcfg create corrupted",
- "111" => "gctl verb=add geom=%dev%",
+ "111" => "gctl class=PART verb=add geom=%dev%",
"120" => "mdcfg destroy",
);
Modified: projects/clang500-import/tools/regression/geom_gpt/gctl_test_helper.c
==============================================================================
--- projects/clang500-import/tools/regression/geom_gpt/gctl_test_helper.c Sat Jun 10 19:48:45 2017 (r319800)
+++ projects/clang500-import/tools/regression/geom_gpt/gctl_test_helper.c Sat Jun 10 20:23:49 2017 (r319801)
@@ -117,7 +117,6 @@ main(int argc, char *argv[])
req = gctl_get_handle();
assert(req != NULL);
- gctl_ro_param(req, "class", -1, "PART");
while ((c = getopt(argc, argv, "v")) != -1) {
switch (c) {
More information about the svn-src-projects
mailing list