From patchwork Fri May 9 15:56:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 29913 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f72.google.com (mail-oa0-f72.google.com [209.85.219.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9433D20534 for ; Fri, 9 May 2014 15:56:11 +0000 (UTC) Received: by mail-oa0-f72.google.com with SMTP id l6sf20912525oag.3 for ; Fri, 09 May 2014 08:56:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=yN7hQ4vK4bHtrGNedZ6qbvrMU7OW1ErvKaAS9DpCseA=; b=fR7IRs5WNhBACcbs0sSJ2IfO9F+xWsSP25aAUhnaGpaSWtU7X+JKTs5+M5cO/fJIyz xgAfXrKnw1t6psbzHXtB6faohC1VCjDjAnt/fcwpF0d1ml/Wg4ZCiq7PkHt7iIm1GT5a vQP4eUhMMe8jREmFPPlpkdZMJDIFOLjxOoXL6okEYot1GAGBAQgouJkWweNGoPWh300r LWE4SISURqCbkx697PbYMuUh7hJBQxs6n5G5cc5HoN7aWSXQktVGTRnujgO0uV9DPjoe FR8ijInqwjRz4OJwR3MbGxdEJSl1PUWv8o4xj6RZLsKvchNbpN5mBb7ndvpkp4yeeR1S 3GbQ== X-Gm-Message-State: ALoCoQntXxeB3jylvYaPrSsgVnmwrbMj/mek44MaDU51eM8Y6DHoQ+K8uIpry7Az5Jrf6fOv6SKY X-Received: by 10.182.186.103 with SMTP id fj7mr5506693obc.9.1399650971195; Fri, 09 May 2014 08:56:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.118 with SMTP id f109ls399066qge.8.gmail; Fri, 09 May 2014 08:56:10 -0700 (PDT) X-Received: by 10.52.104.72 with SMTP id gc8mr1001509vdb.48.1399650970889; Fri, 09 May 2014 08:56:10 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id tb2si789657vdc.75.2014.05.09.08.56.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 09 May 2014 08:56:10 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.173 as permitted sender) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id pa12so5476244veb.18 for ; Fri, 09 May 2014 08:56:10 -0700 (PDT) X-Received: by 10.220.5.129 with SMTP id 1mr1181141vcv.71.1399650970817; Fri, 09 May 2014 08:56:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp92039vcb; Fri, 9 May 2014 08:56:10 -0700 (PDT) X-Received: by 10.66.122.72 with SMTP id lq8mr21909143pab.69.1399650968735; Fri, 09 May 2014 08:56:08 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id sw1si2249618pab.131.2014.05.09.08.56.07 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 09 May 2014 08:56:08 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1Win9Y-0005UV-HG; Fri, 09 May 2014 16:56:04 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH v2 4/4] arm11scu: Use qom_private to mark private fields Date: Fri, 9 May 2014 16:56:04 +0100 Message-Id: <1399650964-21067-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1399650964-21067-1-git-send-email-peter.maydell@linaro.org> References: <1399650964-21067-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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