for (i = 0; i < vm->nr_vpes; i++) {
                        struct its_vpe *vpe = vm->vpes[i];
+                       struct irq_data *d = irq_get_irq_data(vpe->irq);
 
                        /* Map the VPE to the first possible CPU */
                        vpe->col_idx = cpumask_first(cpu_online_mask);
                        its_send_vmapp(its, vpe, true);
                        its_send_vinvall(its, vpe);
+                       irq_data_update_effective_affinity(d, cpumask_of(vpe->col_idx));
                }
        }
 
                its_vpe_db_proxy_move(vpe, from, cpu);
        }
 
+       irq_data_update_effective_affinity(d, cpumask_of(cpu));
+
        return IRQ_SET_MASK_OK_DONE;
 }
 
                its_send_vinvall(its, vpe);
        }
 
+       irq_data_update_effective_affinity(d, cpumask_of(vpe->col_idx));
+
        return 0;
 }