From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WinMc-0002PZ-Q0 for qemu-devel@nongnu.org; Fri, 09 May 2014 12:09:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WinMa-0003Li-GL for qemu-devel@nongnu.org; Fri, 09 May 2014 12:09:34 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48105) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WinMa-0003LA-9H for qemu-devel@nongnu.org; Fri, 09 May 2014 12:09:32 -0400 From: Peter Maydell Date: Fri, 9 May 2014 16:56:04 +0100 Message-Id: <1399650964-21067-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1399650964-21067-1-git-send-email-peter.maydell@linaro.org> References: <1399650964-21067-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH v2 4/4] arm11scu: Use qom_private to mark private fields List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , patches@linaro.org Mark the arm11scu private fields as qom_private. Signed-off-by: Peter Maydell --- hw/misc/arm11scu.c | 2 ++ include/hw/misc/arm11scu.h | 14 ++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/misc/arm11scu.c b/hw/misc/arm11scu.c index a791675..d8d5b2b 100644 --- a/hw/misc/arm11scu.c +++ b/hw/misc/arm11scu.c @@ -8,6 +8,8 @@ * This code is licensed under the GPL. */ +#define IMPLEMENTING_ARM11_SCU + #include "hw/misc/arm11scu.h" static uint64_t mpcore_scu_read(void *opaque, hwaddr offset, diff --git a/include/hw/misc/arm11scu.h b/include/hw/misc/arm11scu.h index 5ad0f3d..4de1eb1 100644 --- a/include/hw/misc/arm11scu.h +++ b/include/hw/misc/arm11scu.h @@ -16,14 +16,20 @@ #define TYPE_ARM11_SCU "arm11-scu" #define ARM11_SCU(obj) OBJECT_CHECK(ARM11SCUState, (obj), TYPE_ARM11_SCU) +#ifdef IMPLEMENTING_ARM11_SCU +#define qom_private +#else +#define qom_private QEMU_PRIVATE_ATTR +#endif + typedef struct ARM11SCUState { /*< private >*/ - SysBusDevice parent_obj; + qom_private SysBusDevice parent_obj; /*< public >*/ - uint32_t control; - uint32_t num_cpu; - MemoryRegion iomem; + qom_private uint32_t control; + qom_private uint32_t num_cpu; + qom_private MemoryRegion iomem; } ARM11SCUState; #endif -- 1.9.2