D40991.id124553.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D40991.id124553.diff
View Options

	diff --git a/usr.sbin/bhyve/amd64/vmexit.c b/usr.sbin/bhyve/amd64/vmexit.c
	--- a/usr.sbin/bhyve/amd64/vmexit.c
	+++ b/usr.sbin/bhyve/amd64/vmexit.c
	@@ -56,6 +56,19 @@
	#include "vmexit.h"
	#include "xmsr.h"

	+void
	+vm_inject_fault(struct vcpu *vcpu, int vector, int errcode_valid,
	+ int errcode)
	+{
	+ int error, restart_instruction;
	+
	+ restart_instruction = 1;
	+
	+ error = vm_inject_exception(vcpu, vector, errcode_valid, errcode,
	+ restart_instruction);
	+ assert(error == 0);
	+}
	+
	static int
	vmexit_inout(struct vmctx ctx, struct vcpu vcpu, struct vm_run *vmrun)
	{
	diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
	--- a/usr.sbin/bhyve/bhyverun.c
	+++ b/usr.sbin/bhyve/bhyverun.c
	@@ -383,19 +383,6 @@
	}
	}

	-void
	-vm_inject_fault(struct vcpu *vcpu, int vector, int errcode_valid,
	- int errcode)
	-{
	- int error, restart_instruction;
	-
	- restart_instruction = 1;
	-
	- error = vm_inject_exception(vcpu, vector, errcode_valid, errcode,
	- restart_instruction);
	- assert(error == 0);
	-}
	-
	void *
	paddr_guest2host(struct vmctx *ctx, uintptr_t gaddr, size_t len)
	{