The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=dc6a00f2e4242521cb7099f95f87686b35b98231

commit dc6a00f2e4242521cb7099f95f87686b35b98231
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-04-03 17:43:35 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-04-10 15:17:56 +0000

    bhyve: Use vm_raise_msi() instead of vm_lapic_msi()
    
    No functional change intended.
    
    Reviewed by:    corvink, jhb
    MFC after:      2 weeks
    Sponsored by:   Innovate UK
    Differential Revision:  https://reviews.freebsd.org/D41740
---
 usr.sbin/bhyve/pci_emul.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index 2da97e0a522f..f2c9c4c9b6e7 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -1952,7 +1952,8 @@ pci_generate_msix(struct pci_devinst *pi, int index)
        mte = &pi->pi_msix.table[index];
        if ((mte->vector_control & PCIM_MSIX_VCTRL_MASK) == 0) {
                /* XXX Set PBA bit if interrupt is disabled */
-               vm_lapic_msi(pi->pi_vmctx, mte->addr, mte->msg_data);
+               vm_raise_msi(pi->pi_vmctx, mte->addr, mte->msg_data,
+                   pi->pi_bus, pi->pi_slot, pi->pi_func);
        }
 }
 
@@ -1961,8 +1962,9 @@ pci_generate_msi(struct pci_devinst *pi, int index)
 {
 
        if (pci_msi_enabled(pi) && index < pci_msi_maxmsgnum(pi)) {
-               vm_lapic_msi(pi->pi_vmctx, pi->pi_msi.addr,
-                            pi->pi_msi.msg_data + index);
+               vm_raise_msi(pi->pi_vmctx, pi->pi_msi.addr,
+                   pi->pi_msi.msg_data + index,
+                   pi->pi_bus, pi->pi_slot, pi->pi_func);
        }
 }
 

Reply via email to