From patchwork Thu Jun 26 11:42:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 32556 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A67B720E7A for ; Thu, 26 Jun 2014 11:42:52 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id il7sf6238476vcb.8 for ; Thu, 26 Jun 2014 04:42:52 -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=MvcnvRbvfgeYX+fOhCnU05evl8Enfu7Cc9rbbViFzj8=; b=UTHT3rrsc3tRkskL42K5Jw/xuUYN6pLyxWa6XvN1gEOPCQr/xGE9tDA2rQormFwYp+ UYkJ4ya5sEjle7Zw3nWk8jFwqlSt4GRMkWzHk/6QUYtL8b0vC6hizdCemouDOZj/0rgF UtLun0oROVlCfZ7QkMjaYYQkIE2VE6KeWXiHglmwFLjtipGRzmucGagz0JMTWMnfy2hT CNldPICJa0BhRZgbo3ST0tUWGemKVDQb/WnFPYDRzzd6bPXP26qi0PCa9nNwq2PEMSeB ksIGf0QMS4DHQ5sANBOr0Xqb+WNqlNpe4KIGu7KK1Z3oJ9duVfb6xcyX9StbzhwOmGyu Gvgw== X-Gm-Message-State: ALoCoQlyJ8PSa94yP9ammz0/sRMfX2xc9cDzwvkOgG3ixEafJlfijg96sRcBWVQ/VfSeFh4uJmPV X-Received: by 10.58.164.226 with SMTP id yt2mr7925023veb.7.1403782972533; Thu, 26 Jun 2014 04:42:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.37.18 with SMTP id q18ls167611qgq.70.gmail; Thu, 26 Jun 2014 04:42:52 -0700 (PDT) X-Received: by 10.52.69.172 with SMTP id f12mr10769818vdu.26.1403782972421; Thu, 26 Jun 2014 04:42:52 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id mw5si4193549vec.34.2014.06.26.04.42.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 04:42:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hy4so3353580vcb.20 for ; Thu, 26 Jun 2014 04:42:52 -0700 (PDT) X-Received: by 10.58.155.38 with SMTP id vt6mr12842289veb.3.1403782972344; Thu, 26 Jun 2014 04:42:52 -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.221.37.5 with SMTP id tc5csp23997vcb; Thu, 26 Jun 2014 04:42:51 -0700 (PDT) X-Received: by 10.68.139.137 with SMTP id qy9mr20476135pbb.11.1403782970736; Thu, 26 Jun 2014 04:42:50 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fn1si9480848pbb.74.2014.06.26.04.42.49 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Jun 2014 04:42:50 -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 1X084k-0005Kf-NO; Thu, 26 Jun 2014 12:42:46 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Peter Crosthwaite Subject: [PATCH v2 4/4] hw/arm/pxa2xx_gpio: Correct and register vmstate Date: Thu, 26 Jun 2014 12:42:46 +0100 Message-Id: <1403782966-20457-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1403782966-20457-1-git-send-email-peter.maydell@linaro.org> References: <1403782966-20457-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.220.175 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 pxa2xx-gpio device has a VMStateDescription, but it was accidentally never actually registered, and it wasn't quite correct. Remove the 'lines' field (this is a device property, not mutable state), add the missing 'prev_level' field, and set dc->vmsd so it actually gets used. Signed-off-by: Peter Maydell --- hw/arm/pxa2xx_gpio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/pxa2xx_gpio.c b/hw/arm/pxa2xx_gpio.c index cd506df..354ccf1 100644 --- a/hw/arm/pxa2xx_gpio.c +++ b/hw/arm/pxa2xx_gpio.c @@ -312,7 +312,6 @@ static const VMStateDescription vmstate_pxa2xx_gpio_regs = { .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_INT32(lines, PXA2xxGPIOInfo), VMSTATE_UINT32_ARRAY(ilevel, PXA2xxGPIOInfo, PXA2XX_GPIO_BANKS), VMSTATE_UINT32_ARRAY(olevel, PXA2xxGPIOInfo, PXA2XX_GPIO_BANKS), VMSTATE_UINT32_ARRAY(dir, PXA2xxGPIOInfo, PXA2XX_GPIO_BANKS), @@ -320,6 +319,7 @@ static const VMStateDescription vmstate_pxa2xx_gpio_regs = { VMSTATE_UINT32_ARRAY(falling, PXA2xxGPIOInfo, PXA2XX_GPIO_BANKS), VMSTATE_UINT32_ARRAY(status, PXA2xxGPIOInfo, PXA2XX_GPIO_BANKS), VMSTATE_UINT32_ARRAY(gafr, PXA2xxGPIOInfo, PXA2XX_GPIO_BANKS * 2), + VMSTATE_UINT32_ARRAY(prev_level, PXA2xxGPIOInfo, PXA2XX_GPIO_BANKS), VMSTATE_END_OF_LIST(), }, }; @@ -338,6 +338,7 @@ static void pxa2xx_gpio_class_init(ObjectClass *klass, void *data) k->init = pxa2xx_gpio_initfn; dc->desc = "PXA2xx GPIO controller"; dc->props = pxa2xx_gpio_properties; + dc->vmsd = &vmstate_pxa2xx_gpio_regs; } static const TypeInfo pxa2xx_gpio_info = {