Deleted Added
full compact
bhyverun.c (267341) bhyverun.c (267393)
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: stable/10/usr.sbin/bhyve/bhyverun.c 267341 2014-06-10 21:20:37Z jhb $
26 * $FreeBSD: stable/10/usr.sbin/bhyve/bhyverun.c 267393 2014-06-12 13:13:15Z jhb $
27 */
28
29#include <sys/cdefs.h>
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: stable/10/usr.sbin/bhyve/bhyverun.c 267341 2014-06-10 21:20:37Z jhb $");
30__FBSDID("$FreeBSD: stable/10/usr.sbin/bhyve/bhyverun.c 267393 2014-06-12 13:13:15Z jhb $");
31
32#include <sys/types.h>
33#include <sys/mman.h>
34#include <sys/time.h>
35
36#include <machine/atomic.h>
37#include <machine/segments.h>
38

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

50
51#include <machine/vmm.h>
52#include <vmmapi.h>
53
54#include "bhyverun.h"
55#include "acpi.h"
56#include "inout.h"
57#include "dbgport.h"
31
32#include <sys/types.h>
33#include <sys/mman.h>
34#include <sys/time.h>
35
36#include <machine/atomic.h>
37#include <machine/segments.h>
38

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

50
51#include <machine/vmm.h>
52#include <vmmapi.h>
53
54#include "bhyverun.h"
55#include "acpi.h"
56#include "inout.h"
57#include "dbgport.h"
58#include "legacy_irq.h"
58#include "ioapic.h"
59#include "mem.h"
60#include "mevent.h"
61#include "mptbl.h"
62#include "pci_emul.h"
63#include "pci_lpc.h"
64#include "xmsr.h"
65#include "spinup_ap.h"
66#include "rtc.h"

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

690 err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
691 if (err) {
692 fprintf(stderr, "Unable to setup memory (%d)\n", err);
693 exit(1);
694 }
695
696 init_mem();
697 init_inout();
59#include "mem.h"
60#include "mevent.h"
61#include "mptbl.h"
62#include "pci_emul.h"
63#include "pci_lpc.h"
64#include "xmsr.h"
65#include "spinup_ap.h"
66#include "rtc.h"

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

690 err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
691 if (err) {
692 fprintf(stderr, "Unable to setup memory (%d)\n", err);
693 exit(1);
694 }
695
696 init_mem();
697 init_inout();
698 legacy_irq_init();
698 ioapic_init(ctx);
699
700 rtc_init(ctx);
701
702 /*
703 * Exit if a device emulation finds an error in it's initilization
704 */
705 if (init_pci(ctx) != 0)
706 exit(1);

--- 37 unchanged lines hidden ---
699
700 rtc_init(ctx);
701
702 /*
703 * Exit if a device emulation finds an error in it's initilization
704 */
705 if (init_pci(ctx) != 0)
706 exit(1);

--- 37 unchanged lines hidden ---