diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-10-08 08:45:31 -0600 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2012-10-08 08:45:31 -0600 |
| commit | 3a4f2816fac1b0f9cc197bb2208ddf03dc7bc592 (patch) | |
| tree | c0987f7626feec5d5dcbab01de7042448f1f04c8 /hw/vfio_pci.c | |
| parent | 1a40313381262ebb5f30fb95d5550b674280f396 (diff) | |
| download | qemu-3a4f2816fac1b0f9cc197bb2208ddf03dc7bc592.zip qemu-3a4f2816fac1b0f9cc197bb2208ddf03dc7bc592.tar.gz qemu-3a4f2816fac1b0f9cc197bb2208ddf03dc7bc592.tar.bz2 | |
vfio-pci: Fix BAR->VFIODevice translation in
DO_UPCAST is supposed to translate from the first member of a struct to
that struct, not from arbitrary ones. And it (usually) breaks the build
when neglecting this rule. Use container_of to fix the build breakage
and likely also the runtime behavior.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
aw: runtime behavior is actually the same, but clearly misuse of DO_UPCAST
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'hw/vfio_pci.c')
| -rw-r--r-- | hw/vfio_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index 85b16bb..639371e 100644 --- a/hw/vfio_pci.c +++ b/hw/vfio_pci.c @@ -721,7 +721,7 @@ static void vfio_bar_write(void *opaque, target_phys_addr_t addr, * which access will service the interrupt, so we're potentially * getting quite a few host interrupts per guest interrupt. */ - vfio_eoi(DO_UPCAST(VFIODevice, bars[bar->nr], bar)); + vfio_eoi(container_of(bar, VFIODevice, bars[bar->nr])); } static uint64_t vfio_bar_read(void *opaque, @@ -761,7 +761,7 @@ static uint64_t vfio_bar_read(void *opaque, __func__, bar->nr, addr, size, data); /* Same as write above */ - vfio_eoi(DO_UPCAST(VFIODevice, bars[bar->nr], bar)); + vfio_eoi(container_of(bar, VFIODevice, bars[bar->nr])); return data; } |