From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473523; cv=none; d=zohomail.com; s=zohoarc; b=Ud11IDn/2MJdZDEaZbx/AivVzuANwTjUBzsVoiCptA+R0D+Ws7nAm6c3HOdE/xLOw3QFHI02Fi7KZAEaTzjiUznsKTJzLam9j+15d8ilOAWEki+14jcXnTDtt7qOhxL0Db2RptBfBsCGxHvUGNTBjx1UihD4JILhWG71/Wh30AA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473523; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=JUQHzUWI6gn0rZiMO104Nh4NxBzPWeUQz9xRTGtk8RE=; b=BhvtlG8ptSf0/mELQ9lyvwHRiX9/bGuwBxaLYj9Kq5qO0Whz5bNRhy+uvChIyOX2RneXBMsn4nclYIISoOXZuVF73LpYWftt6bJi0EqzeMc7814F3ElN0EqbfZwYkPYOjjhuY+XtgNE3pKXddJwW0tLAcmxbTUdq8UKqmDEkubE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774473523093918.4428580699769; Wed, 25 Mar 2026 14:18:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5Vbo-0000pb-6H; Wed, 25 Mar 2026 17:17:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5Vbk-0000o8-1a for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:17:44 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5Vbh-0000wq-Cg for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:17:43 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-48704db565eso4186905e9.1 for ; Wed, 25 Mar 2026 14:17:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b9192e35esm2489972f8f.6.2026.03.25.14.17.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:17:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473458; x=1775078258; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JUQHzUWI6gn0rZiMO104Nh4NxBzPWeUQz9xRTGtk8RE=; b=UCt+8YMe4BEy3/6z4JhYtLwswCT1LoWEtyLcE4UaBJj6IFkO8+AlymZGU4os3l/prw FqhPyFCl96uwlfX/4Al0lcPAmhiBlWSMZOXEHUKAeslJMbtAiUHn5eBQDFTfzqGQcBKk zBfgV7j6Vnab5m/R+WWZkNF3WUr7WChJj8rp2VBXxE0au3DtYaac0kA8A3ywV/k712PL z0m/yWaCD/6N1zW/2wujBPlaYr0NM96Po4P5P54m6w6pr4/GB5MI+ma5XI7o8D8vochg 8rCKiW2wPbGXQZIt0W7ry6reFwHQvzG2XIFcHnekF3+Z5wi3O1vasdwJKMfwTmG8uxHP 2Zrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473458; x=1775078258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JUQHzUWI6gn0rZiMO104Nh4NxBzPWeUQz9xRTGtk8RE=; b=rHB2yXs1SoDBwqZyeu8TsZ173RrymAabSdLXOyP7hV+kDb1s4wi4ZZUNdrt0yspwD8 MXiweuOo+s2QhynzutLY6UwfvkiDtQa3GUzI9lywUJcJqhB6BZd48L2YhH/tZWDx6NsH LKrFX5owdLuITZdm7U/YsVbr98faJhZePuyuDQY8hHnLbRuzBttG8Zlt9rwbZV3laT3f 98ELwoYqPHEIsR4QXEyRIE03CId672OjbDzEQnCmrHmRVzcn80CyRspOmp3MXtrEJDCi ujtfMLwjNw9pQ4QN6ld1qWGVvHSBr4rN+tn4TJJC7wIqORSvTEB+AhW56M2v0jjc7M9Z Ahvw== X-Gm-Message-State: AOJu0YxgXeiXJsMgZq/2Ci+95FxsA89xIKUf5O0P5T0E8qxIHwrvoBGL bTeQP5WY8TiXli8yBYWC/1owDhPeAUJfxUCup3xbQ+d81tPZE3c1cloJcNdtcDS5deHaQhHzrQE jnzLbUpk= X-Gm-Gg: ATEYQzzuxooNIaKA/zIM1rHPY2hMqahS56Z55LG028Ploon0QSoGtrrzMPnvuUz4p4h 63AA43zbTI8qpTfo7AR6i4G2YsrrGRrKJR9xFJ6pqrmKAaBu4TfaPqzO+41pvuBkcuxTtpMP7zg LG4cDK0Rm6xLYAztfEfFhnhcwfoNfhSA92G1O+WIFXQFEj8BpP0kubspy/wU8Ntf94W7oIjRATo XgO/Ic9z2AAYENXwKXMCg6j8FMkJuG0umXu6B4d1SAxHn3BhFw3pm/qqFopNfLPU7GZ0RhktkXU BtaAQ2cRp/i+q+58nPOOBKhV4chUn5j4fldmKI0gZT33pgnzhnZhruetsY5Q4gksKVQ3iq3ZUQX 3A70QIUAdw5TB0ks9NnxqRbUmdhLhppvbocjhYeKkYWDDb/fwjN5HIgGhCg82ywNZZzsLXeXO6h KVSMFX1TR00wFLenPcYCO7zootvax5wM2ZM/+JNkLcKGjLEysLU6PhGnqJuFjRfYELKFuyS55R X-Received: by 2002:a05:6000:2306:b0:439:c18f:5aaf with SMTP id ffacd0b85a97d-43b889e34b8mr7687238f8f.34.1774473458019; Wed, 25 Mar 2026 14:17:38 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Rolnik Subject: [PATCH-for-11.1 01/10] target/avr: Avoid target-specific migration headers in machine.c Date: Wed, 25 Mar 2026 22:17:19 +0100 Message-ID: <20260325211728.89204-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473528024154100 machine.c doesn't use any target-specific macro defined by the "migration/cpu.h" header. Use the minimum headers required: "migration/qemu-file-types.h" and "migration/vmstate.h", which are not target-specific. This allows to build this file as common object. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- target/avr/machine.c | 3 ++- target/avr/meson.build | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/avr/machine.c b/target/avr/machine.c index 4402862fb96..8064a7214a3 100644 --- a/target/avr/machine.c +++ b/target/avr/machine.c @@ -20,7 +20,8 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "migration/cpu.h" +#include "migration/qemu-file-types.h" +#include "migration/vmstate.h" =20 static int get_sreg(QEMUFile *f, void *opaque, size_t size, const VMStateField *field) diff --git a/target/avr/meson.build b/target/avr/meson.build index af5e7d63741..39e5eb02c2b 100644 --- a/target/avr/meson.build +++ b/target/avr/meson.build @@ -15,8 +15,7 @@ avr_ss.add(files( =20 avr_common_system_ss =3D ss.source_set() avr_common_system_ss.add(files('gdbstub.c')) - -avr_system_ss.add(files('machine.c')) +avr_common_system_ss.add(files('machine.c')) =20 target_arch +=3D {'avr': avr_ss} target_system_arch +=3D {'avr': avr_system_ss} --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473523; cv=none; d=zohomail.com; s=zohoarc; b=bx2knyPmf+wwwo1Sw7wYN1Y9RYADW185+YAFb+KSkjApYAXfHyfqfjKRBXHfvMss9+/lAvChS5wTKhOp2G1ltHaZA6GhhCrSQiSLBlt1LtKcmmJvCVxhIWJkIEZtExKVoXQN2K7k5CpiWR+vaqGuOe/tXUSqLMVR2bKos8iBy6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473523; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kfJwMXjluZgiTP+augjPX/N9RW5TR5jPeS41ZUSD62g=; b=Jmh9QwXf/VIEmhgHWZ6Q3nhsDel5vflElv36Gh1cZKgp7owl0wF2krC/Pw2s1LJYm2nXnssTPMyztFPn6UmvImy2YipC4M+/F4Cma7bLT/X+RsLd80a3z0O0dhdxCyMq1xLDPKyvTNCel5eb4q490lrp1Mq+vV4GIVtE+wZyphM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774473523326251.06228803371494; Wed, 25 Mar 2026 14:18:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5Vbr-0000uX-VO; Wed, 25 Mar 2026 17:17:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5Vbp-0000s1-ES for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:17:49 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5Vbm-00015Y-Vm for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:17:49 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4838c15e3cbso2512425e9.3 for ; Wed, 25 Mar 2026 14:17:46 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4871fb3cb42sm7864125e9.9.2026.03.25.14.17.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:17:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473465; x=1775078265; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kfJwMXjluZgiTP+augjPX/N9RW5TR5jPeS41ZUSD62g=; b=AZhlndkTp5ewLI9TiBhe7U4Vf+ftBZbvbqCIauZaad8AgHbLyEEXo45EhDQcigsHvg g5CVs2DaLk7i6QJ5oseAgWY20sltBSUdQFYfK9A07+9yOrmEiKuUR4MBOfBDstNNIbpE vHB8xW7VqKxFCj0ms+Bf/tmXByucjYqnojjqEYI52aEdAnfriarjO9WQ1YmKy2inpjG1 3TDG+1GKN8B8dwMCQh0IpBP5/wN8YZbBmS1iL8wqZqAgSIjOJaN7pyGTQAUZUTuq7jZo FE7Ols75m0sF1k4oXbE08O3BGakPDRW3w0VRFhB3cCrJKvpPN2yhlrKKp1sauzMRMBC/ CTDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473465; x=1775078265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=kfJwMXjluZgiTP+augjPX/N9RW5TR5jPeS41ZUSD62g=; b=l/SdJ1T0kWNivfPZ4xpJeSftIcXtCLudPD5wNhoJLVm3UTlmtnJW7dLJv27VeX0hqz WAaAgkoHLIH6nt98ergvuPg9AZcBfXKI6V4BQ8JgjJVhXRObecSe9dnWycZ3PQbXg63A llpidlvuJc6cKV9B9fgLPVPiPRUoM5/92McQa21kM66VLUR3ZQWC6953/iHW6J+tvQ1f BwHc10yVwBlOpQRzrWo6jawePxqnHB6JvLbaTMb/xtiS2IR5wg7BzsL6DNhE5INHszqq LdGTgJv9GxdygQ3yT5Wc1fti/4iLRyCxhI5WPXRaVr+7HFcqFwHNEJBXNbHqF6gYS/z/ rR+A== X-Gm-Message-State: AOJu0Yy4xd6x7Xhb366MDEJMZJlY4+f6qQlcQG5K+j2KJP2TjHzcTNij qLwSetmEQz/IK2Qy6olb9+qEr3D0gUWAmJzXE9oB/JEecyupGov1rU1wzRGuUmWByVzwD0S4Vrn 4QkZo2Uc= X-Gm-Gg: ATEYQzxwCPxw+IXv801igvJaeyUsfly0U9VG+3hCNEek4JGovTe77EtrmPPuyRs6+GO kgPhEXAlPo980trRwXkA40jXmvRAAh/sgXMwmUbV4JQbbcJZvdTuAOHZfy9s/FQGmd30nXOnrnh LpaborHtLnhIK8CJ5osH7sHjO4/lGX10lGFqy3DP9LdsOZpKcxY3Tk5khceaATTC2EooZfhPRcD A+8Kb7vFVyiOsIZ8HL4c9TlN5hhirsdBy6ULXTKctgCEjDdEQwLIMOi4TZ6g0JU1SCLuS+3FFFu 0H3vrpbnFGzwbkNnLGaeY1dKx7GLA3YF04M7kuPoh+bYwCRLkk9AlHZCoJBjfniQAxwnGHYN9BG R5PEEjcSJ3VfyX+0v7gQsfSu2mpmdAXdcAC6568uKjG3X3EY0akNn4SdewnN4xBjZgpOovusa84 P9UI+GoP8DshKZDSpSEkF8FrAEdlZhj3mASff+9XK9/NXTSRptiEUy7mCAED5N6sCJRgkkGoLw X-Received: by 2002:a05:600c:4692:b0:485:4eaf:eb54 with SMTP id 5b1f17b1804b1-48716039b83mr72870265e9.20.1774473465043; Wed, 25 Mar 2026 14:17:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Song Gao Subject: [PATCH-for-11.1 02/10] target/loongarch: Avoid target-specific migration headers in machine.c Date: Wed, 25 Mar 2026 22:17:20 +0100 Message-ID: <20260325211728.89204-3-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473526756158500 machine.c doesn't use any target-specific macro defined by the "migration/cpu.h" header. Use the minimum header required: "migration/qemu-file-types.h" which is not target-specific. This allows to build this file as common object. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- target/loongarch/machine.c | 2 +- target/loongarch/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/loongarch/machine.c b/target/loongarch/machine.c index 28b9079d04e..4db53fec267 100644 --- a/target/loongarch/machine.c +++ b/target/loongarch/machine.c @@ -7,7 +7,7 @@ =20 #include "qemu/osdep.h" #include "cpu.h" -#include "migration/cpu.h" +#include "migration/vmstate.h" #include "system/tcg.h" #include "vec.h" =20 diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build index 2ae96d68695..c5a2953b29c 100644 --- a/target/loongarch/meson.build +++ b/target/loongarch/meson.build @@ -10,6 +10,7 @@ loongarch_user_ss.add(files('gdbstub.c')) =20 loongarch_common_system_ss =3D ss.source_set() loongarch_common_system_ss.add(files('gdbstub.c')) +loongarch_common_system_ss.add(files('machine.c')) =20 loongarch_system_ss =3D ss.source_set() loongarch_system_ss.add(files( @@ -17,7 +18,6 @@ loongarch_system_ss.add(files( 'cpu_helper.c', 'csr.c', 'loongarch-qmp-cmds.c', - 'machine.c', )) =20 common_ss.add(when: 'CONFIG_LOONGARCH_DIS', if_true: [files('disas.c'), ge= n]) --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473523; cv=none; d=zohomail.com; s=zohoarc; b=a5LCZ8xVuJT2VWzIQO1YlFSOd1zWb6tXSAWVTzCtt5836FqvsGaFyb2ms/Nac0wOJTEtdbRicsg4LSJ0z8ufzUcXtbi6y4YxeJp8TXelmY2R5LNzsclENcrXS/g2u7MsIL9ew2suUnY/NC7VWMwZpIrGD5qsN2AAqN/SeRC9F9E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473523; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=x/OkQfe9cDqmPmNyowe4I82r/OnDAbDAwbC9U/upN5o=; b=HLhMzVea81Bh8zZ/LVdymoveNSCSPBcbz9ZUQj6FqPk4pN+gfpgg4AOjMH7hTfxOluD5+6QXBDUQb9GBNAiRNauuUweIyV/XrvyS2AUUORiNGm92c2GatgWnrq0xhjPMCQgY1SKTl8jNXLbMGoyRhQao7q15Rl3AOvAisuMyBjY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17744735229981015.8673088173483; Wed, 25 Mar 2026 14:18:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5Vc2-00013L-2A; Wed, 25 Mar 2026 17:18:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5Vbw-00010m-VO for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:17:57 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5Vbu-0001Jn-Jg for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:17:56 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-48558d6ef83so2787545e9.3 for ; Wed, 25 Mar 2026 14:17:54 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-487117732a1sm146035575e9.15.2026.03.25.14.17.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:17:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473473; x=1775078273; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x/OkQfe9cDqmPmNyowe4I82r/OnDAbDAwbC9U/upN5o=; b=qyS9NpztlARIm1y3/3vVWd100C4SzXcd1KhVZb79/PEfysrLGgpPgpe/PsBcyZeqN/ qhjpBy7is/GWn9DOd+gvzrITPeDN/mXii7tGnYjqxCHN4TiiRcfSzO+YGdlmlTEwawMS PK3JJ9CDO21I/PckxRc++rK7Nz8DgYvu7HV6BI6OlZIiw8AGyEAEgBZ9WqZP2OeuirZf zHvJxsBTz4NUG8tcZ4F6hP8PUYvLm7pNH8D3qh0bONQhdBgLiY8nSgrucd704d3lHveC ZCEqrpUF0mAhsAc2Ac4hxZmjnlH5+iWizAl0bvjziUYUVY9Rujlyqou0ZYG3iqEiZgGK oasA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473473; x=1775078273; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=x/OkQfe9cDqmPmNyowe4I82r/OnDAbDAwbC9U/upN5o=; b=QqTNXMtEzICSwlfgTIogETCzLPtOCgZAyM5HX2egfpvBIDYkRPxv/jsDua262GRXpP dYpUt14BxvBJIK5z3C4zHvzQU1DmkcFBA73VXOzlneGaqIX8ksnsGQ9dl9dDVPWHz+No 4lXEW7MrnPiL03jts9Z3ZzZ7l3G7TcBI5E6Vbhcv9aqePC39dWrMkyj8pfBIf9RtDm1i sEsTyeOLkSM1Ryiw+wJh/cS2l9Wdt8D6D7W2hoBheFbB/t14xs5SHPLRnIDDGPYP/qiD B6xCtuoNL7R+Ai1l6ET9o1kR/l/H12nHhhehLBgP3oZxzZ48V5c1aLjmQOoFcmp4X9nZ eXvg== X-Gm-Message-State: AOJu0YyH3+SWtWFK5xPL5mdbL6Dnz7wxvCGpKRbiLVNmq2BVFW0DaqCT NOu/jouGDjYLnS84vhjlIXT/VOe1BxKZH4cAUwkdYGmeu3yWs6RyjG5KO6dXJJrF7H4JHPxoSdj y+X0RSCI= X-Gm-Gg: ATEYQzyYoC8QxzD2LgKRssNm5nyZXyZkvDPMSYa5u0r/ZzHWuWqUBSsJa5pdGot9SFG TaN6ZMu+pVW+ecqBJp7tmEAmkKVVSkO5Am1HeX6IHUcOy6Y9CiflM5oWJTKOnx7AAjUzhuYlq+7 +v9f42nPZvd9xftQEc5c/kQTPdjA2sjtm13tiSYG2MwiA3KCvANO3obnAmLHYnWSTrwQeks51KI j3geecMZgl02bVHz+ts/h6l0k2ZoQlfTjKg4m6tF3Yzrn1zfJA3G6W90ICd/PMGkOkESdNMqMhP zjAKFc2VGEKwk1KdcAigA65e/UOEKMFiH6pbXxr5n5eeJTQSgdvPBPYGxVx3tjctIpdJdiqg5Yk vnX20Cq5yN1Zz3vWQTnBeN/h8T4n0B5HMM8AnOS5mtt4Hjuk7KnilrMsspVyYu4Hc651BRqgc9W YI2c+bM2QWV0DYWxWEGtgbtiHr+E1+OsrQqYnpDenIjDp96Y+f2hQwhWLUDr4PtOkM+t3yicMt X-Received: by 2002:a05:600c:8b6d:b0:485:3e20:4013 with SMTP id 5b1f17b1804b1-4871604b905mr81773315e9.28.1774473472853; Wed, 25 Mar 2026 14:17:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 03/10] migration: Revert "Add VMSTATE_UINTTL_2DARRAY()" Date: Wed, 25 Mar 2026 22:17:21 +0100 Message-ID: <20260325211728.89204-4-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473528227154100 The VMSTATE_UINTTL_2DARRAY() macro was never used, remove it. This reverts commit 4597992f624c015ceb51fedb4628b3fdb1e5bbaa. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu Reviewed-by: Pierrick Bouvier --- include/migration/cpu.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 1335abe2230..e3d6c06b7d4 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -23,8 +23,6 @@ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v) \ - VMSTATE_UINT64_2DARRAY_V(_f, _s, _n1, _n2, _v) #define VMSTATE_UINTTL_TEST(_f, _s, _t) \ VMSTATE_UINT64_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint64 @@ -44,8 +42,6 @@ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, _v) \ - VMSTATE_UINT32_2DARRAY_V(_f, _s, _n1, _n2, _v) #define VMSTATE_UINTTL_TEST(_f, _s, _t) \ VMSTATE_UINT32_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint32 @@ -55,8 +51,6 @@ VMSTATE_UINTTL_V(_f, _s, 0) #define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0) -#define VMSTATE_UINTTL_2DARRAY(_f, _s, _n1, _n2) \ - VMSTATE_UINTTL_2DARRAY_V(_f, _s, _n1, _n2, 0) =20 =20 #endif --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473540; cv=none; d=zohomail.com; s=zohoarc; b=OsPz2s6YjfNA5z+U59n74aT0iWUWxyTB4YHmGw/R+wl/KPaqyLme03y0GBaTq1G6lY/JZ+EmhnIcquCQmuDOAPYGd74XeCdnIHzn2UZw6A8WPDuFxNc3CE5DRfLZbwFQnsxopKtmFH1Q7EUwYAI+9aiKkudnp1jCxKz68GYjic8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473540; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3NHfcewKXbZp0JQoxYRv0EAYvd3pedgucecsXHnlRB4=; b=L1sMzVxdTxhp6fecx/A5n4wK+dstx+Ko9/9DgqIzKLergsSOCY4CbrPA6gBhDyIaJbRu7BZKtQa6lTe5q150l8RkAGFmHWblMnZMVyDjXLb2c0XWyxNvHTQSDslmUcSb4Nc0LyxcyEXERQWkXZv5l6hPfkQbod5JFOWPUx9pqko= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774473540176559.4950589513396; Wed, 25 Mar 2026 14:19:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5VcX-0001M7-Ru; Wed, 25 Mar 2026 17:18:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5Vc4-000165-7M for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:05 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5Vc1-0001XX-Nb for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:03 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-486fb439299so3038715e9.0 for ; Wed, 25 Mar 2026 14:18:01 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4871fb3fc8esm8777515e9.11.2026.03.25.14.17.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:17:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473480; x=1775078280; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3NHfcewKXbZp0JQoxYRv0EAYvd3pedgucecsXHnlRB4=; b=xF8e/hCdSc18e59/1M3x7d4exZJGOqKSqqmAzcrxq/NVjkTZYRVcCCLq96smp3hn/U Fcb7+OEiHuiJ3ZyiKWz0BEyMFOjthjq4OSYi4NPx2SRi4+jG6x1jufmQOMGXHIyEEBoh HEzZAyer2bDOj2upUhPnxI+lc6ZWVf8ZshMc3F4V/Bx0rUI1stc4SYZcDH9WMihgk5Nl HR1eujvDsQrYAWTz4tKT/juv4JhrsNMq3xBmGE+wPAUy0G5Q6oHJzUx0jj3i+9xjut2N WszzOCNaEulcvn05P18UXx/PYpNFivxmDvpe/8hEJZ0ZUypGuTYjNjJ+o7PEZrCHbEnE Ln+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473480; x=1775078280; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3NHfcewKXbZp0JQoxYRv0EAYvd3pedgucecsXHnlRB4=; b=DtTp7AG0j9TfxqzPQhl7wO/j/i9JxlKR40z/TSOYqNN893t6DMVknG3l10KcAxQIOz ONTFGhGWiug78sPDBL8p/09pGQMj6ZG9dG5k7uIJjuL9yEcCwZH5MdWTlys/S2Mki28S OJEx7Fetge+1+JrpjuuGdfBYs21QRM44Atm8goEPwp9zmCuML1gkWHxqLrhuzhdrCMlT 529kKRf10tze3+FXgB4mJycEYjodEl/VNlKwQgvSyKYnDVZpoIj8fRBJQQWWy/Qe9kM2 gEph46w/YvgicF9AO6H++iBXcvLX230tynVS6lL9CtmhvDpLHTlRFtC5vyN9yeqFF2H4 Fg8Q== X-Gm-Message-State: AOJu0YzukBLReAIIALFguUL98/8/euc1Lr+ODLJ9Wh64lx4sx/uhSBMO n17UlHwmuhV2U6LK7GTnnmhu7PTCu7Z6DaM+OfS7EdvepOlk3cRtFBoTDySfObXrY2EEvVbZmbQ Za8WdtDM= X-Gm-Gg: ATEYQzx7effxamP/8o9ZQxExjVGa7MKZKYCdAMEUc9/TyJBbDBxAcaBfvS1WleNaokN tDrJbhvXAWmFt9cgVrzPHmddCpK+MUtev4WQT+mM3yN6oKGDjg7908uP9utZVTU5HOF3Ysg6MMs 27QQbJblZmy5vhQYySihbCWkqxZ6OmkmcvCLfeoI7amDuQRk6qIhllXfKu3z/fLCvhrtx/EriKt Okp1ty1nbltaSUVcESJDinSqV63HJwMYQ88F5FO7MiM+HK5Mr9zmrtgW4B6SsERgNNf5+zvEriC KtzZoh95En4ted7PGceCj7+dtlyOpwbIZh/bMGcjpD/S0+p7pk8wu/ju3eqsLrw8PYVpBFDmyDz GlLEQG25ZEErfMZOz83rNcaO+Vcin04GINkQlI3MvKXlmphTq6bZ0OZj62mqt6+X8/iHFnnao0z YdKlftOTAWmSnMFd2P3VHN0jqR/vB3G4btedD1kmNjclm3rDO0IlsL9MnaNfIZO6okSFMBCaufv n8hylmXDvo= X-Received: by 2002:a05:600c:4343:b0:487:76c:5c97 with SMTP id 5b1f17b1804b1-4871607e665mr40730755e9.32.1774473479732; Wed, 25 Mar 2026 14:17:59 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 04/10] migration: Remove unused target-specific macros Date: Wed, 25 Mar 2026 22:17:22 +0100 Message-ID: <20260325211728.89204-5-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473541849158500 Last use of VMSTATE_UINTTL_TEST() was removed in commit 445d3facffe ("ppc/spapr: remove deprecated machine pseries-2.7"). The following definitions were added in commit b6c4f71f508 ("Resurrect the safe part of r5274") but never used: - qemu_put_sbetl qemu_put_sbe64 - qemu_get_sbetl qemu_get_sbe64 - qemu_put_sbetls qemu_put_sbe64s - qemu_get_sbetls qemu_get_sbe64s Remove all as unused. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Xu Reviewed-by: Pierrick Bouvier --- include/migration/cpu.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index e3d6c06b7d4..bb8ecfbeea5 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -12,10 +12,6 @@ #define qemu_get_betl qemu_get_be64 #define qemu_put_betls qemu_put_be64s #define qemu_get_betls qemu_get_be64s -#define qemu_put_sbetl qemu_put_sbe64 -#define qemu_get_sbetl qemu_get_sbe64 -#define qemu_put_sbetls qemu_put_sbe64s -#define qemu_get_sbetls qemu_get_sbe64s =20 #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT64_V(_f, _s, _v) @@ -23,18 +19,12 @@ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_TEST(_f, _s, _t) \ - VMSTATE_UINT64_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint64 #else #define qemu_put_betl qemu_put_be32 #define qemu_get_betl qemu_get_be32 #define qemu_put_betls qemu_put_be32s #define qemu_get_betls qemu_get_be32s -#define qemu_put_sbetl qemu_put_sbe32 -#define qemu_get_sbetl qemu_get_sbe32 -#define qemu_put_sbetls qemu_put_sbe32s -#define qemu_get_sbetls qemu_get_sbe32s =20 #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) @@ -42,8 +32,6 @@ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) #define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) -#define VMSTATE_UINTTL_TEST(_f, _s, _t) \ - VMSTATE_UINT32_TEST(_f, _s, _t) #define vmstate_info_uinttl vmstate_info_uint32 #endif =20 @@ -52,5 +40,4 @@ #define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0) =20 - #endif --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473591; cv=none; d=zohomail.com; s=zohoarc; b=k2KHIi49EFAXpqpByXQ0xpDlbTb93Jxnq53wYOjUB9N+Zp9tT8Ame/zeKau+dCzUBpqc40VMTVlM8hib1W6xHsZQFADPQizZqNC+mTPtBHNpvcy+ravrAMg+yMbkmDBU1RVPhB1IkWylTlXcmiD6yqKHTT475P6fuh3RFI5d3i4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473591; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pYU4i5VAwkEHAw1VrKk7PiVi7f6gEyJjDsvkpa8kUyc=; b=joEXIbU/AerelqDmboUv3MDIHVmw/vuM03VagmoM0427NiNhdYLpqn3FlWD/N+SptuNJNPPUVDuJHKh6KX3oV1DrZFsvKTuvy9CE3EQLBkHA/U3HK7aLWgJ6q3fe5rg/2i6LiCOsaoOZMCKlA2CShxYBoAyGKaBY7Yt8VLa6mSo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774473591865492.5222387730597; Wed, 25 Mar 2026 14:19:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5VcY-0001OT-Rp; Wed, 25 Mar 2026 17:18:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5VcC-0001EH-2X for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:12 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5Vc9-0001Z2-Fk for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:11 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-483487335c2so3628355e9.2 for ; Wed, 25 Mar 2026 14:18:08 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48711709e95sm159875045e9.8.2026.03.25.14.18.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:18:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473487; x=1775078287; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pYU4i5VAwkEHAw1VrKk7PiVi7f6gEyJjDsvkpa8kUyc=; b=HXoqK/fxUR3IONC/u5TWuAwb+5EqkXZmJKDUu+QP3K/g2Lu9xyZK966qok1aChPo4P mYQS/XvCmUvnbZHW4y+QlS+6GPfMQXk3mvcug56rLr2eqADhpdjKBgZHpfO7+yHRQTVo 2WL3lHUwTpDomk/Ev0zg24ho+XBA3iuxZi5W3bm258DsspMOkapbLqLB5zv6Yeu7aG26 Tw9l9ZlQj5zeWVDokfZ4gL5eb4a18ZRLupLB0ZrT01qILSZmtAY/32Qkwb5I0Haz7D1O LTYZXGQ02IXrLOW57pAd7CiplGPi3bJAudOVKzIkBeh1rDkyFNsFlAhO7YKpC8b2dXYB jlMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473487; x=1775078287; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pYU4i5VAwkEHAw1VrKk7PiVi7f6gEyJjDsvkpa8kUyc=; b=OofzY4asfJMm9SuyV2JkpOmNwuZ9dR+41aWfoj46aaDAUW9FHGA78B6WQeFJi/3xJb VQey6yxj2bP71nbDiu9C5xJmJCfna4jzrGV51ZnPLSK/ISNTiRB3Xb1xTAk/RQeHLv2p InM09OuNL/jiY81wId2bndoIh7QQ7G025AvKnosZBpdyQUgaecrNqlUh3yXPJra0pHwk dEjZsjUAipMG4P71kP5U5Ks7PzI6U+Z6Gm1lsYpxNWyTU1KlilEgEjwjR6UC/WddPaSU aMUgK3ubmqlzAIlLScbrSosy2ixY6aeO69yVwILLNVUMMuE8IiXTxphrPExulKM9etjD /x2w== X-Gm-Message-State: AOJu0YxfWgB3wKmBueWJM1q6S1GMAj0FhXzDPmi4Dv24RCMgkmt6ZcFr C5bMFYwYVu6HbJTvPNh2pTcGVLPlIwn24MBsk592b/SmRKVpRzO9QWA5PIf+BVk52JGwzslkpJL kmAkk1vo= X-Gm-Gg: ATEYQzzaHJD+ivSBtstbZLNqL4jvXEeVEoW65+CzdC0mHzlyXT+Le+YNv6iEDWMNp/7 D3xG15IUormeJQxe6Wh4vAh4yOJy9gXKy3/2WMYBiY2sKplATZoQwFenqt8FsIm2zh5JxiK8xoX vrIVh5FvNRh/cySnlHPjod5SCVeJZO3E/TPzWUBiNGkNm3q0BzF3uj0Zs1uGgzZ66VAMfdGC80a iN2fiokZ14E+3BI6f7inphVNrr3hO5fQHYJFQ3ziOWMe1hWCA6wMLF6iZo9rosY4CxGZJ7nudY4 SMItCg7o+udHacLmNbAbSFbeM1FPFhM3sKsdGs+xIaRd7SwUZ29S4CXxvnjgwr2ti6WeoRC9tNH bcSf5Z5IKYzd9Bl8p6PQAKb3V3YMXT8EQYb3eoxKRNUJwCtEVP/Y8DvbjynFMMZzF46qtitW9Nc 5/EtrYzGn3wGZ6tF8BeOFEMfI4ugNBrCr5aAyRqFGk6OQebfc94R9BYxv4C7wZ4OxRYR1o9nWzZ 5f7EXahHgo= X-Received: by 2002:a05:600c:5296:b0:486:ffa3:593 with SMTP id 5b1f17b1804b1-4871606730amr71524315e9.28.1774473486772; Wed, 25 Mar 2026 14:18:06 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 05/10] target/sparc: Inline qemu_get/put_betl() Date: Wed, 25 Mar 2026 22:17:23 +0100 Message-ID: <20260325211728.89204-6-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philmd@linaro.org; helo=mail-wm1-x32a.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473593674154100 Use TargetInfo target_long_bits() helper at runtime to migrate the FSR register as 32 or 64-bits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/migration/cpu.h | 4 ---- target/sparc/machine.c | 17 +++++++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index bb8ecfbeea5..87ca977a3fd 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -8,8 +8,6 @@ #include "migration/vmstate.h" =20 #if TARGET_LONG_BITS =3D=3D 64 -#define qemu_put_betl qemu_put_be64 -#define qemu_get_betl qemu_get_be64 #define qemu_put_betls qemu_put_be64s #define qemu_get_betls qemu_get_be64s =20 @@ -21,8 +19,6 @@ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) #define vmstate_info_uinttl vmstate_info_uint64 #else -#define qemu_put_betl qemu_put_be32 -#define qemu_get_betl qemu_get_be32 #define qemu_put_betls qemu_put_be32s #define qemu_get_betls qemu_get_be32s =20 diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 4dd75aff74a..0a449f2f8c6 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -1,8 +1,10 @@ #include "qemu/osdep.h" #include "cpu.h" +#include "qemu/target-info.h" #include "qemu/timer.h" =20 #include "migration/cpu.h" +#include "migration/qemu-file-types.h" =20 #ifdef TARGET_SPARC64 static const VMStateDescription vmstate_cpu_timer =3D { @@ -86,9 +88,13 @@ static int get_fsr(QEMUFile *f, void *opaque, size_t siz= e, const VMStateField *field) { SPARCCPU *cpu =3D opaque; - target_ulong val =3D qemu_get_betl(f); =20 - cpu_put_fsr(&cpu->env, val); + if (target_long_bits() =3D=3D 64) { + cpu_put_fsr(&cpu->env, qemu_get_be64(f)); + } else { + cpu_put_fsr(&cpu->env, qemu_get_be32(f)); + } + return 0; } =20 @@ -96,9 +102,12 @@ static int put_fsr(QEMUFile *f, void *opaque, size_t si= ze, const VMStateField *field, JSONWriter *vmdesc) { SPARCCPU *cpu =3D opaque; - target_ulong val =3D cpu_get_fsr(&cpu->env); =20 - qemu_put_betl(f, val); + if (target_long_bits() =3D=3D 64) { + qemu_put_be64(f, cpu_get_fsr(&cpu->env)); + } else { + qemu_put_be32(f, cpu_get_fsr(&cpu->env)); + } return 0; } =20 --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473600; cv=none; d=zohomail.com; s=zohoarc; b=LYdC7Hg61wrcccvoxU82q+Wy54VUa8I9zKfwx2awr3l5NQECCEeOSCauI2GkLGxU6nLPc1nrqsPYj110ffSruijTOCFv1Ta2XsHQAmdwp1eU6/yVj1sZ04yo9QYvYOs9kJa9BSyHeEdMYBYxehLEIK2LqtIOHqCW79c4ed7o0q4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473600; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=fAfGwk5iQFxUtFp9tEuDqdstwJOUxCbrpEqefh8vUSI=; b=UOmtHSbkwOFEL4g/mWsccaXs7GgpQdUXMkOXknhbAhaADQl04acJj4O/h7S8yaQIrkESoFeZrvrTnBoOGKy7+XRuiMCP6f3kHTTDBhX5iwXypbSB/vDlQGIkPrxXF2mYBa2si6bUEUD7pxiIkiZiIfTZl3NTzb2a9xWNyemeWBM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774473600753142.56833334465614; Wed, 25 Mar 2026 14:20:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5VcZ-0001PC-Cx; Wed, 25 Mar 2026 17:18:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5VcN-0001JZ-PJ for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:26 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5VcF-0001Zy-J2 for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:17 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-486b9675d36so2787425e9.0 for ; Wed, 25 Mar 2026 14:18:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48711709b48sm150514935e9.7.2026.03.25.14.18.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473494; x=1775078294; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fAfGwk5iQFxUtFp9tEuDqdstwJOUxCbrpEqefh8vUSI=; b=gpn/yO3x0nuCMVjW/94IJ/ZafvhAOpPV19SRnZd11NUzAsaTd0exC8SoGhbdCzyGM/ IFG+iPWQLAYZvnm1ZOeLQRggalrdUUAtsOJVA7xWuhHVUP6uX8/niBQzhF4Bn779cRAr 5ETrs1aFQCsIREDqy2OVRfwTVidVn7dthXTkMqlKCES/Zw9I7pvRg2Oq5DDwfRJy0TI+ pdELB5AFfS5Tp/72BYkQPVrESKKzQyw/inRCZ5K8mTczO8DrlHsArNMb3pAyjCOIKb8U 2tp9nvX511eZxFy0jLnY9oTvX3zvcx9xL3BOsDLTVpq9fqvnkwCV2kBo10NkEl1TwC/k jfLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473494; x=1775078294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=fAfGwk5iQFxUtFp9tEuDqdstwJOUxCbrpEqefh8vUSI=; b=E+VDJ7SE1BNGj9GYUnizbAUO8wcWtQnkAVVXS5ZMMta7IKw6JRXyw+zlsZFJEIh6i3 dCLWR2fet+T7gAUtbDqg3F7qYaKu9sCTYZZjBcm7szEaYz4ZRKtYmy7IAj3Lgi4ka+IY 688uXUYs32OUL88tMC0/VEgjs+SVXwD4RpYseQ5S2Ot+4WkDF/l9M07hvOUu0HJxr9yq iwVBr+zXP9ST4pNJ4BInUNn5hgT5UgPcRbmhy2/t7x6sU5+RyRSIs/72PLpOdoRvHuKK OEDieXlOIHl17VDd9tgxp+emY86JPI3/2yFVF7KxzBeMQihoT4evn2eFUAkjOV0FO9aq qrHA== X-Gm-Message-State: AOJu0Yw0Ttxkb23gnsokGTZUOHxw5UmCThErEkga4K4XVpSoZ8/pBmc3 UJOXwqegJfS6Nl6oj7/WTED+eM0J9Mkb4HoA4yWWR+91eBzaFt6Y1dratMqD0Pep7UiUEUDDS9d ItdaCI7M= X-Gm-Gg: ATEYQzw47AssiX67LCb+FhEDXGW9b/aRZrJ3/fpw66F2IicaPg2E7fKr/dlAV/rZ+SY j23MoArM20r4RfltwftkZOhRFA26axNWYa3yQxOO4Cj8eRUR8Vm3OuN8Wxs5CEdIJyZGR7x0KCN z5l9rx7WgaYPk/Eh8zPqqlMtN3jW+kyfsazS76W0Ypn7Wx94Vg/EKRTaN2HwjaVanqI48K9RC5+ LBvgGOgj5r2QKCyG2m4NuxnfGCls0/weJH+ckRdjRQCItz2CsD3QumVIKZAsb2b8EDxwUa9nAYu E21TE0qOzK4xZk9BHEeXf0gku7Z7H5hsk5YhZxZ/h8ZWJTMAKW3moc7KVjndFbcjw9ZKX5VfBZg 5kM5n6j1qkmxDjWkjscjEuW81YIJFvnWx8VkgdhJFlI9LY6IxR1qsYuttxbrf1KJ6MJ1tD1MkVn kxZsCU+Nq2/GWoLr12xMfF6rOxRhUwQ9/2pEa/LzwrtSb6KMwEiu0/0RUMYcczuh6LCxVwW2sm X-Received: by 2002:a05:600c:c086:b0:485:2fc5:3a5 with SMTP id 5b1f17b1804b1-48716056385mr53086605e9.26.1774473493770; Wed, 25 Mar 2026 14:18:13 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Huacai Chen , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo Subject: [PATCH-for-11.1 06/10] target/mips: Inline qemu_get/put_betls() Date: Wed, 25 Mar 2026 22:17:24 +0100 Message-ID: <20260325211728.89204-7-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473603552154100 Use TargetInfo target_long_bits() helper at runtime to migrate the VPN register as 32 or 64-bits. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/migration/cpu.h | 6 ------ target/mips/system/machine.c | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 87ca977a3fd..82a81b5d895 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -8,9 +8,6 @@ #include "migration/vmstate.h" =20 #if TARGET_LONG_BITS =3D=3D 64 -#define qemu_put_betls qemu_put_be64s -#define qemu_get_betls qemu_get_be64s - #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT64_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ @@ -19,9 +16,6 @@ VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) #define vmstate_info_uinttl vmstate_info_uint64 #else -#define qemu_put_betls qemu_put_be32s -#define qemu_get_betls qemu_get_be32s - #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ diff --git a/target/mips/system/machine.c b/target/mips/system/machine.c index 8af11fd896b..20de322385b 100644 --- a/target/mips/system/machine.c +++ b/target/mips/system/machine.c @@ -1,7 +1,9 @@ #include "qemu/osdep.h" +#include "qemu/target-info.h" #include "cpu.h" #include "internal.h" #include "migration/cpu.h" +#include "migration/qemu-file-types.h" #include "fpu_helper.h" =20 static int cpu_post_load(void *opaque, int version_id) @@ -139,7 +141,11 @@ static int get_tlb(QEMUFile *f, void *pv, size_t size, r4k_tlb_t *v =3D pv; uint16_t flags; =20 - qemu_get_betls(f, &v->VPN); + if (target_long_bits() =3D=3D 64) { + v->VPN =3D qemu_get_be64(f); + } else { + v->VPN =3D qemu_get_be32(f); + } qemu_get_be32s(f, &v->PageMask); qemu_get_be16s(f, &v->ASID); qemu_get_be32s(f, &v->MMID); @@ -182,7 +188,11 @@ static int put_tlb(QEMUFile *f, void *pv, size_t size, (v->D0 << 1) | (v->D1 << 0)); =20 - qemu_put_betls(f, &v->VPN); + if (target_long_bits() =3D=3D 64) { + qemu_put_be64(f, v->VPN); + } else { + qemu_put_be32(f, v->VPN); + } qemu_put_be32s(f, &v->PageMask); qemu_put_be16s(f, &asid); qemu_put_be32s(f, &mmid); --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473531; cv=none; d=zohomail.com; s=zohoarc; b=PH+Fc85EjTEIB/4OBQiu2Lic2F9SC6eR141s9ses8TOibIhdti/RTLO3InszpsRTkMRlWj0yLrdsvMi1Of5JYiICUmZSDzYjDFyiZDGcoiMAbf2X733nXcTFj/J2qxt/RA5jNkhd4nG0YO56577IC4jDD1vSA/z3cqJVIPfFZ+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473531; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=aqyoMwzLRJR2AbAa6Ihy5x9qHK83oShAfwYCT+jORGY=; b=G+6HxYt4AorrPaAyEQR71+CXwSoZotA8SoIBPmLx0uke5Be5zIA0rsQt2N7mL2vMjDQ0+QrwpXGdIGz/agMDhK1jLD3c31LeMM5HLPfbdGK3lWAd7Hy+B1Ye5iwQuWy0BfxsBjtdwz4KMpSS9++DFzyyvtzyqCR9SYKtMtOo6EE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774473531771486.79144814480503; Wed, 25 Mar 2026 14:18:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5Vca-0001Q0-2t; Wed, 25 Mar 2026 17:18:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5VcV-0001Lq-Cg for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:33 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5VcN-0001bk-QT for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:27 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-4870206f73bso1803575e9.3 for ; Wed, 25 Mar 2026 14:18:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4871fb3cb42sm7892895e9.9.2026.03.25.14.18.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:18:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473501; x=1775078301; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aqyoMwzLRJR2AbAa6Ihy5x9qHK83oShAfwYCT+jORGY=; b=axKR04R04ZIgMHWGTyQVk4LGfFJ9a/ZBXchh8T0jxQPQ/aFjyTitM+9bYzvlYrGcaU oPp86T6s4z2JlNZbjr1LghwUdg5j1oAeYw1QBPN8WlNL4cUREA1TunfvrGnRcgwDdwEc WXhMUmnxbkgWXdvAOlsrvHfx6Rhl75hXmWrvm64AZnOVvuFQBP3SC3zDkz/YbqewwRjK 1+QGjkoZik29DmjQtFLNPVPwIibLUnoU8flhANZbRPp38UgjGqrEhkdE+6n+AH/WAqAX nzSzBOuw2sAP2cpmAf1XTzN0hSOpXFVkUntoujgscOw9FKA9NR/kpL/Z/SJIaIbM96Ym qNcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473501; x=1775078301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=aqyoMwzLRJR2AbAa6Ihy5x9qHK83oShAfwYCT+jORGY=; b=s3jWET7uDomzHbPn1jibYXS2R+2++WUBlCVCVNACL6tkJptvw6Y3jaCq3dkRL5Niiv WiuZk7XfFISqImcXrrWGNnc0LFhfAOfnJNHXxCvv8uSg8VkDbQKacw7KYLA8brAD9M3X CI9ZFkD5f6HT96/sVo67IIV9RRZQM+++t/eEoygBq3xfyyyW02yucYJBdTHcDTAgX+JD e21iEKJYiuHihpuqPyysefDMRtm3E3oDf8nnEOgGHrG/QSApgkLTYlPZjZu5q1fr4/bv lgnRFhG5lKqWJElsvne9IoeZfFXDHW6K5DV9NGGVJ7KATDGpgkLn8+pPLbajWMV7B2EH ScJw== X-Gm-Message-State: AOJu0Yw4yOG7ioeFp5XzCo+AunWl21Wwu9Ado961EAsv74yYv9FiszVJ SVoQn9vxrU/qp1YYty8YdAL5Lb4wPUlFdmxeDuo6lPKbqMuQrO2hd8/Lvddv+MkYxpm+mQdPx77 v0VOD+zg= X-Gm-Gg: ATEYQzwCvJa15/PgXa/hfVgnxd4D/cX0RnelkDBQQS4HShWFa4lEOls9b3Dmd52K8mo rz8btuBI1Su4IOA8euzaslsOQdpG0UqMTmtnshtZql+1fFrkick4Jqh50IjIjN7ru3vNaZWc/+0 Ujj+m6/X5nGaSafvDoGa7dXB43ixEF1K3u5lRSRoIfTOBhRSC+vf9vpQPfiOFr7F33T2Wzce4br OYw63by2uTzRB6rJP9p7Z0LKcC+WtBL7R9ILo//jMWtkKc1YLTwaAmIlRQ1S5CdHmLocnv3/ShF T7fZBI/xaqi7vXXwbi/1LH48QOkxxXuyqBT6HI/EzV/ZVNGDUDTm+xFnPLuIhxIznmLOAuOKop+ afX4u8XbA9cwOslm6Osa2Ta9mvmBUH0V3TpBrkqqb7MytD8I+uMculNNs3rhn5bEmpI3tmwzIs8 Ois8vUpEBERyH9j1ErhYTKTt7o1k9dUQCNK0cXNdkpnRu3ZaOgV6NGWhhFn4lv0i739MO+ckxs X-Received: by 2002:a7b:ce8b:0:b0:485:41c4:e2e4 with SMTP id 5b1f17b1804b1-487160616a8mr49059105e9.23.1774473500835; Wed, 25 Mar 2026 14:18:20 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PATCH-for-11.1 07/10] target/i386: Expand VMSTATE_UINTTL_SUB_ARRAY for APX registers Date: Wed, 25 Mar 2026 22:17:25 +0100 Message-ID: <20260325211728.89204-8-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473533484158500 APX registers are only migrated for 64-bit binaries, so VMSTATE_UINTTL_SUB_ARRAY() expands to VMSTATE_UINT64_SUB_ARRAY(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- target/i386/machine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/machine.c b/target/i386/machine.c index 48a2a4b3190..1f5c517e562 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1756,7 +1756,7 @@ static const VMStateDescription vmstate_apx =3D { .minimum_version_id =3D 1, .needed =3D apx_needed, .fields =3D (VMStateField[]) { - VMSTATE_UINTTL_SUB_ARRAY(env.regs, X86CPU, CPU_NB_REGS, + VMSTATE_UINT64_SUB_ARRAY(env.regs, X86CPU, CPU_NB_REGS, CPU_NB_EREGS - CPU_NB_REGS), VMSTATE_END_OF_LIST() } --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473569; cv=none; d=zohomail.com; s=zohoarc; b=kop5wClHjq9RaPamsPls4JobAE2ZvBBKJM6NaPvwQ4v+NLAsdOg1HPNhz8NIHebuciwvNlRPWE5jWD4HbqjeVEtV9wiyDci+/Sl1wY9jp9J7l8YLVV7iXhWBSm4f/FlvQzjHsfICglEjP7DhP0shwTTUmxZfoUooM/GYg2jp54Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473569; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ik5dNOPzzIxkGj0tgUhxiCaEIrTWAFn/Zu/ILMDzmRk=; b=E54oVlzeUsh2d+FDiTf7ScAjwET07UtRs5nbdsmdjAVuWPA1CedidwVaXUYGTKPqBshrJJI8vWcNM/lYsJYi/gQvcazOTqI5OU/2+dpKKum6kcEdzekmNShKIXxtnRvGzdrxnAUF8/AMgqXWt4jl8kq8n4BTpZzQ43gMJsA5XAY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17744735699061007.4359517995277; Wed, 25 Mar 2026 14:19:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5Vcc-0001XV-4j; Wed, 25 Mar 2026 17:18:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5VcX-0001Lv-7T for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5VcU-0001iX-RZ for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:32 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-48558d6ef83so2792105e9.3 for ; Wed, 25 Mar 2026 14:18:29 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4871fb08e9esm8608925e9.0.2026.03.25.14.18.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:18:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473508; x=1775078308; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Ik5dNOPzzIxkGj0tgUhxiCaEIrTWAFn/Zu/ILMDzmRk=; b=l962iEv6Hf+vqgql/+m3hG9OEuUq+COmY83zckbTgYN1qpxiBfRkImjUmFSh9uD1B5 se65jCagGyFaMpKXyi6e4/cmLXdq147t5g2aWZRJZXA3lyTIUKAcL6XkveNqqlIaT9Sa Y/wjGB+FYlky2lfHF7g5d0Tj/D0VuEUQv9hqR9RWIueNjwawVwwiEICtVrmZShNY1Urm 7BNOuAcJIQJbbF6TouDAQVfQhtgpbxM8e0+VaIkpNzsG8//PVChUyElpl7H4n9ywVc9C 4cOhQf4GEsqBdUFkkVIrJlQeiiDKm21TPrs8ww2xB4QlQk3yh+QnNy/FIVDqqHQyU3Uk /8Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473508; x=1775078308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Ik5dNOPzzIxkGj0tgUhxiCaEIrTWAFn/Zu/ILMDzmRk=; b=sk3TWSnC2LemtttZSqZMZiUCKNVyRiMxB4XVGmet9i0/JGsGhbqgKnG5mSnCMK2RSU 3B4NVnfN262qmDKKgnhWBSj+bW0rtz2RQtXNfeAOY37MNmnO/KmqkoO/QclgYEmzCzW4 mGY867NRZOvc46Eus/7ctSWCtwNT0IMctTnJsjAo3ENl4EKJZEg5ahqyQZ21C7A1mlAx Y4MD9ijoqy5CRlbnYSbqui7wu+cn0/OhcL5L2KA77MIQBxfNQdoPL3qvvhK9BKT50k8L 1iWXsrIipNTqtuiEDGfd102hAWwSLKA6Uk0aZKnPdDwXyL+A0EGSNM8ZSsAT3uj8lwyn dVFg== X-Gm-Message-State: AOJu0Yze8J0g2427k/MzZxFO4eZ4+GmFBATuIeD3frBtca3pa5oaLJD2 eSyao1INiDqS+DfiveREW4VSX4oM8fdccHmNQXko76hTJ/4Hnx8lJKZFQ6+NqoACk7mUzWW/ZPQ kHx+mdW0= X-Gm-Gg: ATEYQzwmXMXt6PBJt6jaxt8NwXcZPz9EeUBwTYqmd+RQhpbIbINt7NcUjw1T3DkhrpY gAVSmsTujqvgB+0mF/ZlC3N4QtHQxZtes2x8Vmb7rtZAUM/Bt09QT8kW2qVZGwCvHhuIuJcb76N qoaaOxjq+RjPeNMp5KclIHjr1yNM5l3mV+vIVfOkkwvS5ObhedjE4BA3Sm7en6rr4ioJPP70D6i 1BChmwtwbtrv9HgxVcpsQ2eCS/S2hXEL9CvQUm7+UJ5pS13uKlu4PPDS9D0eEfsOMDVDtKIJI0O thajlbOEAMO/o0NXmDjI7qY58m2idaPAiII1vLC5l/4iE6qPN6GKGQ4kYodZyPtdEKo1PrJ0zDM 5sD0VV7QP8CX7tTEYQ1s3ByhtCkxyIS1XGdSi9Mp5b2yTsR0oa9bWc+KMtRXf//9ku2tDw4migH SZ1F28U3/NZtGPTK5j5RP02Y02xaHCSzqULiG2SYogmc7Z14AOrTfKuzuQ9tKpG4PZq869fMKm X-Received: by 2002:a05:600c:1f12:b0:486:fdca:ea8d with SMTP id 5b1f17b1804b1-48716050758mr71567905e9.25.1774473507719; Wed, 25 Mar 2026 14:18:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu Subject: [PATCH-for-11.1 08/10] target/i386: Inline VMSTATE_UINTTL_SUB_ARRAY() macro Date: Wed, 25 Mar 2026 22:17:26 +0100 Message-ID: <20260325211728.89204-9-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473571646158500 The x86 target is the single one using the VMSTATE_UINTTL_SUB_ARRAY macro. Inline it to avoid further uses of this legacy macro on other targets. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/migration/cpu.h | 4 ---- target/i386/machine.c | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 82a81b5d895..ea411d863ad 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -12,16 +12,12 @@ VMSTATE_UINT64_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) -#define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ - VMSTATE_UINT64_SUB_ARRAY(_f, _s, _start, _num) #define vmstate_info_uinttl vmstate_info_uint64 #else #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) -#define VMSTATE_UINTTL_SUB_ARRAY(_f, _s, _start, _num) \ - VMSTATE_UINT32_SUB_ARRAY(_f, _s, _start, _num) #define vmstate_info_uinttl vmstate_info_uint32 #endif =20 diff --git a/target/i386/machine.c b/target/i386/machine.c index 1f5c517e562..16b65bddcdd 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1770,7 +1770,11 @@ const VMStateDescription vmstate_x86_cpu =3D { .pre_save =3D cpu_pre_save, .post_load =3D cpu_post_load, .fields =3D (const VMStateField[]) { - VMSTATE_UINTTL_SUB_ARRAY(env.regs, X86CPU, 0, CPU_NB_REGS), +#if TARGET_LONG_BITS =3D=3D 64 + VMSTATE_UINT64_SUB_ARRAY(env.regs, X86CPU, 0, CPU_NB_REGS), +#else + VMSTATE_UINT32_SUB_ARRAY(env.regs, X86CPU, 0, CPU_NB_REGS), +#endif VMSTATE_UINTTL(env.eip, X86CPU), VMSTATE_UINTTL(env.eflags, X86CPU), VMSTATE_UINT32(env.hflags, X86CPU), --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473566; cv=none; d=zohomail.com; s=zohoarc; b=VvFci6fP9QE+k/lsCsrXZ0Xo5v2s/exapGzHlYzsMHskvyA6HtcJ+DIIQT6ugMDk0OhCNRJuURR9IUaoUwf2j/fIgtWcVFCVHxqlYdCx4RsjZems4bc4KV0My528KMToHbZeLGKexVLXefdV/C+6Uu7GnfPtDeMj4SepYVm777A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473566; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=sYLEjfbOiczTZUFDQRpJ1WZc2p5N+UskvmbNC3BaZgI=; b=ceaULj0fTAq3l+QUylydZ2ife1smtBk91yQUrvjIBvMeQA0WaOUYUwzEzbcTC70Hk7O7roM8UxvBkXskDWxQ/trqH61CN0pd8KgyCJmtrExDJfhNbwIdKfMPn4HVaSX3vgmrcrf2fEb+RP8Vfx3CbNCyysi8ewdMLAudP50DkwQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774473566945193.38017732803326; Wed, 25 Mar 2026 14:19:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5Vcf-0001dv-1D; Wed, 25 Mar 2026 17:18:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5Vcd-0001cs-T7 for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:39 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5Vca-0001qw-R5 for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:39 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-43b4f48c47cso203710f8f.0 for ; Wed, 25 Mar 2026 14:18:36 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b9192e3e8sm2917709f8f.5.2026.03.25.14.18.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:18:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473515; x=1775078315; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sYLEjfbOiczTZUFDQRpJ1WZc2p5N+UskvmbNC3BaZgI=; b=S/YXUGD6YXLJjanHRcE+nmVClXdBBIv+shjUwLVqpzHsjSCWOIurU23J3IHKTG6HIz uhvIPwqkD+AhruLJ0pJ3f92H2HXBCGbABF6jFDZNwV0Mmt4TF1ytjsC+n6S5Kdf5u5Lj 2l608vgp7PdBM3ka0A9MM1ezJpvqw/lqoeghvr/WHWq86c6ADkE9xdWHIyjNIq0CKI9D 5Wm0GuFb9dZdF6BYZplUS7m5e+lGtTZTWsWoIirzLoemMdGteqROw7tyJ+JzUqUIO/a9 Syg5OJlQBMgZyl4ggpALcHf8WUy0TY1+exvgbDxRu1rOOn8TCrkmDeiuGni9LEzsK1pJ ZjdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473515; x=1775078315; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=sYLEjfbOiczTZUFDQRpJ1WZc2p5N+UskvmbNC3BaZgI=; b=DEeB/hZpm39imch12Zs76aG4iXQIaWgxpMqJ3PS+NWbfdRSvC4XbyFlCTBs893WWsq M3Y+5b0OnqdzqTv2phA5u+lY3MX0RN5eurhb4wqPvGS4G9nlxrO9VQKKxQOqnsTd1KDY UMtZ75RcsGzuuLDlXJ30s006FrHfrTMl+FHF+i63Pm7rL4DSV6jrIvvCqbnQ3d0piAvZ xq1Ysbcf+BHvT16l8dyVethRnCaaW6hWo/TPydWKFQ2YnxIBYdyAK1yHrrK0Biw8kmer YNNqwrMlVpAA0+TJM3ydaTDPLQepqszN6iNk6Yf/JkOjaisPGZn+t2FMblreS+sow/xY Ei7g== X-Gm-Message-State: AOJu0YyRhAa7cSTKcGp3k64y7ClU1QG+UgVRwPP3z7DP7iuKW/l3LGid TZUcoUZ8gh/3sUahQAB/BF+DAUSYX7HbcajWDCBF0p0miLO5FK2p/bq8Vskadp4n3RgFhNo48VM cE2xzVOA= X-Gm-Gg: ATEYQzyCmUbAvySaZmI4biS8sPAdJ5VGyQ/rMXGiERpxhDmf0x/4poWWyMDihEzY5nU Q99igmrXktDSxOL4lAIzxbk5zRMmNwpfgyEyLeL122PQTCYy88Y7e8B8cVXIuGUXmH+GLuSnbZg 1Gjqrf0wwIQtdVP3+zL7DBzILrJbLU21E8Zd6NW/7KvZVDgEXJJoouNhpOPKw2S3e8YnIYvZ/pH OEuUfOo6GdVcMODuPTm5m1Ul9YwkOexOD+vCeJbUrB8ueN0KLvUZ01kgQC60PcUENU0Ir6OK8To DGIoRWukT1f/v191r+pr342pvA8J31oTCy0YkXNj7Z/HD26WcYI1NEJxNW13C2zuLIi808sJ8Qf vVCb281hc/rlGKv8xx8dzN+KsdvcnBsJikLXFS7ZEN0KAh0pit/xMf/SjatsAmw7Bn4btGRB2UW HORlKKNAXD4EYOk4rdyB5KBtxfbQQueRf/wHZj6uElHu/BJCS6XRKKB8Vnfwo3uwTWxZKjzmbj X-Received: by 2002:a05:6000:2dc7:b0:439:b6d6:723 with SMTP id ffacd0b85a97d-43b88a1bcc5mr7764409f8f.42.1774473514778; Wed, 25 Mar 2026 14:18:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-11.1 09/10] target/sparc: Replace VMSTATE_VARRAY_MULTIPLY -> VMSTATE_UINTTL_ARRAY Date: Wed, 25 Mar 2026 22:17:27 +0100 Message-ID: <20260325211728.89204-10-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473569744158500 VMSTATE_VARRAY_MULTIPLY() seems to be an "optimized" version of VMSTATE_UINTTL_ARRAY(), and is only used once. Prefer the generic macro, removing the need for the VMS_MULTIPLY_ELEMENTS field. Bump the SPARC CPU migration stream version. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- include/migration/cpu.h | 2 -- include/migration/vmstate.h | 22 +++------------------- migration/vmstate.c | 4 ---- target/sparc/machine.c | 7 +++---- 4 files changed, 6 insertions(+), 29 deletions(-) diff --git a/include/migration/cpu.h b/include/migration/cpu.h index ea411d863ad..05a1ddde343 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -12,13 +12,11 @@ VMSTATE_UINT64_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) -#define vmstate_info_uinttl vmstate_info_uint64 #else #define VMSTATE_UINTTL_V(_f, _s, _v) \ VMSTATE_UINT32_V(_f, _s, _v) #define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) -#define vmstate_info_uinttl vmstate_info_uint32 #endif =20 #define VMSTATE_UINTTL(_f, _s) \ diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 62c2abd0c49..663b0c8ae06 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -94,7 +94,7 @@ enum VMStateFlags { VMS_ARRAY_OF_POINTER =3D 0x040, =20 /* The field is an array of variable size. The uint16_t at opaque - * + VMStateField.num_offset (subject to VMS_MULTIPLY_ELEMENTS) + * + VMStateField.num_offset * contains the number of entries in the array. See the VMS_ARRAY * description regarding array handling in general. May not be * combined with VMS_ARRAY or any other VMS_VARRAY*. */ @@ -115,14 +115,14 @@ enum VMStateFlags { VMS_MULTIPLY =3D 0x200, =20 /* The field is an array of variable size. The uint8_t at opaque + - * VMStateField.num_offset (subject to VMS_MULTIPLY_ELEMENTS) + * VMStateField.num_offset * contains the number of entries in the array. See the VMS_ARRAY * description regarding array handling in general. May not be * combined with VMS_ARRAY or any other VMS_VARRAY*. */ VMS_VARRAY_UINT8 =3D 0x400, =20 /* The field is an array of variable size. The uint32_t at opaque - * + VMStateField.num_offset (subject to VMS_MULTIPLY_ELEMENTS) + * + VMStateField.num_offset * contains the number of entries in the array. See the VMS_ARRAY * description regarding array handling in general. May not be * combined with VMS_ARRAY or any other VMS_VARRAY*. */ @@ -139,12 +139,6 @@ enum VMStateFlags { * cause the individual entries to be allocated. */ VMS_ALLOC =3D 0x2000, =20 - /* Multiply the number of entries given by the integer at opaque + - * VMStateField.num_offset (see VMS_VARRAY*) with VMStateField.num - * to determine the number of entries in the array. Only valid in - * combination with one of VMS_VARRAY*. */ - VMS_MULTIPLY_ELEMENTS =3D 0x4000, - /* A structure field that is like VMS_STRUCT, but uses * VMStateField.struct_version_id to tell which version of the * structure we are referencing to use. */ @@ -398,16 +392,6 @@ extern const VMStateInfo vmstate_info_qlist; .offset =3D vmstate_offset_2darray(_state, _field, _type, _n1, _n2= ), \ } =20 -#define VMSTATE_VARRAY_MULTIPLY(_field, _state, _field_num, _multiply, _in= fo, _type) { \ - .name =3D (stringify(_field)), \ - .num_offset =3D vmstate_offset_value(_state, _field_num, uint32_t),\ - .num =3D (_multiply), \ - .info =3D &(_info), \ - .size =3D sizeof(_type), \ - .flags =3D VMS_VARRAY_UINT32|VMS_MULTIPLY_ELEMENTS, \ - .offset =3D vmstate_offset_varray(_state, _field, _type), \ -} - #define VMSTATE_SUB_ARRAY(_field, _state, _start, _num, _version, _info, _= type) { \ .name =3D (stringify(_field)), \ .version_id =3D (_version), \ diff --git a/migration/vmstate.c b/migration/vmstate.c index 4d28364f7ba..e960bc7a7c4 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -97,10 +97,6 @@ static int vmstate_n_elems(void *opaque, const VMStateFi= eld *field) n_elems =3D *(uint8_t *)(opaque + field->num_offset); } =20 - if (field->flags & VMS_MULTIPLY_ELEMENTS) { - n_elems *=3D field->num; - } - trace_vmstate_n_elems(field->name, n_elems); return n_elems; } diff --git a/target/sparc/machine.c b/target/sparc/machine.c index 0a449f2f8c6..5f402e098cf 100644 --- a/target/sparc/machine.c +++ b/target/sparc/machine.c @@ -189,9 +189,9 @@ static int cpu_pre_save(void *opaque) * versions are different. */ #ifndef TARGET_SPARC64 -#define SPARC_VMSTATE_VER 7 +#define SPARC_VMSTATE_VER 8 #else -#define SPARC_VMSTATE_VER 9 +#define SPARC_VMSTATE_VER 10 #endif =20 const VMStateDescription vmstate_sparc_cpu =3D { @@ -202,8 +202,7 @@ const VMStateDescription vmstate_sparc_cpu =3D { .fields =3D (const VMStateField[]) { VMSTATE_UINTTL_ARRAY(env.gregs, SPARCCPU, 8), VMSTATE_UINT32(env.nwindows, SPARCCPU), - VMSTATE_VARRAY_MULTIPLY(env.regbase, SPARCCPU, env.nwindows, 16, - vmstate_info_uinttl, target_ulong), + VMSTATE_UINTTL_ARRAY(env.regbase, SPARCCPU, MAX_NWINDOWS * 16 + 8), VMSTATE_CPUDOUBLE_ARRAY(env.fpr, SPARCCPU, TARGET_DPREGS), VMSTATE_UINTTL(env.pc, SPARCCPU), VMSTATE_UINTTL(env.npc, SPARCCPU), --=20 2.53.0 From nobody Fri Apr 3 01:25:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774473541; cv=none; d=zohomail.com; s=zohoarc; b=S7K3iuU5FKK31nwMxj6poV8OnxwPRetN/il9bqBRJgxs8awo9XM0/ahdKA28nZdp01SOYfT31Bs1t1Fcikt84JrDXTk0UYaqkkN0WDUV5/Sd8sw9kuLz1KNf59iEI9xWXEV2DPxkFm4CDsUpsnKSzaJmZza8GsrPtxhzlXjFmt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774473541; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ELyG3CPRX3HGPrR46En7QqMJTEd390KuOAkz1dhhPqI=; b=ivGbvpQc0Zv9T/+Co5VeET1U3W17zw3wXevBE+gshTBPpzIkhhuoD8myN8XjH40OBMC07z7iI4X4U4JRLWEghcKa8OfqjwqT4NE6kIxly+O4ZnE54VumaqCAatH0Qqtkacu4f6PcQunspN62eHIqfrJxY3z1N6BTwphGjrsjx3Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177447354127181.54226233270742; Wed, 25 Mar 2026 14:19:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5Vcp-0001so-Lx; Wed, 25 Mar 2026 17:18:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5Vck-0001pO-Ev for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:47 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w5Vci-00021p-9o for qemu-devel@nongnu.org; Wed, 25 Mar 2026 17:18:46 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-43b41b545d9so239820f8f.2 for ; Wed, 25 Mar 2026 14:18:43 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b9192e352sm2748535f8f.3.2026.03.25.14.18.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 25 Mar 2026 14:18:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774473522; x=1775078322; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ELyG3CPRX3HGPrR46En7QqMJTEd390KuOAkz1dhhPqI=; b=NscsU5NC3OBZxW/SfQ4LW2L2k/P53CUe+2beyP/bSdjDieYvZJE5iAeWcthM2nBqyN 1hm4VfYYBDrQV6bAlgvGZJGkHO+lYAxTwsVTz9+bU7vCY1QebVHiy1IGAu9w3G17/XLy DbB27Qz61X4SM0/7sq86Kp3fnuEqR2yI4kHoD9OX8Lhdry717PZn14oQGcGxXl6iuEfF SwloXSk2udz+6ZfbrHgmvZa/Y8TvmIaNX0hPqRaudo9MaaL/gui+H+8TgmHo4STW3I0E dDZiOCSkra+CYO2gjmDNdKvaCbyI/A8QbeDsVIyPPsR9H242xCN9j/0fhICfwh553CjR psQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774473522; x=1775078322; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ELyG3CPRX3HGPrR46En7QqMJTEd390KuOAkz1dhhPqI=; b=ijOIfr6cfRzLfMTOBEgC7fu11pDZCDThreGgLWvIMcRdrwcUKmOEofBHpaT2kRXXKQ lxZTf8tyhxeruYCioRP5dbF24G3+X59TnMm65wCUHk8UDISkP7e2K4V7UVs5o7H9NU1N 4IpQvhuGuHOVYzotV4TI+vRuCuG/p17EgGCdzeGQm82ktyVnt20qtpXRaRd2RflE3sK4 pdQvz9NwluoNuxOj2BpK0mN3eyEp2KCSAmh3OGBkoaylMHknkjYzbzxlEbLjS05Zi5zx r+VBNQkxRyP+nmTeyv0UB4vWAKUDBUU6VYuv8qoRAHNQxExQPQlN/BwUni9ejKQnTUYb h83A== X-Gm-Message-State: AOJu0Yx1uIMjIh6B7uHPLrthZkvyLzoV9UnivfmJdnANGRGxx+owljpI kraSW/4zGVHWfnhiTszCYHVNYCxxUSRuSu+qm840As4PyxhI1ToPidqWpsVy0E+x9PJ+m8VeSjT 50fs/Oyo= X-Gm-Gg: ATEYQzx5utbiEmH1HJTpKBsRuXDmG6uTvx1jJYsK1rrh8qHz6FVtDI7nAslFnA+PSxp SI9Pe+nEDyw2GF4Jb1TJifUDxk2BbMvJDZGmrbzAX6ru6O2T7IM7kB7+FbxyTVwnfJOXd3AL9bu ZkVDtKgBsplHaFO3PO9FcJA2NCD3ljTsklYomMYGjMImGsM7CgqWtT3ngo8xhLEfHeZeMxxBZIw 4dH00jy1AH/UsSfWEmEUvORtyP4X6aeptSlQ/VLCKP5zawuHKQFng117dE4hSQaWbt6EPPhCTjI l3plse33rbKSxNVdahO/k6I/bkA6UVZHzAdnFBKt19MuOO4shEtq4va3cHQV7EShUe676A3uNii XlYEZeEQoQXr9vrhFyS2c6obX/686XntAukV5Wx6ZttQ9mE6vnMXYUeqBVuRbgadEYGK+IO9z8B TjvacYXYSJlBUbo25gBHMgyn+vDQR1mzFtu8YHX6KwpVEU2YmwvAlPpaLVLfWZK4a1UCnirCV9 X-Received: by 2002:a05:6000:2308:b0:43b:6a16:17e with SMTP id ffacd0b85a97d-43b88994d97mr7991806f8f.11.1774473522203; Wed, 25 Mar 2026 14:18:42 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Glenn Miles , Mark Cave-Ayland , Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , Fabiano Rosas , Alistair Francis , Pierrick Bouvier , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-riscv@nongnu.org, Paolo Bonzini , Artyom Tarasenko , Anton Johansson , Peter Xu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , Jiaxun Yang , Palmer Dabbelt , Weiwei Li , Liu Zhiwei , Chao Liu , Chinmay Rath Subject: [PATCH-for-11.1 10/10] migration: Restrict legacy VMSTATE_UINTTL() macros to few targets Date: Wed, 25 Mar 2026 22:17:28 +0100 Message-ID: <20260325211728.89204-11-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260325211728.89204-1-philmd@linaro.org> References: <20260325211728.89204-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774473543662158500 Only 5 base targets use VMSTATE_UINTTL (MIPS, PPC, X86, SPARC and RISCV). In order to build a single binary (preliminary step toward heterogeneous emulation) we need to remove it, but it will take some time. Add a temporary TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API definition to keep targets not using these macros clean while we keep cleaning the last few targets one by one, preventing legacy uses to creep back in. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- configs/targets/i386-softmmu.mak | 1 + configs/targets/mips-softmmu.mak | 1 + configs/targets/mips64-softmmu.mak | 1 + configs/targets/mips64el-softmmu.mak | 1 + configs/targets/mipsel-softmmu.mak | 1 + configs/targets/ppc-softmmu.mak | 1 + configs/targets/ppc64-softmmu.mak | 1 + configs/targets/riscv32-softmmu.mak | 1 + configs/targets/riscv64-softmmu.mak | 1 + configs/targets/sparc-softmmu.mak | 1 + configs/targets/sparc64-softmmu.mak | 1 + configs/targets/x86_64-softmmu.mak | 1 + include/migration/cpu.h | 24 +++++++++++------------- target/ppc/machine.c | 1 + scripts/make-config-poison.sh | 1 + 15 files changed, 25 insertions(+), 13 deletions(-) diff --git a/configs/targets/i386-softmmu.mak b/configs/targets/i386-softmm= u.mak index 38a8f85201f..048ae17fdc5 100644 --- a/configs/targets/i386-softmmu.mak +++ b/configs/targets/i386-softmmu.mak @@ -4,3 +4,4 @@ TARGET_KVM_HAVE_RESET_PARKED_VCPU=3Dy TARGET_XML_FILES=3D i386-32bit.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/mips-softmmu.mak b/configs/targets/mips-softmm= u.mak index 95397af9442..81990d21880 100644 --- a/configs/targets/mips-softmmu.mak +++ b/configs/targets/mips-softmmu.mak @@ -2,3 +2,4 @@ TARGET_ARCH=3Dmips TARGET_BIG_ENDIAN=3Dy TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/mips64-softmmu.mak b/configs/targets/mips64-so= ftmmu.mak index f9cc41b9ed4..2f7873af06d 100644 --- a/configs/targets/mips64-softmmu.mak +++ b/configs/targets/mips64-softmmu.mak @@ -3,3 +3,4 @@ TARGET_BASE_ARCH=3Dmips TARGET_BIG_ENDIAN=3Dy TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/mips64el-softmmu.mak b/configs/targets/mips64e= l-softmmu.mak index 4e7dedc5f30..62e74f77ba5 100644 --- a/configs/targets/mips64el-softmmu.mak +++ b/configs/targets/mips64el-softmmu.mak @@ -2,3 +2,4 @@ TARGET_ARCH=3Dmips64 TARGET_BASE_ARCH=3Dmips TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/mipsel-softmmu.mak b/configs/targets/mipsel-so= ftmmu.mak index b0fba8a9d0a..57e556b93b8 100644 --- a/configs/targets/mipsel-softmmu.mak +++ b/configs/targets/mipsel-softmmu.mak @@ -1,3 +1,4 @@ TARGET_ARCH=3Dmips TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/ppc-softmmu.mak b/configs/targets/ppc-softmmu.= mak index 867898bd47c..1e28d40b440 100644 --- a/configs/targets/ppc-softmmu.mak +++ b/configs/targets/ppc-softmmu.mak @@ -3,3 +3,4 @@ TARGET_BIG_ENDIAN=3Dy TARGET_KVM_HAVE_GUEST_DEBUG=3Dy TARGET_XML_FILES=3D power-core.xml power-fpu.xml power-altivec.xml power-s= pe.xml TARGET_LONG_BITS=3D32 +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/ppc64-softmmu.mak b/configs/targets/ppc64-soft= mmu.mak index 10d7a2681e7..8c7171f9d5e 100644 --- a/configs/targets/ppc64-softmmu.mak +++ b/configs/targets/ppc64-softmmu.mak @@ -6,3 +6,4 @@ TARGET_XML_FILES=3D power64-core.xml power-fpu.xml power-al= tivec.xml power-spe.xml # all boards require libfdt TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D64 +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/riscv32-softmmu.mak b/configs/targets/riscv32-= softmmu.mak index 26080599be7..a9cd8ae89ee 100644 --- a/configs/targets/riscv32-softmmu.mak +++ b/configs/targets/riscv32-softmmu.mak @@ -5,3 +5,4 @@ TARGET_XML_FILES=3D riscv-32bit-cpu.xml riscv-32bit-fpu.xml= riscv-64bit-fpu.xml ri TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/riscv64-softmmu.mak b/configs/targets/riscv64-= softmmu.mak index 5059c550480..3f97cd6dfa5 100644 --- a/configs/targets/riscv64-softmmu.mak +++ b/configs/targets/riscv64-softmmu.mak @@ -6,3 +6,4 @@ TARGET_XML_FILES=3D riscv-64bit-cpu.xml riscv-32bit-fpu.xml= riscv-64bit-fpu.xml ri TARGET_NEED_FDT=3Dy TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/sparc-softmmu.mak b/configs/targets/sparc-soft= mmu.mak index 126ce12abb0..0630fa54b43 100644 --- a/configs/targets/sparc-softmmu.mak +++ b/configs/targets/sparc-softmmu.mak @@ -4,3 +4,4 @@ TARGET_XML_FILES=3Dsparc32-cpu.xml sparc32-fpu.xml sparc32-= cp0.xml TARGET_LONG_BITS=3D32 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/sparc64-softmmu.mak b/configs/targets/sparc64-= softmmu.mak index 4e621fb8e39..500db845ea9 100644 --- a/configs/targets/sparc64-softmmu.mak +++ b/configs/targets/sparc64-softmmu.mak @@ -5,3 +5,4 @@ TARGET_XML_FILES=3Dsparc64-cpu.xml sparc64-fpu.xml sparc64-= cp0.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/configs/targets/x86_64-softmmu.mak b/configs/targets/x86_64-so= ftmmu.mak index c7f8746b4f5..18b3575e4e2 100644 --- a/configs/targets/x86_64-softmmu.mak +++ b/configs/targets/x86_64-softmmu.mak @@ -5,3 +5,4 @@ TARGET_KVM_HAVE_RESET_PARKED_VCPU=3Dy TARGET_XML_FILES=3D i386-64bit.xml i386-64bit-apx.xml TARGET_LONG_BITS=3D64 TARGET_NOT_USING_LEGACY_LDST_PHYS_API=3Dy +TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API=3Dy diff --git a/include/migration/cpu.h b/include/migration/cpu.h index 05a1ddde343..4c8c9c34cc8 100644 --- a/include/migration/cpu.h +++ b/include/migration/cpu.h @@ -3,25 +3,23 @@ #ifndef MIGRATION_CPU_H #define MIGRATION_CPU_H =20 +#ifdef TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API + #include "exec/cpu-defs.h" -#include "migration/qemu-file-types.h" #include "migration/vmstate.h" =20 #if TARGET_LONG_BITS =3D=3D 64 -#define VMSTATE_UINTTL_V(_f, _s, _v) \ - VMSTATE_UINT64_V(_f, _s, _v) -#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ - VMSTATE_UINT64_ARRAY_V(_f, _s, _n, _v) +#define VMSTATE_UINTTL(_f, _s) \ + VMSTATE_UINT64_V(_f, _s, 0) +#define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ + VMSTATE_UINT64_ARRAY_V(_f, _s, _n, 0) #else -#define VMSTATE_UINTTL_V(_f, _s, _v) \ - VMSTATE_UINT32_V(_f, _s, _v) -#define VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, _v) \ - VMSTATE_UINT32_ARRAY_V(_f, _s, _n, _v) +#define VMSTATE_UINTTL(_f, _s) \ + VMSTATE_UINT32_V(_f, _s, 0) +#define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ + VMSTATE_UINT32_ARRAY_V(_f, _s, _n, 0) #endif =20 -#define VMSTATE_UINTTL(_f, _s) \ - VMSTATE_UINTTL_V(_f, _s, 0) -#define VMSTATE_UINTTL_ARRAY(_f, _s, _n) \ - VMSTATE_UINTTL_ARRAY_V(_f, _s, _n, 0) +#endif /* TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API */ =20 #endif diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 49cfdc6d674..f6169a128dc 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -5,6 +5,7 @@ #include "helper_regs.h" #include "mmu-hash64.h" #include "migration/cpu.h" +#include "migration/qemu-file-types.h" #include "qapi/error.h" #include "kvm_ppc.h" #include "power8-pmu.h" diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh index b4d61e8bc9e..a1c5fa77d9d 100755 --- a/scripts/make-config-poison.sh +++ b/scripts/make-config-poison.sh @@ -12,6 +12,7 @@ exec sed -n \ -e '/CONFIG_SOFTMMU/d' \ -e '/TARGET_NOT_USING_LEGACY_LDST_PHYS_API/d' \ -e '/TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API/d' \ + -e '/TARGET_USING_LEGACY_MIGRATION_VMSTATE_UINTTL_API/d' \ -e '/^#define / {' \ -e 's///' \ -e 's/ .*//' \ --=20 2.53.0