From nobody Mon Mar 2 10:54:35 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=1772121473; cv=none; d=zohomail.com; s=zohoarc; b=IEZ2ruH34PAKEnN9EpzILgOYsj6zg09dtTbUqXNNjhau3n25YkXu7GLXDhyVE1MWjWbcccBjndDH9n3xitpn1z/F9GpUVxAkEp1AF95q/wnICujdEIEZNfzeaffWFksRRQsIss/I9GULh2dcCgskusR6TPl22cza4OimAN+XLNs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772121473; h=Content-Transfer-Encoding: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:Cc; bh=9JJmQIaiVFL0Mge03bSjQhlB7hltQcjiAuFGOTxguH4=; b=nL48fACB+lqoHaGdmYNhJlNPDN9N8eZHm2lqShkZXO2sEsepJgJ1konn/wJsjPFyVhtoEr0dHIK4i5yPWDiV0t8sFV59C20B7xlM9cCc7JSr+IIUHD0GKndmBjF8kkyuifYDPZQJCWtYem9gW84vC2LFnNyv7sNPfak+qZp3iDo= 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 1772121473722704.865646385893; Thu, 26 Feb 2026 07:57:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vvdiR-0005Na-Nu; Thu, 26 Feb 2026 10:55:51 -0500 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 1vvdiP-0005Lc-6k for qemu-devel@nongnu.org; Thu, 26 Feb 2026 10:55:49 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vvdiM-0003kr-Lg for qemu-devel@nongnu.org; Thu, 26 Feb 2026 10:55:48 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-4398d1f06caso961964f8f.0 for ; Thu, 26 Feb 2026 07:55:46 -0800 (PST) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4399c75b8afsm407235f8f.23.2026.02.26.07.55.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Feb 2026 07:55:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772121345; x=1772726145; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=9JJmQIaiVFL0Mge03bSjQhlB7hltQcjiAuFGOTxguH4=; b=c6NyRxMqRJZQ+fA1Z6G7mo/lZ0GEQb7DdOzxno2hXvp2x9bvMxBSNlYsvz1bSOojY7 MAvZm4reG+JUt71u1PGcFakYrzgP8/qhP0aN54L4EoOxVrM4yRXH4tT+sBrreXtGQiU9 gLdYXYQeu1VvlUd602Uwjf50a7kQ+q/Q3Fj7FgKkIMzomhqNc7UfEkPZKZDFF7Fnxk0q Vuh2Isq2ynGC4xZegWTjN/yKK1KvbylmeRwsNnvDa+bKXtGEb1rk93p8NNwALSlHlMPa BKcpebC6ETbBKUYkHO6KKX9yZr31buXenYclyiHwHFAsm+Bfg7UmcXKPFGKoYmYgnfjO uxfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772121345; x=1772726145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=9JJmQIaiVFL0Mge03bSjQhlB7hltQcjiAuFGOTxguH4=; b=ba/tkFer9u9ajCLgo7BnSjsIXHUqb2CKOibxqIVUdxUZAMmXUkuo2199CmLBth4WNb Mka29t19xaq2qY3sETb6r3p1mdwOI9MgL6dJV/hIVJb8zQWExbPsMjSgs3htDYl9ONlz lJTBdieciA23hLaCiHCK7vlZgqc2MJyoCfBowJU3S+mslNvDZOHdPPWyUHBPjTwclEUU jReXB9/02lUM2TySgWzuVKUXNHHn9SQ7uuvMpxtKGse13/HaKSV8/c37aaiugDP33tkq 9Y8fF170jj0BEltivHP1Zlp1kmL9c8eO0e0xsfHfpajtNKg0ZWs//nuIjfd22VwGbcFM UXrw== X-Gm-Message-State: AOJu0YzlfMccLwaEkBvDW626q5NotdCxe75NssuNy0V1NJg9gfKw+B6K cB6fjW+EFtBy8mHQwi744It6U4WlJD7/WVE8DybXFATaYZxQIOALu36FKAq12roZ4FejGbd3ZKu OwL8x X-Gm-Gg: ATEYQzxJBviGD3/JQDpCbsDodCiU4AWOYncszJCFhM4pbBIfyhaBhyZBe3CJHAkJE6R 8hK5fU7gsSRPVMpUtcWEKvSTF8alRv5gTRfzE6gZR8BhChpzMgmI+vvzVVLLIj4Onjta52HZtlZ vxilsm82gmuE3BN6Mi17+wXAKIgin7hPDyrgvtwG7rL+YXXlapkFEkxZoKAT1Z1JE2fGnRVsCTt Z3yikFWkVRtYu9Odn+HNlC12f4DYSb6MqKxzOT21VsRQv8655MmFv8OI/YlEWB6WZ/+9+4f5o9S 6s68R2uRQ/NgVKPPZ2P8P8sHseHizy1xVDb5yDHoqmLgsHvD482d9ASGgpF7hQD3jTSIlM2GSBI 6Wgp1El9QFLGWq9Hv7L6uXP1OhTiHfz10j6WeOmId0sShTZvQrSm3tcngKGcPR35QXEiIIeUsFC 0uQuCCWWIulGVTME0Q//mlbD2ulVAqg0TemSRBAbi7c20b3uamPGAeVehJ+zr4qp8r81Gtu2Hmj 9ss+rdl8xAOBbrEIMaGXkJvOha6Y6I= X-Received: by 2002:a5d:64c9:0:b0:436:8058:452 with SMTP id ffacd0b85a97d-439942f2c8fmr9772213f8f.44.1772121345026; Thu, 26 Feb 2026 07:55:45 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/20] Revert "target/arm/hvf: Sync CNTV_CTL_EL0 & CNTV_CVAL_EL0" Date: Thu, 26 Feb 2026 15:55:22 +0000 Message-ID: <20260226155535.1171290-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260226155535.1171290-1-peter.maydell@linaro.org> References: <20260226155535.1171290-1-peter.maydell@linaro.org> MIME-Version: 1.0 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::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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=ham 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: 1772121474127158500 Content-Type: text/plain; charset="utf-8" From: Mohamed Mediouni This reverts commit bfbea371ef2cabc47effac5a286e2644d727a8d6. This commit breaks VM save/restore: Assertion failed: (b), function hvf_arch_get_registers, file hvf.c, line 66= 7. zsh: abort ./qemu-system-aarch64 -m 8192 -M virt,accel=3Dhvf -cdrom -= device virtio-gpu Signed-off-by: Mohamed Mediouni Tested-by: Zenghui Yu Signed-off-by: Peter Maydell --- target/arm/hvf/hvf.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 1b19d9713e..d79469ca27 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -200,9 +200,6 @@ void hvf_arm_init_debug(void) #define SYSREG_PMCEID0_EL0 SYSREG(3, 3, 9, 12, 6) #define SYSREG_PMCEID1_EL0 SYSREG(3, 3, 9, 12, 7) #define SYSREG_PMCCNTR_EL0 SYSREG(3, 3, 9, 13, 0) - -#define SYSREG_CNTV_CTL_EL0 SYSREG(3, 3, 14, 3, 1) -#define SYSREG_CNTV_CVAL_EL0 SYSREG(3, 3, 14, 3, 2) #define SYSREG_PMCCFILTR_EL0 SYSREG(3, 3, 14, 15, 7) =20 #define SYSREG_ICC_AP0R0_EL1 SYSREG(3, 0, 12, 8, 4) @@ -505,7 +502,6 @@ int hvf_arch_get_registers(CPUState *cpu) uint64_t val; hv_simd_fp_uchar16_t fpval; int i, n; - bool b; =20 for (i =3D 0; i < ARRAY_SIZE(hvf_reg_match); i++) { ret =3D hv_vcpu_get_reg(cpu->accel->fd, hvf_reg_match[i].reg, &val= ); @@ -635,16 +631,6 @@ int hvf_arch_get_registers(CPUState *cpu) =20 aarch64_restore_sp(env, arm_current_el(env)); =20 - ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_CNTV_CVAL_EL0, = &val); - assert_hvf_ok(ret); - b =3D hvf_sysreg_write_cp(cpu, "VTimer", SYSREG_CNTV_CVAL_EL0, val); - assert(b); - - ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, HV_SYS_REG_CNTV_CTL_EL0, &= val); - assert_hvf_ok(ret); - b =3D hvf_sysreg_write_cp(cpu, "VTimer", SYSREG_CNTV_CTL_EL0, val); - assert(b); - return 0; } =20 @@ -656,7 +642,6 @@ int hvf_arch_put_registers(CPUState *cpu) uint64_t val; hv_simd_fp_uchar16_t fpval; int i, n; - bool b; =20 for (i =3D 0; i < ARRAY_SIZE(hvf_reg_match); i++) { val =3D *(uint64_t *)((void *)env + hvf_reg_match[i].offset); @@ -771,16 +756,6 @@ int hvf_arch_put_registers(CPUState *cpu) ret =3D hv_vcpu_set_vtimer_offset(cpu->accel->fd, hvf_state->vtimer_of= fset); assert_hvf_ok(ret); =20 - b =3D hvf_sysreg_read_cp(cpu, "VTimer", SYSREG_CNTV_CVAL_EL0, &val); - assert(b); - ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_CNTV_CVAL_EL0, = val); - assert_hvf_ok(ret); - - b =3D hvf_sysreg_read_cp(cpu, "VTimer", SYSREG_CNTV_CTL_EL0, &val); - assert(b); - ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, HV_SYS_REG_CNTV_CTL_EL0, v= al); - assert_hvf_ok(ret); - return 0; } =20 --=20 2.43.0