From patchwork Tue Apr 22 19:27:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883138 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2600372wrs; Tue, 22 Apr 2025 13:08:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWPMsbJtPhQKJxKuiOB6ebFPjX/RC3xmDnb5kE3g3NeOefwkmtxytwQqhQEGu/uwq9ztm+7hQ==@linaro.org X-Google-Smtp-Source: AGHT+IGTiheCu+coiTlehHen5xV8YycLezCFySAtjZ6sSRD35dxnReKGU3Y8sCrqIFA3pmykvwYg X-Received: by 2002:a05:6000:144a:b0:391:2f71:bbb3 with SMTP id ffacd0b85a97d-39efbb05917mr13997942f8f.46.1745352538089; Tue, 22 Apr 2025 13:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745352538; cv=none; d=google.com; s=arc-20240605; b=V7YgXrrm7T84nAnqeuHTf6pCe8ElTurpv7FVWTXHR/x35W8rYIvOTkuv8FFad0YUXG rBqj4iEIfl50gsSl6rStA9PhhcQCKclqmylVj02w6fj6qzAzBucFvBRPOMms0Htaod3/ RDP1P/tw67BWh15k8wedSxU8SGqpylUoy+dQf1bKGPx1vxSD/ckV/R3fC+kapGcZqAYP I/RBU8I8cKXscpLmLXDZQz3bJqx8m+l/5tyxjR5tS4ZcLlezoYOCpMkYR5RnRfNsTtjv eJt6jYySBzxZHmd3wYqEmHUTqZ7RNtZD9qNWkhFqRif91/WZ9ggW3DBmQep9MW6K4Muj jDvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=XEXzmO/KCSQQZKkw02RCDXKV53yZWyTGZY0ovHpDmRg=; fh=kQadAhxV42GJ3cd2VUw1RyURv/zJQGvmUdF7iLEVTtc=; b=RogLUcI93jLfARnvHq4f3770w+q/taglnYbCP1XrLU2o3jGl1aOG6U2rF7u6Nj3wx2 uJPeoXFz0HOjgbzz4dStE+sCvwXSyb14JAreLUlqXPcnoLNQQnWMceSQeyDpHA2m/wme vsG0c/XItG02a3JdRTkNXQ/SkmZu5EZFSy9OF2GfhH7rWyo1VLxG4lv2f2zWeDKXDsRm aFHu0UI0/GpHfR7KIgyMCc1KQwX8hcB+pJ52ElO9bzFdj2zunpQynbdNG1dkajGrlaUK xPMKV/ncnyiZ/DmW4H+zkaclGH/OKwn/762epdidW+gjrZlfrcmWmOJcMSfjcqM3JHmE bxew==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aKgJy241; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-39efa4944a0si6969384f8f.494.2025.04.22.13.08.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 13:08:58 -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=aKgJy241; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7JQu-0000yl-1H; Tue, 22 Apr 2025 15:37:28 -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 1u7JOu-00056Y-3a for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:29 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JOr-00072B-2W for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:35:23 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-2279915e06eso58644985ad.1 for ; Tue, 22 Apr 2025 12:35:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350519; x=1745955319; 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=XEXzmO/KCSQQZKkw02RCDXKV53yZWyTGZY0ovHpDmRg=; b=aKgJy241OMOBCwypdyFwjD4M/WmclH7C6wJdAP2HlTfhBO75COUEQhHtsEDyJW5chB BvZFBbbG8qKHG5jGVdxOZ/CXlayZ/J7A+p/DbQL45PUntQM6mR9T/TjnxZ0Gsf173jW2 l4rvaQKlXprgIJzKU+K58OzXSMi2PLo3YmGj71Kp9bb81U/+jpHTS0cZkl/12sCDl8nt ifpYvontg0DC6s6Lfe/hB07h+YGSSXA+UBOMH1b8G8uAlpZ7q5D+X1Lkgjv0vYyiWnyg fmCZ5Neu1sLoFWXAMYNRfZpzHgoouI4HFFb+C826jOQTPn7F5ZyL9Fgt3rmkb9D/p2pW 2xxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350519; x=1745955319; 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=XEXzmO/KCSQQZKkw02RCDXKV53yZWyTGZY0ovHpDmRg=; b=FR8GTkQUrrEKPhYcUVY/CZcRz0uwGpUOY9YEklHyqlw/DfHAf1EpTIL5ZOM5rHHJsk CAE+8W4eXWMUE9Buwq/J7IDzmkDxEgv29YhMOMwW7D56P0PcJQHIMSJUqpGgWhzvPRcQ pKGJeNXnpXEQU1Vf/y/NobAj3Nk9HS93i/zd+DVf0ETChigfYV9ofVoz6tiAr916fIsA C3oHEjKUf4xANB7iTIGW8fCVYUKfSbrV1Q56OiGkOUTHH1DjEGXa36R33TlWePpvE6cK XfdOo1GbStSxAnuLbuli59Pc/kf01q+1yRI3coAlAHV9BTZM4KKWeT+8yI1weqhVy4F6 VcEQ== X-Gm-Message-State: AOJu0YxZp46uNUdDpxei6UtiovWgXep20l9QK5H5bhiCZrEo0eRFH2Xa 9BJ4/iGq4uHzvXeLn4nymbmbxoHZ9qMYDV0WLX9XNmfPo075UbV8tRUHaUe6pncq5UyppsCU7Tc t X-Gm-Gg: ASbGncuSDrl1Rb1JxO3RVNnzxkDAd+d3GeY4Dw8oewXQQDhpcjf+q4x03EHzmjhxYHD aydGFIPEokghoxNBaZ+fByLRDZ+w6K63RcM+F+m8gFt2TcSWJEa3JfwQTeLF6qmF1pgGpr4SDW3 Gye6rSdkFZs19817aIJW83Goc9tegwmz+eVQkCiJGaCBGoHI6MIyghvnLVlc2jkhidcB0CYD56o waqyBiaYUHLKjHeJ8ZTgM/1EdQoSMO1rXDZ+EsvgicgzRG+ifTBGiP+z+6JggVRUAvtwHZ+1dmZ HHzExy3IGgXMS7j5TpPfNgVOXCTCTsOtwUWX7pf3Ul6+8ZP7wU3gI+0QdgFm4BcdBcOeRwfWmdI = X-Received: by 2002:a17:902:f611:b0:220:d909:1734 with SMTP id d9443c01a7336-22c5359c1fdmr243158385ad.14.1745350519123; Tue, 22 Apr 2025 12:35:19 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50fdf1f1sm88996795ad.237.2025.04.22.12.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:35:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 089/147] target/s390x: Restrict SoftMMU mmu_index() to TCG Date: Tue, 22 Apr 2025 12:27:18 -0700 Message-ID: <20250422192819.302784-90-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.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 From: Philippe Mathieu-Daudé Convert CPUClass::mmu_index() to TCGCPUOps::mmu_index(), restricting s390x_cpu_mmu_index() to TCG #ifdef. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Richard Henderson Message-ID: <20250401080938.32278-19-philmd@linaro.org> --- target/s390x/cpu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 1f75629ddc..d15b1943e0 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -126,11 +126,6 @@ static vaddr s390_cpu_get_pc(CPUState *cs) return cpu->env.psw.addr; } -static int s390x_cpu_mmu_index(CPUState *cs, bool ifetch) -{ - return s390x_env_mmu_index(cpu_env(cs), ifetch); -} - static void s390_query_cpu_fast(CPUState *cpu, CpuInfoFast *value) { S390CPU *s390_cpu = S390_CPU(cpu); @@ -308,6 +303,11 @@ static const Property s390x_cpu_properties[] = { #ifdef CONFIG_TCG #include "accel/tcg/cpu-ops.h" +static int s390x_cpu_mmu_index(CPUState *cs, bool ifetch) +{ + return s390x_env_mmu_index(cpu_env(cs), ifetch); +} + void cpu_get_tb_cpu_state(CPUS390XState *env, vaddr *pc, uint64_t *cs_base, uint32_t *pflags) { @@ -348,6 +348,7 @@ static const TCGCPUOps s390_tcg_ops = { .initialize = s390x_translate_init, .translate_code = s390x_translate_code, .restore_state_to_opc = s390x_restore_state_to_opc, + .mmu_index = s390x_cpu_mmu_index, #ifdef CONFIG_USER_ONLY .record_sigsegv = s390_cpu_record_sigsegv, @@ -378,7 +379,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) &scc->parent_phases); cc->class_by_name = s390_cpu_class_by_name; - cc->mmu_index = s390x_cpu_mmu_index; cc->dump_state = s390_cpu_dump_state; cc->query_cpu_fast = s390_query_cpu_fast; cc->set_pc = s390_cpu_set_pc;