From owner-svn-src-head@FreeBSD.ORG  Sun Jul 20 16:34:35 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A4949D81;
 Sun, 20 Jul 2014 16:34:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 927D42413;
 Sun, 20 Jul 2014 16:34:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6KGYZ99041398;
 Sun, 20 Jul 2014 16:34:35 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6KGYZCD041397;
 Sun, 20 Jul 2014 16:34:35 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201407201634.s6KGYZCD041397@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sun, 20 Jul 2014 16:34:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r268922 - head/sys/amd64/vmm/intel
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Jul 2014 16:34:35 -0000

Author: neel
Date: Sun Jul 20 16:34:35 2014
New Revision: 268922
URL: http://svnweb.freebsd.org/changeset/base/268922

Log:
  Fix build without INVARIANTS defined by getting rid of unused variable 'exc'.
  
  Reported by:	adrian, stefanf

Modified:
  head/sys/amd64/vmm/intel/vmx.c

Modified: head/sys/amd64/vmm/intel/vmx.c
==============================================================================
--- head/sys/amd64/vmm/intel/vmx.c	Sun Jul 20 14:49:24 2014	(r268921)
+++ head/sys/amd64/vmm/intel/vmx.c	Sun Jul 20 16:34:35 2014	(r268922)
@@ -1211,7 +1211,6 @@ vmx_inject_nmi(struct vmx *vmx, int vcpu
 static void
 vmx_inject_interrupts(struct vmx *vmx, int vcpu, struct vlapic *vlapic)
 {
-	struct vm_exception exc;
 	int vector, need_nmi_exiting, extint_pending;
 	uint64_t rflags, entryinfo;
 	uint32_t gi, info;
@@ -1222,7 +1221,7 @@ vmx_inject_interrupts(struct vmx *vmx, i
 
 		info = vmcs_read(VMCS_ENTRY_INTR_INFO);
 		KASSERT((info & VMCS_INTR_VALID) == 0, ("%s: cannot inject "
-		     "pending exception %d: %#x", __func__, exc.vector, info));
+		     "pending exception: %#lx/%#x", __func__, entryinfo, info));
 
 		info = entryinfo;
 		vector = info & 0xff;