ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

msi: Use msi/msix_present more consistently 

Replace some open-coded msi/msix_present checks.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Jan Kiszka 2012-06-04 16:53:48 +02:00 committed by Michael S. Tsirkin
parent 95d6580024
commit 44701ab71a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/msi.c
View File

@ -175,7 +175,7 @@ void msi_uninit(struct PCIDevice *dev)
uint16_t flags; uint16_t flags;
uint8_t cap_size; uint8_t cap_size;
if (!(dev->cap_present & QEMU_PCI_CAP_MSI)) { if (!msi_present(dev)) {
return; return;
} }
flags = pci_get_word(dev->config + msi_flags_off(dev)); flags = pci_get_word(dev->config + msi_flags_off(dev));

13
hw/msix.c
View File

@ -319,8 +319,9 @@ static void msix_free_irq_entries(PCIDevice *dev)
/* Clean up resources for the device. */ /* Clean up resources for the device. */
int msix_uninit(PCIDevice *dev, MemoryRegion *bar) int msix_uninit(PCIDevice *dev, MemoryRegion *bar)
{ {
if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) if (!msix_present(dev)) {
return 0; return 0;
}
pci_del_capability(dev, PCI_CAP_ID_MSIX, MSIX_CAP_LENGTH); pci_del_capability(dev, PCI_CAP_ID_MSIX, MSIX_CAP_LENGTH);
dev->msix_cap = 0; dev->msix_cap = 0;
msix_free_irq_entries(dev); msix_free_irq_entries(dev);
@ -339,7 +340,7 @@ void msix_save(PCIDevice *dev, QEMUFile *f)
{ {
unsigned n = dev->msix_entries_nr; unsigned n = dev->msix_entries_nr;
if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) { if (!msix_present(dev)) {
return; return;
} }
@ -353,7 +354,7 @@ void msix_load(PCIDevice *dev, QEMUFile *f)
unsigned n = dev->msix_entries_nr; unsigned n = dev->msix_entries_nr;
unsigned int vector; unsigned int vector;
if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) { if (!msix_present(dev)) {
return; return;
} }
@ -407,8 +408,9 @@ void msix_notify(PCIDevice *dev, unsigned vector)
void msix_reset(PCIDevice *dev) void msix_reset(PCIDevice *dev)
{ {
if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) if (!msix_present(dev)) {
return; return;
}
msix_free_irq_entries(dev); msix_free_irq_entries(dev);
dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] &= dev->config[dev->msix_cap + MSIX_CONTROL_OFFSET] &=
~dev->wmask[dev->msix_cap + MSIX_CONTROL_OFFSET]; ~dev->wmask[dev->msix_cap + MSIX_CONTROL_OFFSET];
@ -447,8 +449,9 @@ void msix_vector_unuse(PCIDevice *dev, unsigned vector)
void msix_unuse_all_vectors(PCIDevice *dev) void msix_unuse_all_vectors(PCIDevice *dev)
{ {
if (!(dev->cap_present & QEMU_PCI_CAP_MSIX)) if (!msix_present(dev)) {
return; return;
}
msix_free_irq_entries(dev); msix_free_irq_entries(dev);
} }