From patchwork Wed Feb 26 18:02:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 25368 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B6F9D20636 for ; Wed, 26 Feb 2014 18:03:56 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id jw12sf5709431veb.3 for ; Wed, 26 Feb 2014 10:03:56 -0800 (PST) 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:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=gi9BMiCdrOzb+k6ZBOB/OfGed58I/UKG/QL/EWnQnzY=; b=FhBdwObZ3amF2JoR7L91CCvi7QM5HWa9aJX+SQykrltmotks2rhATNOfqXzy+qeMui QX4EEf+2vxmOuhlDuJ3j937ykCA66DUCyA5/PDF3GsmSCasTR8DcDvLc/ZdtND1+ajhA 5RTEuY93U333tH9dmVmzZPZFMYlh/fHJ46WNCQUyvn1h+Yp892ggwi/L2HdbG0E0jJlz XZLq3GXeSBPJpgveJ/ZPaciBB/nLxjQV9RWgHFYkqoeKhq2fRGQlqy/Z9zzvAQ2y7xmj WN602TESk6X07GMbtDvyjpv2k9RFWvAjAg3w4SWf6bbxMAncnpCh8CD3/Ij0VS3MghIZ 0Stg== X-Gm-Message-State: ALoCoQkNa6X/bsGRWIIXr28xPrsQdFYYHGqdpxd22Eo0KtguaxQIFP3FijlbyuvO55b8xn4dVakS X-Received: by 10.236.145.34 with SMTP id o22mr2917569yhj.22.1393437836504; Wed, 26 Feb 2014 10:03:56 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.169 with SMTP id o38ls351991qge.37.gmail; Wed, 26 Feb 2014 10:03:56 -0800 (PST) X-Received: by 10.220.69.133 with SMTP id z5mr136098vci.49.1393437836197; Wed, 26 Feb 2014 10:03:56 -0800 (PST) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id kl10si423181vdb.116.2014.02.26.10.03.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Feb 2014 10:03:56 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id im17so1299872vcb.5 for ; Wed, 26 Feb 2014 10:03:56 -0800 (PST) X-Received: by 10.58.94.195 with SMTP id de3mr901983veb.39.1393437836111; Wed, 26 Feb 2014 10:03:56 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp44532vcz; Wed, 26 Feb 2014 10:03:55 -0800 (PST) X-Received: by 10.140.107.138 with SMTP id h10mr1265942qgf.30.1393437835083; Wed, 26 Feb 2014 10:03:55 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o46si463465qgo.8.2014.02.26.10.03.54 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 26 Feb 2014 10:03:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIipm-00022r-Kd for patch@linaro.org; Wed, 26 Feb 2014 13:03:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIioh-0000kS-Ha for qemu-devel@nongnu.org; Wed, 26 Feb 2014 13:02:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WIiog-0007JT-Ny for qemu-devel@nongnu.org; Wed, 26 Feb 2014 13:02:47 -0500 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:46191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIiog-0007Eu-IZ for qemu-devel@nongnu.org; Wed, 26 Feb 2014 13:02:46 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1WIioX-0006Dn-U2; Wed, 26 Feb 2014 18:02:37 +0000 From: Peter Maydell To: Anthony Liguori Date: Wed, 26 Feb 2014 18:02:32 +0000 Message-Id: <1393437755-23586-43-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1393437755-23586-1-git-send-email-peter.maydell@linaro.org> References: <1393437755-23586-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno Subject: [Qemu-devel] [PULL 42/45] dma/pl330: Rename parent_obj X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Crosthwaite As per current QOM conventions. Signed-off-by: Peter Crosthwaite Reviewed-by: Peter Maydell Message-id: abb137347ea1ee9c31487b544f3d5435fb17f6a4.1393372019.git.peter.crosthwaite@xilinx.com Signed-off-by: Peter Maydell --- hw/dma/pl330.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c index a4cc6f9..8046a6f 100644 --- a/hw/dma/pl330.c +++ b/hw/dma/pl330.c @@ -227,7 +227,8 @@ static const VMStateDescription vmstate_pl330_queue = { }; struct PL330State { - SysBusDevice busdev; + SysBusDevice parent_obj; + MemoryRegion iomem; qemu_irq irq_abort; qemu_irq *irq;