{"id":1585781,"url":"http://patchwork.ozlabs.org/api/patches/1585781/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20220128153009.2467560-3-peter.maydell@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20220128153009.2467560-3-peter.maydell@linaro.org>","list_archive_url":null,"date":"2022-01-28T15:29:39","name":"[PULL,02/32] hw/armv7m: Fix broken VMStateDescription","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c97f1a1f779962fce6500fef08ae9b9cb3f0e894","submitter":{"id":5111,"url":"http://patchwork.ozlabs.org/api/people/5111/?format=json","name":"Peter Maydell","email":"peter.maydell@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20220128153009.2467560-3-peter.maydell@linaro.org/mbox/","series":[{"id":283405,"url":"http://patchwork.ozlabs.org/api/series/283405/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=283405","date":"2022-01-28T15:29:53","name":"[PULL,01/32] Update copyright dates to 2022","version":1,"mbox":"http://patchwork.ozlabs.org/series/283405/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1585781/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1585781/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["bilbo.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=I2IlkuAs;\n\tdkim-atps=neutral","ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4JljGf12wWz9t6h\n\tfor ; Sat, 29 Jan 2022 03:15:04 +1100 (AEDT)","from localhost ([::1]:59838 helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1nDTtt-0008JS-AW\n\tfor incoming@patchwork.ozlabs.org; Fri, 28 Jan 2022 11:15:01 -0500","from eggs.gnu.org ([209.51.188.92]:58116)\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1nDTDP-0002Hx-8E\n for qemu-devel@nongnu.org; Fri, 28 Jan 2022 10:31:07 -0500","from [2a00:1450:4864:20::436] (port=44890\n helo=mail-wr1-x436.google.com)\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1nDTDK-0006JY-SP\n for qemu-devel@nongnu.org; Fri, 28 Jan 2022 10:31:06 -0500","by mail-wr1-x436.google.com with SMTP id k18so11533494wrg.11\n for ; Fri, 28 Jan 2022 07:30:17 -0800 (PST)","from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2])\n by smtp.gmail.com with ESMTPSA id j3sm4749485wrb.57.2022.01.28.07.30.15\n for \n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 28 Jan 2022 07:30:15 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n h=from:to:subject:date:message-id:in-reply-to:references:mime-version\n :content-transfer-encoding;\n bh=6TNsa+9vU96PmnK49D4r+sw0Gbh6DRvow5OiVFqQM9A=;\n b=I2IlkuAs0VgoOHsZy86QqzWCqA8Kvswrt0Uv2hZvmrfVjNg/NANb0X6oVjtFWePqim\n QRJO/Z9Pbb4XYthPB9Du953vk3OAgvo5DYV/yv1y/zYginR2aiWIkLU2pX5DkwgP/7Qy\n DzehgFu2DbsHoQG/1sLPH/+YKCs1cotjznLYzaHq6GmLrshkEqBmDRzLt/5J4HcwR6ZS\n +xq/iRCj6o9FJCGUFfo3/OAQZKOC4arU4wc2stu3bfh9rVpQF4HJ+qZVU4DIWvLenPdv\n YJlN3I5XjDKnzPTUcpTZwzeS5IJQ49OlXTO1PP1LJXgMa5e2LtMAkWrXL13pttsaPN0C\n KOWQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=6TNsa+9vU96PmnK49D4r+sw0Gbh6DRvow5OiVFqQM9A=;\n b=m4XRSG3UzH4POcCmP0f5roQweiqfHcTsF1oHvEBXw0Z+U1LbawCkAF/9phuZTSoCEp\n sTLrftUQK9AUX8xXWCUZ8jY4PWhBfKes+A4yEQKKjI0mIaPNP1/nCo3BPH9lJpxRqY58\n pjsK8SF9TViCXVW7sWKlhme4kQz9CcpcV7ZFtI5joRDA40tug/tpwWxpBS2jc9kARpOO\n RWoKg52W/xRo3ThkaXt/eoY/RfjL3SEnY+zwnJw1aVloAKBfDeCCKysqmNMzDfRsoPbC\n 9G/upBXPdNerrQo4C9EMkYw0Q90ns6AN1+dnDYoxVWcv8GH3fqyhbLf/lADZEAHuRTeo\n GwbA==","X-Gm-Message-State":"AOAM531HnrPBbI1DesRfRjMz7qkbkb+gMWWwP7obhym81ITTCKXwsrm/\n XnBuuDKuTjp9XAcML1uMczMT/HygJyUXEw==","X-Google-Smtp-Source":"\n ABdhPJzMZvtXCvuq1Fj/16saUuXGMVH4tSiKoZtGaTh09hCandY8xxR2Uk8sRlSzcgHj4CjEtd9eEA==","X-Received":"by 2002:adf:f582:: with SMTP id f2mr7613899wro.161.1643383816240;\n Fri, 28 Jan 2022 07:30:16 -0800 (PST)","From":"Peter Maydell ","To":"qemu-devel@nongnu.org","Subject":"[PULL 02/32] hw/armv7m: Fix broken VMStateDescription","Date":"Fri, 28 Jan 2022 15:29:39 +0000","Message-Id":"<20220128153009.2467560-3-peter.maydell@linaro.org>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20220128153009.2467560-1-peter.maydell@linaro.org>","References":"<20220128153009.2467560-1-peter.maydell@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Host-Lookup-Failed":"Reverse DNS lookup failed for 2a00:1450:4864:20::436\n (failed)","Received-SPF":"pass client-ip=2a00:1450:4864:20::436;\n envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.google.com","X-Spam_score_int":"-12","X-Spam_score":"-1.3","X-Spam_bar":"-","X-Spam_report":"(-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793,\n SPF_HELO_NONE=0.001, SPF_PASS=-0.001,\n T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n "},"content":"In commit d5093d961585f02 we added a VMStateDescription to\nthe TYPE_ARMV7M object, to handle migration of its Clocks.\nHowever a cut-and-paste error meant we used the wrong struct\nname in the VMSTATE_CLOCK() macro arguments. The result was\nthat attempting a 'savevm' might result in an assertion\nfailure.\n\nCc: qemu-stable@nongnu.org\nBuglink: https://gitlab.com/qemu-project/qemu/-/issues/803\nFixes: d5093d961585f02\nSigned-off-by: Peter Maydell \nReviewed-by: Ani Sinha \nReviewed-by: Alex Bennée \nReviewed-by: Philippe Mathieu-Daudé \nMessage-id: 20220120151609.433555-1-peter.maydell@linaro.org\n---\n hw/arm/armv7m.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c\nindex 8d08db80be8..ceb76df3cd4 100644\n--- a/hw/arm/armv7m.c\n+++ b/hw/arm/armv7m.c\n@@ -520,8 +520,8 @@ static const VMStateDescription vmstate_armv7m = {\n .version_id = 1,\n .minimum_version_id = 1,\n .fields = (VMStateField[]) {\n- VMSTATE_CLOCK(refclk, SysTickState),\n- VMSTATE_CLOCK(cpuclk, SysTickState),\n+ VMSTATE_CLOCK(refclk, ARMv7MState),\n+ VMSTATE_CLOCK(cpuclk, ARMv7MState),\n VMSTATE_END_OF_LIST()\n }\n };\n","prefixes":["PULL","02/32"]}