diff options
Diffstat (limited to 'sbin')
53 files changed, 24 insertions, 5635 deletions
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index 070e3bc..19a5636 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -20,14 +20,8 @@ LIBADD= geom util .else -.include <src.opts.mk> - SUBDIR= core class -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - .include <bsd.subdir.mk> .endif diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile index 8ea22ff..a7ed1b9 100644 --- a/sbin/geom/class/Makefile +++ b/sbin/geom/class/Makefile @@ -21,8 +21,4 @@ SUBDIR+=shsec SUBDIR+=stripe SUBDIR+=virstor -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - .include <bsd.subdir.mk> diff --git a/sbin/geom/core/tests/ConfCmp/ConfCmp.c b/sbin/geom/core/tests/ConfCmp/ConfCmp.c deleted file mode 100644 index 161b5cc..0000000 --- a/sbin/geom/core/tests/ConfCmp/ConfCmp.c +++ /dev/null @@ -1,379 +0,0 @@ -/*- - * Copyright (c) 2002 Poul-Henning Kamp - * Copyright (c) 2002 Networks Associates Technology, Inc. - * All rights reserved. - * - * This software was developed for the FreeBSD Project by Poul-Henning Kamp - * and NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. - * - * 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. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * 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. - * - * $FreeBSD$ - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <ctype.h> -#include <sys/stat.h> -#include <sys/mman.h> -#include <sys/queue.h> -#include <sys/sbuf.h> -#include <err.h> -#include <bsdxml.h> - -FILE *fsubs; - -struct node { - LIST_HEAD(, node) children; - LIST_ENTRY(node) siblings; - struct node *parent; - const char *name; - struct sbuf *cont; - struct sbuf *key; - char *id; - char *ref; -}; - -struct mytree { - struct node *top; - struct node *cur; - int indent; - int ignore; -}; - -struct ref { - LIST_ENTRY(ref) next; - char *k1; - char *k2; -}; - -LIST_HEAD(, ref) refs = LIST_HEAD_INITIALIZER(refs); - -static struct node * -new_node(void) -{ - struct node *np; - - np = calloc(1, sizeof *np); - np->cont = sbuf_new_auto(); - sbuf_clear(np->cont); - np->key = sbuf_new_auto(); - sbuf_clear(np->key); - LIST_INIT(&np->children); - return (np); -} - -static void -indent(int n) -{ - - printf("%*.*s", n, n, ""); -} - -static void -StartElement(void *userData, const char *name, const char **attr) -{ - struct mytree *mt; - struct node *np; - int i; - - mt = userData; - if (!strcmp(name, "FreeBSD")) { - mt->ignore = 1; - return; - } - mt->ignore = 0; - mt->indent += 2; - np = new_node(); - for (i = 0; attr[i]; i += 2) { - if (!strcmp(attr[i], "id")) - np->id = strdup(attr[i+1]); - else if (!strcmp(attr[i], "ref")) - np->ref = strdup(attr[i+1]); - } - np->name = strdup(name); - sbuf_cat(np->key, name); - sbuf_cat(np->key, "::"); - np->parent = mt->cur; - LIST_INSERT_HEAD(&mt->cur->children, np, siblings); - mt->cur = np; -} - -static void -EndElement(void *userData, const char *name __unused) -{ - struct mytree *mt; - struct node *np; - - mt = userData; - if (mt->ignore) - return; - - mt->indent -= 2; - sbuf_finish(mt->cur->cont); - LIST_FOREACH(np, &mt->cur->children, siblings) { - if (strcmp(np->name, "name")) - continue; - sbuf_cat(mt->cur->key, sbuf_data(np->cont)); - break; - } - sbuf_finish(mt->cur->key); - mt->cur = mt->cur->parent; -} - -static void -CharData(void *userData , const XML_Char *s , int len) -{ - struct mytree *mt; - const char *b, *e; - - mt = userData; - if (mt->ignore) - return; - b = s; - e = s + len - 1; - while (isspace(*b) && b < e) - b++; - while (isspace(*e) && e > b) - e--; - if (e != b || *b) - sbuf_bcat(mt->cur->cont, b, e - b + 1); -} - -static struct mytree * -dofile(char *filename) -{ - XML_Parser parser; - struct mytree *mt; - struct stat st; - int fd; - char *p; - int i; - - parser = XML_ParserCreate(NULL); - mt = calloc(1, sizeof *mt); - mt->top = new_node(); - mt->top->name = "(top)"; - mt->top->parent = mt->top; - mt->cur = mt->top; - sbuf_finish(mt->top->key); - sbuf_finish(mt->top->cont); - XML_SetUserData(parser, mt); - XML_SetElementHandler(parser, StartElement, EndElement); - XML_SetCharacterDataHandler(parser, CharData); - fd = open(filename, O_RDONLY); - if (fd < 0) - err(1, "%s", filename); - fstat(fd, &st); - p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); - i = XML_Parse(parser, p, st.st_size, 1); - if (i != 1) - errx(1, "XML_Parse complained -> %d", i); - munmap(p, st.st_size); - close(fd); - XML_ParserFree(parser); - sbuf_finish(mt->top->cont); - if (i) - return (mt); - else - return (NULL); -} - -static void -print_node(struct node *np) -{ - printf("\"%s\" -- \"%s\" -- \"%s\"", np->name, sbuf_data(np->cont), sbuf_data(np->key)); - if (np->id) - printf(" id=\"%s\"", np->id); - if (np->ref) - printf(" ref=\"%s\"", np->ref); - printf("\n"); -} - -#if 0 -static void -print_tree(struct node *np, int n) -{ - struct node *np1; - - indent(n); printf("%s id=%s ref=%s\n", np->name, np->id, np->ref); - LIST_FOREACH(np1, &np->children, siblings) - print_tree(np1, n + 2); -} -#endif - -static void -sort_node(struct node *np) -{ - struct node *np1, *np2; - int n; - - LIST_FOREACH(np1, &np->children, siblings) - sort_node(np1); - do { - np1 = LIST_FIRST(&np->children); - n = 0; - for (;;) { - if (np1 == NULL) - return; - np2 = LIST_NEXT(np1, siblings); - if (np2 == NULL) - return; - if (strcmp(sbuf_data(np1->key), sbuf_data(np2->key)) > 0) { - LIST_REMOVE(np2, siblings); - LIST_INSERT_BEFORE(np1, np2, siblings); - n++; - break; - } - np1 = np2; - } - } while (n); -} - -static int -refcmp(char *r1, char *r2) -{ - struct ref *r; - - LIST_FOREACH(r, &refs, next) { - if (!strcmp(r1, r->k1)) - return (strcmp(r2, r->k2)); - } - r = calloc(1, sizeof(*r)); - r->k1 = strdup(r1); - r->k2 = strdup(r2); - LIST_INSERT_HEAD(&refs, r, next); - if (fsubs != NULL) { - fprintf(fsubs, "s/%s/%s/g\n", r1, r2); - fflush(fsubs); - } - return (0); -} - -static int compare_node2(struct node *n1, struct node *n2, int in); - -static int -compare_node(struct node *n1, struct node *n2, int in) -{ - int i; - struct node *n1a, *n2a; - - i = strcmp(n1->name, n2->name); - if (i) - return (i); - if (n1->id && n2->id) - i = refcmp(n1->id, n2->id); - else if (n1->id || n2->id) - i = -1; - if (i) - return (i); - if (n1->ref && n2->ref) - i = refcmp(n1->ref, n2->ref); - else if (n1->ref || n2->ref) - i = -1; - if (i) - return (i); - if (!strcmp(n1->name, "ref")) - i = refcmp(sbuf_data(n1->cont), sbuf_data(n2->cont)); - else - i = strcmp(sbuf_data(n1->cont), sbuf_data(n2->cont)); - if (i) - return (1); - n1a = LIST_FIRST(&n1->children); - n2a = LIST_FIRST(&n2->children); - for (;;) { - if (n1a == NULL && n2a == NULL) - return (0); - if (n1a != NULL && n2a == NULL) { - printf("1>"); - indent(in); - print_node(n1a); - printf("2>\n"); - return (1); - } - if (n1a == NULL && n2a != NULL) { - printf("1>\n"); - printf("2>"); - indent(in); - print_node(n2a); - return (1); - } - i = compare_node2(n1a, n2a, in + 2); - if (i) - return (1); - n1a = LIST_NEXT(n1a, siblings); - n2a = LIST_NEXT(n2a, siblings); - } - return (0); -} - -static int -compare_node2(struct node *n1, struct node *n2, int in) -{ - int i; - - i = compare_node(n1, n2, in); - if (i) { - printf("1>"); - indent(in); - print_node(n1); - printf("2>"); - indent(in); - print_node(n2); - } - return (i); -} - - - -int -main(int argc, char **argv) -{ - struct mytree *t1, *t2; - int i; - - fsubs = fopen("_.subs", "w"); - setbuf(stdout, NULL); - setbuf(stderr, NULL); - if (argc != 3) - errx(1, "usage: %s file1 file2", argv[0]); - - t1 = dofile(argv[1]); - if (t1 == NULL) - errx(2, "XML parser error on file %s", argv[1]); - sort_node(t1->top); - t2 = dofile(argv[2]); - if (t2 == NULL) - errx(2, "XML parser error on file %s", argv[2]); - sort_node(t2->top); - i = compare_node(t1->top, t2->top, 0); - return (i); -} - diff --git a/sbin/geom/core/tests/ConfCmp/Makefile b/sbin/geom/core/tests/ConfCmp/Makefile deleted file mode 100644 index ffd814e..0000000 --- a/sbin/geom/core/tests/ConfCmp/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# $FreeBSD$ - -BINDIR= ${TESTSBASE}/sbin/geom/core/ConfCmp - -PROG= ConfCmp -SRCS+= ConfCmp.c -SRCS+= subr_sbuf.c - -.PATH: ${SRCTOP}/sys/kern - -# Uncomment for ElectricFence -#LDADD+= -lefence -L/usr/local/lib - -DPADD+= ${LIBBSDXML} -LDADD+= -lbsdxml - -LDFLAGS+= -static - -MAN= -CLEANFILES+= _* - -# XXX: this should be in a test script -check: .PHONY -check: ${PROG} - cd ${.CURDIR} && env PATH="$$PATH:${.OBJDIR}" ${MAKE} _check - -_check: .PHONY -_check: ${PROG} - rm -f _* *.core - cd ${.CURDIR}; ${PROG} a1.conf a1.conf - cd ${.CURDIR}; ${PROG} a1.conf a1a.conf - cd ${.CURDIR}; if ${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi - cd ${.CURDIR}; if ${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi - cd ${.CURDIR}; if ${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi - cd ${.CURDIR}; ${PROG} a2.conf a2.conf - cd ${.CURDIR}; ${PROG} a2.conf a2a.conf - cd ${.CURDIR}; if ${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi - cd ${.CURDIR}; if ${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi - cd ${.CURDIR}; if ${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi - -WARNS?= 5 - -.include <bsd.prog.mk> diff --git a/sbin/geom/core/tests/ConfCmp/a1.conf b/sbin/geom/core/tests/ConfCmp/a1.conf deleted file mode 100644 index 94171cd..0000000 --- a/sbin/geom/core/tests/ConfCmp/a1.conf +++ /dev/null @@ -1,414 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <method> - <ref>0x80712c0</ref> - <name>DEV-method</name> - <geom> - <ref>0x80bfd00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3d</name> - <rank>4</rank> - <consumer> - <ref>0x80b9500</ref> - <geom><ref>0x80bfd00</ref></geom> - <provider><ref>0x80bf880</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3c</name> - <rank>4</rank> - <consumer> - <ref>0x80b94c0</ref> - <geom><ref>0x80bfc80</ref></geom> - <provider><ref>0x80bf800</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9480</ref> - <geom><ref>0x80bfc00</ref></geom> - <provider><ref>0x80bf780</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9440</ref> - <geom><ref>0x80bfb80</ref></geom> - <provider><ref>0x80bf600</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1f</name> - <rank>4</rank> - <consumer> - <ref>0x80b9400</ref> - <geom><ref>0x80bfb00</ref></geom> - <provider><ref>0x80bf480</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1e</name> - <rank>4</rank> - <consumer> - <ref>0x80b93c0</ref> - <geom><ref>0x80bfa80</ref></geom> - <provider><ref>0x80bf400</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9380</ref> - <geom><ref>0x80bfa00</ref></geom> - <provider><ref>0x80bf380</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf980</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1b</name> - <rank>4</rank> - <consumer> - <ref>0x80b9340</ref> - <geom><ref>0x80bf980</ref></geom> - <provider><ref>0x80bf300</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf900</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9300</ref> - <geom><ref>0x80bf900</ref></geom> - <provider><ref>0x80bf280</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf680</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <consumer> - <ref>0x80b9280</ref> - <geom><ref>0x80bf680</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf500</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <consumer> - <ref>0x80b9200</ref> - <geom><ref>0x80bf500</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf180</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <consumer> - <ref>0x80b9180</ref> - <geom><ref>0x80bf180</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80b9080</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0</name> - <rank>2</rank> - <consumer> - <ref>0x80b90c0</ref> - <geom><ref>0x80b9080</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - </method> - <method> - <ref>0x8071280</ref> - <name>MBREXT-method</name> - </method> - <method> - <ref>0x8071260</ref> - <name>MBR-method</name> - <geom> - <ref>0x80b9100</ref> - <method><ref>0x8071260</ref></method> - <name>ad0</name> - <rank>2</rank> - <config> - </config> - <consumer> - <ref>0x80b9140</ref> - <geom><ref>0x80b9100</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf100</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf080</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2</name> - <config> - <index>1</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf000</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1</name> - <config> - <index>0</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - <type>165</type> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80712a0</ref> - <name>BSD-method</name> - <geom> - <ref>0x80bf700</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b92c0</ref> - <geom><ref>0x80bf700</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf880</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3d</name> - <config> - <index>3</index> - <length>6488104960</length> - <seclength>12672080</seclength> - <offset>10682408960</offset> - <secoffset>20864080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf800</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3c</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf780</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3a</name> - <config> - <index>0</index> - <length>2097152000</length> - <seclength>4096000</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf580</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b9240</ref> - <geom><ref>0x80bf580</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf600</ref> - <geom><ref>0x80bf580</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2c</name> - <config> - <index>2</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf200</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b91c0</ref> - <geom><ref>0x80bf200</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf480</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1f</name> - <config> - <index>5</index> - <length>2066973184</length> - <seclength>4037057</seclength> - <offset>1153465856</offset> - <secoffset>2252863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf400</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1e</name> - <config> - <index>4</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>629177856</offset> - <secoffset>1228863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf380</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1c</name> - <config> - <index>2</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf300</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1b</name> - <config> - <index>1</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>104889856</offset> - <secoffset>204863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf280</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1a</name> - <config> - <index>0</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80711c0</ref> - <name>SIMDISK-method</name> - <geom> - <ref>0x80b9000</ref> - <method><ref>0x80711c0</ref></method> - <name>ad0</name> - <rank>1</rank> - <provider> - <ref>0x80b9040</ref> - <geom><ref>0x80b9000</ref></geom> - <mode>r0w0e0</mode> - <name>ad0</name> - </provider> - </geom> - </method> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a1a.conf b/sbin/geom/core/tests/ConfCmp/a1a.conf deleted file mode 100644 index 01110f3..0000000 --- a/sbin/geom/core/tests/ConfCmp/a1a.conf +++ /dev/null @@ -1,414 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <method> - <ref>0x90712c0</ref> - <name>DEV-method</name> - <geom> - <ref>0x90bfd00</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s3d</name> - <rank>4</rank> - <consumer> - <ref>0x90b9500</ref> - <geom><ref>0x90bfd00</ref></geom> - <provider><ref>0x90bf880</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bfc80</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s3c</name> - <rank>4</rank> - <consumer> - <ref>0x90b94c0</ref> - <geom><ref>0x90bfc80</ref></geom> - <provider><ref>0x90bf800</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bfc00</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s3a</name> - <rank>4</rank> - <consumer> - <ref>0x90b9480</ref> - <geom><ref>0x90bfc00</ref></geom> - <provider><ref>0x90bf780</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bfb80</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s2c</name> - <rank>4</rank> - <consumer> - <ref>0x90b9440</ref> - <geom><ref>0x90bfb80</ref></geom> - <provider><ref>0x90bf600</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bfb00</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s1f</name> - <rank>4</rank> - <consumer> - <ref>0x90b9400</ref> - <geom><ref>0x90bfb00</ref></geom> - <provider><ref>0x90bf480</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bfa80</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s1e</name> - <rank>4</rank> - <consumer> - <ref>0x90b93c0</ref> - <geom><ref>0x90bfa80</ref></geom> - <provider><ref>0x90bf400</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bfa00</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s1c</name> - <rank>4</rank> - <consumer> - <ref>0x90b9380</ref> - <geom><ref>0x90bfa00</ref></geom> - <provider><ref>0x90bf380</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bf980</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s1b</name> - <rank>4</rank> - <consumer> - <ref>0x90b9340</ref> - <geom><ref>0x90bf980</ref></geom> - <provider><ref>0x90bf300</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bf900</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s1a</name> - <rank>4</rank> - <consumer> - <ref>0x90b9300</ref> - <geom><ref>0x90bf900</ref></geom> - <provider><ref>0x90bf280</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bf680</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <consumer> - <ref>0x90b9280</ref> - <geom><ref>0x90bf680</ref></geom> - <provider><ref>0x90bf100</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bf500</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <consumer> - <ref>0x90b9200</ref> - <geom><ref>0x90bf500</ref></geom> - <provider><ref>0x90bf080</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90bf180</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <consumer> - <ref>0x90b9180</ref> - <geom><ref>0x90bf180</ref></geom> - <provider><ref>0x90bf000</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x90b9080</ref> - <method><ref>0x90712c0</ref></method> - <name>ad0</name> - <rank>2</rank> - <consumer> - <ref>0x90b90c0</ref> - <geom><ref>0x90b9080</ref></geom> - <provider><ref>0x90b9040</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - </method> - <method> - <ref>0x9071280</ref> - <name>MBREXT-method</name> - </method> - <method> - <ref>0x9071260</ref> - <name>MBR-method</name> - <geom> - <ref>0x90b9100</ref> - <method><ref>0x9071260</ref></method> - <name>ad0</name> - <rank>2</rank> - <config> - </config> - <consumer> - <ref>0x90b9140</ref> - <geom><ref>0x90b9100</ref></geom> - <provider><ref>0x90b9040</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x90bf100</ref> - <geom><ref>0x90b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x90bf080</ref> - <geom><ref>0x90b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2</name> - <config> - <index>1</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x90bf000</ref> - <geom><ref>0x90b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1</name> - <config> - <index>0</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - <type>165</type> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x90712a0</ref> - <name>BSD-method</name> - <geom> - <ref>0x90bf700</ref> - <method><ref>0x90712a0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x90b92c0</ref> - <geom><ref>0x90bf700</ref></geom> - <provider><ref>0x90bf100</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x90bf880</ref> - <geom><ref>0x90bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3d</name> - <config> - <index>3</index> - <length>6488104960</length> - <seclength>12672080</seclength> - <offset>10682408960</offset> - <secoffset>20864080</secoffset> - </config> - </provider> - <provider> - <ref>0x90bf800</ref> - <geom><ref>0x90bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3c</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - <provider> - <ref>0x90bf780</ref> - <geom><ref>0x90bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3a</name> - <config> - <index>0</index> - <length>2097152000</length> - <seclength>4096000</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x90bf580</ref> - <method><ref>0x90712a0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x90b9240</ref> - <geom><ref>0x90bf580</ref></geom> - <provider><ref>0x90bf080</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x90bf600</ref> - <geom><ref>0x90bf580</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2c</name> - <config> - <index>2</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x90bf200</ref> - <method><ref>0x90712a0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x90b91c0</ref> - <geom><ref>0x90bf200</ref></geom> - <provider><ref>0x90bf000</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x90bf480</ref> - <geom><ref>0x90bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1f</name> - <config> - <index>5</index> - <length>2066973184</length> - <seclength>4037057</seclength> - <offset>1153465856</offset> - <secoffset>2252863</secoffset> - </config> - </provider> - <provider> - <ref>0x90bf400</ref> - <geom><ref>0x90bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1e</name> - <config> - <index>4</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>629177856</offset> - <secoffset>1228863</secoffset> - </config> - </provider> - <provider> - <ref>0x90bf380</ref> - <geom><ref>0x90bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1c</name> - <config> - <index>2</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - <provider> - <ref>0x90bf300</ref> - <geom><ref>0x90bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1b</name> - <config> - <index>1</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>104889856</offset> - <secoffset>204863</secoffset> - </config> - </provider> - <provider> - <ref>0x90bf280</ref> - <geom><ref>0x90bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1a</name> - <config> - <index>0</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x90711c0</ref> - <name>SIMDISK-method</name> - <geom> - <ref>0x90b9000</ref> - <method><ref>0x90711c0</ref></method> - <name>ad0</name> - <rank>1</rank> - <provider> - <ref>0x90b9040</ref> - <geom><ref>0x90b9000</ref></geom> - <mode>r0w0e0</mode> - <name>ad0</name> - </provider> - </geom> - </method> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a1b.conf b/sbin/geom/core/tests/ConfCmp/a1b.conf deleted file mode 100644 index 46f423b..0000000 --- a/sbin/geom/core/tests/ConfCmp/a1b.conf +++ /dev/null @@ -1,414 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <method> - <ref>0x80712c0</ref> - <name>DEV-method</name> - <geom> - <ref>0x80bfd00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3d</name> - <rank>4</rank> - <consumer> - <ref>0x80b9500</ref> - <geom><ref>0x80bfd00</ref></geom> - <provider><ref>0x80bf880</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3c</name> - <rank>4</rank> - <consumer> - <ref>0x80b94c0</ref> - <geom><ref>0x80bfc80</ref></geom> - <provider><ref>0x80bf800</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9480</ref> - <geom><ref>0x80bfc00</ref></geom> - <provider><ref>0x80bf780</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9440</ref> - <geom><ref>0x80bfb80</ref></geom> - <provider><ref>0x80bf600</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1f</name> - <rank>4</rank> - <consumer> - <ref>0x80b9400</ref> - <geom><ref>0x80bfb00</ref></geom> - <provider><ref>0x80bf480</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1e</name> - <rank>4</rank> - <consumer> - <ref>0x80b93c0</ref> - <geom><ref>0x80bfa80</ref></geom> - <provider><ref>0x80bf400</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9380</ref> - <geom><ref>0x80bfa00</ref></geom> - <provider><ref>0x80bf380</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf980</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1b</name> - <rank>4</rank> - <consumer> - <ref>0x80b9340</ref> - <geom><ref>0x80bf980</ref></geom> - <provider><ref>0x80bf300</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf900</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9300</ref> - <geom><ref>0x80bf900</ref></geom> - <provider><ref>0x80bf280</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf680</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <consumer> - <ref>0x80b9280</ref> - <geom><ref>0x80bf680</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf500</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <consumer> - <ref>0x80b9200</ref> - <geom><ref>0x80bf500</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf180</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <consumer> - <ref>0x80b9180</ref> - <geom><ref>0x80bf180</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80b9080</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0</name> - <rank>2</rank> - <consumer> - <ref>0x80b90c0</ref> - <geom><ref>0x80b9080</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - </method> - <method> - <ref>0x8071280</ref> - <name>MBREXT-method</name> - </method> - <method> - <ref>0x8071260</ref> - <name>MBR-method</name> - <geom> - <ref>0x80b9100</ref> - <method><ref>0x8071260</ref></method> - <name>ad0</name> - <rank>2</rank> - <config> - </config> - <consumer> - <ref>0x80b9140</ref> - <geom><ref>0x80b9100</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf100</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf080</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2</name> - <config> - <index>1</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf000</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1</name> - <config> - <index>0</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - <type>165</type> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80712a0</ref> - <name>BSD-method</name> - <geom> - <ref>0x80bf700</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b92c0</ref> - <geom><ref>0x80bf700</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf880</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3d</name> - <config> - <index>3</index> - <length>6488104960</length> - <seclength>12672080</seclength> - <offset>10682408960</offset> - <secoffset>20864080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf800</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3c</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf780</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3a</name> - <config> - <index>0</index> - <length>2097152000</length> - <seclength>4096000</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf580</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b9240</ref> - <geom><ref>0x80bf580</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf600</ref> - <geom><ref>0x80bf580</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2c</name> - <config> - <index>2</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf200</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b91c0</ref> - <geom><ref>0x80bf200</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf480</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1f</name> - <config> - <index>5</index> - <length>2066973184</length> - <seclength>4037057</seclength> - <offset>1153465856</offset> - <secoffset>2252863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf400</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1e</name> - <config> - <index>4</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>629177856</offset> - <secoffset>1228863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf380</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1c</name> - <config> - <index>2</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf300</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1b</name> - <config> - <index>1</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>104889856</offset> - <secoffset>204863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf280</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1a</name> - <config> - <index>0</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80711c0</ref> - <name>SIMDISK-method</name> - <geom> - <ref>0x80b9000</ref> - <method><ref>0x80711c0</ref></method> - <name>ad0</name> - <rank>1</rank> - <provider> - <ref>0x80b9041</ref> - <geom><ref>0x80b9000</ref></geom> - <mode>r0w0e0</mode> - <name>ad0</name> - </provider> - </geom> - </method> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a1c.conf b/sbin/geom/core/tests/ConfCmp/a1c.conf deleted file mode 100644 index 1b5a2b9..0000000 --- a/sbin/geom/core/tests/ConfCmp/a1c.conf +++ /dev/null @@ -1,414 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <method> - <ref>0x80712c0</ref> - <name>DEV-method</name> - <geom> - <ref>0x80bfd00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3d</name> - <rank>4</rank> - <consumer> - <ref>0x80b9500</ref> - <geom><ref>0x80bfd00</ref></geom> - <provider><ref>0x80bf880</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3c</name> - <rank>4</rank> - <consumer> - <ref>0x80b94c0</ref> - <geom><ref>0x80bfc80</ref></geom> - <provider><ref>0x80bf800</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9480</ref> - <geom><ref>0x80bfc00</ref></geom> - <provider><ref>0x80bf780</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9440</ref> - <geom><ref>0x80bfb80</ref></geom> - <provider><ref>0x80bf600</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1f</name> - <rank>4</rank> - <consumer> - <ref>0x80b9400</ref> - <geom><ref>0x80bfb00</ref></geom> - <provider><ref>0x80bf480</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1e</name> - <rank>4</rank> - <consumer> - <ref>0x80b93c0</ref> - <geom><ref>0x80bfa80</ref></geom> - <provider><ref>0x80bf400</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9380</ref> - <geom><ref>0x80bfa00</ref></geom> - <provider><ref>0x80bf380</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf980</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1b</name> - <rank>4</rank> - <consumer> - <ref>0x80b9340</ref> - <geom><ref>0x80bf980</ref></geom> - <provider><ref>0x80bf300</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf900</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9300</ref> - <geom><ref>0x80bf900</ref></geom> - <provider><ref>0x80bf280</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf680</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <consumer> - <ref>0x80b9280</ref> - <geom><ref>0x80bf680</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf500</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <consumer> - <ref>0x80b9200</ref> - <geom><ref>0x80bf500</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf180</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <consumer> - <ref>0x80b9180</ref> - <geom><ref>0x80bf180</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80b9080</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0</name> - <rank>2</rank> - <consumer> - <ref>0x80b90c0</ref> - <geom><ref>0x80b9080</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - </method> - <method> - <ref>0x8071280</ref> - <name>MBREXT-method</name> - </method> - <method> - <ref>0x8071260</ref> - <name>MBR-method</name> - <geom> - <ref>0x80b9100</ref> - <method><ref>0x8071260</ref></method> - <name>ad0</name> - <rank>2</rank> - <config> - </config> - <consumer> - <ref>0x80b9140</ref> - <geom><ref>0x80b9100</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf100</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf080</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2</name> - <config> - <index>1</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf000</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1</name> - <config> - <index>0</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - <type>165</type> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80712a0</ref> - <name>BSD-method</name> - <geom> - <ref>0x80bf700</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b92c0</ref> - <geom><ref>0x80bf700</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf880</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3d</name> - <config> - <index>3</index> - <length>6488104960</length> - <seclength>12672080</seclength> - <offset>10682408960</offset> - <secoffset>20864080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf800</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3c</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf780</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3a</name> - <config> - <index>0</index> - <length>2097152000</length> - <seclength>4096000</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf580</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b9240</ref> - <geom><ref>0x80bf580</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf600</ref> - <geom><ref>0x80bf580</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2c</name> - <config> - <index>2</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf200</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b91c0</ref> - <geom><ref>0x80bf200</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf480</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1f</name> - <config> - <index>5</index> - <length>2066973184</length> - <seclength>4037057</seclength> - <offset>1153465856</offset> - <secoffset>2252863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf400</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1e</name> - <config> - <index>4</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>629177856</offset> - <secoffset>1228863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf380</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1c</name> - <config> - <index>2</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf300</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1b</name> - <config> - <index>1</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>104889856</offset> - <secoffset>204863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf280</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1a</name> - <config> - <index>0</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80711c0</ref> - <name>SIMDISK-method</name> - <geom> - <ref>0x80b9000</ref> - <method><ref>0x80711c0</ref></method> - <name>ad0</name> - <rank>1</rank> - <provider> - <ref>0x80b9040</ref> - <geom><ref>0x80b9000</ref></geom> - <mode>r0w0e1</mode> - <name>ad0</name> - </provider> - </geom> - </method> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a1d.conf b/sbin/geom/core/tests/ConfCmp/a1d.conf deleted file mode 100644 index a9063c5..0000000 --- a/sbin/geom/core/tests/ConfCmp/a1d.conf +++ /dev/null @@ -1,414 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <method> - <ref>0x80712c0</ref> - <name>DEV-method</name> - <geom> - <ref>0x80bfd00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3d</name> - <rank>4</rank> - <consumer> - <ref>0x80b9500</ref> - <geom><ref>0x80bfd00</ref></geom> - <provider><ref>0x80bf880</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3c</name> - <rank>4</rank> - <consumer> - <ref>0x80b94c0</ref> - <geom><ref>0x80bfc80</ref></geom> - <provider><ref>0x80bf800</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfc00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9480</ref> - <geom><ref>0x80bfc00</ref></geom> - <provider><ref>0x80bf780</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9440</ref> - <geom><ref>0x80bfb80</ref></geom> - <provider><ref>0x80bf600</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfb00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1f</name> - <rank>4</rank> - <consumer> - <ref>0x80b9400</ref> - <geom><ref>0x80bfb00</ref></geom> - <provider><ref>0x80bf480</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa80</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1e</name> - <rank>4</rank> - <consumer> - <ref>0x80b93c0</ref> - <geom><ref>0x80bfa80</ref></geom> - <provider><ref>0x80bf400</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bfa00</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1c</name> - <rank>4</rank> - <consumer> - <ref>0x80b9380</ref> - <geom><ref>0x80bfa00</ref></geom> - <provider><ref>0x80bf380</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf980</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1b</name> - <rank>4</rank> - <consumer> - <ref>0x80b9340</ref> - <geom><ref>0x80bf980</ref></geom> - <provider><ref>0x80bf300</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf900</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1a</name> - <rank>4</rank> - <consumer> - <ref>0x80b9300</ref> - <geom><ref>0x80bf900</ref></geom> - <provider><ref>0x80bf280</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf680</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <consumer> - <ref>0x80b9280</ref> - <geom><ref>0x80bf680</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf500</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <consumer> - <ref>0x80b9200</ref> - <geom><ref>0x80bf500</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80bf180</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <consumer> - <ref>0x80b9180</ref> - <geom><ref>0x80bf180</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom> - <ref>0x80b9080</ref> - <method><ref>0x80712c0</ref></method> - <name>ad0</name> - <rank>2</rank> - <consumer> - <ref>0x80b90c0</ref> - <geom><ref>0x80b9080</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - </consumer> - </geom> - </method> - <method> - <ref>0x8071280</ref> - <name>MBREXT-method</name> - </method> - <method> - <ref>0x8071260</ref> - <name>MBR-method</name> - <geom> - <ref>0x80b9100</ref> - <method><ref>0x8071260</ref></method> - <name>ad0</name> - <rank>2</rank> - <config> - </config> - <consumer> - <ref>0x80b9140</ref> - <geom><ref>0x80b9100</ref></geom> - <provider><ref>0x80b9040</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf100</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf080</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2</name> - <config> - <index>1</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - <type>165</type> - </config> - </provider> - <provider> - <ref>0x80bf000</ref> - <geom><ref>0x80b9100</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1</name> - <config> - <index>0</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - <type>165</type> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80712a0</ref> - <name>BSD-method</name> - <geom> - <ref>0x80bf700</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s3</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b92c0</ref> - <geom><ref>0x80bf700</ref></geom> - <provider><ref>0x80bf100</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf880</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3d</name> - <config> - <index>3</index> - <length>6488104960</length> - <seclength>12672080</seclength> - <offset>10682408960</offset> - <secoffset>20864080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf800</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3c</name> - <config> - <index>2</index> - <length>8585256960</length> - <seclength>16768080</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf780</ref> - <geom><ref>0x80bf700</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s3a</name> - <config> - <index>0</index> - <length>2097152000</length> - <seclength>4096000</seclength> - <offset>8585256960</offset> - <secoffset>16768080</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf580</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s2</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b9240</ref> - <geom><ref>0x80bf580</ref></geom> - <provider><ref>0x80bf080</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf600</ref> - <geom><ref>0x80bf580</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s2c</name> - <config> - <index>2</index> - <length>5364817920</length> - <seclength>10478160</seclength> - <offset>3220439040</offset> - <secoffset>6289920</secoffset> - </config> - </provider> - </geom> - <geom> - <ref>0x80bf200</ref> - <method><ref>0x80712a0</ref></method> - <name>ad0s1</name> - <rank>3</rank> - <config> - </config> - <consumer> - <ref>0x80b91c0</ref> - <geom><ref>0x80bf200</ref></geom> - <provider><ref>0x80bf000</ref></provider> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider> - <ref>0x80bf480</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1f</name> - <config> - <index>5</index> - <length>2066973184</length> - <seclength>4037057</seclength> - <offset>1153465856</offset> - <secoffset>2252863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf400</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1e</name> - <config> - <index>4</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>629177856</offset> - <secoffset>1228863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf380</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1c</name> - <config> - <index>2</index> - <length>3220406784</length> - <seclength>6289857</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf300</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1b</name> - <config> - <index>1</index> - <length>524288000</length> - <seclength>1024000</seclength> - <offset>104889856</offset> - <secoffset>204863</secoffset> - </config> - </provider> - <provider> - <ref>0x80bf280</ref> - <geom><ref>0x80bf200</ref></geom> - <mode>r0w0e0</mode> - <name>ad0s1a</name> - <config> - <index>0</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>32256</offset> - <secoffset>63</secoffset> - </config> - </provider> - </geom> - </method> - <method> - <ref>0x80711c0</ref> - <name>SIMDISK-method</name> - <geom> - <ref>0x80b9000</ref> - <method><ref>0x80711c0</ref></method> - <name>ad0</name> - <rank>1</rank> - <provider> - <ref>0x80b9040</ref> - <geom><ref>0x80b9000</ref></geom> - <mode>r0w0e0</mode> - <name>ad0</namf> - </provider> - </geom> - </method> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a2.conf b/sbin/geom/core/tests/ConfCmp/a2.conf deleted file mode 100644 index 6688fd1..0000000 --- a/sbin/geom/core/tests/ConfCmp/a2.conf +++ /dev/null @@ -1,207 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <class id="0x80740e0"> - <name>DEV-class</name> - <geom id="0x80bce00"> - <class ref="0x80740e0"/> - <name>wd0s1f</name> - <rank>4</rank> - <consumer id="0x80ba240"> - <geom ref="0x80bce00"/> - <provider ref="0x80bc880"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcc80"> - <class ref="0x80740e0"/> - <name>wd0s1e</name> - <rank>4</rank> - <consumer id="0x80ba200"> - <geom ref="0x80bcc80"/> - <provider ref="0x80bc800"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcb00"> - <class ref="0x80740e0"/> - <name>wd0s1c</name> - <rank>4</rank> - <consumer id="0x80ba1c0"> - <geom ref="0x80bcb00"/> - <provider ref="0x80bc780"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc980"> - <class ref="0x80740e0"/> - <name>wd0s1b</name> - <rank>4</rank> - <consumer id="0x80ba180"> - <geom ref="0x80bc980"/> - <provider ref="0x80bc700"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc900"> - <class ref="0x80740e0"/> - <name>wd0s1a</name> - <rank>4</rank> - <consumer id="0x80ba140"> - <geom ref="0x80bc900"/> - <provider ref="0x80bc680"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc300"> - <class ref="0x80740e0"/> - <name>wd0s1</name> - <rank>3</rank> - <consumer id="0x80ba0c0"> - <geom ref="0x80bc300"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc100"> - <class ref="0x80740e0"/> - <name>wd0</name> - <rank>2</rank> - <consumer id="0x80ba040"> - <geom ref="0x80bc100"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - </class> - <class id="0x8073fc0"> - <name>PC98-class</name> - <geom id="0x80bc180"> - <class ref="0x8073fc0"/> - <name>wd0</name> - <rank>2</rank> - <config> - <frontstuff>8704</frontstuff> - </config> - <consumer id="0x80ba080"> - <geom ref="0x80bc180"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc280"> - <geom ref="0x80bc180"/> - <mode>r0w0e0</mode> - <name>wd0s1</name> - <config> - <index>0</index> - <length>1626533888</length> - <seclength>3176824</seclength> - <offset>69632</offset> - <secoffset>136</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8073fe0"> - <name>SUNLABEL-class</name> - </class> - <class id="0x80740c0"> - <name>MBREXT-class</name> - </class> - <class id="0x80740a0"> - <name>MBR-class</name> - </class> - <class id="0x8074100"> - <name>BSD-class</name> - <geom id="0x80bc480"> - <class ref="0x8074100"/> - <name>wd0s1</name> - <rank>3</rank> - <config> - <labeloffset>512</labeloffset> - <frontstuff>8192</frontstuff> - </config> - <consumer id="0x80ba100"> - <geom ref="0x80bc480"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc880"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1f</name> - <config> - <index>5</index> - <length>1390673920</length> - <seclength>2716160</seclength> - <offset>235929600</offset> - <secoffset>460800</secoffset> - </config> - </provider> - <provider id="0x80bc800"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1e</name> - <config> - <index>4</index> - <length>52428800</length> - <seclength>102400</seclength> - <offset>183500800</offset> - <secoffset>358400</secoffset> - </config> - </provider> - <provider id="0x80bc780"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1c</name> - <config> - <index>2</index> - <length>1626603520</length> - <seclength>3176960</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - <provider id="0x80bc700"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1b</name> - <config> - <index>1</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>78643200</offset> - <secoffset>153600</secoffset> - </config> - </provider> - <provider id="0x80bc680"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1a</name> - <config> - <index>0</index> - <length>78643200</length> - <seclength>153600</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8074000"> - <name>SIMDISK-class</name> - <geom id="0x80bc000"> - <class ref="0x8074000"/> - <name>wd0</name> - <rank>1</rank> - <provider id="0x80bc080"> - <geom ref="0x80bc000"/> - <mode>r0w0e0</mode> - <name>wd0</name> - </provider> - </geom> - </class> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a2a.conf b/sbin/geom/core/tests/ConfCmp/a2a.conf deleted file mode 100644 index 3d35fe9..0000000 --- a/sbin/geom/core/tests/ConfCmp/a2a.conf +++ /dev/null @@ -1,207 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <class id="0x90740e0"> - <name>DEV-class</name> - <geom id="0x90bce00"> - <class ref="0x90740e0"/> - <name>wd0s1f</name> - <rank>4</rank> - <consumer id="0x90ba240"> - <geom ref="0x90bce00"/> - <provider ref="0x90bc880"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x90bcc80"> - <class ref="0x90740e0"/> - <name>wd0s1e</name> - <rank>4</rank> - <consumer id="0x90ba200"> - <geom ref="0x90bcc80"/> - <provider ref="0x90bc800"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x90bcb00"> - <class ref="0x90740e0"/> - <name>wd0s1c</name> - <rank>4</rank> - <consumer id="0x90ba1c0"> - <geom ref="0x90bcb00"/> - <provider ref="0x90bc780"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x90bc980"> - <class ref="0x90740e0"/> - <name>wd0s1b</name> - <rank>4</rank> - <consumer id="0x90ba180"> - <geom ref="0x90bc980"/> - <provider ref="0x90bc700"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x90bc900"> - <class ref="0x90740e0"/> - <name>wd0s1a</name> - <rank>4</rank> - <consumer id="0x90ba140"> - <geom ref="0x90bc900"/> - <provider ref="0x90bc680"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x90bc300"> - <class ref="0x90740e0"/> - <name>wd0s1</name> - <rank>3</rank> - <consumer id="0x90ba0c0"> - <geom ref="0x90bc300"/> - <provider ref="0x90bc280"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x90bc100"> - <class ref="0x90740e0"/> - <name>wd0</name> - <rank>2</rank> - <consumer id="0x90ba040"> - <geom ref="0x90bc100"/> - <provider ref="0x90bc080"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - </class> - <class id="0x9073fc0"> - <name>PC98-class</name> - <geom id="0x90bc180"> - <class ref="0x9073fc0"/> - <name>wd0</name> - <rank>2</rank> - <config> - <frontstuff>8704</frontstuff> - </config> - <consumer id="0x90ba080"> - <geom ref="0x90bc180"/> - <provider ref="0x90bc080"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x90bc280"> - <geom ref="0x90bc180"/> - <mode>r0w0e0</mode> - <name>wd0s1</name> - <config> - <index>0</index> - <length>1626533888</length> - <seclength>3176824</seclength> - <offset>69632</offset> - <secoffset>136</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x9073fe0"> - <name>SUNLABEL-class</name> - </class> - <class id="0x90740c0"> - <name>MBREXT-class</name> - </class> - <class id="0x90740a0"> - <name>MBR-class</name> - </class> - <class id="0x9074100"> - <name>BSD-class</name> - <geom id="0x90bc480"> - <class ref="0x9074100"/> - <name>wd0s1</name> - <rank>3</rank> - <config> - <labeloffset>512</labeloffset> - <frontstuff>8192</frontstuff> - </config> - <consumer id="0x90ba100"> - <geom ref="0x90bc480"/> - <provider ref="0x90bc280"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x90bc880"> - <geom ref="0x90bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1f</name> - <config> - <index>5</index> - <length>1390673920</length> - <seclength>2716160</seclength> - <offset>235929600</offset> - <secoffset>460800</secoffset> - </config> - </provider> - <provider id="0x90bc800"> - <geom ref="0x90bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1e</name> - <config> - <index>4</index> - <length>52428800</length> - <seclength>102400</seclength> - <offset>183500800</offset> - <secoffset>358400</secoffset> - </config> - </provider> - <provider id="0x90bc780"> - <geom ref="0x90bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1c</name> - <config> - <index>2</index> - <length>1626603520</length> - <seclength>3176960</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - <provider id="0x90bc700"> - <geom ref="0x90bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1b</name> - <config> - <index>1</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>78643200</offset> - <secoffset>153600</secoffset> - </config> - </provider> - <provider id="0x90bc680"> - <geom ref="0x90bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1a</name> - <config> - <index>0</index> - <length>78643200</length> - <seclength>153600</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x9074000"> - <name>SIMDISK-class</name> - <geom id="0x90bc000"> - <class ref="0x9074000"/> - <name>wd0</name> - <rank>1</rank> - <provider id="0x90bc080"> - <geom ref="0x90bc000"/> - <mode>r0w0e0</mode> - <name>wd0</name> - </provider> - </geom> - </class> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a2b.conf b/sbin/geom/core/tests/ConfCmp/a2b.conf deleted file mode 100644 index 58c0e15..0000000 --- a/sbin/geom/core/tests/ConfCmp/a2b.conf +++ /dev/null @@ -1,207 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <class id="0x80740e0"> - <name>DEV-class</name> - <geom id="0x80bce00"> - <class ref="0x80740e0"/> - <name>wd0s1f</name> - <rank>4</rank> - <consumer id="0x80ba240"> - <geom ref="0x80bce00"/> - <provider ref="0x80bc880"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcc80"> - <class ref="0x80740e0"/> - <name>wd0s1e</name> - <rank>4</rank> - <consumer id="0x80ba200"> - <geom ref="0x80bcc80"/> - <provider ref="0x80bc800"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcb00"> - <class ref="0x80740e0"/> - <name>wd0s1c</name> - <rank>4</rank> - <consumer id="0x80ba1c0"> - <geom ref="0x80bcb00"/> - <provider ref="0x80bc780"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc980"> - <class ref="0x80740e0"/> - <name>wd0s1b</name> - <rank>4</rank> - <consumer id="0x80ba180"> - <geom ref="0x80bc981"/> - <provider ref="0x80bc700"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc900"> - <class ref="0x80740e0"/> - <name>wd0s1a</name> - <rank>4</rank> - <consumer id="0x80ba140"> - <geom ref="0x80bc900"/> - <provider ref="0x80bc680"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc300"> - <class ref="0x80740e0"/> - <name>wd0s1</name> - <rank>3</rank> - <consumer id="0x80ba0c0"> - <geom ref="0x80bc300"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc100"> - <class ref="0x80740e0"/> - <name>wd0</name> - <rank>2</rank> - <consumer id="0x80ba040"> - <geom ref="0x80bc100"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - </class> - <class id="0x8073fc0"> - <name>PC98-class</name> - <geom id="0x80bc180"> - <class ref="0x8073fc0"/> - <name>wd0</name> - <rank>2</rank> - <config> - <frontstuff>8704</frontstuff> - </config> - <consumer id="0x80ba080"> - <geom ref="0x80bc180"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc280"> - <geom ref="0x80bc180"/> - <mode>r0w0e0</mode> - <name>wd0s1</name> - <config> - <index>0</index> - <length>1626533888</length> - <seclength>3176824</seclength> - <offset>69632</offset> - <secoffset>136</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8073fe0"> - <name>SUNLABEL-class</name> - </class> - <class id="0x80740c0"> - <name>MBREXT-class</name> - </class> - <class id="0x80740a0"> - <name>MBR-class</name> - </class> - <class id="0x8074100"> - <name>BSD-class</name> - <geom id="0x80bc480"> - <class ref="0x8074100"/> - <name>wd0s1</name> - <rank>3</rank> - <config> - <labeloffset>512</labeloffset> - <frontstuff>8192</frontstuff> - </config> - <consumer id="0x80ba100"> - <geom ref="0x80bc480"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc880"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1f</name> - <config> - <index>5</index> - <length>1390673920</length> - <seclength>2716160</seclength> - <offset>235929600</offset> - <secoffset>460800</secoffset> - </config> - </provider> - <provider id="0x80bc800"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1e</name> - <config> - <index>4</index> - <length>52428800</length> - <seclength>102400</seclength> - <offset>183500800</offset> - <secoffset>358400</secoffset> - </config> - </provider> - <provider id="0x80bc780"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1c</name> - <config> - <index>2</index> - <length>1626603520</length> - <seclength>3176960</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - <provider id="0x80bc700"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1b</name> - <config> - <index>1</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>78643200</offset> - <secoffset>153600</secoffset> - </config> - </provider> - <provider id="0x80bc680"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1a</name> - <config> - <index>0</index> - <length>78643200</length> - <seclength>153600</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8074000"> - <name>SIMDISK-class</name> - <geom id="0x80bc000"> - <class ref="0x8074000"/> - <name>wd0</name> - <rank>1</rank> - <provider id="0x80bc080"> - <geom ref="0x80bc000"/> - <mode>r0w0e0</mode> - <name>wd0</name> - </provider> - </geom> - </class> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a2c.conf b/sbin/geom/core/tests/ConfCmp/a2c.conf deleted file mode 100644 index 381c410..0000000 --- a/sbin/geom/core/tests/ConfCmp/a2c.conf +++ /dev/null @@ -1,206 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <class id="0x80740e0"> - <name>DEV-class</name> - <geom id="0x80bce00"> - <class ref="0x80740e0"/> - <name>wd0s1f</name> - <rank>4</rank> - <consumer id="0x80ba240"> - <geom ref="0x80bce00"/> - <provider ref="0x80bc880"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcc80"> - <class ref="0x80740e0"/> - <name>wd0s1e</name> - <rank>4</rank> - <consumer id="0x80ba200"> - <geom ref="0x80bcc80"/> - <provider ref="0x80bc800"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcb00"> - <class ref="0x80740e0"/> - <name>wd0s1c</name> - <rank>4</rank> - <consumer id="0x80ba1c0"> - <geom ref="0x80bcb00"/> - <provider ref="0x80bc780"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc980"> - <class ref="0x80740e0"/> - <name>wd0s1b</name> - <rank>4</rank> - <consumer id="0x80ba180"> - <geom ref="0x80bc980"/> - <provider ref="0x80bc700"/> - </consumer> - </geom> - <geom id="0x80bc900"> - <class ref="0x80740e0"/> - <name>wd0s1a</name> - <rank>4</rank> - <consumer id="0x80ba140"> - <geom ref="0x80bc900"/> - <provider ref="0x80bc680"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc300"> - <class ref="0x80740e0"/> - <name>wd0s1</name> - <rank>3</rank> - <consumer id="0x80ba0c0"> - <geom ref="0x80bc300"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc100"> - <class ref="0x80740e0"/> - <name>wd0</name> - <rank>2</rank> - <consumer id="0x80ba040"> - <geom ref="0x80bc100"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - </class> - <class id="0x8073fc0"> - <name>PC98-class</name> - <geom id="0x80bc180"> - <class ref="0x8073fc0"/> - <name>wd0</name> - <rank>2</rank> - <config> - <frontstuff>8704</frontstuff> - </config> - <consumer id="0x80ba080"> - <geom ref="0x80bc180"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc280"> - <geom ref="0x80bc180"/> - <mode>r0w0e0</mode> - <name>wd0s1</name> - <config> - <index>0</index> - <length>1626533888</length> - <seclength>3176824</seclength> - <offset>69632</offset> - <secoffset>136</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8073fe0"> - <name>SUNLABEL-class</name> - </class> - <class id="0x80740c0"> - <name>MBREXT-class</name> - </class> - <class id="0x80740a0"> - <name>MBR-class</name> - </class> - <class id="0x8074100"> - <name>BSD-class</name> - <geom id="0x80bc480"> - <class ref="0x8074100"/> - <name>wd0s1</name> - <rank>3</rank> - <config> - <labeloffset>512</labeloffset> - <frontstuff>8192</frontstuff> - </config> - <consumer id="0x80ba100"> - <geom ref="0x80bc480"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc880"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1f</name> - <config> - <index>5</index> - <length>1390673920</length> - <seclength>2716160</seclength> - <offset>235929600</offset> - <secoffset>460800</secoffset> - </config> - </provider> - <provider id="0x80bc800"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1e</name> - <config> - <index>4</index> - <length>52428800</length> - <seclength>102400</seclength> - <offset>183500800</offset> - <secoffset>358400</secoffset> - </config> - </provider> - <provider id="0x80bc780"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1c</name> - <config> - <index>2</index> - <length>1626603520</length> - <seclength>3176960</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - <provider id="0x80bc700"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1b</name> - <config> - <index>1</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>78643200</offset> - <secoffset>153600</secoffset> - </config> - </provider> - <provider id="0x80bc680"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1a</name> - <config> - <index>0</index> - <length>78643200</length> - <seclength>153600</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8074000"> - <name>SIMDISK-class</name> - <geom id="0x80bc000"> - <class ref="0x8074000"/> - <name>wd0</name> - <rank>1</rank> - <provider id="0x80bc080"> - <geom ref="0x80bc000"/> - <mode>r0w0e0</mode> - <name>wd0</name> - </provider> - </geom> - </class> -</mesh> diff --git a/sbin/geom/core/tests/ConfCmp/a2d.conf b/sbin/geom/core/tests/ConfCmp/a2d.conf deleted file mode 100644 index bccaed5..0000000 --- a/sbin/geom/core/tests/ConfCmp/a2d.conf +++ /dev/null @@ -1,211 +0,0 @@ -<mesh> - <FreeBSD>$FreeBSD$</FreeBSD> - <class id="0x80740e0"> - <name>DEV-class</name> - <geom id="0x80bce00"> - <class ref="0x80740e0"/> - <name>wd0s1f</name> - <rank>4</rank> - <consumer id="0x80ba240"> - <geom ref="0x80bce00"/> - <provider ref="0x80bc880"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcc80"> - <class ref="0x80740e0"/> - <name>wd0s1e</name> - <rank>4</rank> - <consumer id="0x80ba200"> - <geom ref="0x80bcc80"/> - <provider ref="0x80bc800"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bcb00"> - <class ref="0x80740e0"/> - <name>wd0s1c</name> - <rank>4</rank> - <consumer id="0x80ba1c0"> - <geom ref="0x80bcb00"/> - <provider ref="0x80bc780"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc980"> - <class ref="0x80740e0"/> - <name>wd0s1b</name> - <rank>4</rank> - <consumer id="0x80ba180"> - <geom ref="0x80bc980"/> - <provider ref="0x80bc700"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc900"> - <class ref="0x80740e0"/> - <name>wd0s1a</name> - <rank>4</rank> - <consumer id="0x80ba140"> - <geom ref="0x80bc900"/> - <provider ref="0x80bc680"/> - <mode>r0w0e0</mode> - </consumer> - <consumer id="0x80ba141"> - <geom ref="0x80bc900"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc300"> - <class ref="0x80740e0"/> - <name>wd0s1</name> - <rank>3</rank> - <consumer id="0x80ba0c0"> - <geom ref="0x80bc300"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - <geom id="0x80bc100"> - <class ref="0x80740e0"/> - <name>wd0</name> - <rank>2</rank> - <consumer id="0x80ba040"> - <geom ref="0x80bc100"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - </consumer> - </geom> - </class> - <class id="0x8073fc0"> - <name>PC98-class</name> - <geom id="0x80bc180"> - <class ref="0x8073fc0"/> - <name>wd0</name> - <rank>2</rank> - <config> - <frontstuff>8704</frontstuff> - </config> - <consumer id="0x80ba080"> - <geom ref="0x80bc180"/> - <provider ref="0x80bc080"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc280"> - <geom ref="0x80bc180"/> - <mode>r0w0e0</mode> - <name>wd0s1</name> - <config> - <index>0</index> - <length>1626533888</length> - <seclength>3176824</seclength> - <offset>69632</offset> - <secoffset>136</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8073fe0"> - <name>SUNLABEL-class</name> - </class> - <class id="0x80740c0"> - <name>MBREXT-class</name> - </class> - <class id="0x80740a0"> - <name>MBR-class</name> - </class> - <class id="0x8074100"> - <name>BSD-class</name> - <geom id="0x80bc480"> - <class ref="0x8074100"/> - <name>wd0s1</name> - <rank>3</rank> - <config> - <labeloffset>512</labeloffset> - <frontstuff>8192</frontstuff> - </config> - <consumer id="0x80ba100"> - <geom ref="0x80bc480"/> - <provider ref="0x80bc280"/> - <mode>r0w0e0</mode> - <config> - </config> - </consumer> - <provider id="0x80bc880"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1f</name> - <config> - <index>5</index> - <length>1390673920</length> - <seclength>2716160</seclength> - <offset>235929600</offset> - <secoffset>460800</secoffset> - </config> - </provider> - <provider id="0x80bc800"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1e</name> - <config> - <index>4</index> - <length>52428800</length> - <seclength>102400</seclength> - <offset>183500800</offset> - <secoffset>358400</secoffset> - </config> - </provider> - <provider id="0x80bc780"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1c</name> - <config> - <index>2</index> - <length>1626603520</length> - <seclength>3176960</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - <provider id="0x80bc700"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1b</name> - <config> - <index>1</index> - <length>104857600</length> - <seclength>204800</seclength> - <offset>78643200</offset> - <secoffset>153600</secoffset> - </config> - </provider> - <provider id="0x80bc680"> - <geom ref="0x80bc480"/> - <mode>r0w0e0</mode> - <name>wd0s1a</name> - <config> - <index>0</index> - <length>78643200</length> - <seclength>153600</seclength> - <offset>0</offset> - <secoffset>0</secoffset> - </config> - </provider> - </geom> - </class> - <class id="0x8074000"> - <name>SIMDISK-class</name> - <geom id="0x80bc000"> - <class ref="0x8074000"/> - <name>wd0</name> - <rank>1</rank> - <provider id="0x80bc080"> - <geom ref="0x80bc000"/> - <mode>r0w0e0</mode> - <name>wd0</name> - </provider> - </geom> - </class> -</mesh> diff --git a/sbin/geom/core/tests/Data/Makefile b/sbin/geom/core/tests/Data/Makefile deleted file mode 100644 index 33d7aa6..0000000 --- a/sbin/geom/core/tests/Data/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -FILES+= disk.alpha.da0.xml -FILES+= disk.alpha2.da0.xml -FILES+= disk.apple.xml -FILES+= disk.beast.da0.xml -FILES+= disk.critter.ad0.xml -FILES+= disk.empty.flp.xml -FILES+= disk.far.ad0.xml -FILES+= disk.flat.da1.xml -FILES+= disk.kern.flp.xml -FILES+= disk.msdos.ext.xml -FILES+= disk.msdos.flp.xml -FILES+= disk.pc98.wdc0.xml -FILES+= disk.sun.da0.xml -FILES+= disk.sun.da1.xml -FILES+= disk.typo.ad0.xml - -FILESDIR= ${TESTSBASE}/sbin/geom/core/Data - -.include <bsd.prog.mk> diff --git a/sbin/geom/core/tests/Data/disk.alpha.da0.xml b/sbin/geom/core/tests/Data/disk.alpha.da0.xml deleted file mode 100644 index 670fcc3..0000000 --- a/sbin/geom/core/tests/Data/disk.alpha.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <FreeBSD>$FreeBSD$</FreeBSD> - <comment> - Yet an alpha disklabel. - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <fwsectors>0</fwsectors> - <fwheads>0</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 574556820400000057444947544c202000000000000000000000000000000000 - 0000000000000000000200003f000000ff000000b2080000c13e00002eae2102 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682a22908000020000000200000008007000000000000040000 - 07081600c05f20000080070000000000010000002eae21020000000000000000 - 000000000000000000000000000000000000000000a00000c0df270000040000 - 070818006e2ef901c07f28000004000007081600000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0e0000000000000001000000000000000000000000000000c51a45ca2ad1dba8 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.alpha2.da0.xml b/sbin/geom/core/tests/Data/disk.alpha2.da0.xml deleted file mode 100644 index 5b341b1..0000000 --- a/sbin/geom/core/tests/Data/disk.alpha2.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <FreeBSD>$FreeBSD$</FreeBSD> - <comment> - alpha label which O'brien says blows up libdisk - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <fwsectors>0</fwsectors> - <fwheads>0</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5745568204000000000000000000000000000000000000000000000000000000 - 0000000000000000000200003f000000ff00000009020000c13e0000c9b67f00 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568219cf0300002000000020000043bc0000c13e000000000000 - 08000000fc867c0004fb00000000000008000000c934020000827d0000000000 - 0100000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000005a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a5a - 9800000000000000020000000000000000000000000000007a13ad55a1c382b0 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.apple.xml b/sbin/geom/core/tests/Data/disk.apple.xml deleted file mode 100644 index ecdd523..0000000 --- a/sbin/geom/core/tests/Data/disk.apple.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <FreeBSD>$FreeBSD$</FreeBSD> - <sectorsize>512</sectorsize> - <mediasize>366530560</mediasize> - <fwsectors>0</fwsectors> - <fwheads>0</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - 45520200000aec68000100010000000000010000004000120001000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 504d00000000000300000060000aec084d61634f530000000000000000000000 - 000000000000000000000000000000004170706c655f48465300000000000000 - 0000000000000000000000000000000000000000000aec08000000b700000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>1024</offset> - <hexdata> - 504d000000000003000000010000003f4170706c650000000000000000000000 - 000000000000000000000000000000004170706c655f706172746974696f6e5f - 6d617000000000000000000000000000000000000000003f0000003700000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>1536</offset> - <hexdata> - 504d00000000000300000040000000204d6163696e746f736800000000000000 - 000000000000000000000000000000004170706c655f44726976657234330000 - 0000000000000000000000000000000000000000000000200000007f00000000 - 000023ee0000000000000000000000000000000000007c083638303030000000 - 0000000000000000000106000000000000000001000700000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.beast.da0.xml b/sbin/geom/core/tests/Data/disk.beast.da0.xml deleted file mode 100644 index 96ad5f7..0000000 --- a/sbin/geom/core/tests/Data/disk.beast.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - alpha BSD label from beast.freebsd.org - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <fwsectors>0</fwsectors> - <fwheads>0</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 5745568204000000646130000000000000000000000000000000000000000000 - 0000000000000000000200003f000000ff0000000f020000c13e000000338100 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682594e08000020000000200000002079000000000000040000 - 0708100000130800002079000000000001000000003381000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0f0000000000000001000000000000000000000000000000fc8c1983a904da83 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.critter.ad0.xml b/sbin/geom/core/tests/Data/disk.critter.ad0.xml deleted file mode 100644 index 9e93b24..0000000 --- a/sbin/geom/core/tests/Data/disk.critter.ad0.xml +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - This image contains the MBR and disklabel sectors from my Asus M1300 - laptop. - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <sector> - <offset>0</offset> - <hexdata> - fc31c08ec08ed88ed0bc007cbe1a7cbf1a06b9e601f3a4e9008a31f6bbbe07b1 - 04382f74087f7885f6757489de80c310e2ef85f67502cd1880fa80720b8a3675 - 0480c68038f272028a1489e78a74018b4c02bb007c80feff753283f9ff752d51 - 53bbaa55b441cd13722081fb55aa751af6c10174155b666a0066ff740806536a - 016a1089e6b80042eb055b59b80102cd1389fc720f81bffe0155aa750cffe3be - bc06eb11bed406eb0cbef306eb07bb0700b40ecd10ac84c075f4ebfe496e7661 - 6c696420706172746974696f6e207461626c65004572726f72206c6f6164696e - 67206f7065726174696e672073797374656d004d697373696e67206f70657261 - 74696e672073797374656d000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008001 - 0100a50fffff3f00000041295402000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>32768</offset> - <hexdata> - 5745568205000000616430733100000000000000000000000000000000000000 - 0000000000000000000200003f0000001000000067970000f003000041295402 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000574556824fa608000020000000200000000020003f00000000040000 - 07081600000020003f0020000000000001000000412954023f00000000000000 - 00000000418984003fa0cf01000400000708160000a00f003f00400000040000 - 07081600000080003fa04f000004000007081600000060003fa0cf0000040000 - 070816000000a0003fa02f010004000007081600000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>64512</offset> - <hexdata> - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>1073806336</offset> - <hexdata> - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - </hexdata> - </sector> - <sector> - <offset>1598094336</offset> - <hexdata> - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - 4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f4f - </hexdata> - </sector> - <sector> - <offset>2147548160</offset> - <hexdata> - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>2671836160</offset> - <hexdata> - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffff00000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.empty.flp.xml b/sbin/geom/core/tests/Data/disk.empty.flp.xml deleted file mode 100644 index 88c603a..0000000 --- a/sbin/geom/core/tests/Data/disk.empty.flp.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - An empty floppy disk - </comment> - <sectorsize>512</sectorsize> - <mediasize>1474560</mediasize> - <fwsectors>18</fwsectors> - <fwheads>2</fwheads> - <fwcylinders>80</fwcylinders> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.far.ad0.xml b/sbin/geom/core/tests/Data/disk.far.ad0.xml deleted file mode 100644 index 0a8d3ca..0000000 --- a/sbin/geom/core/tests/Data/disk.far.ad0.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - A Windows laptop. - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <sector> - <offset>0</offset> - <hexdata> - 33c08ed0bc007cfb5007501ffcbe1b7cbf1b065057b9e501f3a4cbbebe07b104 - 382c7c09751583c610e2f5cd188b148bee83c610497416382c74f6be10074eac - 3c0074fabb0700b40ecd10ebf2894625968a4604b4063c0e7411b40b3c0c7405 - 3ac4752b40c64625067524bbaa5550b441cd1358721681fb55aa7510f6c10174 - 0b8ae0885624c706a106eb1e886604bf0a00b801028bdc33c983ff057f038b4e - 25034e02cd137229be4607813efe7d55aa745a83ef057fda85f67583be2707eb - 8a9891529903460813560ae812005aebd54f74e433c0cd13ebb8000080093521 - 5633f656565250065351be1000568bf45052b800428a5624cd135a588d641072 - 0a4075014280c702e2f7f85ec3eb74496e76616c696420706172746974696f6e - 207461626c65004572726f72206c6f6164696e67206f7065726174696e672073 - 797374656d004d697373696e67206f7065726174696e672073797374656d0000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000008bfc1e578bf5cb00000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 0100a05304263f00000092d80800805401260befbf730cd90800340a88000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.flat.da1.xml b/sbin/geom/core/tests/Data/disk.flat.da1.xml deleted file mode 100644 index 2302a7c..0000000 --- a/sbin/geom/core/tests/Data/disk.flat.da1.xml +++ /dev/null @@ -1,97 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - This image contains an interesting setup: there is an MBR+BSD - but also another BSD at sector one which is valid but bogus. - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <fwsectors>0</fwsectors> - <fwheads>0</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - fc31c08ec08ed88ed0bc007cbe1a7cbf1a06b9e601f3a4e9008a31f6bbbe07b1 - 04382f74087f7885f6757489de80c310e2ef85f67502cd1880fa80720b8a3675 - 0480c68038f272028a1489e78a74018b4c02bb007c80feff753283f9ff752d51 - 53bbaa55b441cd13722081fb55aa751af6c10174155b666a0066ff740806536a - 016a1089e6b80042eb055b59b80102cd1389fc720f81bffe0155aa750cffe3be - bc06eb11bed406eb0cbef306eb07bb0700b40ecd10ac84c075f4ebfe496e7661 - 6c696420706172746974696f6e207461626c65004572726f72206c6f6164696e - 67206f7065726174696e672073797374656d004d697373696e67206f70657261 - 74696e672073797374656d000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008001 - 0100a5feffff3f0000003a612302000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 5745568204000000534541474154452053543331383433360000000000000000 - 000000000000000000020000000800000100000072440000000800000004fb00 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682e29908000020000000200000002001000000000000040000 - 07081000000008000020010000000000010000000004fb000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000e0f100002009000004000007081000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>32256</offset> - <hexdata> - eb1b9090161f666a005150065331c088f0506a1089e5e8c7008d6610cbfc31c9 - 8ec18ed98ed1bc007c89e6bf0007fec5f3a5beee7d80fa80722cb601e86700b9 - 0100bebe8db601807c04a57507e319f60480751483c610fec680fe0572e949e3 - e1be8b7deb5231d289160009b610e83500bb00908b770a01debf00b0b900ac29 - f1f3a429f930c0f3aae80300e98113fae464a80275fab0d1e664e464a80275fa - b0dfe660fbc3bb008c8b44088b4c0a0ee853ff732abe867de81c00be907de816 - 0030e4cd16c70672043412ea0000ffffbb0700b40ecd10ac84c075f4b401f9c3 - 52b408cd1388f55a72f580e13f74edfa668b460852660fb6d96631d266f7f388 - eb88d54330d266f7f388d75a663dff030000fb774486c4c0c80208e8409188fe - 28e08a660238e0720288e0bf0500c45e0450b402cd135b730a4f741c30e4cd13 - 93ebeb0fb6c30146087303ff460ad0e3005e052846027788c32ef6069908800f - 8479ffbbaa5552b441cd135a0f826fff81fb55aa0f8564fff6c1010f845dff89 - eeb442cd13c35265616400426f6f7400206572726f720d0a0080909090909090 - 9090909090909090909090909090909090909090909090909090909090900000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000080000100a5ffffff0000000050c3000055aa - </hexdata> - </sector> - <sector> - <offset>32768</offset> - <hexdata> - 5745568204000000646131733100000000000000000000000000000000000000 - 0000000000000000000200003f000000ff000000b8080000c13e00003a612302 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568233c408000020000000200000000000000000000000000000 - 0000000000800c003f800c0000000000010000003a6123023f00000000000000 - 000000000000000000000000000000000000000000800c003f00000000040000 - 07081600000020003f00190000040000070816003a61ea013f00390000040000 - 0708160000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.kern.flp.xml b/sbin/geom/core/tests/Data/disk.kern.flp.xml deleted file mode 100644 index 6640c48..0000000 --- a/sbin/geom/core/tests/Data/disk.kern.flp.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - A FreeBSD kern.flp image. - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <sector> - <offset>0</offset> - <hexdata> - eb1b9090161f666a005150065331c088f0506a1089e5e8c7008d6610cbfc31c9 - 8ec18ed98ed1bc007c89e6bf0007fec5f3a5beee7d80fa80722cb601e86700b9 - 0100bebe8db601807c04a57507e319f60480751483c610fec680fe0572e949e3 - e1be8b7deb5231d289160009b610e83500bb00908b770a01debf00b0b900ac29 - f1f3a429f930c0f3aae80300e98113fae464a80275fab0d1e664e464a80275fa - b0dfe660fbc3bb008c8b44088b4c0a0ee853ff732abe867de81c00be907de816 - 0030e4cd16c70672043412ea0000ffffbb0700b40ecd10ac84c075f4b401f9c3 - 52b408cd1388f55a72f580e13f74edfa668b460852660fb6d96631d266f7f388 - eb88d54330d266f7f388d75a663dff030000fb774486c4c0c80208e8409188fe - 28e08a660238e0720288e0bf0500c45e0450b402cd135b730a4f741c30e4cd13 - 93ebeb0fb6c30146087303ff460ad0e3005e052846027788c32ef6069908800f - 8479ffbbaa5552b441cd135a0f826fff81fb55aa0f8564fff6c1010f845dff89 - eeb442cd13c35265616400426f6f7400206572726f720d0a0080909090909090 - 9090909090909090909090909090909090909090909090909090909090900000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000080000100a5ffffff0000000050c3000055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 5745568200000000666431343430000000000000000000000000000000000000 - 00000000000000000002000012000000020000005000000024000000400b0000 - 00000000000000002c0101000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682286903000020000000200000400b00000000000000020000 - 00080000400b0000000000000002000000080000400b00000000000000020000 - 0708060000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.msdos.ext.xml b/sbin/geom/core/tests/Data/disk.msdos.ext.xml deleted file mode 100644 index 868a88f7..0000000 --- a/sbin/geom/core/tests/Data/disk.msdos.ext.xml +++ /dev/null @@ -1,534 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - A MSDOS 6.22 disk with maximal number of extended partitions. - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <sector> - <offset>0</offset> - <hexdata> - fa33c08ed0bc007c8bf45007501ffbfcbf0006b90001f2a5ea1d060000bebe07 - b304803c80740e803c00751c83c610fecb75efcd188b148b4c028bee83c610fe - cb741a803c0074f4be8b06ac3c00740b56bb0700b40ecd105eebf0ebfebf0500 - bb007cb8010257cd135f730c33c0cd134f75edbea306ebd3bec206bffe7d813d - 55aa75c78bf5ea007c0000496e76616c696420706172746974696f6e20746162 - 6c65004572726f72206c6f6164696e67206f7065726174696e67207379737465 - 6d004d697373696e67206f7065726174696e672073797374656d000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000008001 - 010006fe7f043f00000086fa3f000000410505fe7f38c5fa3f0034bf0c000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>2146798080</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410501fe7f053f000000823e00000000410605fe7f06c13e0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2155023360</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410601fe7f063f000000823e00000000410705fe7f07827d0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2163248640</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410701fe7f073f000000823e00000000410805fe7f0843bc0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2171473920</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410801fe7f083f000000823e00000000410905fe7f0904fb0000c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2179699200</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410901fe7f093f000000823e00000000410a05fe7f0ac5390100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2187924480</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410a01fe7f0a3f000000823e00000000410b05fe7f0b86780100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2196149760</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410b01fe7f0b3f000000823e00000000410c05fe7f0c47b70100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2204375040</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410c01fe7f0c3f000000823e00000000410d05fe7f0d08f60100c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2212600320</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410d01fe7f0d3f000000823e00000000410e05fe7f0ec9340200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2220825600</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410e01fe7f0e3f000000823e00000000410f05fe7f0f8a730200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2229050880</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 410f01fe7f0f3f000000823e00000000411005fe7f104bb20200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2237276160</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411001fe7f103f000000823e00000000411105fe7f110cf10200c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2245501440</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411101fe7f113f000000823e00000000411205fe7f12cd2f0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2253726720</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411201fe7f123f000000823e00000000411305fe7f138e6e0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2261952000</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411301fe7f133f000000823e00000000411405fe7f144fad0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2270177280</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411401fe7f143f000000823e00000000411505fe7f1510ec0300c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2278402560</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411501fe7f153f000000823e00000000411605fe7f16d12a0400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2286627840</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411601fe7f163f000000823e00000000411705fe7f1792690400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2294853120</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411701fe7f173f000000823e00000000411805fe7f1853a80400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2303078400</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411801fe7f183f000000823e00000000411905fe7f1914e70400c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2311303680</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411901fe7f193f000000823e00000000411a05fe7f1ad5250500c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2319528960</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411a01fe7f1a3f000000823e00000000411b05fe7f1b96640500c13e00000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>2327754240</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000001 - 411b01fe7f1b3f000000823e0000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000000000000000000055aa - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.msdos.flp.xml b/sbin/geom/core/tests/Data/disk.msdos.flp.xml deleted file mode 100644 index d057d1a..0000000 --- a/sbin/geom/core/tests/Data/disk.msdos.flp.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - A MSDOS floppy image. - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <sector> - <offset>0</offset> - <hexdata> - eb3c904d53444f53352e30000201010002e000400bf009001200020000000000 - 0000000000002911053b114e4f204e414d45202020204641543132202020fa33 - c08ed0bc007c1607bb780036c5371e561653bf3e7cb90b00fcf3a4061fc645fe - 0f8b0e187c884df9894702c7073e7cfbcd13727933c03906137c74088b0e137c - 890e207ca0107cf726167c03061c7c13161e7c03060e7c83d200a3507c891652 - 7ca3497c89164b7cb82000f726117c8b1e0b7c03c348f7f30106497c83164b7c - 00bb00058b16527ca1507ce89200721db001e8ac0072168bfbb90b00bee67df3 - a6750a8d7f20b90b00f3a67418be9e7de85f0033c0cd165e1f8f048f4402cd19 - 585858ebe88b471a48488a1e0d7c32fff7e30306497c13164b7cbb0007b90300 - 505251e83a0072d8b001e85400595a5872bb05010083d200031e0b7ce2e28a2e - 157c8a16247c8b1e497ca14b7cea00007000ac0ac07429b40ebb0700cd10ebf2 - 3b16187c7319f736187cfec288164f7c33d2f7361a7c8816257ca34d7cf8c3f9 - c3b4028b164d7cb106d2e60a364f7c8bca86e98a16247c8a36257ccd13c30d0a - 4e6f6e2d53797374656d206469736b206f72206469736b206572726f720d0a52 - 65706c61636520616e6420707265737320616e79206b6579207768656e207265 - 6164790d0a00494f2020202020205359534d53444f53202020535953000055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - f0ffff03400005600007800009a0000bc0000de0000f00011120011340011560 - 0117800119a0011bc0011de0011f000221200223400225600227800229a0022b - c0022de0022f000331200333400335600337800339a0033bc0033de0033f0004 - 41200443400445600447800449a0044bc0044de0044f000551f0ff5340055560 - 0557800559a0055bc0055de0055f000661200663400665600667800669a0066b - c0066de0066f000771200773400775600777800779a0077bc0077de0077f0008 - 81200883400885600887800889a0088bc0088de0088f00099120099340099560 - 0997800999a0099bc009ffef099f000aa1200aa3400aa5600aa7800aa9a00aab - c00aade00aaf000bb1200bb3400bb5600bb7800bb9a00bbbc00bbde00bbf000c - c1200cc3400cc5600cc7800cc9a00ccbc00ccde00ccf000dd1200dd3400dd560 - 0dd7800dd9a00ddbc00ddde00ddf000ee1200ee3400ee5600ee7800ee9a00eeb - c00eede00eef000ff1200ff3400ff5600ff7800ff9a00ffbc00ffde00fff0010 - 01211003411005611007f1ff09a1100bc1100de1100f01111121111341111561 - 1117811119a1111bc1111de1111f011221211223411225611227811229a1122b - c1122de1122f011331211333411335611337811339a1133bc1133de1133f0114 - 41211443411445611447811449a1144bc1144de1144f01155121155341155561 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.pc98.wdc0.xml b/sbin/geom/core/tests/Data/disk.pc98.wdc0.xml deleted file mode 100644 index 6bae97f..0000000 --- a/sbin/geom/core/tests/Data/disk.pc98.wdc0.xml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <FreeBSD>$FreeBSD$</FreeBSD> - <comment> - A PC98 disklabel from Warner - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <fwsectors>17</fwsectors> - <fwheads>8</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - e9fd009049504c310000001ea08405b48ecd1ba820742232dbb414cd1b721a80 - fb847515e896007303eb6b90b424bb0004b93012ba4001cd1bbb0001b484cd1b - b40633c933d2508cc82dc0038ec05833edcd1b7241b406ba010081c50008cd1b - 7234ba0400f7c300aa7403ba0200b406bb001c81c50008cd1b721b508bc5b104 - d3e88cc103c18bf058e815002e89360a002eff1e0800e80800b40ecd1bb90100 - cb56a0840532dbb414cd1b720e80fb8475092ec606d40000e802005ec3b4b0be - d000ba06001e0e1fcd1bb4b0cd1b1fc31e000000010000000000000000000000 - 000000000000000000000000000000000000000000000000000000000d0055aa - fa601e066800d81f33f6b51e813c8b46750e817c0204eb7507817c05b4007405 - 46e2e9eb6032ff8a5c040358f18d7c03be9a012e015c03b00cba6104eeb002ba - 3d05ee68009807b95b00f32ea4b9ff0f33f633d226ad02f402d0e2f8f6def6da - 268914b416b3c2e4f0a840750680cc2080cb048ac3ba3f04ee8ac4ba3d05eeb0 - 08ba6104ee071f612ec7060000eb0a2ec70602009090fbe966fec390e8ebffb9 - 21007402b1118bc1f6660702460612e5912ef66703f7660403c183d200c3fec2 - 26881605205926880e0a20c390909090905191b81100502ef6670291f7f126a3 - 0220599233d2f7f12680260420f02608060420ebc9000000000080010d0055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 94c4000000000100000001000000405b46726565425344000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>70144</offset> - <hexdata> - 5745568205000000776430733100000000000000000000000000000000000000 - 0000000000000000000200001100000008000000415b000088000000887a3000 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568295f208000020000000200000005802008800000000000000 - 0700000000200300885802000000000001000000007a30008800000000000000 - 0000000000000000000000000000000000000000009001008878050000000000 - 0700000000722900880807000000000007000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.sun.da0.xml b/sbin/geom/core/tests/Data/disk.sun.da0.xml deleted file mode 100644 index 826581f..0000000 --- a/sbin/geom/core/tests/Data/disk.sun.da0.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - A Solaris 8 disklabel - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <fwsectors>0</fwsectors> - <fwheads>0</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - 49424d2d444459532d5433363935304d2d533936482063796c20313439373020 - 616c742032206864203132207365632033393900000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000100000000000000000008000200000003000100050000000000000000 - 0000000000000000000000080000003f000000000000000000000000600ddeee - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000027103a7c00000000000000013a7a0002000c018f00000000000000dc - 002d96c000000000001012b0000000000445b1c8000000000000000000000000 - 00000000000000000000000000000000000000000000034c04080858dabe5ec8 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.sun.da1.xml b/sbin/geom/core/tests/Data/disk.sun.da1.xml deleted file mode 100644 index 0aac8e5..0000000 --- a/sbin/geom/core/tests/Data/disk.sun.da1.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - A Solaris 8 disklabel - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <fwsectors>0</fwsectors> - <fwheads>0</fwheads> - <fwcylinders>0</fwcylinders> - <sector> - <offset>0</offset> - <hexdata> - 53554e3138472063796c203735303620616c7420322068642031392073656320 - 3234380000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000170686b00000000000008000200000003000100050000000800010000 - 00000007000000040000000800000000000000000000000000000000600ddeee - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000001c201d5400000000000000011d520002001300f80000000000000000 - 0007d6480000006d0020113000000000021bad5000000b4e014b873800000000 - 000000000000022b00400ff8000005a600400ff80000092100280c48dabe971e - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Data/disk.typo.ad0.xml b/sbin/geom/core/tests/Data/disk.typo.ad0.xml deleted file mode 100644 index 56383ab..0000000 --- a/sbin/geom/core/tests/Data/disk.typo.ad0.xml +++ /dev/null @@ -1,219 +0,0 @@ -<?xml version="1.0"?> -<DISKIMAGE> - <comment> - $FreeBSD$ - A multislice FreeBSD disk - </comment> - <sectorsize>512</sectorsize> - <mediasize>0</mediasize> - <sector> - <offset>0</offset> - <hexdata> - fc31c08ec08ed88ed0bc007cbd000a89efb108f3abfe45f252bb000689eeb802 - 02e82e015ae9008af686bbfd20750484d278048a96bafd885600e8fc0052bbc2 - 0731d2886ffc0fa396bbfd731c8a07bf0f08b103f2ae7411b10df2ae750481c7 - 0d008a0d01cfe8c1004280c31073d4582c7f3a067504720548740e30c004b088 - 86b8fdbfb207e8a100be0308e8ad008a96b9fd4ee8880030e4cd1a89d703bebc - fdb401cd16751330e4cd1a39fa72f28a86b9fdeb15b007e88e0030e4cd1688e0 - 3c1c74eb2c3b3c0477eb980fa3460c73e48886b9fdbe000a8a1489f33c049c74 - 0ac0e00405be0793c6078053f686bbfd407509bb0006b80103e856005e9d7507 - 8a96b8fd80ea30bb007cb80102e8420072a381bffe0155aa759be81c00ffe3b0 - 46e82400b03100d0eb170fab560cbe0008e8ebff89fee80300be0d08aca88075 - 05e80400ebf6247f53bb0700b40ecd105bc38a74018b4c025689e780feff7540 - 83f9ff753bf686bbfd8074345153bbaa5550b441cd1358720e81fb55aa7508f6 - c101740380cc405b59f6c4407412666a0066ff740806536a006a1089e6864402 - cd1389fc5ec39090909090909090909001014472697665200000808fb6008001 - 0100a5ef7f9f3f000000c1f95f00000041a0a5efffff00fa5f0050e29f0000ff - ffffa5efffff50dcff0050dcff000000000000000000000000000000000055aa - </hexdata> - </sector> - <sector> - <offset>512</offset> - <hexdata> - 2020a00a44656661756c743aa00d8a00050f010406070b0c0e6383a5a6a9b70e - 141312141d1c1b2124282e3439556e6b6e6f77ee444fd357696e646f7773204e - d457696e646f77f3554e49d84c696e75f8467265654253c44f70656e4253c44e - 65744253c44253442f4fd3000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>32768</offset> - <hexdata> - 5745568205000000616430733100000000000000000000000000000000000000 - 0000000000000000000200003f000000f0000000180a0000103b000080295402 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000005745568204c108000020000000200000002003003f00000000000000 - 0700000000a00f003f2003000000000001000000c1f95f003f00000000000000 - 000000000000000000000000000000000000000000a00f003fc0120000000000 - 07000000c1993d003f6022000000000007000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>64512</offset> - <hexdata> - 0000007c0000010002000400f8ff0000000400f8000000000000000000000004 - 0000004000000008000000000010007e00800000070000fe1f00000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>104922112</offset> - <hexdata> - 3310f30d0350fbf66f44ebd906c9963d46b2bf609bb753131e7c24cf9ed194ce - a59117b612772b207ddcb753df72456f98d0cac567f60526c7b9308afd87e657 - dd45b3d1eb075b6820aa6ea5a0f10511f65a257f0d7d89d88e189bef43786ff5 - a0316511a7a07168f2ef001e71fbc56dd8ddc7866c4856dc979742be22f4badd - e1fcba7aebe4b5f4bb8b0c89e84de59f0ba48d7a8b00bb1797fc057e3d3d8058 - 4b1987ac49b74bed74cb4985850d5be64e8188d40ad0323165b355c512a91523 - 5d5211eeb021c754f552b160f9a73c4c5e59370163cf531ca0382cc462f9ac9d - 35612380f7a5d9d5e3bde129ef6fab02347088025d0937fb6c56dc68c283ce9d - 1cfc5b3c7ad1f52faeae05188386cb57cb88c5dccaa2db17a09420ae7d9f9d6e - 058370711f445cff4d4543ee9f0c3054400116304018f68d9c08d05b04680162 - 23172b8b1775157790fe5e5100c530e3377d383a0080468b0125e87e8d7dee5f - 46030a238dc8a0000cb4eafc6ad4735f2c16d1642e3834aefbb5bfc25fcc0062 - 3a89410ab88839e3ed151cd6bc2b5704c5db4c9fc39662bd3a41347212c664be - 04684e551c0a0362bb3139a460a7c8d178c349a47d724b7d456606b2f47a8d99 - d4af7998148ed93443a828ece96cdb7eb158a21189ed1527bdad7b18b74f168b - d01fcfde994977174e41ad8f6ea19fac8bb95e5d68643d0457d746cf32531639 - </hexdata> - </sector> - <sector> - <offset>629210112</offset> - <hexdata> - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>1153498112</offset> - <hexdata> - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>3220439552</offset> - <hexdata> - 5745568205000000616430733200000000000000000000000000000000000000 - 0000000000000000000200003f000000f0000000180a0000103b000080295402 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682fc1908000020000000200000000000000000000000000000 - 000000000000000000000000000000000000000050e29f0000fa5f0000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> - <sector> - <offset>6440878080</offset> - <hexdata> - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a3c4120200a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a - 0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a687265663d22687474703a2f2f777777 - 2e706c6179626f7973746f72652e636f6d2f70626c696e6b2e6367693f616666 - 696c696174653d4d4f3130303030303034353426736b753d4249303130362220 - 7461726765743d225f626c616e6b22206f6e6d6f7573656f7665723d22706172 - 656e742e77696e646f772e7374617475733d27506c6179626f792053746f7265 - 273b2072657475726e2074727565223e3c494d47207372633d22687474703a2f - 2f61313833322e672e616b2e706c6179626f792e636f6d2f372f313833322f32 - 332f3939303232313437302f7777772e706c6179626f792e636f6d2f6d616761 - 7a696e652f63757272656e742f696d782f636f7665725f696e6465782e6a7067 - 2220616c69676e3d72696768742077696474683d223135302220686569676874 - </hexdata> - </sector> - <sector> - <offset>8585257472</offset> - <hexdata> - 5745568205000000616430733300000000000000000000000000000000000000 - 0000000000000000000200003f000000f000000055040000103b000050dcff00 - 0000000000000000100e01000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000057455682bcbd0800002000000020000000803e0050dcff0000040000 - 070816000000000000000000000000000000000050dcff0050dcff0000000000 - 00000000505cc100505c3e010010000007049f00000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - </hexdata> - </sector> -</DISKIMAGE> diff --git a/sbin/geom/core/tests/Makefile b/sbin/geom/core/tests/Makefile deleted file mode 100644 index eaaa997..0000000 --- a/sbin/geom/core/tests/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -TESTSDIR= ${TESTSBASE}/sbin/geom/core - -TAP_TESTS_SH+= run_test - -SUBDIR+= ConfCmp -SUBDIR+= Data -SUBDIR+= MdLoad -SUBDIR+= Ref - -.include <bsd.test.mk> diff --git a/sbin/geom/core/tests/MdLoad/Makefile b/sbin/geom/core/tests/MdLoad/Makefile deleted file mode 100644 index 27cf94b..0000000 --- a/sbin/geom/core/tests/MdLoad/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# $FreeBSD$ - -BINDIR= ${TESTSBASE}/sbin/geom/core/MdLoad - -PROG= MdLoad - -DPADD= ${LIBSBUF} ${LIBBSDXML} -LDADD= -lsbuf -lbsdxml - -MAN= - -WARNS?= 4 - -check: .PHONY -check: ${PROG} - ./${PROG} md34 ../Data/disk.critter.ad0.xml - -.include <bsd.prog.mk> diff --git a/sbin/geom/core/tests/MdLoad/MdLoad.c b/sbin/geom/core/tests/MdLoad/MdLoad.c deleted file mode 100644 index a7238aaa..0000000 --- a/sbin/geom/core/tests/MdLoad/MdLoad.c +++ /dev/null @@ -1,275 +0,0 @@ -/*- - * Copyright (c) 2003 Poul-Henning Kamp - * Copyright (c) 2002 Networks Associates Technology, Inc. - * All rights reserved. - * - * This software was developed for the FreeBSD Project by Poul-Henning Kamp - * and NAI Labs, the Security Research Division of Network Associates, Inc. - * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the - * DARPA CHATS research program. - * - * 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. - * 3. The names of the authors may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * 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. - * - * $FreeBSD$ - */ - -#include <sys/types.h> -#include <sys/mman.h> -#include <sys/queue.h> -#include <sys/sbuf.h> -#include <sys/stat.h> -#include <ctype.h> -#include <err.h> -#include <errno.h> -#include <fcntl.h> -#include <paths.h> -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <unistd.h> -#include <string.h> - -#include <bsdxml.h> - -struct sector { - LIST_ENTRY(sector) sectors; - off_t offset; - unsigned char *data; -}; - -struct simdisk_softc { - int sectorsize; - off_t mediasize; - off_t lastsector; - LIST_HEAD(,sector) sectors; - struct sbuf *sbuf; - struct sector *sp; - u_int fwsectors; - u_int fwheads; - u_int fwcylinders; -}; - -static void -g_simdisk_insertsector(struct simdisk_softc *sc, struct sector *dsp) -{ - struct sector *dsp2, *dsp3; - - if (sc->lastsector < dsp->offset) - sc->lastsector = dsp->offset; - if (LIST_EMPTY(&sc->sectors)) { - LIST_INSERT_HEAD(&sc->sectors, dsp, sectors); - return; - } - dsp3 = NULL; - LIST_FOREACH(dsp2, &sc->sectors, sectors) { - dsp3 = dsp2; - if (dsp2->offset > dsp->offset) { - LIST_INSERT_BEFORE(dsp2, dsp, sectors); - return; - } - } - LIST_INSERT_AFTER(dsp3, dsp, sectors); -} - -static void -startElement(void *userData, const char *name, const char **atts __unused) -{ - struct simdisk_softc *sc; - - sc = userData; - if (!strcasecmp(name, "sector")) { - sc->sp = calloc(1, sizeof(*sc->sp) + sc->sectorsize); - sc->sp->data = (u_char *)(sc->sp + 1); - } - sbuf_clear(sc->sbuf); -} - -static void -endElement(void *userData, const char *name) -{ - struct simdisk_softc *sc; - char *p; - u_char *q; - int i, j; - off_t o; - - sc = userData; - - if (!strcasecmp(name, "comment")) { - sbuf_clear(sc->sbuf); - return; - } - sbuf_finish(sc->sbuf); - if (!strcasecmp(name, "sectorsize")) { - sc->sectorsize = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on sectorsize"); - } else if (!strcasecmp(name, "mediasize")) { - o = strtoull(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on mediasize"); - if (o > 0) - sc->mediasize = o; - } else if (!strcasecmp(name, "fwsectors")) { - sc->fwsectors = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on fwsectors"); - } else if (!strcasecmp(name, "fwheads")) { - sc->fwheads = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on fwheads"); - } else if (!strcasecmp(name, "fwcylinders")) { - sc->fwcylinders = strtoul(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on fwcylinders"); - } else if (!strcasecmp(name, "offset")) { - sc->sp->offset= strtoull(sbuf_data(sc->sbuf), &p, 0); - if (*p != '\0') - errx(1, "strtoul croaked on offset"); - } else if (!strcasecmp(name, "fill")) { - j = strtoul(sbuf_data(sc->sbuf), NULL, 16); - memset(sc->sp->data, j, sc->sectorsize); - } else if (!strcasecmp(name, "hexdata")) { - q = sc->sp->data; - p = sbuf_data(sc->sbuf); - for (i = 0; i < sc->sectorsize; i++) { - if (!isxdigit(*p)) - errx(1, "I croaked on hexdata %d:(%02x)", i, *p); - if (isdigit(*p)) - j = (*p - '0') << 4; - else - j = (tolower(*p) - 'a' + 10) << 4; - p++; - if (!isxdigit(*p)) - errx(1, "I croaked on hexdata %d:(%02x)", i, *p); - if (isdigit(*p)) - j |= *p - '0'; - else - j |= tolower(*p) - 'a' + 10; - p++; - *q++ = j; - } - } else if (!strcasecmp(name, "sector")) { - g_simdisk_insertsector(sc, sc->sp); - sc->sp = NULL; - } else if (!strcasecmp(name, "diskimage")) { - } else if (!strcasecmp(name, "FreeBSD")) { - } else { - printf("<%s>[[%s]]\n", name, sbuf_data(sc->sbuf)); - } - sbuf_clear(sc->sbuf); -} - -static void -characterData(void *userData, const XML_Char *s, int len) -{ - const char *b, *e; - struct simdisk_softc *sc; - - sc = userData; - b = s; - e = s + len - 1; - while (isspace(*b) && b < e) - b++; - while (isspace(*e) && e > b) - e--; - if (e != b || !isspace(*b)) - sbuf_bcat(sc->sbuf, b, e - b + 1); -} - -static struct simdisk_softc * -g_simdisk_xml_load(const char *file) -{ - XML_Parser parser = XML_ParserCreate(NULL); - struct stat st; - char *p; - struct simdisk_softc *sc; - int fd, i; - - sc = calloc(1, sizeof *sc); - sc->sbuf = sbuf_new_auto(); - LIST_INIT(&sc->sectors); - XML_SetUserData(parser, sc); - XML_SetElementHandler(parser, startElement, endElement); - XML_SetCharacterDataHandler(parser, characterData); - - fd = open(file, O_RDONLY); - if (fd < 0) - err(1, "%s: opening %s failed", __func__, file); - if (fstat(fd, &st) == -1) - err(1, "%s: fstat'ing %s failed", __func__, file); - p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); - if (p == MAP_FAILED) - err(1, "%s: mmap'ing %s failed", __func__, file); - i = XML_Parse(parser, p, st.st_size, 1); - if (i != 1) - errx(1, "XML_Parse complains: return %d", i); - munmap(p, st.st_size); - close(fd); - XML_ParserFree(parser); - return (sc); -} - -int -main(int argc, char **argv) -{ - struct simdisk_softc *sc; - char buf[BUFSIZ]; - int error, fd; - struct sector *dsp; - - if (argc != 3) - errx(1, "Usage: %s mddevice xmlfile", argv[0]); - - sc = g_simdisk_xml_load(argv[2]); - if (sc->mediasize == 0) - sc->mediasize = sc->lastsector + sc->sectorsize * 10; - if (sc->sectorsize == 0) - sc->sectorsize = 512; - sprintf(buf, "mdconfig -a -t malloc -s %jd -S %d", - (intmax_t)sc->mediasize / sc->sectorsize, sc->sectorsize); - if (sc->fwsectors && sc->fwheads) - sprintf(buf + strlen(buf), " -x %d -y %d", - sc->fwsectors, sc->fwheads); - sprintf(buf + strlen(buf), " -u %s", argv[1]); - error = system(buf); - if (error) - err(1, "calling `%s` failed; status=%d", buf, error); - fd = open(argv[1], O_RDWR); - if (fd < 0 && errno == ENOENT) { - sprintf(buf, "%s%s", _PATH_DEV, argv[1]); - fd = open(buf, O_RDWR); - } - if (fd < 0) - err(1, "Could not open %s", argv[1]); - LIST_FOREACH(dsp, &sc->sectors, sectors) { - lseek(fd, dsp->offset, SEEK_SET); - error = write(fd, dsp->data, sc->sectorsize); - if (error != sc->sectorsize) - err(1, "write sectordata failed"); - } - close(fd); - exit (0); -} diff --git a/sbin/geom/core/tests/Ref/Makefile b/sbin/geom/core/tests/Ref/Makefile deleted file mode 100644 index 582ea33..0000000 --- a/sbin/geom/core/tests/Ref/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# $FreeBSD$ - -FILES+= disk.alpha.da0.xml -FILES+= disk.alpha2.da0.xml -FILES+= disk.apple.xml -FILES+= disk.beast.da0.xml -FILES+= disk.critter.ad0.xml -FILES+= disk.empty.flp.xml -FILES+= disk.far.ad0.xml -FILES+= disk.flat.da1.xml -FILES+= disk.kern.flp.xml -FILES+= disk.msdos.ext.xml -FILES+= disk.msdos.flp.xml -FILES+= disk.pc98.wdc0.xml -FILES+= disk.sun.da0.xml -FILES+= disk.sun.da1.xml -FILES+= disk.typo.ad0.xml - -FILESDIR= ${TESTSBASE}/sbin/geom/core/Ref - -.include <bsd.prog.mk> diff --git a/sbin/geom/core/tests/Ref/disk.alpha.da0.xml b/sbin/geom/core/tests/Ref/disk.alpha.da0.xml deleted file mode 100644 index d2fcacb..0000000 --- a/sbin/geom/core/tests/Ref/disk.alpha.da0.xml +++ /dev/null @@ -1,6 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 0 0 -/dev/md34a 512 251658240 491520 0 0 -/dev/md34b 512 1086291968 2121664 0 0 -/dev/md34e 512 20971520 40960 0 0 -/dev/md34f 512 16951073792 33107566 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml b/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml deleted file mode 100644 index 0323eee..0000000 --- a/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml +++ /dev/null @@ -1,4 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 0 0 -/dev/md34a 512 24675840 48195 0 0 -/dev/md34b 512 4178442240 8161020 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.apple.xml b/sbin/geom/core/tests/Ref/disk.apple.xml deleted file mode 100644 index bec8403..0000000 --- a/sbin/geom/core/tests/Ref/disk.apple.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 366530560 715880 0 0 -/dev/md34s1 512 366481408 715784 0 0 -/dev/md34s2 512 32256 63 0 0 -/dev/md34s3 512 16384 32 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.beast.da0.xml b/sbin/geom/core/tests/Ref/disk.beast.da0.xml deleted file mode 100644 index a6c922c..0000000 --- a/sbin/geom/core/tests/Ref/disk.beast.da0.xml +++ /dev/null @@ -1,4 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 0 0 -/dev/md34a 512 4064280576 7938048 0 0 -/dev/md34b 512 270925824 529152 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.critter.ad0.xml b/sbin/geom/core/tests/Ref/disk.critter.ad0.xml deleted file mode 100644 index 7d83981..0000000 --- a/sbin/geom/core/tests/Ref/disk.critter.ad0.xml +++ /dev/null @@ -1,10 +0,0 @@ -$FreeBSD$ -/dev/md34 512 2671841280 5218440 0 0 -/dev/md34s1 512 20003848704 39070017 0 0 -/dev/md34s1a 512 1073741824 2097152 0 0 -/dev/md34s1b 512 1073741824 2097152 0 0 -/dev/md34s1d 512 4447175168 8685889 0 0 -/dev/md34s1e 512 524288000 1024000 0 0 -/dev/md34s1f 512 4294967296 8388608 0 0 -/dev/md34s1g 512 3221225472 6291456 0 0 -/dev/md34s1h 512 5368709120 10485760 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.empty.flp.xml b/sbin/geom/core/tests/Ref/disk.empty.flp.xml deleted file mode 100644 index d0a1b49..0000000 --- a/sbin/geom/core/tests/Ref/disk.empty.flp.xml +++ /dev/null @@ -1,2 +0,0 @@ -$FreeBSD$ -/dev/md34 512 1474560 2880 0 0 80 2 18 diff --git a/sbin/geom/core/tests/Ref/disk.far.ad0.xml b/sbin/geom/core/tests/Ref/disk.far.ad0.xml deleted file mode 100644 index c929d48..0000000 --- a/sbin/geom/core/tests/Ref/disk.far.ad0.xml +++ /dev/null @@ -1,4 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 0 0 -/dev/md34s1 512 296821760 579730 0 0 -/dev/md34s2 512 4564740096 8915508 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.flat.da1.xml b/sbin/geom/core/tests/Ref/disk.flat.da1.xml deleted file mode 100644 index 4a02fec..0000000 --- a/sbin/geom/core/tests/Ref/disk.flat.da1.xml +++ /dev/null @@ -1,10 +0,0 @@ -$FreeBSD$ -/dev/md34 512 37888 74 0 0 -/dev/md34a 512 37748736 73728 0 0 -/dev/md34b 512 268435456 524288 0 0 -/dev/md34h 512 8115978240 15851520 0 0 -/dev/md34s1 512 18367017984 35873082 0 0 -/dev/md34s1b 512 419430400 819200 0 0 -/dev/md34s1e 512 419430400 819200 0 0 -/dev/md34s1f 512 1073741824 2097152 0 0 -/dev/md34s1g 512 16454415360 32137530 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.kern.flp.xml b/sbin/geom/core/tests/Ref/disk.kern.flp.xml deleted file mode 100644 index d62c963..0000000 --- a/sbin/geom/core/tests/Ref/disk.kern.flp.xml +++ /dev/null @@ -1,4 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 0 0 -/dev/md34a 512 1474560 2880 0 0 -/dev/md34b 512 1474560 2880 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.msdos.ext.xml b/sbin/geom/core/tests/Ref/disk.msdos.ext.xml deleted file mode 100644 index 2820c46..0000000 --- a/sbin/geom/core/tests/Ref/disk.msdos.ext.xml +++ /dev/null @@ -1,27 +0,0 @@ -$FreeBSD$ -/dev/md34 512 2327759360 4546405 0 0 -/dev/md34s1 512 2146765824 4192902 0 0 -/dev/md34s10 512 8193024 16002 0 0 -/dev/md34s11 512 8193024 16002 0 0 -/dev/md34s12 512 8193024 16002 0 0 -/dev/md34s13 512 8193024 16002 0 0 -/dev/md34s14 512 8193024 16002 0 0 -/dev/md34s15 512 8193024 16002 0 0 -/dev/md34s16 512 8193024 16002 0 0 -/dev/md34s17 512 8193024 16002 0 0 -/dev/md34s18 512 8193024 16002 0 0 -/dev/md34s19 512 8193024 16002 0 0 -/dev/md34s2 512 427714560 835380 0 0 -/dev/md34s20 512 8193024 16002 0 0 -/dev/md34s21 512 8193024 16002 0 0 -/dev/md34s22 512 8193024 16002 0 0 -/dev/md34s23 512 8193024 16002 0 0 -/dev/md34s24 512 8193024 16002 0 0 -/dev/md34s25 512 8193024 16002 0 0 -/dev/md34s26 512 8193024 16002 0 0 -/dev/md34s27 512 8193024 16002 0 0 -/dev/md34s5 512 8193024 16002 0 0 -/dev/md34s6 512 8193024 16002 0 0 -/dev/md34s7 512 8193024 16002 0 0 -/dev/md34s8 512 8193024 16002 0 0 -/dev/md34s9 512 8193024 16002 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.msdos.flp.xml b/sbin/geom/core/tests/Ref/disk.msdos.flp.xml deleted file mode 100644 index 2b2b63e..0000000 --- a/sbin/geom/core/tests/Ref/disk.msdos.flp.xml +++ /dev/null @@ -1,2 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml b/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml deleted file mode 100644 index ea89ed2..0000000 --- a/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml +++ /dev/null @@ -1,7 +0,0 @@ -$FreeBSD$ -/dev/md34 512 75264 147 0 0 1 8 17 -/dev/md34s1 512 1626603520 3176960 23360 0 0 8 17 -/dev/md34s1a 512 78643200 153600 1129 0 0 8 17 -/dev/md34s1b 512 104857600 204800 1505 0 0 8 17 -/dev/md34s1e 512 52428800 102400 752 0 0 8 17 -/dev/md34s1f 512 1390673920 2716160 19971 0 0 8 17 diff --git a/sbin/geom/core/tests/Ref/disk.sun.da0.xml b/sbin/geom/core/tests/Ref/disk.sun.da0.xml deleted file mode 100644 index da6c0aa..0000000 --- a/sbin/geom/core/tests/Ref/disk.sun.da0.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 0 0 -/dev/md34a 512 1529708544 2987712 0 0 -/dev/md34b 512 539320320 1053360 0 0 -/dev/md34h 512 34629267456 67635288 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.sun.da1.xml b/sbin/geom/core/tests/Ref/disk.sun.da1.xml deleted file mode 100644 index b1fe169..0000000 --- a/sbin/geom/core/tests/Ref/disk.sun.da1.xml +++ /dev/null @@ -1,8 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 0 0 -/dev/md34a 512 262967296 513608 0 0 -/dev/md34b 512 1075994624 2101552 0 0 -/dev/md34d 512 11124240384 21727032 0 0 -/dev/md34f 512 2149576704 4198392 0 0 -/dev/md34g 512 2149576704 4198392 0 0 -/dev/md34h 512 1343787008 2624584 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.typo.ad0.xml b/sbin/geom/core/tests/Ref/disk.typo.ad0.xml deleted file mode 100644 index 0ff1773..0000000 --- a/sbin/geom/core/tests/Ref/disk.typo.ad0.xml +++ /dev/null @@ -1,11 +0,0 @@ -$FreeBSD$ -/dev/md34 512 8585262592 16768091 0 0 -/dev/md34s1 512 3220406784 6289857 0 0 -/dev/md34s1a 512 104857600 204800 0 0 -/dev/md34s1b 512 524288000 1024000 0 0 -/dev/md34s1e 512 524288000 1024000 0 0 -/dev/md34s1f 512 2066973184 4037057 0 0 -/dev/md34s2 512 5364817920 10478160 0 0 -/dev/md34s3 512 8585256960 16768080 0 0 -/dev/md34s3a 512 2097152000 4096000 0 0 -/dev/md34s3d 512 6488104960 12672080 0 0 diff --git a/sbin/geom/core/tests/run_test.sh b/sbin/geom/core/tests/run_test.sh deleted file mode 100644 index bc640e5..0000000 --- a/sbin/geom/core/tests/run_test.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -MD=34 -: ${TMPDIR=/tmp} -TMP=$TMPDIR/$$ - -# The testcases seem to have been broken when the geom_sim provider was removed -echo "# these tests need to be rewritten; they were broken in r113434" -echo "1..0 # SKIP" -exit 0 - -set -e - -# Start from the right directory so we can find all our data files. -testsdir=$(realpath $(dirname $0)) - -# Print the test header -set -- $testsdir/Data/disk.*.xml -echo "1..$#" -data_files="$@" - -trap "rm -f $TMP; mdconfig -d -u $MD" EXIT INT TERM - -set +e - -refdir=$(realpath $(mktemp -d Ref.XXXXXX)) -for f in $data_files; do - b=`basename $f` - mdconfig -d -u $MD - - i=0 - while [ $i -lt 2 -a -c /dev/md$MD ]; do - sleep 1 - : $(( i += 1 )) - done - if [ -c /dev/md$MD ] ; then - echo "Bail out!" - echo "/dev/md$MD is busy" - exit 1 - fi - if ! $testsdir/MdLoad/MdLoad md${MD} $f; then - echo "not ok - $b # MdLoad failed" - continue - fi - if [ ! -f $refdir/$b ]; then - if [ -f $testsdir/Ref/$b ] ; then - grep -v '\$FreeBSD.*\$' $testsdir/Ref/$b > $refdir/$b - else - diskinfo /dev/md${MD}* > $refdir/$b - continue - fi - fi - diskinfo /dev/md${MD}* | diff -u $refdir/$b - > $TMP - if [ $? -eq 0 ]; then - echo "ok - $b" - else - echo "not ok - $b" - sed 's/^/# /' $TMP - fi -done diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile index 83516c6..af5c9bd 100644 --- a/sbin/ggate/ggated/Makefile +++ b/sbin/ggate/ggated/Makefile @@ -6,7 +6,7 @@ PROG= ggated MAN= ggated.8 SRCS= ggated.c ggate.c -LIBADD= pthread util +LIBADD= pthread CFLAGS+= -I${.CURDIR}/../shared diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8 index 15b1792..dd6109a 100644 --- a/sbin/ggate/ggated/ggated.8 +++ b/sbin/ggate/ggated/ggated.8 @@ -37,7 +37,6 @@ .Op Fl v .Op Fl a Ar address .Op Fl p Ar port -.Op Fl F Ar pidfile .Op Fl R Ar rcvbuf .Op Fl S Ar sndbuf .Op Ar "exports file" @@ -68,10 +67,6 @@ Port on which .Nm listens for connections. Default is 3080. -.It Fl F Ar pidfile -PID file that -.Nm -uses. .It Fl R Ar rcvbuf Size of receive buffer to use. Default is 131072 (128kB). @@ -91,14 +86,6 @@ The format of an exports file is as follows: 1.2.3.0/24 RW /tmp/test.img hostname WO /tmp/image .Ed -.El -.Sh FILES -.Bl -tag -width ".Pa /var/run/ggated.pid" -compact -.It Pa /var/run/ggated.pid -The default location of the -.Nm -PID file. -.El .Sh EXIT STATUS Exit status is 0 on success, or 1 if the command fails. To get details about the failure, diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c index e234cb5..a340f01 100644 --- a/sbin/ggate/ggated/ggated.c +++ b/sbin/ggate/ggated/ggated.c @@ -26,34 +26,32 @@ * $FreeBSD$ */ +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <unistd.h> +#include <fcntl.h> +#include <pthread.h> #include <sys/param.h> -#include <sys/bio.h> -#include <sys/disk.h> -#include <sys/endian.h> -#include <sys/ioctl.h> #include <sys/queue.h> +#include <sys/endian.h> #include <sys/socket.h> +#include <sys/ioctl.h> #include <sys/stat.h> #include <sys/time.h> -#include <arpa/inet.h> +#include <sys/disk.h> +#include <sys/bio.h> #include <netinet/in.h> #include <netinet/tcp.h> +#include <arpa/inet.h> +#include <signal.h> #include <assert.h> #include <err.h> #include <errno.h> -#include <fcntl.h> -#include <libgen.h> -#include <libutil.h> -#include <paths.h> -#include <pthread.h> -#include <signal.h> -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> #include <string.h> +#include <libgen.h> #include <syslog.h> -#include <unistd.h> +#include <stdarg.h> #include "ggate.h" @@ -112,8 +110,8 @@ static void usage(void) { - fprintf(stderr, "usage: %s [-nv] [-a address] [-F pidfile] [-p port] " - "[-R rcvbuf] [-S sndbuf] [exports file]\n", getprogname()); + fprintf(stderr, "usage: %s [-nv] [-a address] [-p port] [-R rcvbuf] " + "[-S sndbuf] [exports file]\n", getprogname()); exit(EXIT_FAILURE); } @@ -948,18 +946,20 @@ huphandler(int sig __unused) int main(int argc, char *argv[]) { - const char *ggated_pidfile = _PATH_VARRUN "/ggated.pid"; - struct pidfh *pfh; struct sockaddr_in serv; struct sockaddr from; socklen_t fromlen; - pid_t otherpid; - int ch, sfd, tmpsfd; + int sfd, tmpsfd; unsigned port; bindaddr = htonl(INADDR_ANY); port = G_GATE_PORT; - while ((ch = getopt(argc, argv, "a:hnp:F:R:S:v")) != -1) { + for (;;) { + int ch; + + ch = getopt(argc, argv, "a:hnp:R:S:v"); + if (ch == -1) + break; switch (ch) { case 'a': bindaddr = g_gate_str2ip(optarg); @@ -968,9 +968,6 @@ main(int argc, char *argv[]) "Invalid IP/host name to bind to."); } break; - case 'F': - ggated_pidfile = optarg; - break; case 'n': nagle = 0; break; @@ -1007,23 +1004,12 @@ main(int argc, char *argv[]) exports_file = argv[0]; exports_get(); - pfh = pidfile_open(ggated_pidfile, 0600, &otherpid); - if (pfh == NULL) { - if (errno == EEXIST) { - errx(EXIT_FAILURE, "Daemon already running, pid: %jd.", - (intmax_t)otherpid); - } - err(EXIT_FAILURE, "Cannot open/create pidfile"); - } - if (!g_gate_verbose) { /* Run in daemon mode. */ if (daemon(0, 0) == -1) g_gate_xlog("Cannot daemonize: %s", strerror(errno)); } - pidfile_write(pfh); - signal(SIGCHLD, SIG_IGN); sfd = socket(AF_INET, SOCK_STREAM, 0); @@ -1060,6 +1046,5 @@ main(int argc, char *argv[]) close(tmpsfd); } close(sfd); - pidfile_remove(pfh); exit(EXIT_SUCCESS); } |
