1 files changed, 7 insertions, 3 deletions
diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index ad7ce9fc70..1130a391d4 100644
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -2423,12 +2423,16 @@ int kvm_arch_fixup_msi_route(struct kvm_irq_routing_entry *route,
                              uint64_t address, uint32_t data, PCIDevice *dev)
 {
     S390PCIBusDevice *pbdev;
-    uint32_t idx = data >> ZPCI_MSI_VEC_BITS;
     uint32_t vec = data & ZPCI_MSI_VEC_MASK;
 
-    pbdev = s390_pci_find_dev_by_idx(s390_get_phb(), idx);
+    if (!dev) {
+        DPRINTF("add_msi_route no pci device\n");
+        return -ENODEV;
+    }
+
+    pbdev = s390_pci_find_dev_by_target(s390_get_phb(), DEVICE(dev)->id);
     if (!pbdev) {
-        DPRINTF("add_msi_route no dev\n");
+        DPRINTF("add_msi_route no zpci device\n");
         return -ENODEV;
     }