From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Peter Maydell Date: Wed, 26 Feb 2014 18:02:32 +0000 Message-Id: <1393437755-23586-43-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1393437755-23586-1-git-send-email-peter.maydell@linaro.org> References: <1393437755-23586-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 42/45] dma/pl330: Rename parent_obj List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Blue Swirl , qemu-devel@nongnu.org, Aurelien Jarno 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; -- 1.9.0