From nobody Mon Feb 9 05:43:15 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=1759825067; cv=none; d=zohomail.com; s=zohoarc; b=lXwPrZH70vHbtEp7GC8+LQgfiI3Qm+x7NO4UqUK0TEKK3kVjENXs23IV2iM9DIozDPLsqNciD66IZP7FbTUH9rrZ23mXgQv6oNa8zC4lwe5eU9pA+jxfHRwIJsWULt0aVPJPaBp8v5w4zeqLD6LWuormmh9D23IbINKZ1KXYcyw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759825067; 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=cD5B6th7c1TeoiHWNXDK88lPUBnBW5SZJ2RDNW2CK3g=; b=R8t7PzhiiGh8I+DVVdkKOH4disnAChOfecQqRnfudU1m8P2HQUIpSffaz3a0OOpnoQnMrs7E2fHm2b4Gf4/v1weXQGHxuErCX8xzDaAcSVvSKzF73NYVUT8kbUVJYmQCrSx/TGEg031ocKnMIevO13j1b7qhxiNazqnDHr7bkfU= 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 1759825067752613.5607776614943; Tue, 7 Oct 2025 01:17:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v62s2-0006pH-FO; Tue, 07 Oct 2025 04:16:30 -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 1v62s1-0006oU-6y for qemu-devel@nongnu.org; Tue, 07 Oct 2025 04:16:29 -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 1v62ry-00020l-LG for qemu-devel@nongnu.org; Tue, 07 Oct 2025 04:16:28 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-46e491a5b96so33838015e9.2 for ; Tue, 07 Oct 2025 01:16:26 -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-46fa2cfa2dcsm13204885e9.0.2025.10.07.01.16.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 01:16:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759824984; x=1760429784; 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=cD5B6th7c1TeoiHWNXDK88lPUBnBW5SZJ2RDNW2CK3g=; b=lzUJaSQFJWo/39OG3STAFtqkcUsLdemPLj1VCXQg98LoHbGOC/vc83EjwA/2WFSxiV eRCbPm0KTyqHIFwdkGANqNfPMkVKbyyE4VrTlx8vI9x7wXJbPXkdVJuODLFeHaBUmzsQ 5kZhORFq7vYn2cSMrOLM4TCEw/vgzRBr5/JRsevdORNORsD3fsWxskURZfVhXg65NoHG wPNIK67wyPp3cXOtFFCRYHIAgNpvF/gZF8ZAzoJt27pJlfwdhPgCVS46kOyoiQx+tBYH IO07hMUCW8MATLKPX/uc6v4ALol7kYRA8hnSH2YypWfty+RCNVBfBpFSuUpOvu3pc5XQ J+IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759824984; x=1760429784; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cD5B6th7c1TeoiHWNXDK88lPUBnBW5SZJ2RDNW2CK3g=; b=s2B8Imt8Ow+teCvGXw+g/N25CwiQahBJx9NFPwF2lU2PAxXgJJNPsRIxnvzpRBwg3g 6bMH7qMCwEInIuTpfZhk1LtGu2/dOLS/1Ytictyyjv01/OagaBd9jN4hBvJFeu4Bm5S8 dy6et60gPifAb1a+hZon5290hcV7ApHnLIJAAmQ/voSqQzMNySlB9V4GWjOXqEp2tmuI GhFa3pDh6Rog6bNnGWKQJ3dTHa2rMWJtu8xmUB0VMVOxcLmJDLGhGBkKAS+Q1sEsGj49 mYvFY8PK06DlMv9K2uxDvVmENI0b+KL5cyPc/X/tVnlsHPxYaLH26g3dL87ww6foTySL JYcg== X-Gm-Message-State: AOJu0YxBKfbBfjqeclHX37maZq/0ghkcn0wqOeNyqrtK4/+30AJ9zcmu rsDWik8iCli9viJWJUn1yodojbKIRhwwlAszApf4CBSBB9/W8jLRBw1F8zcUNvRv8p8PgB6wHjN oeUYwr38dGg== X-Gm-Gg: ASbGnct4zjPSVj8jP6JMUj575o/HoOCxUWtw1JQ0t2Msvc6x5pBzRx7/wKiS9Sd6tnB t2oONBUYJzyEUlloPEEj/GoDf5rOF8VJmSPr9lJ2ccXIncUGErAP0I7rKCBctfvSXwCzkftscUN S3cYsAyyYEpE3xqNAP2bm84fjz/8Itk7cf/CVZnNYSAfbVK7gpkAWi1GhzIJtx36uAbskhoW7RR JhUc7Et7ywn7MRfYLTL11toGcYpP9/X3p4mwmsRujDJ/TCQK0j3sQVDMk/NUa4/cOlFn877g64g ThZZ59ByJqK2eg/ph15aocnmhE13gNWrKrNCT9AR4zCnGmfNdN+HZHQ57XmlfM4DRULxqQ/pg1M 8EHqsHdg5k8D635/ALORkUCg/Q2OKvWIN2PgS1pQ5SsW7tD51cmLReVmgSFDkByda2gK8mYtsPz sCx9Hv6vsIHBaZv/0Y9HcrHl0l X-Google-Smtp-Source: AGHT+IHqJitJWd85EjVa6wBFl1HVhO0dJ2xXoZpIa4bEQDcdZ0MzcJ4BX+zr8XLtbIecHxBNFaDD4g== X-Received: by 2002:a05:600c:c4a8:b0:45c:b53f:ad9 with SMTP id 5b1f17b1804b1-46e71151aedmr107360115e9.33.1759824984354; Tue, 07 Oct 2025 01:16:24 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Weiwei Li , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Borntraeger , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Song Gao , Liu Zhiwei , Matthew Rosato , Eric Farman , Richard Henderson , Halil Pasic , kvm@vger.kernel.org, Aurelien Jarno , Aleksandar Rikalo , Marcelo Tosatti , Huacai Chen , qemu-riscv@nongnu.org, Nicholas Piggin , Harsh Prateek Bora , Chinmay Rath , Ilya Leoshkevich , Thomas Huth , qemu-ppc@nongnu.org, Alistair Francis , Paolo Bonzini , Palmer Dabbelt , Jiaxun Yang Subject: [PATCH 1/3] accel/kvm: Do not expect more then KVM_PUT_FULL_STATE Date: Tue, 7 Oct 2025 10:16:14 +0200 Message-ID: <20251007081616.68442-2-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251007081616.68442-1-philmd@linaro.org> References: <20251007081616.68442-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: 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: 1759825074714116600 KVM_PUT_FULL_STATE is the higher level defined so far in "system/kvm.h"; do not check for more. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Harsh Prateek Bora --- target/loongarch/kvm/kvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c index e5ea2dba9da..45292edcb1c 100644 --- a/target/loongarch/kvm/kvm.c +++ b/target/loongarch/kvm/kvm.c @@ -397,7 +397,7 @@ static int kvm_loongarch_put_csr(CPUState *cs, int leve= l) &env->CSR_RVACFG); =20 /* CPUID is constant after poweron, it should be set only once */ - if (level >=3D KVM_PUT_FULL_STATE) { + if (level =3D=3D KVM_PUT_FULL_STATE) { ret |=3D kvm_set_one_reg(cs, KVM_IOC_CSRID(LOONGARCH_CSR_CPUID), &env->CSR_CPUID); } @@ -801,7 +801,7 @@ int kvm_arch_put_registers(CPUState *cs, int level, Err= or **errp) once =3D 1; } =20 - if (level >=3D KVM_PUT_FULL_STATE) { + if (level =3D=3D KVM_PUT_FULL_STATE) { /* * only KVM_PUT_FULL_STATE is required, kvm kernel will clear * guest_addr for KVM_PUT_RESET_STATE --=20 2.51.0 From nobody Mon Feb 9 05:43:15 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=1759825040; cv=none; d=zohomail.com; s=zohoarc; b=eYWo8jCXc7VYhY4wcMbriqsj3jOW6mqFWp9Wj9vCG42a/JAjt0RW9vkcy7HuFm8IcTi0lKIscL+3zNN7hr2WxTr36j7kvOW5lOq4AH2aMTTfkr/HOaNl5Bjt/x0SuZXf45YlJjAlwzZIUCR44a0wwGbhoXL+fubHqVzmZv0/cS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759825040; 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=PSS/vO/urkPdDooJB2oeDa3yztjhJ4DM7WnJ6N8yGds=; b=a4MP9x21Asrg9MryjqHHqDY3ojyl6EzamRy9VNaBtN3pccvU2i1s//9ZRtKfxdYnUXVlNRoq17R9wzbIYJ0KK1Q+OxVYZKsMY3WIrk4Xu43/YOR/mJqVVHE0JvRDxqMzOJX13OO0102gAOnTEuWg4TQruVqF9ukOFQYpVsvVMO8= 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 1759825040757420.1381405107553; Tue, 7 Oct 2025 01:17:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v62s9-0006tR-RK; Tue, 07 Oct 2025 04:16:37 -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 1v62s7-0006sX-4H for qemu-devel@nongnu.org; Tue, 07 Oct 2025 04:16:35 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v62s3-00021e-Ti for qemu-devel@nongnu.org; Tue, 07 Oct 2025 04:16:34 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3f2ae6fadb4so742900f8f.1 for ; Tue, 07 Oct 2025 01:16:31 -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-4255d8e97f0sm24090022f8f.27.2025.10.07.01.16.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 01:16:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759824990; x=1760429790; 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=PSS/vO/urkPdDooJB2oeDa3yztjhJ4DM7WnJ6N8yGds=; b=PkHl96/USvcanLX7i2Kb6SS6JbhoMEv8OyIvET8IDMDpF+4mRmlgIdHaEv+X+onmPM MKmqHM2yvUPVEUKFpwOZX/J1i5QbU7PxMdMVaP49qIIQO5kl83jR8+by2du6zbmqYlvm /qbzhu3/tMXY8zonMsJ/b55F0QFtNV5N8j5gkylE50qGS55jdfEQ5pC0N+od4cqTI+cS I82nACRkZnRrN/DTKC7AQoJ/1B2OHeh4A4LqFgflN0Aw0hM/NX+FXK1IiaPPk0qFS5uA EAibNnCjwUXkcDhgljNLCd+ZXCklZQjpgIawZ3BpdOlsJFvApqpseEP1f/Z35MQ6mhIq CedQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759824990; x=1760429790; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PSS/vO/urkPdDooJB2oeDa3yztjhJ4DM7WnJ6N8yGds=; b=WlYAiRQvz5xYaYJ74kMk/XMb9YUxsE28/k/cxhWAhMrsvTagBiEYk3c6iqDhz5bB1t mX1xowADIV6qLAbw7f9nR+WIKhFimUlw2ceKjS7GS+/55CVMbBVw2Ln0bhwinnP+vtyA KC8EYW2CSaXdnSrJIs/Tz0EPQFrFCZOnpjQuyrs29WYZuShC3SZ83uWUmFYLl3crPNnQ +G70bW14CwUM8jO5sZOsLG1yigpED9EMYZTmlBEjgL+24AXTGOHSwTsu4Okr3VLhH9DY meUhp0Cz9JUT38UokJtav8KS79Zlo/Y9ZX+zJgVxelCd37KxBFA7igsAfN1O+xmSohgR IAmA== X-Gm-Message-State: AOJu0YzjsC1kXR5znw1YrSFOB05piDOzQy/FmumhaAAQ5Jt/d+ybxGps ltNW5Q7LjtNHOCdjDOJoUotfowqaYBwGyF01RQpiIpMHuw2r0QjNh6pySiJlAuHb6A4bTZV3hzN 8/aUSz/AtrA== X-Gm-Gg: ASbGnctQdWwaUkqMffweCNMOmWO2ew7O2oLjR3pFCmFiX01EBnCAJQ4jU6xC0Kgx6B3 y1kmpDhXfZFFj0aGo6ndK57KcpEC106lrMKnQYUd8jSYHdPxNNp37NK/P4QYZkC1ik8Vt9yPHMk m54hGoE0lH0auv/TAdtslH4k5e6/fg0OII5M2yF8PimqSaHt+nRq6nm7QO40xvXmzqLghnz1rqa 61Yc6zatg/cxzp4mo4ZW5L89JwC2RFNVevA0mCYsUeXJ5Pk8SPWZdhQdsR/LukwweQWkEhlVuZJ OWy4xOjknRoN3VYlyKlt97V1ILyyXZUYYvoDtwMsnGZLSy8hDOiXMQf80AXfePW+McxRl8dGdlE VGUpSa3KRhXJzwpY0FX3oZMhnCu0oaknuIDfb4Qn/WsrWGBRDCdaDEkoOMbwLqAZop2jtUeP00H AUXLPGszRGRAS04G4i667AMCEW X-Google-Smtp-Source: AGHT+IGRA6KPyvhxXtzYnOvTFtl5YLGs1n5NMaDQ4KBPLj2KKkceTTHa9sfY0JuyGZTIHGBzptzjJA== X-Received: by 2002:a05:6000:609:b0:401:70eb:eec7 with SMTP id ffacd0b85a97d-425671bc76amr9419782f8f.43.1759824989839; Tue, 07 Oct 2025 01:16:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Weiwei Li , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Borntraeger , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Song Gao , Liu Zhiwei , Matthew Rosato , Eric Farman , Richard Henderson , Halil Pasic , kvm@vger.kernel.org, Aurelien Jarno , Aleksandar Rikalo , Marcelo Tosatti , Huacai Chen , qemu-riscv@nongnu.org, Nicholas Piggin , Harsh Prateek Bora , Chinmay Rath , Ilya Leoshkevich , Thomas Huth , qemu-ppc@nongnu.org, Alistair Francis , Paolo Bonzini , Palmer Dabbelt , Jiaxun Yang Subject: [PATCH 2/3] accel/kvm: Introduce KvmPutState enum Date: Tue, 7 Oct 2025 10:16:15 +0200 Message-ID: <20251007081616.68442-3-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251007081616.68442-1-philmd@linaro.org> References: <20251007081616.68442-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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: 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: 1759825046435116600 Join the 3 KVM_PUT_*_STATE definitions in a single enum. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Harsh Prateek Bora --- include/system/kvm.h | 16 +++++++++------- target/i386/kvm/kvm.c | 6 +++--- target/loongarch/kvm/kvm.c | 4 ++-- target/mips/kvm.c | 6 +++--- target/ppc/kvm.c | 2 +- target/riscv/kvm/kvm-cpu.c | 2 +- target/s390x/kvm/kvm.c | 2 +- 7 files changed, 20 insertions(+), 18 deletions(-) diff --git a/include/system/kvm.h b/include/system/kvm.h index 4fc09e38910..8f9eecf044c 100644 --- a/include/system/kvm.h +++ b/include/system/kvm.h @@ -340,14 +340,16 @@ int kvm_arch_process_async_events(CPUState *cpu); =20 int kvm_arch_get_registers(CPUState *cpu, Error **errp); =20 -/* state subset only touched by the VCPU itself during runtime */ -#define KVM_PUT_RUNTIME_STATE 1 -/* state subset modified during VCPU reset */ -#define KVM_PUT_RESET_STATE 2 -/* full state set, modified during initialization or on vmload */ -#define KVM_PUT_FULL_STATE 3 +typedef enum kvm_put_state { + /* state subset only touched by the VCPU itself during runtime */ + KVM_PUT_RUNTIME_STATE =3D 1, + /* state subset modified during VCPU reset */ + KVM_PUT_RESET_STATE =3D 2, + /* full state set, modified during initialization or on vmload */ + KVM_PUT_FULL_STATE =3D 3, +} KvmPutState; =20 -int kvm_arch_put_registers(CPUState *cpu, int level, Error **errp); +int kvm_arch_put_registers(CPUState *cpu, KvmPutState level, Error **errp); =20 int kvm_arch_get_default_type(MachineState *ms); =20 diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 6a3a1c1ed8e..d06f55938cd 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -3911,7 +3911,7 @@ static void kvm_init_msrs(X86CPU *cpu) assert(kvm_buf_set_msrs(cpu) =3D=3D 0); } =20 -static int kvm_put_msrs(X86CPU *cpu, int level) +static int kvm_put_msrs(X86CPU *cpu, KvmPutState level) { CPUX86State *env =3D &cpu->env; int i; @@ -5031,7 +5031,7 @@ static int kvm_get_apic(X86CPU *cpu) return 0; } =20 -static int kvm_put_vcpu_events(X86CPU *cpu, int level) +static int kvm_put_vcpu_events(X86CPU *cpu, KvmPutState level) { CPUState *cs =3D CPU(cpu); CPUX86State *env =3D &cpu->env; @@ -5274,7 +5274,7 @@ static int kvm_get_nested_state(X86CPU *cpu) return ret; } =20 -int kvm_arch_put_registers(CPUState *cpu, int level, Error **errp) +int kvm_arch_put_registers(CPUState *cpu, KvmPutState level, Error **errp) { X86CPU *x86_cpu =3D X86_CPU(cpu); int ret; diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c index 45292edcb1c..32cd7c5d003 100644 --- a/target/loongarch/kvm/kvm.c +++ b/target/loongarch/kvm/kvm.c @@ -325,7 +325,7 @@ static int kvm_loongarch_get_csr(CPUState *cs) return ret; } =20 -static int kvm_loongarch_put_csr(CPUState *cs, int level) +static int kvm_loongarch_put_csr(CPUState *cs, KvmPutState level) { int ret =3D 0; CPULoongArchState *env =3D cpu_env(cs); @@ -763,7 +763,7 @@ int kvm_arch_get_registers(CPUState *cs, Error **errp) return ret; } =20 -int kvm_arch_put_registers(CPUState *cs, int level, Error **errp) +int kvm_arch_put_registers(CPUState *cs, KvmPutState level, Error **errp) { int ret; static int once; diff --git a/target/mips/kvm.c b/target/mips/kvm.c index 450947c3fa5..912cd5dfa0e 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -590,7 +590,7 @@ static void kvm_mips_update_state(void *opaque, bool ru= nning, RunState state) } } =20 -static int kvm_mips_put_fpu_registers(CPUState *cs, int level) +static int kvm_mips_put_fpu_registers(CPUState *cs, KvmPutState level) { CPUMIPSState *env =3D cpu_env(cs); int err, ret =3D 0; @@ -749,7 +749,7 @@ static int kvm_mips_get_fpu_registers(CPUState *cs) } =20 =20 -static int kvm_mips_put_cp0_registers(CPUState *cs, int level) +static int kvm_mips_put_cp0_registers(CPUState *cs, KvmPutState level) { CPUMIPSState *env =3D cpu_env(cs); int err, ret =3D 0; @@ -1177,7 +1177,7 @@ static int kvm_mips_get_cp0_registers(CPUState *cs) return ret; } =20 -int kvm_arch_put_registers(CPUState *cs, int level, Error **errp) +int kvm_arch_put_registers(CPUState *cs, KvmPutState level, Error **errp) { CPUMIPSState *env =3D cpu_env(cs); struct kvm_regs regs; diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 2521ff65c6c..cd60893a17d 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -907,7 +907,7 @@ int kvmppc_put_books_sregs(PowerPCCPU *cpu) return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_SREGS, &sregs); } =20 -int kvm_arch_put_registers(CPUState *cs, int level, Error **errp) +int kvm_arch_put_registers(CPUState *cs, KvmPutState level, Error **errp) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); CPUPPCState *env =3D &cpu->env; diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c index 187c2c9501e..75ca3fb9fd9 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c @@ -1369,7 +1369,7 @@ int kvm_riscv_sync_mpstate_to_kvm(RISCVCPU *cpu, int = state) return 0; } =20 -int kvm_arch_put_registers(CPUState *cs, int level, Error **errp) +int kvm_arch_put_registers(CPUState *cs, KvmPutState level, Error **errp) { int ret =3D 0; =20 diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c index 491cc5f9756..916dac1f14e 100644 --- a/target/s390x/kvm/kvm.c +++ b/target/s390x/kvm/kvm.c @@ -468,7 +468,7 @@ static int can_sync_regs(CPUState *cs, int regs) #define KVM_SYNC_REQUIRED_REGS (KVM_SYNC_GPRS | KVM_SYNC_ACRS | \ KVM_SYNC_CRS | KVM_SYNC_PREFIX) =20 -int kvm_arch_put_registers(CPUState *cs, int level, Error **errp) +int kvm_arch_put_registers(CPUState *cs, KvmPutState level, Error **errp) { CPUS390XState *env =3D cpu_env(cs); struct kvm_fpu fpu =3D {}; --=20 2.51.0 From nobody Mon Feb 9 05:43:15 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=1759825073; cv=none; d=zohomail.com; s=zohoarc; b=MTZ/TFKgm37M8z08Ini6NEljEJWy8z+UFH5ZZUNYxR8do7DoMqVB2du6NiHESmNbjAuzlMh+DsL37EH8SF2g1oob2NJqfCrUPFNa9EGh89qWg3G71eCpy+payf4u2+9yuwYVERqX9vcdvjnlWFjp0Yjo5snMv6KAV2P3yJg43vI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759825073; 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=DcrQ/BRDK8jh9DN0RScPMJskWDfOgmoQpJ709DYAp4w=; b=JWrFCf5h2ZAzAFnvXwY4y+yQXJky27yvqr8YuvDNQvEkNeJC85UAAN1HdVHaRdb7gCRnu57PKXSg3BjO11utkVIl/4eIjSbvOsNLltbLXiou0/N7L38SyQTh4mikxu2rU2iQAEI5+eTk+aFbG1lMMD2BINDHIpEkXYKR8PzA2Bw= 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 1759825073927960.5255860220474; Tue, 7 Oct 2025 01:17:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v62sD-0006vU-0G; Tue, 07 Oct 2025 04:16: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 1v62sB-0006u6-TA for qemu-devel@nongnu.org; Tue, 07 Oct 2025 04:16:39 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v62s9-00022M-Ef for qemu-devel@nongnu.org; Tue, 07 Oct 2025 04:16:39 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-4060b4b1200so5139651f8f.3 for ; Tue, 07 Oct 2025 01:16: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-4255d8f01absm24198783f8f.44.2025.10.07.01.16.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 07 Oct 2025 01:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1759824995; x=1760429795; 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=DcrQ/BRDK8jh9DN0RScPMJskWDfOgmoQpJ709DYAp4w=; b=Dm9X94ckzfx2f41jJslAvAvrI4pE1gaOXx4VZaExrKGmkpfNuSsdU2H05gEJsh5xYk 73b4fKK0eMp+sn2NvKuOzAefqXtrCAkb+SlpL7v1uCsjlJPaUbjmQFfPk+oCDdL2kO4q 35kZjFxg4K4D+h5LyhV0WxRiokJO6jmhtGIRlrpgCvonhJU50mZrDvTDeaMLyLBLo6/W bigO3MfG+RTmVjwBsFVxtXaNPrtUf+fwg6wuW2wy66tRY4JjQBR+Bk1tIGL6I7pNU8M3 cUKsdyYcBMYUwNyh9Rt95WrgW4pOWSphWk7BxCzTth99y5TxlAKRhNBxn+ITPy3yA25N AQOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759824995; x=1760429795; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DcrQ/BRDK8jh9DN0RScPMJskWDfOgmoQpJ709DYAp4w=; b=RD+YwhYOLiNzjBOopU+y9G3f3Ir58EiEeXca2waP9n3gOBXF8bih36uVZn9L+QDL6z 2Ypqe6KirQLOF9Rot5hlzGgMG57QKgfMGT7m9EwVnziAoU/4WwM+otJPD66YmbE6T8y5 WBjfecuYaC//VjD2j1A6JFUx0xHcmiiLI0RQaK1CSwqmrNmmqhDdURhjORA358cLtfzf l5ag0C/64lAzdZ1gPU2pr0CI1wpOPXIJ3nAuIhER8PYD+lQSnDJM4Yr5tFPLXS3V8bMO S45RxstTlwugCPrRdPVTZTRe4DcNFO/Nr1/QBWQCW03gUduxwLx3xA+gH6ZzwhfikcN7 1UXg== X-Gm-Message-State: AOJu0YxSouYc6JDB+jk8ZzOPCABoXByCsolu4ak2jvtWDIBUO+k4y0+m lE5XfmfMsE8tF8BgR5g3Da1kru2GZDTW9cOdXSBNXaUpDpLQoyY+xARFZhBXDRkbrQDMEaBmJUM 22zqQbHT1jw== X-Gm-Gg: ASbGnctm7LbjEYQel6j9zbrzB6hDz0RydPhayLE5dJCckGy5fkkq+BO6BCXtqlhCOh0 9BgioNwumIMY3IX0Q3BTo8yTWmmnOTz149AHSi6SWdy2HZYSyxtVyBTuvu7tiHAdpY2fi4+J9Jh KeVYF8mcc1QHq0tFWqEdNHjiwiX6DyYc+tdHHezyIaYAhZJd6/zeTpyHHPo1rAgyqtmmj2oISLw k+ceObgL+wMFO7o8Tes3Ov74/dE2va07ov2RBEZ2/7l0fWGl1M9ILB1Z/0m55tPYEpLTgWaWV8Q AxetCVdeFQwfa9mz+4/CH9WwzKy1fbMEQYrnbhatqEBrwJwkMZvq0C/g09OYqcB4TfptKtJCHWL aeZ6jYymga9blgEYqXyGL6hGTGh7pA1HS/0wn2igaAspMKB42XJAwKH4sjErk6NWscaZUdgaDEt 8kqMUGFt+15zjPT1cjZi23rr8U X-Google-Smtp-Source: AGHT+IFHWOG5U1yMfKEb7WzpHpJ5SLy6VLBCW53DXs+72dWbVVXkRnGeB+r0iTL/l/vZ87owsiQaLQ== X-Received: by 2002:a05:6000:659:10b0:425:73c9:7159 with SMTP id ffacd0b85a97d-42573c9773emr6459560f8f.33.1759824995064; Tue, 07 Oct 2025 01:16:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Weiwei Li , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Christian Borntraeger , Daniel Henrique Barboza , qemu-s390x@nongnu.org, Song Gao , Liu Zhiwei , Matthew Rosato , Eric Farman , Richard Henderson , Halil Pasic , kvm@vger.kernel.org, Aurelien Jarno , Aleksandar Rikalo , Marcelo Tosatti , Huacai Chen , qemu-riscv@nongnu.org, Nicholas Piggin , Harsh Prateek Bora , Chinmay Rath , Ilya Leoshkevich , Thomas Huth , qemu-ppc@nongnu.org, Alistair Francis , Paolo Bonzini , Palmer Dabbelt , Jiaxun Yang Subject: [PATCH 3/3] accel/kvm: Factor kvm_cpu_synchronize_put() out Date: Tue, 7 Oct 2025 10:16:16 +0200 Message-ID: <20251007081616.68442-4-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251007081616.68442-1-philmd@linaro.org> References: <20251007081616.68442-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::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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: 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: 1759825077968116600 The same code is duplicated 3 times: factor a common method. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- accel/kvm/kvm-all.c | 47 ++++++++++++++++++--------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 9060599cd73..de79f4ca099 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2935,22 +2935,32 @@ void kvm_cpu_synchronize_state(CPUState *cpu) } } =20 -static void do_kvm_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_da= ta arg) +static bool kvm_cpu_synchronize_put(CPUState *cpu, KvmPutState state, + const char *desc) { Error *err =3D NULL; - int ret =3D kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE, &err); + int ret =3D kvm_arch_put_registers(cpu, state, &err); if (ret) { if (err) { - error_reportf_err(err, "Restoring resisters after reset: "); + error_reportf_err(err, "Restoring resisters %s: ", desc); } else { - error_report("Failed to put registers after reset: %s", + error_report("Failed to put registers %s: %s", desc, strerror(-ret)); } - cpu_dump_state(cpu, stderr, CPU_DUMP_CODE); - vm_stop(RUN_STATE_INTERNAL_ERROR); + return false; } =20 cpu->vcpu_dirty =3D false; + + return true; +} + +static void do_kvm_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_da= ta arg) +{ + if (kvm_cpu_synchronize_put(cpu, KVM_PUT_RESET_STATE, "after reset")) { + cpu_dump_state(cpu, stderr, CPU_DUMP_CODE); + vm_stop(RUN_STATE_INTERNAL_ERROR); + } } =20 void kvm_cpu_synchronize_post_reset(CPUState *cpu) @@ -2964,19 +2974,9 @@ void kvm_cpu_synchronize_post_reset(CPUState *cpu) =20 static void do_kvm_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_dat= a arg) { - Error *err =3D NULL; - int ret =3D kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE, &err); - if (ret) { - if (err) { - error_reportf_err(err, "Putting registers after init: "); - } else { - error_report("Failed to put registers after init: %s", - strerror(-ret)); - } + if (kvm_cpu_synchronize_put(cpu, KVM_PUT_FULL_STATE, "after init")) { exit(1); } - - cpu->vcpu_dirty =3D false; } =20 void kvm_cpu_synchronize_post_init(CPUState *cpu) @@ -3166,20 +3166,11 @@ int kvm_cpu_exec(CPUState *cpu) MemTxAttrs attrs; =20 if (cpu->vcpu_dirty) { - Error *err =3D NULL; - ret =3D kvm_arch_put_registers(cpu, KVM_PUT_RUNTIME_STATE, &er= r); - if (ret) { - if (err) { - error_reportf_err(err, "Putting registers after init: = "); - } else { - error_report("Failed to put registers after init: %s", - strerror(-ret)); - } + if (kvm_cpu_synchronize_put(cpu, KVM_PUT_RUNTIME_STATE, + "at runtime")) { ret =3D -1; break; } - - cpu->vcpu_dirty =3D false; } =20 kvm_arch_pre_run(cpu, run); --=20 2.51.0