From: Jan Kiszka Date: Mon, 8 Oct 2012 14:45:31 +0000 (-0600) Subject: vfio-pci: Fix BAR->VFIODevice translation in X-Git-Tag: v1.3.0-rc0~300^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a4f2816fac1b0f9cc197bb2208ddf03dc7bc592;p=thirdparty%2Fqemu.git 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 aw: runtime behavior is actually the same, but clearly misuse of DO_UPCAST Signed-off-by: Alex Williamson --- diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index 85b16bbd234..639371e7a26 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; }