Deleted Added
full compact
bhyverun.c (245678) bhyverun.c (245679)
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/bhyve/bhyverun.c 245678 2013-01-20 03:42:49Z neel $
26 * $FreeBSD: head/usr.sbin/bhyve/bhyverun.c 245679 2013-01-20 03:47:13Z neel $
27 */
28
29#include <sys/cdefs.h>
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/usr.sbin/bhyve/bhyverun.c 245678 2013-01-20 03:42:49Z neel $");
30__FBSDID("$FreeBSD: head/usr.sbin/bhyve/bhyverun.c 245679 2013-01-20 03:47:13Z neel $");
31
32#include <sys/types.h>
33#include <sys/mman.h>
34#include <sys/time.h>
35
36#include <machine/segments.h>
37
38#include <stdio.h>

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

126} mt_vmm_info[VM_MAXCPU];
127
128static void
129usage(int code)
130{
131
132 fprintf(stderr,
133 "Usage: %s [-aehABHIP][-g <gdb port>][-z <hz>][-s <pci>]"
31
32#include <sys/types.h>
33#include <sys/mman.h>
34#include <sys/time.h>
35
36#include <machine/segments.h>
37
38#include <stdio.h>

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

126} mt_vmm_info[VM_MAXCPU];
127
128static void
129usage(int code)
130{
131
132 fprintf(stderr,
133 "Usage: %s [-aehABHIP][-g <gdb port>][-z <hz>][-s <pci>]"
134 "[-S <pci>][-p pincpu][-n <pci>][-m lowmem][-M highmem] <vm>\n"
134 "[-S ][-p pincpu][-n ][-m lowmem][-M highmem]"
135 " <vmname>\n"
135 " -a: local apic is in XAPIC mode (default is X2APIC)\n"
136 " -A: create an ACPI table\n"
137 " -g: gdb port (default is %d and 0 means don't open)\n"
138 " -c: # cpus (default 1)\n"
139 " -p: pin vcpu 'n' to host cpu 'pincpu + n'\n"
140 " -B: inject breakpoint exception on vm entry\n"
141 " -H: vmexit from the guest on hlt\n"
142 " -I: present an ioapic to the guest\n"

--- 646 unchanged lines hidden ---
136 " -a: local apic is in XAPIC mode (default is X2APIC)\n"
137 " -A: create an ACPI table\n"
138 " -g: gdb port (default is %d and 0 means don't open)\n"
139 " -c: # cpus (default 1)\n"
140 " -p: pin vcpu 'n' to host cpu 'pincpu + n'\n"
141 " -B: inject breakpoint exception on vm entry\n"
142 " -H: vmexit from the guest on hlt\n"
143 " -I: present an ioapic to the guest\n"

--- 646 unchanged lines hidden ---