From patchwork Tue Jun 3 18:29:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 31335 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AACF8203AC for ; Tue, 3 Jun 2014 18:29:53 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id ij19sf393545vcb.7 for ; Tue, 03 Jun 2014 11:29:53 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=CyyFUcg9OPRgcmOIQvYJl+f8tfYdnTBkAIC2xh16MDY=; b=j7jEDVpO4DnlfviD/ZoyBczkBoMtecZ4e4IZ3aZRf3aOM+djDtc2Yi/38M640wK/9B TdqJZ+PpHW+BgZr7UaZpmP7QjsKC/QkdbiK5V+KdqvIL5sRvKvxbiuZRFKGZ1BcQ1CBW 0xlTc8ukF6eaAyHfDQcUuA60/q23/El5i0hhog13Q4xTZO+xIbRdgl9GMaHvfEsbmbXJ i7Khla5wOOfQyuSpJqQGseywbEeGkahrhZ4yOxSFeQS3YRBibzVwnQYGPT0CZNZKfw0l agT4fgrOubDC4W8PuK+7jasFWLOPEj1uAWa00md09euVT1/Sc6QGqJdDWHwHWBHSmf4z 6cQQ== X-Gm-Message-State: ALoCoQmdClmSgUGAlbrY2vx4V4RYSoC2eg89KZKpxPW9Shls30yrxaoobZPH9PhIT6r8OZ+rrXP0 X-Received: by 10.236.135.145 with SMTP id u17mr16529455yhi.44.1401820193226; Tue, 03 Jun 2014 11:29:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.111 with SMTP id b102ls2739121qga.31.gmail; Tue, 03 Jun 2014 11:29:53 -0700 (PDT) X-Received: by 10.58.85.3 with SMTP id d3mr11488676vez.34.1401820193117; Tue, 03 Jun 2014 11:29:53 -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 b8si15525vcf.7.2014.06.03.11.29.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Jun 2014 11:29:53 -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 pa12so7461017veb.18 for ; Tue, 03 Jun 2014 11:29:53 -0700 (PDT) X-Received: by 10.53.10.234 with SMTP id ed10mr3072166vdd.86.1401820193043; Tue, 03 Jun 2014 11:29:53 -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 ib8csp16702vcb; Tue, 3 Jun 2014 11:29:52 -0700 (PDT) X-Received: by 10.180.126.97 with SMTP id mx1mr34756911wib.29.1401820192159; Tue, 03 Jun 2014 11:29:52 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id i1si33953772wja.94.2014.06.03.11.29.51 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 03 Jun 2014 11:29:52 -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 1WrtT4-0000Rv-5K; Tue, 03 Jun 2014 19:29:50 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH] hw/arm/strongarm: Wire up missing GPIO and PPC vmstate Date: Tue, 3 Jun 2014 19:29:50 +0100 Message-Id: <1401820190-1702-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 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: , 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 --- hw/arm/strongarm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 0da9015..5ad8fd4 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -675,7 +675,9 @@ static const VMStateDescription vmstate_strongarm_gpio_regs = { VMSTATE_UINT32(rising, StrongARMGPIOInfo), VMSTATE_UINT32(falling, StrongARMGPIOInfo), VMSTATE_UINT32(status, StrongARMGPIOInfo), + VMSTATE_UINT32(gpsr, StrongARMGPIOInfo), VMSTATE_UINT32(gafr, StrongARMGPIOInfo), + VMSTATE_UINT32(prev_level, StrongARMGPIOInfo), VMSTATE_END_OF_LIST(), }, }; @@ -687,6 +689,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 = { @@ -846,6 +849,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(), }, }; @@ -857,6 +861,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 = {