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));
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
