From patchwork Fri May 3 09:16:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 794366 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp642465wrr; Fri, 3 May 2024 02:18:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUoexSrDLNkTHZPj3cboH4odFrvyJHRCjZJbLjGEI2obIkUxvP12khOInY2LaxhvMl4Pc9N9ClDEjulUQg12bmz X-Google-Smtp-Source: AGHT+IEBnKyIEtCifvzG48aplZjVJYg3exFYxKMy26ZOTOMYqIwGhLpnRIQ1KETW8PoCkSagNTWc X-Received: by 2002:ac8:57c4:0:b0:43a:ecf9:c179 with SMTP id w4-20020ac857c4000000b0043aecf9c179mr1571828qta.52.1714727907114; Fri, 03 May 2024 02:18:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714727907; cv=none; d=google.com; s=arc-20160816; b=MW+xvfsLDw/Mpqj+61t3o4m5y9V8m7re5m2Sp5jhsFuEVGV1X2UMtEmXTw65pT8gM8 K3+krG5GkcefxTlg5D+uFMEpetl9dOEm7hLAzbOHhOQLFhsXFG3tPxW5AtXN/l9sNiKY f+kSfDp+2Rteq65IULhK69B6GfObHf7vZqiRuOIU3eHEpC3yQX7iWu/S9ZcQ9t+QOUq7 1hksN3oo5tlHstsuyM5gm72xJnXr1xCNrMoz9Kxt0VFlvGCZI15VVTFLCo4P2it9WX+r 1Hol7kQLs95SbTWvUjVu+wkDaI+SYzx66aBwRy4jGJbPWf4vxTDM1rDzmoB4QC1QUGGQ /yFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=b8DwnhcqDdYLqJv6uh/ywG6qW/XlS7dFgSw/LzDaIEU=; fh=Wz5tv+q376m1WnuXLGinc1he4hBXyNhLC9q3oZt2ig0=; b=ooGgIg45Tc4MjF2VacDEebT54mIn88AqNWrkKosjEtBlNvOzQLwOiefU4XrWbMiyHo djEdjbjUSogXS/jojNZxbzhVa2L8lMVMNYqjKs6MMTgd4P3Pgp9LYbhRVGAZ83k00Pi9 lbKeTEkRS3Crk+xVxd3Spj1JFXuXUNwais2dQbvhIqbGHzqlb2uoKqa+6jCC/DNvLkKi 2nNDVS575KLWg20rBRpcE/UrCYLC2APfoBEljf6u7G3Mg/yNnCCQD2J103uPVqHtlB+5 tuXBWYAKclqIwIGzGXcNLs6RNcxJhIgirDCWIWCkZGQiycJyetQVVxmzGLLnHFQswq2V 790A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JGWtKHlH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o12-20020ac85a4c000000b00437c00fb70bsi2969832qta.627.2024.05.03.02.18.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 May 2024 02:18:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JGWtKHlH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2p2h-0001hv-9X; Fri, 03 May 2024 05:17:23 -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 1s2p2e-0001hY-4h for qemu-devel@nongnu.org; Fri, 03 May 2024 05:17:20 -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 1s2p2c-0003aM-K5 for qemu-devel@nongnu.org; Fri, 03 May 2024 05:17:19 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-41b5dd5af48so63880165e9.0 for ; Fri, 03 May 2024 02:17:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714727837; x=1715332637; 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=b8DwnhcqDdYLqJv6uh/ywG6qW/XlS7dFgSw/LzDaIEU=; b=JGWtKHlHW3G7TlKBdB1wnjwifucetiaBr8ST0mZfmhrdDjhzo5/gLwEqbCHguZKtdD zIjspNbo8OKSRfZHHx04ywMjC94r4CC2p6+mk1FZiU4fpM2kx23RQg4JJfcaryBkCAqQ pvcQSpRG/LIjABVxOydCtaExbRwCbe2QSzJ5EuL3jAlbnkSexbEYq2dV4wQyQW7RXHpt 7ErwkLj1q0nl4IiM3Dx+2VA6h98noBWFY1gKLbtyOfyw9BW9AWD/m6u5ZXyBHqs1aU3o PVQHglDpi7IYeI+aXFshwSKNaVvd87X+UAbF7/Rc6Q//8j/pXQ1uizo+MoTxUVPmLZO2 xkTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714727837; x=1715332637; 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=b8DwnhcqDdYLqJv6uh/ywG6qW/XlS7dFgSw/LzDaIEU=; b=n1VZSgQ38TAqZJGt5DZBTldXCAhmFX6FrauPQvDj1acnD7fT2Iybg/aMIGXz3Np4Xh 2aNe5+nElPFLzwsmuTGXUUSLjwYuAx1nIhH43icXDnSyYvDd3i8Zr3yA4vxYn1buomcL 2NapzXqJbGm0jprEDs7oebVix3vmM46EKQj3G7B6tkQEaHVrTj/OaHQetopkJBQVhr4S dg0TKE9x/wmpavLb1Dasp3q50EGixF128Zfw9s1l3igwKtobM/bUFsK4YQdVvuPoPNq1 zF5wvtFVr5UHnJqCBot8cKEuWctDBMbL7Ko860Uee9qSskYoJfU19QgjveeaJ61Qe2MU tylA== X-Gm-Message-State: AOJu0YxftHyJUzRJpRkFuJjKQE3M/tYo6d3wHXSKVSfPvr+QNLys3PpS dOUl/w6DmMBltroylBl8soeoyRQdyPY2S04QUyIQqZS7fobWZnReLqdunalfFrDiE5/iLaSwIB6 s X-Received: by 2002:a05:600c:1c09:b0:41a:a4d1:a896 with SMTP id j9-20020a05600c1c0900b0041aa4d1a896mr1749656wms.16.1714727837029; Fri, 03 May 2024 02:17:17 -0700 (PDT) Received: from m1x-phil.lan ([176.176.179.187]) by smtp.gmail.com with ESMTPSA id k6-20020a05600c478600b004185be4baefsm6847025wmo.0.2024.05.03.02.17.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 03 May 2024 02:17:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Warner Losh , Paolo Bonzini , Laurent Vivier , Riku Voipio , Kyle Evans , Ilya Leoshkevich , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH 3/5] accel/tcg: Do not define cpu_exec_reset_hold() as stub Date: Fri, 3 May 2024 11:16:55 +0200 Message-ID: <20240503091657.26468-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240503091657.26468-1-philmd@linaro.org> References: <20240503091657.26468-1-philmd@linaro.org> MIME-Version: 1.0 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=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In commit 1b5120d74b ("accel: Introduce cpu_exec_reset_hold()") we defined the user emulation backend cpu_exec_reset_hold() as a stub. This was a mistake, since common fields are set in CPU reset, and user emulation needs these fields to be resetted. Move cpu_exec_reset_hold() back. Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/user-exec-stub.c | 4 ---- accel/tcg/user-exec.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c index 4fbe2dbdc8..2dc6fd9c4e 100644 --- a/accel/tcg/user-exec-stub.c +++ b/accel/tcg/user-exec-stub.c @@ -14,10 +14,6 @@ void qemu_init_vcpu(CPUState *cpu) { } -void cpu_exec_reset_hold(CPUState *cpu) -{ -} - /* User mode emulation does not support record/replay yet. */ bool replay_exception(void) diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 1c621477ad..6a108eb212 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -37,6 +37,10 @@ __thread uintptr_t helper_retaddr; //#define DEBUG_SIGNAL +void cpu_exec_reset_hold(CPUState *cpu) +{ +} + /* * Adjust the pc to pass to cpu_restore_state; return the memop type. */