Deleted Added
full compact
bhyverun.c (243327) bhyverun.c (243640)
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

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

52#include "acpi.h"
53#include "inout.h"
54#include "dbgport.h"
55#include "mem.h"
56#include "mevent.h"
57#include "mptbl.h"
58#include "pci_emul.h"
59#include "xmsr.h"
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

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

52#include "acpi.h"
53#include "inout.h"
54#include "dbgport.h"
55#include "mem.h"
56#include "mevent.h"
57#include "mptbl.h"
58#include "pci_emul.h"
59#include "xmsr.h"
60#include "instruction_emul.h"
61#include "ioapic.h"
62#include "spinup_ap.h"
63
64#define DEFAULT_GUEST_HZ 100
65#define DEFAULT_GUEST_TSLICE 200
66
67#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */
68

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

450
451static int
452vmexit_paging(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
453{
454 int err;
455 stats.vmexit_paging++;
456
457 err = emulate_mem(ctx, *pvcpu, vmexit->u.paging.gpa, vmexit->rip,
60#include "ioapic.h"
61#include "spinup_ap.h"
62
63#define DEFAULT_GUEST_HZ 100
64#define DEFAULT_GUEST_TSLICE 200
65
66#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */
67

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

449
450static int
451vmexit_paging(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
452{
453 int err;
454 stats.vmexit_paging++;
455
456 err = emulate_mem(ctx, *pvcpu, vmexit->u.paging.gpa, vmexit->rip,
458 vmexit->u.paging.cr3, vmexit->u.paging.rwx);
457 vmexit->u.paging.cr3, vmexit->u.paging.rwx,
458 &vmexit->u.paging.vie);
459
460 if (err) {
461 if (err == EINVAL) {
462 fprintf(stderr,
463 "Failed to emulate instruction at 0x%lx\n",
464 vmexit->rip);
465 } else if (err == ESRCH) {
466 fprintf(stderr, "Unhandled memory access to 0x%lx\n",

--- 305 unchanged lines hidden ---
459
460 if (err) {
461 if (err == EINVAL) {
462 fprintf(stderr,
463 "Failed to emulate instruction at 0x%lx\n",
464 vmexit->rip);
465 } else if (err == ESRCH) {
466 fprintf(stderr, "Unhandled memory access to 0x%lx\n",

--- 305 unchanged lines hidden ---