Deleted Added
full compact
vmrun.sh (284539) vmrun.sh (289001)
1#!/bin/sh
2#
3# Copyright (c) 2013 NetApp, Inc.
4# All rights reserved.
5#
6# Redistribution and use in source and binary forms, with or without
7# modification, are permitted provided that the following conditions
8# are met:

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

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

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

19# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
21# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25# SUCH DAMAGE.
26#
27# $FreeBSD: head/share/examples/bhyve/vmrun.sh 284539 2015-06-18 06:00:17Z neel $
27# $FreeBSD: head/share/examples/bhyve/vmrun.sh 289001 2015-10-08 02:28:22Z marcel $
28#
29
30LOADER=/usr/sbin/bhyveload
31BHYVECTL=/usr/sbin/bhyvectl
32FBSDRUN=/usr/sbin/bhyve
33
34DEFAULT_MEMSIZE=512M
35DEFAULT_CPUS=2

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

43 echo "*** $1"
44}
45
46usage() {
47 local msg=$1
48
49 echo "Usage: vmrun.sh [-ahi] [-c <CPUs>] [-C <console>] [-d <disk file>]"
50 echo " [-e <name=value>] [-g <gdbport> ] [-H <directory>]"
28#
29
30LOADER=/usr/sbin/bhyveload
31BHYVECTL=/usr/sbin/bhyvectl
32FBSDRUN=/usr/sbin/bhyve
33
34DEFAULT_MEMSIZE=512M
35DEFAULT_CPUS=2

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

43 echo "*** $1"
44}
45
46usage() {
47 local msg=$1
48
49 echo "Usage: vmrun.sh [-ahi] [-c <CPUs>] [-C <console>] [-d <disk file>]"
50 echo " [-e <name=value>] [-g <gdbport> ] [-H <directory>]"
51 echo " [-I <location of installation iso>] [-m <memsize>]"
52 echo " [-t ] "
51 echo " [-I <location of installation iso>] [-l <loader>]"
52 echo " [-m <memsize>] [-t <tapdev>] <vmname>"
53 echo ""
54 echo " -h: display this help message"
55 echo " -a: force memory mapped local APIC access"
56 echo " -c: number of virtual cpus (default is ${DEFAULT_CPUS})"
57 echo " -C: console device (default is ${DEFAULT_CONSOLE})"
58 echo " -d: virtio diskdev file (default is ${DEFAULT_VIRTIO_DISK})"
59 echo " -e: set FreeBSD loader environment variable"
60 echo " -g: listen for connection from kgdb at <gdbport>"
61 echo " -H: host filesystem to export to the loader"
62 echo " -i: force boot of the Installation CDROM image"
63 echo " -I: Installation CDROM image location (default is ${DEFAULT_ISOFILE})"
53 echo ""
54 echo " -h: display this help message"
55 echo " -a: force memory mapped local APIC access"
56 echo " -c: number of virtual cpus (default is ${DEFAULT_CPUS})"
57 echo " -C: console device (default is ${DEFAULT_CONSOLE})"
58 echo " -d: virtio diskdev file (default is ${DEFAULT_VIRTIO_DISK})"
59 echo " -e: set FreeBSD loader environment variable"
60 echo " -g: listen for connection from kgdb at <gdbport>"
61 echo " -H: host filesystem to export to the loader"
62 echo " -i: force boot of the Installation CDROM image"
63 echo " -I: Installation CDROM image location (default is ${DEFAULT_ISOFILE})"
64 echo " -l: the OS loader to use (default is /boot/userboot.so)"
64 echo " -m: memory size (default is ${DEFAULT_MEMSIZE})"
65 echo " -p: pass-through a host PCI device at bus/slot/func (e.g. 10/0/0)"
66 echo " -t: tap device for virtio-net (default is $DEFAULT_TAPDEV)"
67 echo ""
68 [ -n "$msg" ] && errmsg "$msg"
69 exit 1
70}
71

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

87cpus=${DEFAULT_CPUS}
88tap_total=0
89disk_total=0
90gdbport=0
91loader_opt=""
92bhyverun_opt="-H -A -P"
93pass_total=0
94
65 echo " -m: memory size (default is ${DEFAULT_MEMSIZE})"
66 echo " -p: pass-through a host PCI device at bus/slot/func (e.g. 10/0/0)"
67 echo " -t: tap device for virtio-net (default is $DEFAULT_TAPDEV)"
68 echo ""
69 [ -n "$msg" ] && errmsg "$msg"
70 exit 1
71}
72

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

88cpus=${DEFAULT_CPUS}
89tap_total=0
90disk_total=0
91gdbport=0
92loader_opt=""
93bhyverun_opt="-H -A -P"
94pass_total=0
95
95while getopts ac:C:d:e:g:hH:iI:m:p:t: c ; do
96while getopts ac:C:d:e:g:hH:iI:l:m:p:t: c ; do
96 case $c in
97 a)
98 bhyverun_opt="${bhyverun_opt} -a"
99 ;;
100 c)
101 cpus=${OPTARG}
102 ;;
103 C)

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

120 host_base=`realpath ${OPTARG}`
121 ;;
122 i)
123 force_install=1
124 ;;
125 I)
126 isofile=${OPTARG}
127 ;;
97 case $c in
98 a)
99 bhyverun_opt="${bhyverun_opt} -a"
100 ;;
101 c)
102 cpus=${OPTARG}
103 ;;
104 C)

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

121 host_base=`realpath ${OPTARG}`
122 ;;
123 i)
124 force_install=1
125 ;;
126 I)
127 isofile=${OPTARG}
128 ;;
129 l)
130 loader_opt="${loader_opt} -l ${OPTARG}"
131 ;;
128 m)
129 memsize=${OPTARG}
130 ;;
131 p)
132 eval "pass_dev${pass_total}=\"${OPTARG}\""
133 pass_total=$(($pass_total + 1))
134 ;;
135 t)

--- 168 unchanged lines hidden ---
132 m)
133 memsize=${OPTARG}
134 ;;
135 p)
136 eval "pass_dev${pass_total}=\"${OPTARG}\""
137 pass_total=$(($pass_total + 1))
138 ;;
139 t)

--- 168 unchanged lines hidden ---