From owner-svn-src-head@FreeBSD.ORG  Tue Mar 11 22:12:13 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 00CA2D59;
 Tue, 11 Mar 2014 22:12:12 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id E2048A6D;
 Tue, 11 Mar 2014 22:12:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2BMCCac018136;
 Tue, 11 Mar 2014 22:12:12 GMT (envelope-from tychon@svn.freebsd.org)
Received: (from tychon@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2BMCC8G018135;
 Tue, 11 Mar 2014 22:12:12 GMT (envelope-from tychon@svn.freebsd.org)
Message-Id: <201403112212.s2BMCC8G018135@svn.freebsd.org>
From: Tycho Nightingale <tychon@FreeBSD.org>
Date: Tue, 11 Mar 2014 22:12:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263054 - head/sys/amd64/vmm/io
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.17
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: Tue, 11 Mar 2014 22:12:13 -0000

Author: tychon
Date: Tue Mar 11 22:12:12 2014
New Revision: 263054
URL: http://svnweb.freebsd.org/changeset/base/263054

Log:
  Don't try to return a vector to a caller that only cares if a vector
  is pending or not.
  
  Approved by:	neel (co-mentor)

Modified:
  head/sys/amd64/vmm/io/vlapic.c

Modified: head/sys/amd64/vmm/io/vlapic.c
==============================================================================
--- head/sys/amd64/vmm/io/vlapic.c	Tue Mar 11 22:11:45 2014	(r263053)
+++ head/sys/amd64/vmm/io/vlapic.c	Tue Mar 11 22:12:12 2014	(r263054)
@@ -1053,8 +1053,12 @@ vlapic_pending_intr(struct vlapic *vlapi
 	int	  	 idx, i, bitpos, vector;
 	uint32_t	*irrptr, val;
 
-	if (vlapic->extint_pending)
-		return (vatpic_pending_intr(vlapic->vm, vecptr));
+	if (vlapic->extint_pending) {
+		if (vecptr == NULL)
+			return (1);
+		else
+			return (vatpic_pending_intr(vlapic->vm, vecptr));
+	}
 
 	if (vlapic->ops.pending_intr)
 		return ((*vlapic->ops.pending_intr)(vlapic, vecptr));