mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
Merge remote-tracking branch 'origin/master' into pci
Conflicts: hw/virtio-pci.c
This commit is contained in:
commit
befeac45d4
283 changed files with 22871 additions and 8772 deletions
2
hw/msi.c
2
hw/msi.c
|
@ -155,7 +155,7 @@ int msi_init(struct PCIDevice *dev, uint8_t offset,
|
|||
pci_set_word(dev->wmask + msi_data_off(dev, msi64bit), 0xffff);
|
||||
|
||||
if (msi_per_vector_mask) {
|
||||
/* Make mask bits 0 to nr_vectors - 1 writeable. */
|
||||
/* Make mask bits 0 to nr_vectors - 1 writable. */
|
||||
pci_set_long(dev->wmask + msi_mask_off(dev, msi64bit),
|
||||
0xffffffff >> (PCI_MSI_VECTORS_MAX - nr_vectors));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue