Deleted Added
full compact
vmm.c (272670) vmm.c (273174)
1/*-
2 * Copyright (c) 2011 NetApp, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2011 NetApp, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/sys/amd64/vmm/vmm.c 272670 2014-10-06 20:48:01Z neel $
26 * $FreeBSD: head/sys/amd64/vmm/vmm.c 273174 2014-10-16 18:04:43Z davide $
27 */
28
29#include <sys/cdefs.h>
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 272670 2014-10-06 20:48:01Z neel $");
30__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 273174 2014-10-16 18:04:43Z davide $");
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/sysctl.h>
37#include <sys/malloc.h>
38#include <sys/pcpu.h>

--- 1890 unchanged lines hidden (view full) ---

1929 * Work around this by scanning multiple environment variable
1930 * names instead of a single one - yuck!
1931 */
1932 const char *names[] = { "pptdevs", "pptdevs2", "pptdevs3", NULL };
1933
1934 /* set pptdevs="1/2/3 4/5/6 7/8/9 10/11/12" */
1935 found = 0;
1936 for (i = 0; names[i] != NULL && !found; i++) {
31
32#include <sys/param.h>
33#include <sys/systm.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/sysctl.h>
37#include <sys/malloc.h>
38#include <sys/pcpu.h>

--- 1890 unchanged lines hidden (view full) ---

1929 * Work around this by scanning multiple environment variable
1930 * names instead of a single one - yuck!
1931 */
1932 const char *names[] = { "pptdevs", "pptdevs2", "pptdevs3", NULL };
1933
1934 /* set pptdevs="1/2/3 4/5/6 7/8/9 10/11/12" */
1935 found = 0;
1936 for (i = 0; names[i] != NULL && !found; i++) {
1937 cp = val = getenv(names[i]);
1937 cp = val = kern_getenv(names[i]);
1938 while (cp != NULL && *cp != '\0') {
1939 if ((cp2 = strchr(cp, ' ')) != NULL)
1940 *cp2 = '\0';
1941
1942 n = sscanf(cp, "%d/%d/%d", &b, &s, &f);
1943 if (n == 3 && bus == b && slot == s && func == f) {
1944 found = 1;
1945 break;

--- 378 unchanged lines hidden ---
1938 while (cp != NULL && *cp != '\0') {
1939 if ((cp2 = strchr(cp, ' ')) != NULL)
1940 *cp2 = '\0';
1941
1942 n = sscanf(cp, "%d/%d/%d", &b, &s, &f);
1943 if (n == 3 && bus == b && slot == s && func == f) {
1944 found = 1;
1945 break;

--- 378 unchanged lines hidden ---