{"id":2229265,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2229265/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427232116.50586-3-scottjgo@gmail.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/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":""},"msgid":"<20260427232116.50586-3-scottjgo@gmail.com>","date":"2026-04-27T23:21:16","name":"[2/2] target/arm/hvf: Stop pre-allocating cpreg_vmstate arrays","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5a80f4854e2f16811f55424bfd577b85ecb59345","submitter":{"id":93060,"url":"http://patchwork.ozlabs.org/api/1.1/people/93060/?format=json","name":"Scott J. Goldman","email":"scottjgo@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260427232116.50586-3-scottjgo@gmail.com/mbox/","series":[{"id":501742,"url":"http://patchwork.ozlabs.org/api/1.1/series/501742/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501742","date":"2026-04-27T23:21:14","name":"target/{arm,i386}/hvf: Fix HVF migration","version":1,"mbox":"http://patchwork.ozlabs.org/series/501742/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2229265/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2229265/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=kT34BOMf;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g4KQx02QMz1yHX\n\tfor ; Tue, 28 Apr 2026 09:24:40 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wHVJ0-0000zM-Q4; Mon, 27 Apr 2026 19:23:58 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wHVIu-0000xU-2V\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 19:23:52 -0400","from mail-dy1-x1336.google.com ([2607:f8b0:4864:20::1336])\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 1wHVIs-0004sx-1y\n for qemu-devel@nongnu.org; Mon, 27 Apr 2026 19:23:51 -0400","by mail-dy1-x1336.google.com with SMTP id\n 5a478bee46e88-2d9916deb14so19059567eec.0\n for ; Mon, 27 Apr 2026 16:23:49 -0700 (PDT)","from localhost.localdomain ([2601:645:8200:47:f4a5:bd04:3ca7:5727])\n by smtp.gmail.com with ESMTPSA id\n 5a478bee46e88-2ed0a0ce710sm849973eec.19.2026.04.27.16.23.46\n (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);\n Mon, 27 Apr 2026 16:23:47 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1777332228; x=1777937028; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=TGl0BbXkGtFoRsQ7y9Jn4eXyp2q/oJa3u0gZmZMsmiA=;\n b=kT34BOMfChisBDkBfJ1F954yfrSEVXggkCz2IZqAEhaREbNsjJ0aqnoIFm59ijKp/G\n TD1dCncLrl+6TUcZWyCUldgm2qIJ0FusfFrL86M7p2jme/PgKykh7c4/ubTEiakoOZ24\n dkZYhZY56ngQ/yWu5EJ+ONzfx6+b/QxBy9psDuOBbBKUS/oPbP9pyhzl9p3PjJu7vnds\n ifhpVwWA1Fdl1n2ij6eG9/14wr2E/wjusUBTM/s0b/1hiXZs0nFzvzuDlStutaTzD2KI\n V8FoiWT3HHOxVpZ7CSCK2o2nrOOzYL9Ai7GRVI9BgqmSBzPgENqiZBjhapKBgSJgvR98\n I1jQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777332228; x=1777937028;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=TGl0BbXkGtFoRsQ7y9Jn4eXyp2q/oJa3u0gZmZMsmiA=;\n b=pxQ1K1N2raZW8yuzrooofOxH5PELgFByy/pQmxQKJ2ukWA98dlCtqMiNSufaMm1Igm\n HB4KEQfn6tELHVdiJonfl9M+5EIY7iYrBxiXsHPC4w7OAKVOiuQd4XLE1zfDsGFf8ahz\n UlrvhiklQtotjsqk5NU7MTpA/5UizQzLtoa4t59NLH0D8+98v5MGHfY7uTb6VGUBPbyh\n VqmdHrsP8UPqH4qp6uHyXZyvSVkjM+lM78UovwTvHXMf1VILadEkZlcL/7luKQ/7XJ7W\n 0RkOItcTgOZt9U1TDSHaaRPfmKZsjZ2pOqqXU+jVZW4JfW4KTN/ttpNhO7G6tQF/ZJ/c\n /dfg==","X-Gm-Message-State":"AOJu0YxCj+zDYt8ukiJE0ihnUG7RfW+tYDlJtY7iF0/B6vgBZvAf8Dsa\n zW9LA1UZr/6pgI0uSQH35oWNhoHkAuRkKLa4OyBZP5V/flBVCoQ+ndYYinRgifGvgVY=","X-Gm-Gg":"AeBDievEsQY0aB75aF4Y09YZccrPmq0n+xg0LdKOLIyMHRYf2Vx8lFhFOTu2vc3VfXu\n p2MDoywYIlHggCRwIMtA9dw4BUqvPZbzcS2dNqVxNorBbYamIL0LO+inWGx1caSQEzY8WHmCKwb\n K8dpwOxfgg6td+zSFYhAx1yQT+DLUdvQ3a6sg1VqsveJri6iZ4U2c0z5OY872nvSYDdk7i56nsy\n rbpgwoo+KHtkdnVF0UU5ZZinqcZlN3ngByTMacAceOd6AHdWD1C4QQfWMGRjW3WOgg0ullCtIRA\n qAYuYSfRXfCcF47CFEixAfCiJBm9RROwf2JSKRbtPbYxeEzzmuH0iKfFxZTAhWwY78ayRaXrZA+\n rhmrYu0h35H0dqLaT+Wgf61uKV2UJWTmviZiQNf5GPGAPsvmq+WBIS3SpR0RX8KaPG2tCvV0UHV\n jYfW0SB8pJ624+y2VqAM7RW/gPnQYf1AllL0ZegiihHof7QL8ujYeuF+bdBVszuWeY497XQUcXY\n kCXPOe151EpelKXmofJ1zE454XeIWOPyLLJEw==","X-Received":"by 2002:a05:7301:30b:b0:2ed:e17:d510 with SMTP id\n 5a478bee46e88-2ed0e17d6fbmr18710eec.35.1777332227823;\n Mon, 27 Apr 2026 16:23:47 -0700 (PDT)","From":"\"Scott J. Goldman\" ","To":"qemu-devel@nongnu.org","Cc":"qemu-arm@nongnu.org, Peter Maydell ,\n Alexander Graf , Roman Bolshakov ,\n Phil Dennis-Jordan ,\n Richard Henderson , =?utf-8?q?Philippe_Mathie?=\n\t=?utf-8?q?u-Daud=C3=A9?= ,\n Eric Auger , \"Scott J. Goldman\" ","Subject":"[PATCH 2/2] target/arm/hvf: Stop pre-allocating cpreg_vmstate arrays","Date":"Mon, 27 Apr 2026 16:21:16 -0700","Message-ID":"<20260427232116.50586-3-scottjgo@gmail.com>","X-Mailer":"git-send-email 2.50.1","In-Reply-To":"<20260427232116.50586-1-scottjgo@gmail.com>","References":"<20260427232116.50586-1-scottjgo@gmail.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2607:f8b0:4864:20::1336;\n envelope-from=scottjgo@gmail.com; helo=mail-dy1-x1336.google.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 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, FREEMAIL_FROM=0.001,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"qemu development ","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-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Commit ab2ddc7b66 (\"target/arm/machine: Use VMSTATE_VARRAY_INT32_ALLOC\nfor cpreg arrays\") moved cpreg_vmstate_indexes / cpreg_vmstate_values\nto be allocated by VMSTATE_VARRAY_INT32_ALLOC and added an assertion\nin cpu_pre_load() that they are NULL on entry. The same commit dropped\nthe redundant g_renew()/array_len assignments from the kvm, whpx and\nhelper.c cpu init paths, but the hvf cpu init path still pre-allocates\nthem.\n\nThe result is that loading a snapshot or migration stream into an HVF\nguest immediately aborts:\n\n ERROR:target/arm/machine.c:1043:cpu_pre_load:\n assertion failed: (!cpu->cpreg_vmstate_indexes)\n\nDrop the leftover cpreg_vmstate_indexes / cpreg_vmstate_values\nallocations and the cpreg_vmstate_array_len assignment from\nhvf_arch_init_vcpu(), matching what was already done for the other\narm accelerators.\n\nSigned-off-by: Scott J. Goldman \n---\n target/arm/hvf/hvf.c | 7 -------\n 1 file changed, 7 deletions(-)","diff":"diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c\nindex a36c634423..fe7dc9448d 100644\n--- a/target/arm/hvf/hvf.c\n+++ b/target/arm/hvf/hvf.c\n@@ -1284,12 +1284,6 @@ int hvf_arch_init_vcpu(CPUState *cpu)\n sregs_match_len);\n arm_cpu->cpreg_values = g_renew(uint64_t, arm_cpu->cpreg_values,\n sregs_match_len);\n- arm_cpu->cpreg_vmstate_indexes = g_renew(uint64_t,\n- arm_cpu->cpreg_vmstate_indexes,\n- sregs_match_len);\n- arm_cpu->cpreg_vmstate_values = g_renew(uint64_t,\n- arm_cpu->cpreg_vmstate_values,\n- sregs_match_len);\n \n memset(arm_cpu->cpreg_values, 0, sregs_match_len * sizeof(uint64_t));\n \n@@ -1326,7 +1320,6 @@ int hvf_arch_init_vcpu(CPUState *cpu)\n }\n }\n arm_cpu->cpreg_array_len = sregs_cnt;\n- arm_cpu->cpreg_vmstate_array_len = sregs_cnt;\n \n /* cpreg tuples must be in strictly ascending order */\n qsort(arm_cpu->cpreg_indexes, sregs_cnt, sizeof(uint64_t), compare_u64);\n","prefixes":["2/2"]}