diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2012-12-15 09:08:08 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2012-12-25 16:58:57 +0200 |
| commit | edde41b3c75bce779549bd2e1dba18eb7beb8267 (patch) | |
| tree | 62ac7686da47a3ea220ec820679305f47dd1012b /hw/msix.c | |
| parent | f77d2c3c841d1990d10ab147b770bf5673dbfacc (diff) | |
| parent | 17d4e9b1e2d6d32da51278a4165621af99bade02 (diff) | |
Imported Debian patch 1.3.0-2012.12-0ubuntu1~linaro1debian/1.3.0-2012.12-0ubuntu1_linaro1
Diffstat (limited to 'hw/msix.c')
| -rw-r--r-- | hw/msix.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -157,7 +157,7 @@ void msix_write_config(PCIDevice *dev, uint32_t addr, } } -static uint64_t msix_table_mmio_read(void *opaque, target_phys_addr_t addr, +static uint64_t msix_table_mmio_read(void *opaque, hwaddr addr, unsigned size) { PCIDevice *dev = opaque; @@ -165,7 +165,7 @@ static uint64_t msix_table_mmio_read(void *opaque, target_phys_addr_t addr, return pci_get_long(dev->msix_table + addr); } -static void msix_table_mmio_write(void *opaque, target_phys_addr_t addr, +static void msix_table_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { PCIDevice *dev = opaque; @@ -188,7 +188,7 @@ static const MemoryRegionOps msix_table_mmio_ops = { }, }; -static uint64_t msix_pba_mmio_read(void *opaque, target_phys_addr_t addr, +static uint64_t msix_pba_mmio_read(void *opaque, hwaddr addr, unsigned size) { PCIDevice *dev = opaque; @@ -366,7 +366,6 @@ void msix_uninit(PCIDevice *dev, MemoryRegion *table_bar, MemoryRegion *pba_bar) g_free(dev->msix_entry_used); dev->msix_entry_used = NULL; dev->cap_present &= ~QEMU_PCI_CAP_MSIX; - return; } void msix_uninit_exclusive_bar(PCIDevice *dev) |