| bhyveload.c (248477) | bhyveload.c (256072) |
|---|---|
| 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/usr.sbin/bhyveload/bhyveload.c 248477 2013-03-18 22:38:30Z neel $ | 26 * $FreeBSD: head/usr.sbin/bhyveload/bhyveload.c 256072 2013-10-05 21:22:35Z neel $ |
| 27 */ 28 29/*- 30 * Copyright (c) 2011 Google, Inc. 31 * All rights reserved. 32 * 33 * Redistribution and use in source and binary forms, with or without 34 * modification, are permitted provided that the following conditions --- 11 unchanged lines hidden (view full) --- 46 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 47 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 48 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 49 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 50 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 51 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 52 * SUCH DAMAGE. 53 * | 27 */ 28 29/*- 30 * Copyright (c) 2011 Google, Inc. 31 * All rights reserved. 32 * 33 * Redistribution and use in source and binary forms, with or without 34 * modification, are permitted provided that the following conditions --- 11 unchanged lines hidden (view full) --- 46 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 47 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 48 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 49 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 50 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 51 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 52 * SUCH DAMAGE. 53 * |
| 54 * $FreeBSD: head/usr.sbin/bhyveload/bhyveload.c 248477 2013-03-18 22:38:30Z neel $ | 54 * $FreeBSD: head/usr.sbin/bhyveload/bhyveload.c 256072 2013-10-05 21:22:35Z neel $ |
| 55 */ 56 57#include <sys/cdefs.h> | 55 */ 56 57#include <sys/cdefs.h> |
| 58__FBSDID("$FreeBSD: head/usr.sbin/bhyveload/bhyveload.c 248477 2013-03-18 22:38:30Z neel $"); | 58__FBSDID("$FreeBSD: head/usr.sbin/bhyveload/bhyveload.c 256072 2013-10-05 21:22:35Z neel $"); |
| 59 60#include <sys/ioctl.h> 61#include <sys/stat.h> 62#include <sys/disk.h> 63 64#include <machine/specialreg.h> 65#include <machine/vmm.h> 66 --- 420 unchanged lines hidden (view full) --- 487 tcsetattr(0, TCSAFLUSH, &oldterm); 488 exit(v); 489} 490 491static void 492cb_getmem(void *arg, uint64_t *ret_lowmem, uint64_t *ret_highmem) 493{ 494 | 59 60#include <sys/ioctl.h> 61#include <sys/stat.h> 62#include <sys/disk.h> 63 64#include <machine/specialreg.h> 65#include <machine/vmm.h> 66 --- 420 unchanged lines hidden (view full) --- 487 tcsetattr(0, TCSAFLUSH, &oldterm); 488 exit(v); 489} 490 491static void 492cb_getmem(void *arg, uint64_t *ret_lowmem, uint64_t *ret_highmem) 493{ 494 |
| 495 vm_get_memory_seg(ctx, 0, ret_lowmem); 496 vm_get_memory_seg(ctx, 4 * GB, ret_highmem); | 495 vm_get_memory_seg(ctx, 0, ret_lowmem, NULL); 496 vm_get_memory_seg(ctx, 4 * GB, ret_highmem, NULL); |
| 497} 498 499static const char * 500cb_getenv(void *arg, int num) 501{ 502 int max; 503 504 static const char * var[] = { --- 135 unchanged lines hidden --- | 497} 498 499static const char * 500cb_getenv(void *arg, int num) 501{ 502 int max; 503 504 static const char * var[] = { --- 135 unchanged lines hidden --- |