summaryrefslogtreecommitdiffstats
path: root/usr.sbin/vmd/vmm.c
diff options
context:
space:
mode:
authormlarkin <mlarkin@openbsd.org>2016-10-12 06:56:54 +0000
committermlarkin <mlarkin@openbsd.org>2016-10-12 06:56:54 +0000
commit0eab2803339ae9b5c24e750f95cae065f65704ad (patch)
tree70fa440316931cf2ddb5fb6a2829c6671cc35e9d /usr.sbin/vmd/vmm.c
parentmake -t uses the "fattr" syscall utimes(2) for its touch(1) built-in. (diff)
downloadwireguard-openbsd-0eab2803339ae9b5c24e750f95cae065f65704ad.tar.xz
wireguard-openbsd-0eab2803339ae9b5c24e750f95cae065f65704ad.zip
Allow 4 vio(4) interfaces in each VM. Also fix a bad interrupt assignment that
caused IRQ9 to be shared between the second disk device and the vio(4)s, which caused poor network performance. ok reyk, stefan
Diffstat (limited to 'usr.sbin/vmd/vmm.c')
-rw-r--r--usr.sbin/vmd/vmm.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/vmd/vmm.c b/usr.sbin/vmd/vmm.c
index b4ebbb70f38..bd874cdb75d 100644
--- a/usr.sbin/vmd/vmm.c
+++ b/usr.sbin/vmd/vmm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmm.c,v 1.49 2016/10/06 20:41:28 reyk Exp $ */
+/* $OpenBSD: vmm.c,v 1.50 2016/10/12 06:56:54 mlarkin Exp $ */
/*
* Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -1349,9 +1349,8 @@ vcpu_exit(struct vm_run_params *vrp)
__progname, vrp->vrp_exit_reason);
}
- /* XXX this may not be irq 9 all the time */
- if (vionet_process_rx())
- vcpu_assert_pic_irq(vrp->vrp_vm_id, vrp->vrp_vcpu_id, 9);
+ /* Process any pending traffic */
+ vionet_process_rx(vrp->vrp_vm_id);
vrp->vrp_continue = 1;