svn commit: r293412 - stable/10/usr.sbin/bhyve

[Marcelo Araujo]

Author: araujo
Date: Fri Jan  8 03:02:19 2016
New Revision: 293412
URL: https://svnweb.freebsd.org/changeset/base/293412

Log:
  MFC: r292982
  
  Remove unused variable after r292981 to unbreak the build.
  
  MFC: r292981
  
  Clean up unused-but-set-variable spotted by gcc-4.9.
  
  Reviewed by:	ngie
  Approved by:	rodrigc (mentor)
  Sponsored by:	gandi.net
  Differential Revision:	https://reviews.freebsd.org/D4773

Modified:
  stable/10/usr.sbin/bhyve/bhyverun.c

Modified: stable/10/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- stable/10/usr.sbin/bhyve/bhyverun.c	Fri Jan  8 02:59:56 2016	(r293411)
+++ stable/10/usr.sbin/bhyve/bhyverun.c	Fri Jan  8 03:02:19 2016	(r293412)
@@ -307,14 +307,13 @@ static int
 vmexit_inout(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
 {
 	int error;
-	int bytes, port, in, out, string;
+	int bytes, port, in, out;
 	int vcpu;
 
 	vcpu = *pvcpu;
 
 	port = vme->u.inout.port;
 	bytes = vme->u.inout.bytes;
-	string = vme->u.inout.string;
 	in = vme->u.inout.in;
 	out = !in;
 
@@ -596,7 +595,7 @@ static vmexit_handler_t handler[VM_EXITC
 static void
 vm_loop(struct vmctx *ctx, int vcpu, uint64_t startrip)
 {
-	int error, rc, prevcpu;
+	int error, rc;
 	enum vm_exitcode exitcode;
 	cpuset_t active_cpus;
 
@@ -617,8 +616,6 @@ vm_loop(struct vmctx *ctx, int vcpu, uin
 		if (error != 0)
 			break;
 
-		prevcpu = vcpu;
-
 		exitcode = vmexit[vcpu].exitcode;
 		if (exitcode >= VM_EXITCODE_MAX || handler[exitcode] == NULL) {
 			fprintf(stderr, "vm_loop: unexpected exitcode 0x%x\n",