From patchwork Mon Jun 30 12:47:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 32708 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C8D90203F4 for ; Mon, 30 Jun 2014 12:48:48 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id hy10sf16608015vcb.9 for ; Mon, 30 Jun 2014 05:48:48 -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:date :message-id:in-reply-to:references: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=WeD5tzukgj+eskFR5lkJs6uFt7uLe9eE2172L5R8YOY=; b=mOE0OfwBq2AleNiE+c3uIVzY4vRTNdApfJyiXR7gRz4051pepmuM3LL7d5Gq+petH4 y1rnudyaDpdVndWnOpDQq0nRmXU53z2L7ikGc+aI2izyh+ZAbR+Yg5RFb3nuCh/hQLSY ZTRKlEGKQaj2vQpLmS4DEGwMrwzsVekJ0KwbbKnzJAmY+c0i5CD8/b5QnuajNHlMBA4T hfdV5zBW6RaOld6i5K/2uOEY15itZ+9uU2m34JvmBh21DaiQExo+7BrvKjFkeqgsB4Sh C78/9NDu8dGDJLM5zqu/9ZqCqq3/ZDI1SFwV28A7sPzxMSv8Fx5yv/OVgDljnzc2EM4Y GUOg== X-Gm-Message-State: ALoCoQmtOgaYdads5cao18AwFzFAtKDRk0eCa6xYjK/n9Nl2UH39OyKk8cQRePbGVBpRluZh0SsR X-Received: by 10.52.120.47 with SMTP id kz15mr18911402vdb.5.1404132528630; Mon, 30 Jun 2014 05:48:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.104.17 with SMTP id z17ls320569qge.74.gmail; Mon, 30 Jun 2014 05:48:48 -0700 (PDT) X-Received: by 10.52.164.70 with SMTP id yo6mr168264vdb.67.1404132528431; Mon, 30 Jun 2014 05:48:48 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id tv5si9978169vcb.38.2014.06.30.05.48.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 05:48:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id il7so7479322vcb.13 for ; Mon, 30 Jun 2014 05:48:48 -0700 (PDT) X-Received: by 10.58.209.7 with SMTP id mi7mr60024vec.80.1404132528344; Mon, 30 Jun 2014 05:48:48 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp135692vcb; Mon, 30 Jun 2014 05:48:48 -0700 (PDT) X-Received: by 10.140.36.43 with SMTP id o40mr30048860qgo.25.1404132527296; Mon, 30 Jun 2014 05:48:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s5si24904177qas.87.2014.06.30.05.48.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 30 Jun 2014 05:48:47 -0700 (PDT) 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]:34062 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1b0o-0005KN-VT for patch@linaro.org; Mon, 30 Jun 2014 08:48:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1azm-0004Ey-92 for qemu-devel@nongnu.org; Mon, 30 Jun 2014 08:47:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X1azk-0005tT-Fd for qemu-devel@nongnu.org; Mon, 30 Jun 2014 08:47:42 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48766) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X1azk-0005rQ-8V for qemu-devel@nongnu.org; Mon, 30 Jun 2014 08:47:40 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1X1azb-0008Sp-Mr for qemu-devel@nongnu.org; Mon, 30 Jun 2014 13:47:31 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jun 2014 13:47:26 +0100 Message-Id: <1404132451-32498-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1404132451-32498-1-git-send-email-peter.maydell@linaro.org> References: <1404132451-32498-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 Subject: [Qemu-devel] [PULL 3/8] hw/arm/strongarm: Wire up missing GPIO and PPC vmstate 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) 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 The VMStateDescription structs for the GPIO and PPC devices were accidentally never wired up. Add missing state fields and register them via dc->vmsd. Signed-off-by: Peter Maydell Reviewed-by: Peter Crosthwaite --- hw/arm/strongarm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index cc2d7f2..9e2a0d4 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -674,6 +674,7 @@ static const VMStateDescription vmstate_strongarm_gpio_regs = { VMSTATE_UINT32(falling, StrongARMGPIOInfo), VMSTATE_UINT32(status, StrongARMGPIOInfo), VMSTATE_UINT32(gafr, StrongARMGPIOInfo), + VMSTATE_UINT32(prev_level, StrongARMGPIOInfo), VMSTATE_END_OF_LIST(), }, }; @@ -685,6 +686,7 @@ static void strongarm_gpio_class_init(ObjectClass *klass, void *data) k->init = strongarm_gpio_initfn; dc->desc = "StrongARM GPIO controller"; + dc->vmsd = &vmstate_strongarm_gpio_regs; } static const TypeInfo strongarm_gpio_info = { @@ -844,6 +846,7 @@ static const VMStateDescription vmstate_strongarm_ppc_regs = { VMSTATE_UINT32(ppar, StrongARMPPCInfo), VMSTATE_UINT32(psdr, StrongARMPPCInfo), VMSTATE_UINT32(ppfr, StrongARMPPCInfo), + VMSTATE_UINT32(prev_level, StrongARMPPCInfo), VMSTATE_END_OF_LIST(), }, }; @@ -855,6 +858,7 @@ static void strongarm_ppc_class_init(ObjectClass *klass, void *data) k->init = strongarm_ppc_init; dc->desc = "StrongARM PPC controller"; + dc->vmsd = &vmstate_strongarm_ppc_regs; } static const TypeInfo strongarm_ppc_info = {