From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLApt-0006nO-Fw for qemu-devel@nongnu.org; Mon, 08 Oct 2012 06:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLApn-0005R2-IP for qemu-devel@nongnu.org; Mon, 08 Oct 2012 06:45:21 -0400 Received: from thoth.sbs.de ([192.35.17.2]:28512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLApn-0005OJ-8Y for qemu-devel@nongnu.org; Mon, 08 Oct 2012 06:45:15 -0400 Message-ID: <5072AEB8.8020706@siemens.com> Date: Mon, 08 Oct 2012 12:45:12 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] vfio: Fix BAR->VFIODevice translation in vfio_bar_read/write List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson , qemu-devel 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 --- 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 a1eeced..d36d50e 100644 --- a/hw/vfio_pci.c +++ b/hw/vfio_pci.c @@ -601,7 +601,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, @@ -641,7 +641,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; } -- 1.7.3.4