Date: Tue, 11 Mar 2014 22:12:12 +0000 (UTC) From: Tycho Nightingale <tychon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263054 - head/sys/amd64/vmm/io Message-ID: <201403112212.s2BMCC8G018135@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403112212.s2BMCC8G018135>