From patchwork Mon Jul 30 14:17:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143144 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4138587ljj; Mon, 30 Jul 2018 07:21:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfpgxR1wAMvpU5BCERXDSgx1e+35qPgxvkJwIQgPaE0MYAwri/NqQE2YMrwo0SzZOa1iteF X-Received: by 2002:a0c:b792:: with SMTP id l18-v6mr15454885qve.110.1532960513267; Mon, 30 Jul 2018 07:21:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532960513; cv=none; d=google.com; s=arc-20160816; b=QOaZeQjUMGm3lOcZuIn7zLyAR8KopADgqrkB5edyuddGFF6gRtlm6HjTjiQvDb5qCH 67UcKM0pOK2C5Lt1epOui4zsx+/G/+54WzCV8De1UhtWHGySmboK/z4GOYBP5ZLv5gbu xvhW+fYGkH7B8GWcVNyzET9AhxconMc+PHr1fijT4pi0w/h8BmEIKjQOC1nAWQ9GLjNN FtdWg8GxukehyM7N8KvDQoDHyMPIUWjuhch0mYkAjUao7M5aaGZee4clMSmN6uulFCeI mOn/bTcfFQxgrfHtMaT8kO73WqOphINNBemWMsVdmsJ7lYauwzjfTE2SrUhX7qQNBvzp IxtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=Diyf6Q9AXCGMRC2BmjYa5ivHY+rjI1+J3qasEe9DhpE=; b=MEHm51mkKXIHydkT9GSVSPeJjwZkGjWiiUxe/b+mJ+YSPcpAgaj8QfDUxBLYkQSIyk q+ir9ZdXmxpRi6irSxh7kLFvtI3uK7BgDp2b/0eUQCgB3dGzC74HwLrDfwrZv5snvoTH hCckvrk6NrYrfT97yRpsNBx9f9iPIpzdCtNQLcqh3ZJjGyOaIf/4K5PuBC5cKJ4HXCxm du/k5maYkSj8pDrbwx6bVNEwP/pFw+L7Qb+K5ET7A7apsbTIpiaIjLgAsBtj7bLe/b0t +sNp+eGiaJpvfIVXUHoHIJnmLh6/ydJo5aoWssww7SYAFT0CPvxYYjScr0Oio/uCUWc7 Hfkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s14-v6si11287265qtg.54.2018.07.30.07.21.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 30 Jul 2018 07:21:53 -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; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk93Y-0003AR-Lv for patch@linaro.org; Mon, 30 Jul 2018 10:21:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58154) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fk8zq-00011O-HQ for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fk8zp-0002QD-Nn for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:02 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:43820) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fk8zp-00029y-FZ for qemu-devel@nongnu.org; Mon, 30 Jul 2018 10:18:01 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fk8zg-0004Fw-5Q for qemu-devel@nongnu.org; Mon, 30 Jul 2018 15:17:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 15:17:45 +0100 Message-Id: <20180730141748.430-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180730141748.430-1-peter.maydell@linaro.org> References: <20180730141748.430-1-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 3/6] armv7m_nvic: Fix m-security subsection name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" The vmstate save/load code insists that subsections of a VMState must have names which include their parent VMState's name as a leading substring. Unfortunately it neither documents this nor checks it on device init or state save, but instead fails state load with a confusing error message ("Missing section footer for armv7m_nvic"). Fix the name of the m-security subsection of the NVIC, so that state save/load works correctly for the security-enabled NVIC. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20180727113854.20283-2-peter.maydell@linaro.org --- hw/intc/armv7m_nvic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c index 6be7fc5266d..cd1e7f17299 100644 --- a/hw/intc/armv7m_nvic.c +++ b/hw/intc/armv7m_nvic.c @@ -2064,7 +2064,7 @@ static int nvic_security_post_load(void *opaque, int version_id) } static const VMStateDescription vmstate_nvic_security = { - .name = "nvic/m-security", + .name = "armv7m_nvic/m-security", .version_id = 1, .minimum_version_id = 1, .needed = nvic_security_needed,