Deleted Added
full compact
vmm.h (249879) vmm.h (255438)
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/include/vmm.h 249879 2013-04-25 04:56:43Z grehan $
26 * $FreeBSD: head/sys/amd64/include/vmm.h 255438 2013-09-10 03:48:18Z grehan $
27 */
28
29#ifndef _VMM_H_
30#define _VMM_H_
31
32#ifdef _KERNEL
33
34#define VM_MAX_NAMELEN 32

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

145
146void *vcpu_stats(struct vm *vm, int vcpu);
147void vm_interrupt_hostcpu(struct vm *vm, int vcpu);
148
149#endif /* KERNEL */
150
151#include <machine/vmm_instruction_emul.h>
152
27 */
28
29#ifndef _VMM_H_
30#define _VMM_H_
31
32#ifdef _KERNEL
33
34#define VM_MAX_NAMELEN 32

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

145
146void *vcpu_stats(struct vm *vm, int vcpu);
147void vm_interrupt_hostcpu(struct vm *vm, int vcpu);
148
149#endif /* KERNEL */
150
151#include <machine/vmm_instruction_emul.h>
152
153#define VM_MAXCPU 8 /* maximum virtual cpus */
153#define VM_MAXCPU 16 /* maximum virtual cpus */
154
155/*
156 * Identifiers for events that can be injected into the VM
157 */
158enum vm_event_type {
159 VM_EVENT_NONE,
160 VM_HW_INTR,
161 VM_NMI,

--- 130 unchanged lines hidden ---
154
155/*
156 * Identifiers for events that can be injected into the VM
157 */
158enum vm_event_type {
159 VM_EVENT_NONE,
160 VM_HW_INTR,
161 VM_NMI,

--- 130 unchanged lines hidden ---