From patchwork Mon Feb 3 03:18:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 861539 Delivered-To: patch@linaro.org Received: by 2002:adf:fb05:0:b0:385:e875:8a9e with SMTP id c5csp1832090wrr; Sun, 2 Feb 2025 19:19:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWRuGhf3VWeZCjbLBjCHAWp7FrvmHJvHej4nc5zQTo2r349Jkpk1WaXZww88qHfh5zEvOldAg==@linaro.org X-Google-Smtp-Source: AGHT+IF88El8KoP8wVu2I4xd5Jsdlw/c3Du74BSwWYpQbAwCLGA7a3BDVujuPxbi5KSGJcG3oDoK X-Received: by 2002:a05:620a:1912:b0:7b6:e8d4:9b86 with SMTP id af79cd13be357-7bffcd9ffe6mr3035803985a.57.1738552795614; Sun, 02 Feb 2025 19:19:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1738552795; cv=none; d=google.com; s=arc-20240605; b=XBGca5xP8W7MsTSaqbG+nHZVOIFTSQGLgLMctYmhZD8H1wqHXUb5ne/BIW5GloOPIO fjTl3sR70sjzCjodWYpCqn6nt09+YSp1cY8a0/svnbjiidiAH388Dpcv3nPxrFAlZ1Tz AD6Xi8fHG7mcIl02ItDRC2C/Vh0dC5egGBwJ8pAsZl7LlEBRIknHWkDfZ33301Vt6BHV g3t8eV5BmZQxDKSIIdbdE6SEis18lBVjCM2PTqy4AYRO71eml0iwrT1XQi2/d5sM1UQu xCxIifnwZEsendaw2SWLJQWPxuWkv5kIDQstTnP7lIgQtS3fZgg9J7+TWva5dvjiApMa Zq+Q== 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=YOiNmgCG27GGUfQ2A+akEblYYk9R7T+pJq3Iu4mV5EA=; fh=kJMCMx+0ERv7a3rbsYoH9j+lG6+DeyggCoQTi5fJs3w=; b=Z+JU4TM3fVwEGTLYLC7r1FMbiNMmRL2NIKVRLFA4pVRJye8xsCpD1bdwAbF8fBV3CZ ImhSQmxVgLA7sWpypmb/FTSG7tXX2M81BkZYZTzH8PhbgbF/zZfChRlcGkQn2EGLDukw YjGqHRAZM+uAKk/mRK9tUtNAwBoW9VLhV6AiE5h6z5SE1FYHQ+QtF0CK52dICFoabFPv TQkPHKvgO5DIRadlZxbqMBqfALfP2V7itvKQWgtyWceCWm+SNXBf3xWOyKJVYqYkCSwv UaFtt5PaBVhKKjRftrmpdLaoS6dg5/XGRqXM3cy+j52+/9NE9c2nwp0pYKgGN7Uyqc7x dZeA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lp8MYQt8; 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 af79cd13be357-7c00a93bc9esi841178185a.608.2025.02.02.19.19.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 02 Feb 2025 19:19:55 -0800 (PST) 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=Lp8MYQt8; 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 1temyp-00082Y-Mu; Sun, 02 Feb 2025 22:18:35 -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 1temym-00080V-Mx for qemu-devel@nongnu.org; Sun, 02 Feb 2025 22:18:32 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1temyl-0002fh-2K for qemu-devel@nongnu.org; Sun, 02 Feb 2025 22:18:32 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-216281bc30fso85004985ad.0 for ; Sun, 02 Feb 2025 19:18:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1738552709; x=1739157509; 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=YOiNmgCG27GGUfQ2A+akEblYYk9R7T+pJq3Iu4mV5EA=; b=Lp8MYQt8PpyKcS/nWukh/AlcdL6co8wyjswUErJLYDePCFOexsWk1lXJ4vhJPGNef+ H+ezSglBgOGKyitjthaoFviuhLiYrkrSCNiV7lOq2B9GBF5u/x9niaVGV0kzMOSPT1Dh QEK+9GK/U7ByQgk0r8st+GyP3GXPlHRpiusOjOtRbnUObeSLCHXH0J4ryjGxDRct5ytR MdO+eItq6JVBNPvSc6ZuxbhHA7+2wk368LNk0wL63jkbrG0vyl7AUUdBYPe0X4KsArkU c9GwUiG7pAlxEk2h17x9X5d/sjgqCOIlY/OKaF0Vgkp80mJhz8OnjCbhZWLQl6Ly28WA bx6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738552709; x=1739157509; 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=YOiNmgCG27GGUfQ2A+akEblYYk9R7T+pJq3Iu4mV5EA=; b=sTZ4Skx8OHnDgJiygRPw1AoxC7P7cRALHR2xyZx9MHwpTEJBmeU5viW5coCbfDKAwS TECs6ZMyPm5GjToJ3cRkOKZNGo6PQd4vuIo5yS2SPmX9feqXNA3K16ooHnkmSjCbpRBP kvdi1BbMQOo8q6bOwnwsL+tyhY92ggxF/6Wkd1Ib8NlDbIrYcOmBVPifz0OQjDtvLqDT Yup7lJF8nC5QIaF3WDUkrrtskqun8+MYnJmlLqze5zWdzosBcBZtkD0nexjZ5GySFFtv xkP16Fg7IdG3SA1EpEcsSUEile8A0UG9ZuyvJWE51vnfnRrvM7nBIO/4z2L67SRqazHW 8skw== X-Gm-Message-State: AOJu0YxvGrX2oDl7g3kQ/aHbiw6oPaf6Wu3FuSEo29Yk4zp5ye6XHbhC /YSxstSglOq3QozgILvSJq3Kp6/qY1+QLfVJBur0rhO3Qsk5YNzfChv6hWV2Rfrko08eFSIALqj 5 X-Gm-Gg: ASbGncs66oR0nFYheoOjCz1/XOf+e1H0z4fv9uv2vL/3B/WHRznB4ve2WW8jAcHrufk nZmFPjKTQn5yCdanC6QRLdvWL58O455A0Tdbc//wM/AF4zsqHvhoggQOCO1MLoEyAm+Cuknv5oS eVjk6FYklzDF9MW8ruuCnLCk4A53BdmeQD2mqjzBaERGZhHfck172kIc/BsyjvIfQeK5LRBgxPL swqO9k8Fo+DlCenDiAvvqbGRB2K5+JzvQPe96LrX9qWcyh2PyrgRXSQhQTkmyPxfKkMfsGYQK78 cTfuLPN4YS4fzrSSP0Pr8Wb+pnRCHZgA8Aj/pwX6rsSiQ8o= X-Received: by 2002:a17:902:c941:b0:215:5ea2:654b with SMTP id d9443c01a7336-21dd7c49718mr319441735ad.1.1738552709583; Sun, 02 Feb 2025 19:18:29 -0800 (PST) Received: from stoup.. (71-212-39-66.tukw.qwest.net. [71.212.39.66]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21de32eb419sm65698135ad.145.2025.02.02.19.18.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Feb 2025 19:18:29 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, berrange@redhat.com, philmd@linaro.org, thuth@redhat.com Subject: [PATCH v2 08/14] target/mips: Protect objects with CONFIG_TCG Date: Sun, 2 Feb 2025 19:18:15 -0800 Message-ID: <20250203031821.741477-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250203031821.741477-1-richard.henderson@linaro.org> References: <20250203031821.741477-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.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 Hack around mips32 host allowing kvm acceleration of mips64 guest, but tcg is disabled. Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth --- target/mips/tcg/meson.build | 4 ++-- target/mips/tcg/system/meson.build | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/mips/tcg/meson.build b/target/mips/tcg/meson.build index fff9cd6c7f..e5574f177b 100644 --- a/target/mips/tcg/meson.build +++ b/target/mips/tcg/meson.build @@ -10,7 +10,7 @@ gen = [ ] mips_ss.add(gen) -mips_ss.add(files( +mips_ss.add(when: 'CONFIG_TCG', if_true: files( 'dsp_helper.c', 'exception.c', 'fpu_helper.c', @@ -26,7 +26,7 @@ mips_ss.add(files( 'vr54xx_helper.c', 'vr54xx_translate.c', )) -mips_ss.add(when: 'TARGET_MIPS64', if_true: files( +mips_ss.add(when: ['CONFIG_TCG', 'TARGET_MIPS64'], if_true: files( 'tx79_translate.c', 'octeon_translate.c', 'lcsr_translate.c', diff --git a/target/mips/tcg/system/meson.build b/target/mips/tcg/system/meson.build index 911341ac37..606ccacebc 100644 --- a/target/mips/tcg/system/meson.build +++ b/target/mips/tcg/system/meson.build @@ -1,12 +1,12 @@ -mips_system_ss.add(files( +mips_system_ss.add(when: 'CONFIG_TCG', if_true: files( 'cp0_helper.c', 'special_helper.c', 'tlb_helper.c', )) -mips_system_ss.add(when: ['CONFIG_SEMIHOSTING'], +mips_system_ss.add(when: ['CONFIG_TCG', 'CONFIG_SEMIHOSTING'], if_true: files('mips-semi.c'), if_false: files('semihosting-stub.c') ) -mips_system_ss.add(when: 'TARGET_MIPS64', if_true: files( +mips_system_ss.add(when: ['CONFIG_TCG', 'TARGET_MIPS64'], if_true: files( 'lcsr_helper.c', ))