Author: neel
Date: Mon May 12 23:35:10 2014
New Revision: 265941
URL: http://svnweb.freebsd.org/changeset/base/265941
Log:
abort(3) the process in response to a VMEXIT_ABORT. This usually happens in
response to an unhandled VM exit or an unexpected error so a core is useful.
Remove unused macro VMEXIT_SWITCH.
Reviewed by: grehan
Modified:
head/usr.sbin/bhyve/bhyverun.c
Modified: head/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- head/usr.sbin/bhyve/bhyverun.c Mon May 12 22:33:22 2014
(r265940)
+++ head/usr.sbin/bhyve/bhyverun.c Mon May 12 23:35:10 2014
(r265941)
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
#define GUEST_NIO_PORT 0x488 /* guest upcalls via i/o port */
-#define VMEXIT_SWITCH 0 /* force vcpu switch in mux
mode */
#define VMEXIT_CONTINUE 1 /* continue from next
instruction */
#define VMEXIT_RESTART 2 /* restart current instruction
*/
#define VMEXIT_ABORT 3 /* abort the vm run loop */
@@ -272,12 +271,6 @@ fbsdrun_deletecpu(struct vmctx *ctx, int
}
static int
-vmexit_catch_inout(void)
-{
- return (VMEXIT_ABORT);
-}
-
-static int
vmexit_handle_notify(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu,
uint32_t eax)
{
@@ -330,7 +323,7 @@ vmexit_inout(struct vmctx *ctx, struct v
fprintf(stderr, "Unhandled %s%c 0x%04x\n",
in ? "in" : "out",
bytes == 1 ? 'b' : (bytes == 2 ? 'w' : 'l'), port);
- return (vmexit_catch_inout());
+ return (VMEXIT_ABORT);
}
}
@@ -575,6 +568,8 @@ vm_loop(struct vmctx *ctx, int vcpu, uin
assert(error == 0 || errno == EALREADY);
rip = vmexit[vcpu].rip + vmexit[vcpu].inst_length;
break;
+ case VMEXIT_ABORT:
+ abort();
default:
exit(1);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
