Deleted Added
full compact
bhyverun.c (257729) bhyverun.c (258075)
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 257729 2013-11-06 00:25:17Z grehan $
26 * $FreeBSD: head/usr.sbin/bhyve/bhyverun.c 258075 2013-11-12 22:51:03Z neel $
27 */
28
29#include <sys/cdefs.h>
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/usr.sbin/bhyve/bhyverun.c 257729 2013-11-06 00:25:17Z grehan $");
30__FBSDID("$FreeBSD: head/usr.sbin/bhyve/bhyverun.c 258075 2013-11-12 22:51:03Z 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>

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

56#include "dbgport.h"
57#include "legacy_irq.h"
58#include "mem.h"
59#include "mevent.h"
60#include "mptbl.h"
61#include "pci_emul.h"
62#include "pci_lpc.h"
63#include "xmsr.h"
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>

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

56#include "dbgport.h"
57#include "legacy_irq.h"
58#include "mem.h"
59#include "mevent.h"
60#include "mptbl.h"
61#include "pci_emul.h"
62#include "pci_lpc.h"
63#include "xmsr.h"
64#include "ioapic.h"
65#include "spinup_ap.h"
66#include "rtc.h"
67
68#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */
69
70#define VMEXIT_SWITCH 0 /* force vcpu switch in mux mode */
71#define VMEXIT_CONTINUE 1 /* continue from next instruction */
72#define VMEXIT_RESTART 2 /* restart current instruction */

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

658 rtc_init(ctx);
659
660 /*
661 * Exit if a device emulation finds an error in it's initilization
662 */
663 if (init_pci(ctx) != 0)
664 exit(1);
665
64#include "spinup_ap.h"
65#include "rtc.h"
66
67#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */
68
69#define VMEXIT_SWITCH 0 /* force vcpu switch in mux mode */
70#define VMEXIT_CONTINUE 1 /* continue from next instruction */
71#define VMEXIT_RESTART 2 /* restart current instruction */

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

657 rtc_init(ctx);
658
659 /*
660 * Exit if a device emulation finds an error in it's initilization
661 */
662 if (init_pci(ctx) != 0)
663 exit(1);
664
666 ioapic_init(0);
667
668 if (gdb_port != 0)
669 init_dbgport(gdb_port);
670
671 if (bvmcons)
672 init_bvmcons();
673
674 error = vm_get_register(ctx, BSP, VM_REG_GUEST_RIP, &rip);
675 assert(error == 0);

--- 28 unchanged lines hidden ---
665 if (gdb_port != 0)
666 init_dbgport(gdb_port);
667
668 if (bvmcons)
669 init_bvmcons();
670
671 error = vm_get_register(ctx, BSP, VM_REG_GUEST_RIP, &rip);
672 assert(error == 0);

--- 28 unchanged lines hidden ---