From patchwork Wed Mar 13 21:33:28 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: 780046 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136472wrb; Wed, 13 Mar 2024 14:35:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWzUChwu5VyjRXVCro2VknXo4NxOm4eZayG93Nxyu7iYEFGCc53lA8elrRXE+sY04QRblyduZQoDNq6h+uf5xZ6 X-Google-Smtp-Source: AGHT+IF7qe4he2dPR4u15h3TZqMVVxSOg1iqcxc1Y5q/5uMY74XBCd3yh+XMO3E3Od1mWRnPFxFO X-Received: by 2002:a05:622a:652:b0:42e:e100:1da2 with SMTP id a18-20020a05622a065200b0042ee1001da2mr5138013qtb.63.1710365700217; Wed, 13 Mar 2024 14:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365700; cv=none; d=google.com; s=arc-20160816; b=gYz3eNCYRYwScneAE9TZd1/UDE5ziuzmqV1/a4N7XKDTN1HD1nXull1ri4FF9h7tLA ez4kBh3ZCnSystcWAaUew6+0x+mgXlQf7VV4/yAxWex1sSU/406gos4VvE6TzIFOmhuR VxiZpfPRR5IG7sam8XLBvuUXkm7/89KimQVOw408KQa/Uluxz7umZHyAiciX2oZeue2n TJgCwh94ZNr3Xw3kUfClxx3NnQ43n3elmd9ueRmmGWOjopiCVTlIrx3BXEpoaczletvF kK8KPDkCMHxrOSvw91R1N12PQhoVvdFdSwDaawZxECPPT5POT6G54PZY/5UCN5+gk/5F 429g== 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=g1fMeXU8v0Ez38VZMi0gdzDmageBAPVY2CeRzL99JPY=; fh=tHch88o8Q74HXDYWfgtzGcxU6ApuDg4u0qDaNmsZBGo=; b=IQTaP2r8yyG7DpNULfYj5zZkjULkXDIay4by17842ga9oLCJ/NmCdtgI2+wpMALqSi kdL+VuyfC1tXH3upMlxmeh0gHy0qiE3KrlKT+k1197510HIx5ppa6z3x9x1WdYZYSVWW 0nUzkndPN3zAmgSIFaVDBT2+hsG5l3oLFphlp7fZG2f3UVnfMddpQjxiYDdrv7kQuZsZ FWQCj/v2n2pDjcGfswSEcBWKBhG79ih+qSfhCczVU/hObHBQfYqHtEYVicO584OBVNEs dicUgZuZPo8HCuUwawM+bwWs7jwJt+CJJRsyfNU8hCV9SIh8zO9Tj7Dw8ZwmgjWltmzz 6YVw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bmAVAnjj; 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 t37-20020a05622a182500b0042f5160d0ccsi36641qtc.379.2024.03.13.14.35.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:35:00 -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=bmAVAnjj; 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 1rkWEa-0001Kk-WE; Wed, 13 Mar 2024 17:34:01 -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 1rkWEW-0001JQ-5c for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:33:56 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWER-0007i1-5n for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:33:55 -0400 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-33e17342ea7so152029f8f.2 for ; Wed, 13 Mar 2024 14:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365630; x=1710970430; 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=g1fMeXU8v0Ez38VZMi0gdzDmageBAPVY2CeRzL99JPY=; b=bmAVAnjj9HgnfKk9ZH5RNt938xpuc9IWtFO4hrvTkILdSsHTI4sz/pF6CaNlVJILvo U9go1COAI+KQmSPE9tcsbxhAXzE/dCEvjzwNh18Seyk72eYV6MotH4iUNjq807KAKQCk fSz7R0KomMKIqSFULJPQ/Ew/pXkrhrucoiLA4KhCrqKTak9dBLjx5oZhVme2h3zy1i2+ HmD8EHu98zgz3ykQdCccT4+tI6+XoBxw0w4XvJUxDvCNLkCrgyKZHcJyNjlgypiR0oQ3 XB3dZRaXSCdVB7s86AN5H3+qrVN897iCmk+bzFTpJfavwi13/ylzSp8Pwo8EceG9TIUH cp/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365630; x=1710970430; 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=g1fMeXU8v0Ez38VZMi0gdzDmageBAPVY2CeRzL99JPY=; b=MMcMuvvF41td55QItYLEAKqD1ZvlGO3dYRBsvDDkG6H5jk38ES9uq/Bpmy+nZz4BKP F8g4NDYCLtOrql/xbBKLNVfTlVKPvFiVROxruF5vMNKz5f8oz3d/oX/3ZvoL8pxxWq5E OzbEoaPjOOaCWxRMNr0zjy22pm+p/YcXCUdUAdSyV5lyzVt6Y0BV38RRIqNwkWQmRPgv 99CmzuOpPz8ZGHIc2DrXykY2tqvN+ukfN710rDWXLBnmB5aD+J1FY1JFmkMj/tyeHzZ1 0QXIA3fVPvwgGSZS/n1QTetEEgVPighdx9vsE2XFd9dgu5gOW64fM7/YSflA4gta8f1z Xa2Q== X-Forwarded-Encrypted: i=1; AJvYcCX4P0iKkDEjt+xvavLmdLWtRhRwHSSON1xWIDRkQGRNUqP5LyDGH9KpPevuG+7VIsztEGU0i0MtjOXbZAu+fDbq3RPiG0I= X-Gm-Message-State: AOJu0YxuhiqTMJ2Lq+9qbeffs9rJRLlgtBfi8Imalw1dx4YjsDpeGv1N uSvFoOkFg8SYlignGm6FIY/gb0uO4H8d5AuObcrGjEWFp2/xEqKiu3wGIY9Vc7s= X-Received: by 2002:a5d:4c51:0:b0:33e:bf71:3665 with SMTP id n17-20020a5d4c51000000b0033ebf713665mr1084303wrt.8.1710365629723; Wed, 13 Mar 2024 14:33:49 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id w16-20020a5d6810000000b0033e22a7b3f8sm62664wru.75.2024.03.13.14.33.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:33:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.0? 01/12] accel/tcg/plugin: Remove CONFIG_SOFTMMU_GATE definition Date: Wed, 13 Mar 2024 22:33:28 +0100 Message-ID: <20240313213339.82071-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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, T_SCC_BODY_TEXT_LINE=-0.01 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 The CONFIG_SOFTMMU_GATE definition was never used, remove it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- accel/tcg/plugin-gen.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 8028786c7b..cd78ef94a1 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -57,12 +57,6 @@ #include "exec/helper-info.c.inc" #undef HELPER_H -#ifdef CONFIG_SOFTMMU -# define CONFIG_SOFTMMU_GATE 1 -#else -# define CONFIG_SOFTMMU_GATE 0 -#endif - /* * plugin_cb_start TCG op args[]: * 0: enum plugin_gen_from From patchwork Wed Mar 13 21:33:29 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: 780048 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136480wrb; Wed, 13 Mar 2024 14:35:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWxLasA7QfI/M59c0U/B0X3E/MI5bbIqSYj2aBJX9SaWyR8ocdZArjHyJhRhnbokty0qRijdpUq4YjwVw2Cum5M X-Google-Smtp-Source: AGHT+IHkzmnyAtNYCU6Q82NL3/NHoM+Qb6FscdPYCMBkkUUxVi/00s7Rs+jFllwgiTb+pdVQMIjH X-Received: by 2002:ac8:7f95:0:b0:42f:3069:a0aa with SMTP id z21-20020ac87f95000000b0042f3069a0aamr4125150qtj.29.1710365701479; Wed, 13 Mar 2024 14:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365701; cv=none; d=google.com; s=arc-20160816; b=ay11dAbc0N0RZAI5Yoo/q/zhWPsIf3XF7DlwaZsospS3c4upg8bw10nPZ5kXVHNKv/ AyMI9tGagDNk2DeCioN1hZHhYhnX3uAt4WCBVBgI6IOoqiWVLAlcVmw64QTdkG/TK0qP T/7jmsvD8+AOe90A2AslYsTifboJvv6XDtg3YAg9Z/ptKs//Ig84nnPTIo8et9k5Pxq8 42QMkq5FYVRuN74A6RxEZDja/z7t1tBl3O34gj/KDBT825jhNnyiXTKlBt015WQcwH8H 5EXh7nZQN4nkfgiUD69sfCeDO1xzUkvkdLMx7buQYhOpenn6jJ545WPZDhskBCFqR4C2 0XHA== 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=iTsiFHK/uF9NgxMDORids06OFuVswudli5ZoOdNSsFQ=; fh=slR9PDj6XLUtKurXzZBu4lLyUhqWqZye8MRkcc5PNL8=; b=M2mwHlHPrO8RLwXhS5eIWdrICVFXndqS4eUq/xh3hj5KucwkBGu1zCGiRvpqG8a5KT HewIJtr67t2dHaMKPsWUkg31q/Lbh1lSmhHOgw4KtGhNl9PYCgNZDfsotkfDUg5hLEVJ vgysuA5nceLlWNNDQ6DYgryYL3ewB7KuR8DgjaMEP5Zq5gT4kxtzSRZ3WkoyLaMhyPTy Q1b54KFS/CKvVXJfO+dWpOf4BRAgcktF7Q2ub4NTHyaC/NWsaOUE4Z9tGJdR+it6X5/y o6I0AKdDk6k8NxypoMR0ITGl1+PNGy3nufgA93bpIrgks1X7UkKo37DhPyaWMcIbNn9s 4olw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y6oYHtn+; 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 21-20020ac85915000000b0042efcf20e6csi29220qty.454.2024.03.13.14.35.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:35:01 -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=Y6oYHtn+; 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 1rkWEc-0001LI-2K; Wed, 13 Mar 2024 17:34:02 -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 1rkWEZ-0001KD-CU for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:00 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWEX-0007je-Qg for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:33:59 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-33e8f906f3dso208539f8f.3 for ; Wed, 13 Mar 2024 14:33:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365636; x=1710970436; 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=iTsiFHK/uF9NgxMDORids06OFuVswudli5ZoOdNSsFQ=; b=Y6oYHtn+bMl+ot6cerwX657JfbR3QfYL/Uu03YQXoZnipC+f7H+jUkl1LqqiwMVwsQ LCRXqFe7Vy+nFFOJ2jSz5fCSidqJy1qhv8vwWqXcjWOdhJJ4jei+esIVocmOVNxiSNeW rPz9r4G7Brl1WnGw79iYCQb3u4yYyGu4w6UGjrUTh1mMZ28Bq3H1+nBa6gpUMXMD8SuN it/IrafvP6ICtcMOOdMjRgZzopl0jEDfEK7A3wIF8Q0P88RXquSkyOLpD5R6e9s8/P8i IOa3j8FyKY3HAowVeg5AT+Gc59xTP1NlkZLEG9kXgV3CZHE/J52C6eiOeAJLRoG7lDkC 7Cgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365636; x=1710970436; 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=iTsiFHK/uF9NgxMDORids06OFuVswudli5ZoOdNSsFQ=; b=NjvgNxC4cEsfoZy4QXVA65Q6W2dNfS6/tLh9Q3GIxlk94ob98i496aOIzU6jg6PHTN YcLGFP3iGkk5/8dnNZVev5Yp4LJonKiRzTv1fXRF+izdqZylf6cgCgC4ntfKkAPaBr1V mcV0xST+NdMcHb+6iIhF6Vv9WD7RSsnhKjyrZW8rsNq+AZnaktpz769CSztUex7hu+1U v/Um7p7psGjkqsyCw3d/SUL7k8o7eFJXOTKzAtpad/bSqbYFLCQnHHgoQCtHO6ujoYlM EzK3aEbsCV70zRlefHY9/AqKjTD4IFa5HFWlNpDh2eybRywy6IH4BGEZHk8gwBNKd2Hl 8wiA== X-Forwarded-Encrypted: i=1; AJvYcCXg1a3ipugsjBoZ2D+R+V7v1XflDRp7T3MNIbdwZd4Vg48sgmXMQmNdfFHf+v/bZ4YIDE/d4aGpLDrKzt/5c2DWtyiN3OI= X-Gm-Message-State: AOJu0Yy2dHXOMb+/sUPcSMY8W6v5tbxTx80kFE10B3jRuIE2v+32GKsW aOWFg4Afyw8ySeciGbtfutTQipUL4Mlxz6Z+Oln+ekmhniwdR1j9h3NxiD8PPfU= X-Received: by 2002:a5d:58c7:0:b0:33d:b2dd:7585 with SMTP id o7-20020a5d58c7000000b0033db2dd7585mr2385663wrf.9.1710365636529; Wed, 13 Mar 2024 14:33:56 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id d18-20020a5d6452000000b0033e48db23bdsm60088wrw.100.2024.03.13.14.33.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:33:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org, Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH-for-9.0? 02/12] travis-ci: Rename SOFTMMU -> SYSTEM Date: Wed, 13 Mar 2024 22:33:29 +0100 Message-ID: <20240313213339.82071-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Since we *might* have user emulation with softmmu, rename MAIN_SOFTMMU_TARGETS as MAIN_SYSTEM_TARGETS to express 'system emulation targets'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 76859d48da..597d151b80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ env: - TEST_BUILD_CMD="" - TEST_CMD="make check V=1" # This is broadly a list of "mainline" system targets which have support across the major distros - - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" + - MAIN_SYSTEM_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" - CCACHE_SLOPPINESS="include_file_ctime,include_file_mtime" - CCACHE_MAXSIZE=1G - G_MESSAGES_DEBUG=error @@ -114,7 +114,7 @@ jobs: env: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --enable-fdt=system - --target-list=${MAIN_SOFTMMU_TARGETS} --cxx=/bin/false" + --target-list=${MAIN_SYSTEM_TARGETS} --cxx=/bin/false" - UNRELIABLE=true - name: "[ppc64] GCC check-tcg" @@ -185,7 +185,7 @@ jobs: env: - TEST_CMD="make check check-tcg V=1" - CONFIG="--disable-containers --enable-fdt=system - --target-list=${MAIN_SOFTMMU_TARGETS},s390x-linux-user" + --target-list=${MAIN_SYSTEM_TARGETS},s390x-linux-user" - UNRELIABLE=true script: - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? @@ -226,7 +226,7 @@ jobs: - genisoimage env: - CONFIG="--disable-containers --enable-fdt=system --audio-drv-list=sdl - --disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}" + --disable-user --target-list-exclude=${MAIN_SYSTEM_TARGETS}" - name: "[s390x] GCC (user)" arch: s390x From patchwork Wed Mar 13 21:33:30 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: 780050 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136558wrb; Wed, 13 Mar 2024 14:35:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWqusdU01PnifGohUePX/YFKVsFDVngnAiRZAXv5bfGLZe5Wz8sJfAuGPNiUuZvCAWk1xNAy0mGfZuATOP0q82B X-Google-Smtp-Source: AGHT+IGbkNGwgHGd+PXRi375oLg3DjB4KX/nAtOvwJDn1HePYAYZJ8t2QIHkQPlN800Dq/3/dZYL X-Received: by 2002:a05:6214:c65:b0:690:cd2d:5f11 with SMTP id t5-20020a0562140c6500b00690cd2d5f11mr1478444qvj.26.1710365715416; Wed, 13 Mar 2024 14:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365715; cv=none; d=google.com; s=arc-20160816; b=l0foEEohxSKSmknqSTh2eQR/jrQmBSd6pXV2+fLV7MD6LgO81sz6Slf9az/xX3uCzi ainDD3yKF+d6wHW8vAgAjM16KjWeI/D79oUNEhlrF7QITu/p2lrywYIF8jMp1QEIiNWj rLjbNegagjVFUhtFcD3+09sCnBwuOzRv+4vLnyEIq2lJIQJveRSpQ5u9/iJ9+IbfKnoM GCpOVlT7HZPOGy/0LyiMYq56OTkLhL9SDJqBlVIXZ9ZIwf9bGXAOf+W9Y5nZGYYo24CQ mhWfzWfbvF1tc9yqr6ZL5wZKj5Sjq0NTEO6ywNIE+7eROzYI0GsHmFkbKLxoXd54mcBX YDRQ== 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=uuIA7snzjzJiFQGDzy7Q/aN2eTCJoDKnsUbMdeEplEw=; fh=F3gnHAaTjcvccL8LZWSgEGoO9u1ktU6lu05G9Dd+spk=; b=iIWctBIfTenU44p0pxGD0z8TVAjNRGeos4MfypShNG1fFCzpcmSNpJIR36r+bsoGnY 3gVZYnGxmrz8tRRv0BI4aXAri6ir7Ac1owPIYFlG9OWQjMUbK0fkDfGpjTJPN9kWK9sw uhrupEuLJv/2bB1SFu/orgHctJ5kHaZIIJ3RDQn0S1yqHU45bPmoI4B/ivnEw/LsrJC0 usgCOu90CKSuAzH5cnqdHa07N5x8EhUtyxXWGI+ZPYxgwZDwSg43N7jLupI5l55pQDfM /SHN5wqhVMxHKBvGqIW9KkeVRsLICQIt1rhVp+ics//80uHLM9lPsYNxAyctGSoyDwk1 1nbw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FSHEEgOg; 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 dv6-20020ad44ee6000000b00690171413dfsi72734qvb.498.2024.03.13.14.35.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:35:15 -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=FSHEEgOg; 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 1rkWEn-0001OK-B7; Wed, 13 Mar 2024 17:34:13 -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 1rkWEh-0001Lt-QR for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:07 -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 1rkWEe-0007lP-6t for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:07 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-33eaafc4419so929705f8f.0 for ; Wed, 13 Mar 2024 14:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365643; x=1710970443; 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=uuIA7snzjzJiFQGDzy7Q/aN2eTCJoDKnsUbMdeEplEw=; b=FSHEEgOgac6vBkgLCgzc4U3EOB8nYfdwa62xIazqXk9886zyIozSCgD8/M3eZk8Li3 s5Ow3QncZWOci54U+378xve2pXL9VsonR/M6vNJ8Sq4RxTM5y2nH7UudRKyhlFyyOSr+ uua9fMpwvDarW9kAjOwk1k71HMF7vxI7t4wLaw96ZgW74f2C3O3qH4SocAV87BmkXH8s /Kg6MxxyTUzXBVuB5AwkYnVIc0EOKVxvJnKSZgfh4wu9kp4qL1uzTVp07o4fgyM1d5xt fXlFvo8Z1bbruFfq+zi2eL9Pq1jvln9yE4e5bZJHnM3utnxSRL8H+2RCk6SOIjeUFvEN Do/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365643; x=1710970443; 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=uuIA7snzjzJiFQGDzy7Q/aN2eTCJoDKnsUbMdeEplEw=; b=ROeRKRlk6pGIYpt7jfx9KDhGt40IxYfzfTMUyCL38f3kdpx6lFniKD1antQwCE66aj pzkfoTrZv1mgTvWUjhIZSBur1zxF20J3HkpT6lYv8rRHsMxqTgvwRWekEwEmCQqVOLek UO7qIrZhzWAk4Tmr3e3lo0Lm6B+Kn9FfC5g6TKzTdgau252nTNDl+yQdazRPighUwoWX 3XxoZICIrDA27WMnQ2s/ftqL5BWRZVnw/g10zrbXwGTRSnSkNnipUlTYcbQnOKGaQesJ Wf8Z5YNu5FUZebKQcQkTQPa636qXkSj4YnazhGPK4wYIKxeEu1xkNYg67f7kjQVv+NuD 7vkg== X-Forwarded-Encrypted: i=1; AJvYcCUcygHxUszxwuig1DJA/dFvrCLTm8yaiULLGejIEVKvDz5HrLAevsC0f+dYMGL19isYbm7cbgg4UHhK9CJdEScNO6tELe8= X-Gm-Message-State: AOJu0YymeAe2sC5Ec8rxLMR8faUZx72hopb92GCnJsk3RRG09Hb7+UFj WjiWKsj3wP2G5bbCVHsQh+81p8qN/kFTKtqpm8pfK42AwmBlqir6q+e9LMj9u3A= X-Received: by 2002:adf:fece:0:b0:33d:7e9:9543 with SMTP id q14-20020adffece000000b0033d07e99543mr25952wrs.32.1710365642885; Wed, 13 Mar 2024 14:34:02 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id p3-20020a5d4e03000000b0033e9e26a2d0sm74645wrt.37.2024.03.13.14.34.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:02 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.0? 03/12] gdbstub: Correct invalid mentions of 'softmmu' by 'system' Date: Wed, 13 Mar 2024 22:33:30 +0100 Message-ID: <20240313213339.82071-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- gdbstub/internals.h | 20 ++++++++++---------- gdbstub/system.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gdbstub/internals.h b/gdbstub/internals.h index b472459838..7055138dee 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -115,7 +115,7 @@ void gdb_read_byte(uint8_t ch); /* * Packet acknowledgement - we handle this slightly differently - * between user and softmmu mode, mainly to deal with the differences + * between user and system mode, mainly to deal with the differences * between the flexible chardev and the direct fd approaches. * * We currently don't support a negotiated QStartNoAckMode @@ -125,7 +125,7 @@ void gdb_read_byte(uint8_t ch); * gdb_got_immediate_ack() - check ok to continue * * Returns true to continue, false to re-transmit for user only, the - * softmmu stub always returns true. + * system stub always returns true. */ bool gdb_got_immediate_ack(void); /* utility helpers */ @@ -135,12 +135,12 @@ CPUState *gdb_first_attached_cpu(void); void gdb_append_thread_id(CPUState *cpu, GString *buf); int gdb_get_cpu_index(CPUState *cpu); unsigned int gdb_get_max_cpus(void); /* both */ -bool gdb_can_reverse(void); /* softmmu, stub for user */ +bool gdb_can_reverse(void); /* system emulation, stub for user */ int gdb_target_sigtrap(void); /* user */ void gdb_create_default_process(GDBState *s); -/* signal mapping, common for softmmu, specialised for user-mode */ +/* signal mapping, common for system, specialised for user-mode */ int gdb_signal_to_target(int sig); int gdb_target_signal_to_gdb(int sig); @@ -157,12 +157,12 @@ void gdb_continue(void); int gdb_continue_partial(char *newstates); /* - * Helpers with separate softmmu and user implementations + * Helpers with separate system and user implementations */ void gdb_put_buffer(const uint8_t *buf, int len); /* - * Command handlers - either specialised or softmmu or user only + * Command handlers - either specialised or system or user only */ void gdb_init_gdbserver_state(void); @@ -187,7 +187,7 @@ typedef union GdbCmdVariant { #define get_param(p, i) (&g_array_index(p, GdbCmdVariant, i)) -void gdb_handle_query_rcmd(GArray *params, void *user_ctx); /* softmmu */ +void gdb_handle_query_rcmd(GArray *params, void *user_ctx); /* system */ void gdb_handle_query_offsets(GArray *params, void *user_ctx); /* user */ void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx); /*user */ void gdb_handle_v_file_open(GArray *params, void *user_ctx); /* user */ @@ -202,7 +202,7 @@ bool gdb_handle_detach_user(uint32_t pid); /* user */ void gdb_handle_query_attached(GArray *params, void *user_ctx); /* both */ -/* softmmu only */ +/* system only */ void gdb_handle_query_qemu_phy_mem_mode(GArray *params, void *user_ctx); void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx); @@ -212,11 +212,11 @@ bool gdb_handled_syscall(void); void gdb_disable_syscalls(void); void gdb_syscall_reset(void); -/* user/softmmu specific syscall handling */ +/* user/system specific syscall handling */ void gdb_syscall_handling(const char *syscall_packet); /* - * Break/Watch point support - there is an implementation for softmmu + * Break/Watch point support - there is an implementation for system * and user mode. */ bool gdb_supports_guest_debug(void); diff --git a/gdbstub/system.c b/gdbstub/system.c index 83fd452800..a3ce384cd1 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -1,5 +1,5 @@ /* - * gdb server stub - softmmu specific bits + * gdb server stub - system specific bits * * Debug integration depends on support from the individual * accelerators so most of this involves calling the ops helpers. From patchwork Wed Mar 13 21:33:31 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: 780056 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136954wrb; Wed, 13 Mar 2024 14:36:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCViTzFBrCEETU9H7lQUhl7PVh4O49rFIJyDScuVD5KC7Sdf5AeIipyMBjJUFFObNjf/Jr6NDi/pEJWxx9ejH28g X-Google-Smtp-Source: AGHT+IGO6NkjB50Msgfu0iL/lY79SGARB+7arI3kz5WMsHgpIz5spM9hhQ5630RjPoAIPYAw9HJH X-Received: by 2002:a05:6870:2b04:b0:221:6e57:ec3c with SMTP id ld4-20020a0568702b0400b002216e57ec3cmr41898oab.51.1710365797305; Wed, 13 Mar 2024 14:36:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365797; cv=none; d=google.com; s=arc-20160816; b=0AAt5dmObrMBcHE3KTpM7EAJElBZiY3LnKhBOHwzkX0OYIJxSagfgRnTza8SYkzK+Y O7zFzaSgelMKaRUMSF83ScUPE75p4kwGTgieeUimqsRmnLH08ewLFpp1h8GrK2cfbpfD D1GrCIWh1fFBAzA17ZvdF6mwNm4DO+n4jjPlIYgmJB/+0YzGDG1IqzyiPadWbEPa21SC jZlFScTFY7Rqwwu313239FLBaLUe7bcIg/OrvCj+7Uqlv4DlSCnpRatAdBOgt7Ym7pDX qKHobleCmsT4gCh/8OhPXJ1vPMwYRae9255rMVwb9TT6jzTO8WC7U/EJ20NMYvyrFUzI MsyA== 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=Mop7Z5XVl4lLMq97v4+OC8Djyhqf7oPYLBMfdu8kMMs=; fh=TQet8eUqRKwp4IPfKAPSUZ2H7h2QLBYmlGc5Lnp9wdw=; b=lj8QACxUOkFdDZNMLUtRFF+k45OkdXUeXad6N518x0tRPvgqW1vZwonnrrstx7vN4o 4iue7RA8wDohIW6Y8tHAxUtG0z9Q9OO9SKD+8u7++qfy8G8GNQoprYSvz1dUuH/LEPY1 zezA7vWa2PFuZROyi9365NHeFZ5whpaemwmKWX2b9fZ7I9+23Gnt/4W1AQjUp447RD3l cfi9xpS2tUaXHrhTOxJ1GEpyVxV5UO52LSkam0PdMiebYgjKOlGFgU8oLdMoDBey++Bg 02e/jitQTn4r9aXUFvQ2ZK899WmJAu8hm1O+rnTVEO+YPUX7CwwfooZnldZ8kA0HYEZ9 gAxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xnE1TCbd; 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 b23-20020a05620a04f700b0078802f0ba65si86126qkh.376.2024.03.13.14.36.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:36:37 -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=xnE1TCbd; 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 1rkWF3-0001Vq-Qs; Wed, 13 Mar 2024 17:34:29 -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 1rkWF2-0001V3-M0 for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:28 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWEm-0007mM-Gm for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:28 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-413f1853b64so174785e9.3 for ; Wed, 13 Mar 2024 14:34:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365650; x=1710970450; 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=Mop7Z5XVl4lLMq97v4+OC8Djyhqf7oPYLBMfdu8kMMs=; b=xnE1TCbdcHZLbLA3PLHxjeFkfqg1YXQWcgdoUf4YOYT53SMouZcmS1sgvYkJMr9DLM 4quU5Dk03xpicflLj/TlVbPCZL/Z41SaOOow0lpXCNkHrmwTkp+rzCMOqagDi8NFUkmi p/Bet2YqBkA2aJKmUX5lEetcrppVEg4F/npkh5ei8u5oTw/GX0AVX2vy/Bh86CVihFUe bmgnJsbvdjabR2pnooEHXcoRgYrbg2r52V4MuLJ6ktotuNzgW9QRXI9FohAQJ8asvDfE jm7gWsltXIn/OmoM5Wpx8FLCjidsZ/7CFlkArgprQWe/6/luC8YZEfdnp8kHIsUA1OmQ VEyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365650; x=1710970450; 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=Mop7Z5XVl4lLMq97v4+OC8Djyhqf7oPYLBMfdu8kMMs=; b=OdFgLg5w0dg0+vy0rKdAYzhKjac4xrEJ2vtcv0FqcXo9saP9fBfL2QcnKNmHUiabA3 ClW7IuQfrWdgXXszWv2tc4nepp4wUg1JKW2uazyFWRF0puxOJ2T0Ugc/9ee7hqxRiiT1 qMO7I6MN3sQo7UtRhvodNFqg4yLlT5Ee7oKPwtj39g8OHPP1h4dClU1leM6DsrP+yjgo PDoV1M2rdC0UQkSo+u7pgehQYikw4hzNz5Ip+8Xwc3K/Vcpy9vel/e8qhnsM+poXERFm A9KLHadNrBwIEH2HpuerDyRCjZY2PcGhQobuVYMeb5QdTv1mu9du1uZY60zj4oYgp4jv rhkQ== X-Forwarded-Encrypted: i=1; AJvYcCUWdHacJiFGyJsAv/8TyTytiO8V7cjKIva057VKyZ92d/nakKsA1nWJ49LyliLGzDoqBy9KLqegSu0DDPWCs5UIepCL9IE= X-Gm-Message-State: AOJu0YznJ6foLMRIkYWe7k3lPKAoBIYzOMHuSaUEnxFla/z/miwA+5UK I4mXdD2zQ8dKhva1xhx2tdxY0Q6lb5M7gCHit8g4NtJZeGY/XSGw8DyrQd8YnQo= X-Received: by 2002:a05:600c:19cd:b0:413:ea5a:7787 with SMTP id u13-20020a05600c19cd00b00413ea5a7787mr25095wmq.22.1710365650111; Wed, 13 Mar 2024 14:34:10 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id h2-20020a05600c350200b00413177c3f1dsm280038wmq.18.2024.03.13.14.34.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:08 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.0? 04/12] gdbstub/system: Rename 'user_ctx' argument as 'ctx' Date: Wed, 13 Mar 2024 22:33:31 +0100 Message-ID: <20240313213339.82071-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=philmd@linaro.org; helo=mail-wm1-x332.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- gdbstub/internals.h | 8 ++++---- gdbstub/system.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdbstub/internals.h b/gdbstub/internals.h index 7055138dee..e39c4b113c 100644 --- a/gdbstub/internals.h +++ b/gdbstub/internals.h @@ -187,7 +187,7 @@ typedef union GdbCmdVariant { #define get_param(p, i) (&g_array_index(p, GdbCmdVariant, i)) -void gdb_handle_query_rcmd(GArray *params, void *user_ctx); /* system */ +void gdb_handle_query_rcmd(GArray *params, void *ctx); /* system */ void gdb_handle_query_offsets(GArray *params, void *user_ctx); /* user */ void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx); /*user */ void gdb_handle_v_file_open(GArray *params, void *user_ctx); /* user */ @@ -200,11 +200,11 @@ void gdb_handle_query_supported_user(const char *gdb_supported); /* user */ bool gdb_handle_set_thread_user(uint32_t pid, uint32_t tid); /* user */ bool gdb_handle_detach_user(uint32_t pid); /* user */ -void gdb_handle_query_attached(GArray *params, void *user_ctx); /* both */ +void gdb_handle_query_attached(GArray *params, void *ctx); /* both */ /* system only */ -void gdb_handle_query_qemu_phy_mem_mode(GArray *params, void *user_ctx); -void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx); +void gdb_handle_query_qemu_phy_mem_mode(GArray *params, void *ctx); +void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *ctx); /* sycall handling */ void gdb_handle_file_io(GArray *params, void *user_ctx); diff --git a/gdbstub/system.c b/gdbstub/system.c index a3ce384cd1..d235403855 100644 --- a/gdbstub/system.c +++ b/gdbstub/system.c @@ -488,13 +488,13 @@ bool gdb_can_reverse(void) */ void gdb_handle_query_qemu_phy_mem_mode(GArray *params, - void *user_ctx) + void *ctx) { g_string_printf(gdbserver_state.str_buf, "%d", phy_memory_mode); gdb_put_strbuf(); } -void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx) +void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *ctx) { if (!params->len) { gdb_put_packet("E22"); @@ -509,7 +509,7 @@ void gdb_handle_set_qemu_phy_mem_mode(GArray *params, void *user_ctx) gdb_put_packet("OK"); } -void gdb_handle_query_rcmd(GArray *params, void *user_ctx) +void gdb_handle_query_rcmd(GArray *params, void *ctx) { const guint8 zero = 0; int len; @@ -539,7 +539,7 @@ void gdb_handle_query_rcmd(GArray *params, void *user_ctx) * Execution state helpers */ -void gdb_handle_query_attached(GArray *params, void *user_ctx) +void gdb_handle_query_attached(GArray *params, void *ctx) { gdb_put_packet("1"); } From patchwork Wed Mar 13 21:33:32 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: 780049 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136514wrb; Wed, 13 Mar 2024 14:35:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvXMsxjP6GyefpueA6qwNEh92CjzPJvH0rBwh47fU0a70h+OBRfAE+rzrQRfozNXEGtuTxnToe+bwsKgNA7zE5 X-Google-Smtp-Source: AGHT+IErWe4wSl/JSjeMFsYeiSrdjw7wXaC3QSlhmz6uxKeg7QtmjzSVrCYEcV/eJpC+QnbCacx7 X-Received: by 2002:ad4:55e6:0:b0:691:9dc:3073 with SMTP id bu6-20020ad455e6000000b0069109dc3073mr1022079qvb.48.1710365707712; Wed, 13 Mar 2024 14:35:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365707; cv=none; d=google.com; s=arc-20160816; b=wnFjFmi15cz2YFanJpnk8m0NX/kO5/3MtJBZSFC/jysgSDlYV9bawYMxfqLXXzWFf1 LWUFWZLaWc2YoYuGzi/gt2pAHPyntgp4eZZHJOxpYe8IFmySt8J4u4zLEpDVetfjtvNg d/+J2iIfHNsQhhmjvjDTxBhTvONY1jsvTWDrVuCxp56UQhLkznfe8k0D0IAAcoF5TOxX NNaRs4BU0k1Z1z/32txeE1SV0s5SyGCKXip+D4GyxTxSBodOJLbcCZQ9JbnBL71XFggh Td3jQla0sBZgpXck//Qhnn2MSBTyLl6R43wkpLZRsL6UEJcMsoROwubzuX1KdiWPv1Br NcZw== 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=NkVZlzl/unZoGeVbI26i1HdVvdJ7WXs7uWwXIhdDAMs=; fh=c/UXgDRYo7dbyRT3BG+fd5AnVndFhiV8RrsLyrFt1QE=; b=Uur2RSzYA7WP1r/Wtl1fWS7XeyPbuqI5iKw05/2SBQp8qYypN9hLYKcORY7l8ONAF2 0htU2UsAd7p979kDAX/yf6sXdP2V960ZeXr86h8dPdYb7AjR9rP+XV1qA0ONCNONLyIb YdIT9omeV8kyVeg4TPUCRXOGvc1/lRFvR1Kfibq5VPDEp1AnsjnhpJls0GCWKjed177z JT9lm0DEu72yDc4b81nGmQ7Ll2Zg/nbP4I1IFIShakorOenistEGcbmOEfD561H/zvmF UA4n8bV5vR0h6zY7ESH8xbLipvZTNQB8NVQFRvEH6i4pRrN5GYmZTgJqfyhdYqOTxXRK FM9A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gB7ip64r; 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 gw6-20020a0562140f0600b0068f876e6065si85507qvb.207.2024.03.13.14.35.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:35:07 -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=gB7ip64r; 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 1rkWEw-0001TD-2B; Wed, 13 Mar 2024 17:34:22 -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 1rkWEu-0001RT-Cq for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:20 -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 1rkWEr-0007pA-Uv for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:20 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-33e8e9a4edaso271771f8f.2 for ; Wed, 13 Mar 2024 14:34:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365656; x=1710970456; 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=NkVZlzl/unZoGeVbI26i1HdVvdJ7WXs7uWwXIhdDAMs=; b=gB7ip64r1fdNpnHsSjG5CdD8P922Cnz0a82bUpmC+KxhBJP8JGhIvQtuqzBSXDTgZj GEkR4/fbsmJLj6YsXtpKXTIltVT0lGGIajLQY978/pGNNcXcQVIxiW9gxo9fdzqYjzro QsHe92zj248IurTwK4MWF0DQBJx8h04tzDxvi9cx0/W1n20R0aUz9OKrRvXY77y1zytf fcMKe5KQoTqUKC6kgS0ZUstW7sU+NjgYmOACkrRpn8m5e9ZBO6EaHQMkxsXs7/Vt3UMg fJOsilg3d3bhiZvnSbqcbgq3VkXjLpWYx/p2zfBJiXU3cGmAvHFAe8jC6eVyLQGM3Zro kZkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365656; x=1710970456; 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=NkVZlzl/unZoGeVbI26i1HdVvdJ7WXs7uWwXIhdDAMs=; b=t8buDaftgp0CEOeaeffM2KzstBhBMePeIn75lxS2n5PyBSkv9mKbdx6g2zZq85J7Xs 8qpp8rLChuqVI9ylFNe/cZg5v/dkNwnPr8dWgZPHJDvinPjX2aUh7UolSo5DANObCNhR 7o4FSb1qWIruTebwUqVRGkydhlkt6m9v56QiSLpMKr6PObdLREGh+SK2ciD0QnQm0WVw E9OBTIPYGnUNPxjkY/ystH+HR7tT1E7KbQlLG8/TeA2jVZeHpt2KLlt1NILTac0spEti S45KKnnYd59g8eXTXFZLT8AqZAry8MGBw+EZauTFs+T/G9qMdL9hhZcq9EYJIKcMNgPA dYkw== X-Forwarded-Encrypted: i=1; AJvYcCVc5Y1S7BA0wJXSdB33cFiHDNvYrDjYsZ6KhrMK5TV+v26/Yhr+hobdxMlbEpzjkjHjwTTnkEjd9VC1C9/izP45zO2+m6c= X-Gm-Message-State: AOJu0YxqJxgbLJ1yrbtt+m92l36bN0OUNyocrpkJjV+OVoe12eUL2qg7 h/EEtXvsCqHDiB07p2Os23D5Fez1ifhzLww0K8CJGjUbg+p2aK0wrh8uwXoR6zY= X-Received: by 2002:adf:f801:0:b0:33e:bb5c:f60a with SMTP id s1-20020adff801000000b0033ebb5cf60amr1934560wrp.66.1710365656644; Wed, 13 Mar 2024 14:34:16 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id q11-20020a05600c46cb00b0041312d21a35sm3550340wmo.7.2024.03.13.14.34.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org, Nicholas Piggin , Daniel Henrique Barboza Subject: [PATCH-for-9.0? 05/12] target/ppc: Rename init_excp_4xx_softmmu() -> init_excp_4xx() Date: Wed, 13 Mar 2024 22:33:32 +0100 Message-ID: <20240313213339.82071-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Unify with other init_excp_FOO() in the same file. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Nicholas Piggin --- target/ppc/cpu_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 7e65f08147..b208bd91a0 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -1642,7 +1642,7 @@ static void register_8xx_sprs(CPUPPCState *env) /*****************************************************************************/ /* Exception vectors models */ -static void init_excp_4xx_softmmu(CPUPPCState *env) +static void init_excp_4xx(CPUPPCState *env) { #if !defined(CONFIG_USER_ONLY) env->excp_vectors[POWERPC_EXCP_CRITICAL] = 0x00000100; @@ -2120,7 +2120,7 @@ static void init_proc_405(CPUPPCState *env) env->id_tlbs = 0; env->tlb_type = TLB_EMB; #endif - init_excp_4xx_softmmu(env); + init_excp_4xx(env); env->dcache_line_size = 32; env->icache_line_size = 32; /* Allocate hardware IRQ controller */ From patchwork Wed Mar 13 21:33:33 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: 780058 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp137012wrb; Wed, 13 Mar 2024 14:36:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWTToSDKbuWAT0jcmNqw6k3ZvMH6FN/53xTsP+GnqUJS9xy4BjJRtLQkXJqdPAQQlyt6wvTCI9vUxgMzKLMXWUK X-Google-Smtp-Source: AGHT+IEw+RYDULKiK/d8ucAaYmKMwyGtu8lbFZ1UJhMm6BX3x7Yum0ZJNyel/YkAwjBoMPnSgLEK X-Received: by 2002:a05:6122:45a:b0:4d4:21cc:5f4f with SMTP id f26-20020a056122045a00b004d421cc5f4fmr145622vkk.11.1710365805815; Wed, 13 Mar 2024 14:36:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365805; cv=none; d=google.com; s=arc-20160816; b=VAvs0u5bwFZoGx1i1tyCDeZC1Cso2Gl/jUsQi63FpltL9nkryqISu+W/rsX/F9Swm/ 0KSk6Ml45ZBP0JEPBi0SASA00lQq/WWxwCI+tAfsGP7fcXJKTEL+ti+aKYHGjDc1e61i ryhE1Zuv+ns9viddqs9FRJ++9er00MgJfRqY4JRXuMS0ohsGEiL1+hOVpb6sGU5rIlgK xm7MH0iAUfzXW3J4XdnzE0nqBZez0gShvv76mAv7R0rM0lglS5g4N7UQME5rvXiHYwhf qMqf4dfIKhGS9707ocvFVg8unT9P806nCRBzY0SAgNjuKH9JiEe+bKdzHjjR1xQgg6SQ YtRg== 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=RBkHrPM3L+Twu6UqfDL2FrSyFRu3n6fnatxa83i/Hyg=; fh=UbD2lrmFlJQmNk4HkUVXcq2BDE0Brzrv8mgvy3lqTLk=; b=hLmNVubYT06Pq4rYBo3bOdZjzM6B83QhW2E+kF6P5tm4moHz0gGKzdfy/hUcEnMdzW irSlNqxbcWUHJxEAPjgE/LWK183Dp9TQgdqnMB6gOdOAg1OYLzmGtmnowNDSn2F4IYaE ssOb/y5BLc37ZSPvJgMTgMK0tHtQJY/97EBJhi+Ky17oGaLitgmniW4dUg6uqE7C46Ia RPpgt5kdNEAi3K2VvZ/dtVoyMf8gRhrZCkc1tFCTDHhD/c+aY79MGChSgb7Z4VbXKC/o GhVFahFqfZJ2fm26bK7xxJBPsTSxB66HKpIit4f29pPjCqurtKGvPEk6kUy9mXLX0vH4 +N+g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I437kgiG; 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 gm10-20020a056214268a00b00690d4e72106si75842qvb.508.2024.03.13.14.36.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:36:45 -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=I437kgiG; 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 1rkWF3-0001Ve-JY; Wed, 13 Mar 2024 17:34:29 -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 1rkWF2-0001V1-L2 for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:28 -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 1rkWEy-0007py-N7 for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:28 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-413eee86528so2228745e9.3 for ; Wed, 13 Mar 2024 14:34:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365663; x=1710970463; 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=RBkHrPM3L+Twu6UqfDL2FrSyFRu3n6fnatxa83i/Hyg=; b=I437kgiG66I2bLr5WT0oT0B9o0NyniwhC/BMdRWe4TKKo35fnN6bIgTH1BwGeeC1Cr o5JDfgvq2bXcnsFsqzCH0tzyCnNkCN3MzOmpgUuy1A0OZP1fo/c4yCmrxsNYv6bCNdC4 B0hss/24ZGin+5X60hFwupaP/Qyg4+M86knPdtRJRaz5smobddUEB6Ap9R5g0M24M8YU wKLkck4DmiFShN+rx7Xw4oJO+RRWUA8UUbyUhR65ti8BsjRt4xf8ZJRgd4+G6YDhTDnr vW4oUbpSK15BH/Pmx4p13kjTQq1MScT/dxO0y7e0JhXGjCtfWc/P7ROPkq2PSrsPJVcg 4ACg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365663; x=1710970463; 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=RBkHrPM3L+Twu6UqfDL2FrSyFRu3n6fnatxa83i/Hyg=; b=QQVTGKDedf0rVWhwZEQRmaWLbPOkbvgf6koNc7zyMjxAXi2OQ2E8RIRyuSa/vwgr5P 5iOJY0yQuZxQxxg6gWbNeWFZH1SaM5MMBTt5/TLfqVNlNC/gafBFDxihP+h8tLMKoCaU AdGOuHpiaEjBGjpCwCykeDxPHkYdSDvc58Unogc8VkRrJTiYcl61oFDqo8ccQU/wLSPR i8YiAjitFi0tFlcUwroXOacdJkqJ3+V4CPsKZ5EtzBcamxqt5VVzLDmgCpXwHw769KhG cfv3sKgHoPR6p0lk856n+PSBdnarDALM6ogKBxrjzeO95VW2PqANfMWaibO9KrjaZ7bG lUEw== X-Forwarded-Encrypted: i=1; AJvYcCXHUrBrygIX6CPzrrAL0V2fhavBCAj4bHu8xTbMo337T8PaA/7HCK2e9LXn9dVCstG/pKyEogtFc2IVdHoh6+46lULttD0= X-Gm-Message-State: AOJu0YwWdWTgpepqM/qjmJI+W1+Fh/gE5LX3TMLMrm7d/5jvd0xkiC7X ABWbvk0ORMOlo4KHf18OM0p0EhN9etKlT3JDNW3u8VNySWO2t7r2/grCFH8LxII= X-Received: by 2002:adf:e8ce:0:b0:33b:62c0:6181 with SMTP id k14-20020adfe8ce000000b0033b62c06181mr2353388wrn.42.1710365663045; Wed, 13 Mar 2024 14:34:23 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id j30-20020a05600c1c1e00b004133825e6cfsm3459020wms.24.2024.03.13.14.34.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.1 06/12] tcg/sparc64: Check for USER_ONLY definition instead of SOFTMMU one Date: Wed, 13 Mar 2024 22:33:33 +0100 Message-ID: <20240313213339.82071-7-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since we *might* have user emulation with softmmu, replace the system emulation check by !user emulation one. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- tcg/sparc64/tcg-target.c.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tcg/sparc64/tcg-target.c.inc b/tcg/sparc64/tcg-target.c.inc index 176c98740b..56915a913b 100644 --- a/tcg/sparc64/tcg-target.c.inc +++ b/tcg/sparc64/tcg-target.c.inc @@ -78,7 +78,7 @@ static const char * const tcg_target_reg_names[TCG_TARGET_NB_REGS] = { #define TCG_REG_T2 TCG_REG_G2 #define TCG_REG_T3 TCG_REG_O7 -#ifndef CONFIG_SOFTMMU +#ifdef CONFIG_USER_ONLY # define TCG_GUEST_BASE_REG TCG_REG_I5 #endif @@ -961,7 +961,7 @@ static void tcg_target_qemu_prologue(TCGContext *s) tcg_out32(s, SAVE | INSN_RD(TCG_REG_O6) | INSN_RS1(TCG_REG_O6) | INSN_IMM13(-frame_size)); -#ifndef CONFIG_SOFTMMU +#ifdef CONFIG_USER_ONLY if (guest_base != 0) { tcg_out_movi_int(s, TCG_TYPE_PTR, TCG_GUEST_BASE_REG, guest_base, true, TCG_REG_T1); @@ -1075,7 +1075,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, h->aa.align = MAX(h->aa.align, s_bits); a_mask = (1u << h->aa.align) - 1; -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY int mem_index = get_mmuidx(oi); int fast_off = tlb_mask_table_ofs(s, mem_index); int mask_off = fast_off + offsetof(CPUTLBDescFast, mask); @@ -1147,7 +1147,7 @@ static TCGLabelQemuLdst *prepare_host_addr(TCGContext *s, HostAddress *h, tcg_out_bpcc0(s, COND_NE, BPCC_PN | BPCC_ICC, 0); } h->base = guest_base ? TCG_GUEST_BASE_REG : TCG_REG_G0; -#endif +#endif /* CONFIG_USER_ONLY */ /* If the guest address must be zero-extended, do in the delay slot. */ if (addr_type == TCG_TYPE_I32) { From patchwork Wed Mar 13 21:33:34 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: 780047 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136473wrb; Wed, 13 Mar 2024 14:35:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbwRQhopYpxSshOtXz/j6gotMqSeNrtnSj2lsTy38OZWbXEBNE9Ok3oWvjP4qAcSOdzxgewzWlXaJgEKy5RaDX X-Google-Smtp-Source: AGHT+IHlbCfewuV54gL1iDvAg4W+//T+QJsxAB7znjnHf9eW4DFMvFY9OPB4SOxzzKnTMjUnVZub X-Received: by 2002:ad4:57cd:0:b0:690:8260:953e with SMTP id y13-20020ad457cd000000b006908260953emr1008117qvx.17.1710365700418; Wed, 13 Mar 2024 14:35:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365700; cv=none; d=google.com; s=arc-20160816; b=va1PYCtGlspM8vq6py4dBbSs3EtRaiGtwZzxW5vr1o/J83tTpp975Z5A/VCsL00BrA bbyTDE6TPxcrL5SnkZxXcpziIOd7KNoKSZCKuLcN97idT2p9cwK3MVdhQLt0LKyhg17t sOhc4gxHI8XmDcnzOzW78fmHsDWC6hk96WCHuTAeonjusXZq9b50vwNL4hEW56sIw86c VT4SrO1yzDEcR3jKaGdTn+G6Kw0ADc9/AB9bpZHAThZ1mYEIZSAGo38FXBYZjAiJBpP5 2AhJYc9/cM5q4mYK9gEdqs9Tmt3tOUk/GwWCB1e8CsfEPUjkgXcV0G1T9iRGXGfGJfMX 2YGA== 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=JMlHJDMRIAHpHLqTr2iQoA8Xh8BaIO4Idzn+WvdthY0=; fh=3xhJ8LSKOz1Q0iRHqHv1RVvfROEagH4RGbL6NacRqSY=; b=yGoyB+p4hFp/woY1v+pT+pmUgAZZzxflAbvahpN1QeBUauI7hTNbfz5Wk5U89v2jiX 6eVRk4zdIzry0w+n5rQq+QwyD8VgWJmyXrl+vDuDqRXhHJ5I2GyW22abNMuZ71YmHwBa vsWMcZSwO37bDilJHfJCY/PQn3BboJmpxy2vQUBHxLgDtN4b8pWdrpbJAx0950JLEP83 L+sBSJWALb4p+AjT/t/QxuN9JUqWqfW6dGQ1KFJ7GqDcHp+54EpjoPLFApc99IwYi47o NvqSQpkqJ9E554peIQDiF4fp4OKz2vJg7MmEfmRkl5vrJj/azZXR9c/R9cqBe7YZjL/v PNxw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UOZLtLlM; 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 5-20020ad45ba5000000b006903065874csi79035qvq.199.2024.03.13.14.35.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:35:00 -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=UOZLtLlM; 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 1rkWFC-0001g9-PZ; Wed, 13 Mar 2024 17:34:38 -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 1rkWF8-0001X3-5p for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:36 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWF6-0007qS-KK for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:33 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-33e99b639e0so175680f8f.0 for ; Wed, 13 Mar 2024 14:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365669; x=1710970469; 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=JMlHJDMRIAHpHLqTr2iQoA8Xh8BaIO4Idzn+WvdthY0=; b=UOZLtLlM8K1O0iwuXrxMRLJoEOld5PAD7vaQigr/873cQ5Fjrk8NVcL1B1Rda2Q7gT t7VVUDaX6aWX4v8HMvqCewkp7fz2CPGi1bhikt2L6h7Jqb2dQr+wwWvGRq2zTOqpPg62 xKy8iVsTDC+G3KUOu9NQhtdwBRFJILCKq8v7wDAnxhce4KqXrKgfGoe7x2VojGCEf5nl GTc4/SahZ4vOSbLJUv7frGdOBy8iEkSlcWSLu19V1amuvvKcLzURVQ/UQL0G6mHgI3Mz xc5c2QsMs0Oh2wNIj1ePWieDwG5GqJfd0cbd8+XDq/ngdkSQhfikUZHp3GBUIHEp5+oE eBLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365669; x=1710970469; 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=JMlHJDMRIAHpHLqTr2iQoA8Xh8BaIO4Idzn+WvdthY0=; b=duc/6gIjDp+ih4iUqs7HcMYCpOBuzAFcK2BYThcyOWYPOdTFShGQkCYtcESDztaI4V vi4qjpIdx0R5opCH4r2KakG/EJ9wxVnpqKF5sJKVzN4ER07inRSNaJvmnglesr0+A4Up Y+HJDL4tD6pod6WmWgfNPFxAN/Qe/vJ2ydCVB1aQ9rVgv5iSfJ9PQnRcKslu/uwFdB/S EInwJnnMdXpFnJpE3d2LcfeoBaVETFqFDuPeWY/d++soW4Fqy2nXRUjF4eUAgZp8EsT0 h1icW1rL9/g2QBWW+0ZpFMB0gOyc39TgvMaK6gBsV9EnbU9SaAZQBXjbYPvWzuVzRLrg 9sBA== X-Forwarded-Encrypted: i=1; AJvYcCUnWGvzL9zLH+/r/9WHw1kl9PgX5nc/HX9nCRGPqeveQg2LAZlyKG+P+GyRd/efOM/SNOwORHWpERbYAQfBkG5cfEhQ3OQ= X-Gm-Message-State: AOJu0YyNYPv4Qh+Xd1GwT/70n0hgDT/mKioXxv1Pgvskhbl60ohVhAed KxlTjDELhIZZeL/ZhXdY5zO4QSY9GuhcmVp0ArJoDjk7Emw3tfqPYWs8ON4wvYo= X-Received: by 2002:adf:f549:0:b0:33e:8aba:cd0a with SMTP id j9-20020adff549000000b0033e8abacd0amr2538518wrp.9.1710365669722; Wed, 13 Mar 2024 14:34:29 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id k6-20020a5d5186000000b0033b48190e5esm62867wrv.67.2024.03.13.14.34.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org, Alexandre Iooss , Mahmoud Mandour Subject: [PATCH-for-9.1 07/12] plugins/api: Check for USER_ONLY definition instead of SOFTMMU one Date: Wed, 13 Mar 2024 22:33:34 +0100 Message-ID: <20240313213339.82071-8-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Since we *might* have user emulation with softmmu, replace the system emulation check by !user emulation one. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- plugins/api.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/api.c b/plugins/api.c index 8fa5a600ac..06d3e95da2 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -294,14 +294,14 @@ bool qemu_plugin_mem_is_store(qemu_plugin_meminfo_t info) * Virtual Memory queries */ -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY static __thread struct qemu_plugin_hwaddr hwaddr_info; #endif struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, uint64_t vaddr) { -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY CPUState *cpu = current_cpu; unsigned int mmu_idx = get_mmuidx(info); enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); @@ -323,7 +323,7 @@ struct qemu_plugin_hwaddr *qemu_plugin_get_hwaddr(qemu_plugin_meminfo_t info, bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) { -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY return haddr->is_io; #else return false; @@ -332,7 +332,7 @@ bool qemu_plugin_hwaddr_is_io(const struct qemu_plugin_hwaddr *haddr) uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) { -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY if (haddr) { return haddr->phys_addr; } @@ -342,7 +342,7 @@ uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) const char *qemu_plugin_hwaddr_device_name(const struct qemu_plugin_hwaddr *h) { -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY if (h && h->is_io) { MemoryRegion *mr = h->mr; if (!mr->name) { From patchwork Wed Mar 13 21:33:35 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: 780057 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136958wrb; Wed, 13 Mar 2024 14:36:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGA/pHFaxjBB32V6x2os2OKi0LX9KwpsIp8j7Ez/Ou25E10pfCOqdGkl9RgPbUV8G3y+7N3jE8+U9wrhwF57YJ X-Google-Smtp-Source: AGHT+IGHAH0RoNnpnanTSU53o6Vr0PNKknT4Nyho9hCmZna+oKGniZGNkjEAj8KcY73yihxUPdLR X-Received: by 2002:a0d:e844:0:b0:60a:422e:c4 with SMTP id r65-20020a0de844000000b0060a422e00c4mr3613049ywe.25.1710365798065; Wed, 13 Mar 2024 14:36:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365798; cv=none; d=google.com; s=arc-20160816; b=i+KsAIXHyM4GyYOAowDk87y5Q4Hmg/fCpzTyDLQrSIlKGoF8vhbMy1/K9O0xMZaZ/u 1FfBMKO7pBEv2wkgvXsuFufYruYAgiqUz0AldkuuwCdTXvODY0H6RQeWXYWfj6rNEUrw FobEWwT6S1Lkh+s29j0846r7qvW8gG9BSw0IbKEm/V9lnjEEMFld8lF1lGra9RygY8T2 LpJtFZPCwjXt9L2VjfJiIf2QL/m6yIdB5rD79b8XNjUYBpX6TwsnS1ldl0x+JWGNSnNm d9uE3Q+lsxqQTdntzSjK59HmyE5ZwtokL4yKiq0LjL71vcUajodG2BjPSXH/yYRjGAXU cnow== 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=Z7QKVDun1Xxye4YCDRYj878clGJ9eUXYpBHFwgHMFxg=; fh=UbBnvB7XNzMIup42ozq+LK2oQPNKwG6s345XYtsd68U=; b=vAyjjh5U31i47IZq/7glWyWxnhTYEDXdYH3b5YLR3UxaplylrPqHXd5AbxzmkjgiX3 htWw2sE/pLcV/vj9PvDSVB9YoTrOnH32jT7kE6Dz/pG+e5iZrKHKR9uTCaq9GfOeDgOy SH25v2AMKFRcgEn4KciYCQThUqwKMqvPN+QyemljUobYva9gV2vd8EU3dVoA1vmn4kfr wD1IZf0QpGpcA38SFhBC1yWbXC32iqqUshdmJmpQHCbOZ0w0r3YZEvvNaS6uVuXeimel RYxVm4znE1EcPcoGDEimkgZ/A0N3IKaHqHF32ZIbnaXQhaxq71PexFHTvlY11QZI2oOH ZLfw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TKAmqZdU; 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 w3-20020a05622a134300b0042f30753e3dsi25537qtk.577.2024.03.13.14.36.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:36:38 -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=TKAmqZdU; 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 1rkWFH-0001xj-4p; Wed, 13 Mar 2024 17:34:43 -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 1rkWFE-0001mN-UK for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:40 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWFB-0007qn-Td for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:39 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-413e61525c2so2147735e9.2 for ; Wed, 13 Mar 2024 14:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365676; x=1710970476; 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=Z7QKVDun1Xxye4YCDRYj878clGJ9eUXYpBHFwgHMFxg=; b=TKAmqZdUJEE11Gb9yaIlSEm4NaD7oZG32wKRl5W1CQHRlGha2U7T9Z3D6BwZf0Pb4f 6VOgWnPVvrpVMy0cBsQ/WCAYv9nYbNPyCZCNYHGqhJTOfW/ifu4LG9jaMCTxz1aFkA4Z k32TU0FT/z/fjauyQPp3EUmWWa5t0Z/7/wM6mWfvmcwOrniTBNZhsPKpKG4LYf48Omy0 9oByzrUyO/pedJbcJMaQWbM944Ey11e5LfehGQ9L5A2B/+9D6tETV4vVku3GNqHOURRW TFG5QDkgh9X0mMtovxNv5s1fVbJm2rHkuL0fFy8LsZfCRgNhQ7rv6Iuk6aJtETMzBDxi kxgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365676; x=1710970476; 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=Z7QKVDun1Xxye4YCDRYj878clGJ9eUXYpBHFwgHMFxg=; b=pAqmOsVC/dpxBBgRbujWLLL50kQllbd7otXRGp5sxD/fzfAZZ33CiJgs5EhClr68Lf i2goWalN2H+uUYSFf3SK8Rc8x2yqKA5QNKj6oXu34WUFb9xq0uT5jYxqTnnzHJ74LBbZ n8nrq+meQ38qLfrBiglNYAkxiXJmWB6KAjOYhTQzmjTgCH3XW5a4KDpd30zP3XYtj+/4 EGSoUdliTonGyjTZr4kaDRqVnDlV8NO27/Gud0yw5Fm4pXy+jOHUXG+aXYAtAWp0DGjd cRzmYcVpezcc2wLUr3TplS5EM8C7sF8bjR9ooy0p9q9InPHrIA5Cj4D6fBrdE56dYc8B ke8w== X-Forwarded-Encrypted: i=1; AJvYcCXARqFTSkCCjAYV9hTEsG46XL4ucUKGf0Pg3JBZfxOnhwyfqXzKx165/tFHYlaNxeUNfuhh2KEhOellYH3UJGCPByfshQ8= X-Gm-Message-State: AOJu0Yx7aSlcGFPcLfiN/n93HtTi+WgvX7RHWpSBPZ2BYwDIgJx1EJJd Y2wlG5a9l9kOIwa3PdBNxQHix73YF7i2bV0SqT9S4Wb50ZR6w/33sHlh9fMhhFw= X-Received: by 2002:adf:f905:0:b0:33e:78f7:51f7 with SMTP id b5-20020adff905000000b0033e78f751f7mr2510415wrr.56.1710365676126; Wed, 13 Mar 2024 14:34:36 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id v6-20020a05600c444600b00412f83e0c11sm3478553wmn.22.2024.03.13.14.34.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.0? 08/12] accel/tcg/tb-maint: Add comments around system emulation Date: Wed, 13 Mar 2024 22:33:35 +0100 Message-ID: <20240313213339.82071-9-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/tb-maint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c index da39a43bd8..2fef7db9e1 100644 --- a/accel/tcg/tb-maint.c +++ b/accel/tcg/tb-maint.c @@ -147,7 +147,8 @@ static PageForEachNext foreach_tb_next(PageForEachNext tb, return NULL; } -#else +#else /* !CONFIG_USER_ONLY */ + /* * In system mode we want L1_MAP to be based on ram offsets. */ @@ -1088,7 +1089,7 @@ bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc) } return false; } -#else +#else /* !CONFIG_USER_ONLY */ /* * @p must be non-NULL. * Call with all @pages locked. @@ -1226,4 +1227,4 @@ void tb_invalidate_phys_range_fast(ram_addr_t ram_addr, page_collection_unlock(pages); } -#endif /* CONFIG_USER_ONLY */ +#endif /* !CONFIG_USER_ONLY */ From patchwork Wed Mar 13 21:33:36 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: 780055 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136869wrb; Wed, 13 Mar 2024 14:36:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMGZG07elyelMThNPWSx4GdqVhSJLQwbP5sPhsGM6nr0Sux4aY2Ul96IdEtT9SDFO7oSz4lNqV9TNfusRdV6qV X-Google-Smtp-Source: AGHT+IH78T2DtUhB9OeV/eqXY5LMg5WWN0DyKSYWAxmri8dbmqoTvAP5twuCATTQ/MnuID+bKOUi X-Received: by 2002:a05:6808:200a:b0:3c2:a779:bd0f with SMTP id q10-20020a056808200a00b003c2a779bd0fmr1182708oiw.51.1710365772341; Wed, 13 Mar 2024 14:36:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365772; cv=none; d=google.com; s=arc-20160816; b=xbRz5VNiMO4X+JChNrF8to8RS4Kq7q9fmSl+V+up49yl2gPt+iXxY3rH2GLz0HzRQn F1dQxjDieLpoFLijIoDZtdbMzps6R8fvlsandbMRyb/qN7mnulodwCoHVs206Z0ocVuG ZOezgPZ2qyeQHMGqD+coq1VuhuLemuFwy1aV7TNyqRTVtqEep3j4Xfs5jtcuVHt46Y+x lA/d3AcsHu8/E9qsePlo2H8iAFOVGc2F3WIjPheqfLiwtV3F2NEeQ2dYJdNmfK+ItX9v xVWAY/53NWp41VqWplTwFAm/sa1n124tm4liDkHR58PzP0Rw/stCcDO/FzMHQJ76nXsx rnaQ== 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=8X472is1XN7Nm+dILoz/idT0Hrtz/X3rNIf8XYJ+iTQ=; fh=rv2CobEIfQWi5eDY/t4BF9vaUeo/yf8wde+SvkYLMXo=; b=qAXPSMUe6ARzMcYZzV2GAwbQGzjoP7u4W11E1p4jY5B0Hbc/dmraVyY0mlQ9Rbbcmc wr1TVUVBq1mECvJK3S+RMQJZCz5T9o9fC34+/Hw/2lQIabhh/RiEarsfNZyJJYr2q/Gl k55f9wwaxR9nIBxuOOsUuWKSifn3GDpSlZkJTluOnrzBB7OC2Olw5yTVT/c+7uDlG4QU 96/OgDZKciMdXBXsbHgdEfJqKyUwEBPbdFe2y1sjtkcjqZfjVu1CYQTzo/iggG80ci/W LXNZ5sy0h2vlMZ6yTdkj5HMUoGduMB355p0TcXj2+a+VnWqpOwtxwoIfwW/VBGzDS4ai +0rA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ftxLuPco; 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 hf13-20020a0562140e8d00b00690d4ba4fd3si80090qvb.398.2024.03.13.14.36.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:36:12 -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=ftxLuPco; 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 1rkWFM-0002Q4-Mt; Wed, 13 Mar 2024 17:34:48 -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 1rkWFJ-0002FR-PO for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:45 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWFH-0007rq-TR for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:45 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-33ddd1624beso231733f8f.1 for ; Wed, 13 Mar 2024 14:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365682; x=1710970482; 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=8X472is1XN7Nm+dILoz/idT0Hrtz/X3rNIf8XYJ+iTQ=; b=ftxLuPcoqiHOwjaIRz+nXm/cc7GnJ3LW5N4apU5H+5lyzFyK3BP4t1lXikkODggPzJ vkW5KoGIrfo1gOd/vZDiehQukxmZF0z/QfOJxQXlD6LoUnjX5IsOnmg5rFATOExSMAja pO9FgmdPNuS+Qyl/rabRkWgiXOlm1J2P9263Q+T2SXQxekzQ81OqBYE58UH782hWBdSF I3kGY/dUM0kOtIAgrGPmMWWV/vJHuBiyb4M7o01e/NWgVH7rhC72+7omatG5Z7m5rPd2 Glx1Gj44hSaZv68pJh5YgbwHA2nHqsPbqSzwGsK+VSOl34wiSysPE5iKL6nuzGLxLnl8 QDUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365682; x=1710970482; 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=8X472is1XN7Nm+dILoz/idT0Hrtz/X3rNIf8XYJ+iTQ=; b=SDNMkZPGzSdvxQif9NrZbTWByfOqwYQDsWN2HsqKLdjDul0Zz078EF3umsq2obKm51 bqzTQrSQdXbEI1ihj9LzdMCNmBvPEIJxOKpqNRxEFxhG2qcVLD1kvRNswkBmMrqXmZ4c kZUm769QckB4K32I5M/VYVaXI1SXL8IJO2GlfqmvoyYaFEscPgbzY0bDWY19j0YQADqb q+I9AMIcvCTbGy0vlmlzrPGfls7HFWSDLgXzcOGq+2s0yDTiF0uQgT7dcCHST3S+9TqG mE5yy87PTHLX+omH6Set/ZSeiQCz9TB6jU9nrooxzSqCZJFA9KU6R8l6+XVWJwWw4wEP h+Tw== X-Forwarded-Encrypted: i=1; AJvYcCXKquW5yDCGVlKLV0eQW/VMJ2r2rUd8U/qqHBJcO/N+O0nTKuIdJs+9aRV8LOqbvLAvlPZwlQ0T60exLp2HmhNC5M6dw+Q= X-Gm-Message-State: AOJu0YzJtyCs2QEfP6XUhyGpdL5j+fxBVmqmJxarh89nyDOu5V/5xfhq GlVgbtnIf8VU1RoHnwBob5lS0GThc5c0qeeKk0+QsnWhxADkBxAzwL90SAVHAUE= X-Received: by 2002:adf:a296:0:b0:33e:bc7f:edd7 with SMTP id s22-20020adfa296000000b0033ebc7fedd7mr2372862wra.7.1710365682559; Wed, 13 Mar 2024 14:34:42 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id bk1-20020a0560001d8100b0033e95794186sm57071wrb.83.2024.03.13.14.34.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.1 09/12] accel/tcg/internal: Check for USER_ONLY definition instead of SOFTMMU Date: Wed, 13 Mar 2024 22:33:36 +0100 Message-ID: <20240313213339.82071-10-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Since we *might* have user emulation with softmmu, replace the system emulation check by !user emulation one. Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/internal-target.h | 6 +++--- accel/tcg/tb-hash.h | 4 ++-- accel/tcg/tcg-all.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h index 4e36cf858e..b22b29c461 100644 --- a/accel/tcg/internal-target.h +++ b/accel/tcg/internal-target.h @@ -24,7 +24,7 @@ #define assert_memory_lock() #endif -#if defined(CONFIG_SOFTMMU) && defined(CONFIG_DEBUG_TCG) +#if !defined(CONFIG_USER_ONLY) && defined(CONFIG_DEBUG_TCG) void assert_no_pages_locked(void); #else static inline void assert_no_pages_locked(void) { } @@ -62,12 +62,12 @@ void tb_unlock_page1(tb_page_addr_t, tb_page_addr_t); void tb_unlock_pages(TranslationBlock *); #endif -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY void tb_invalidate_phys_range_fast(ram_addr_t ram_addr, unsigned size, uintptr_t retaddr); G_NORETURN void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr); -#endif /* CONFIG_SOFTMMU */ +#endif /* !CONFIG_USER_ONLY */ TranslationBlock *tb_gen_code(CPUState *cpu, vaddr pc, uint64_t cs_base, uint32_t flags, diff --git a/accel/tcg/tb-hash.h b/accel/tcg/tb-hash.h index a0c61f25cd..45a484ce82 100644 --- a/accel/tcg/tb-hash.h +++ b/accel/tcg/tb-hash.h @@ -25,7 +25,7 @@ #include "qemu/xxhash.h" #include "tb-jmp-cache.h" -#ifdef CONFIG_SOFTMMU +#ifndef CONFIG_USER_ONLY /* Only the bottom TB_JMP_PAGE_BITS of the jump cache hash bits vary for addresses on the same page. The top bits are the same. This allows @@ -58,7 +58,7 @@ static inline unsigned int tb_jmp_cache_hash_func(vaddr pc) return (pc ^ (pc >> TB_JMP_CACHE_BITS)) & (TB_JMP_CACHE_SIZE - 1); } -#endif /* CONFIG_SOFTMMU */ +#endif /* CONFIG_USER_ONLY */ static inline uint32_t tb_hash_func(tb_page_addr_t phys_pc, vaddr pc, diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index c6619f5b98..929af1f64c 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -116,7 +116,7 @@ static int tcg_init_machine(MachineState *ms) tb_htable_init(); tcg_init(s->tb_size * MiB, s->splitwx_enabled, max_cpus); -#if defined(CONFIG_SOFTMMU) +#if !defined(CONFIG_USER_ONLY) /* * There's no guest base to take into account, so go ahead and * initialize the prologue now. From patchwork Wed Mar 13 21:33:37 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: 780051 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136737wrb; Wed, 13 Mar 2024 14:35:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMA0m4augC/x0AIsc1P/t3sjdPUJjk07pYFByaHI1s52Oz0amIFL9ZCHtiwhiADPh5seUr5GlZQEXzJRUdguYO X-Google-Smtp-Source: AGHT+IHjxtFUEhQxE6EEJZ701TOTFFnW3S9kjqvHTG+29k+kVuGltZ0A3tKGj+150khh7LJo2FAu X-Received: by 2002:a05:622a:15d1:b0:42e:b078:ed96 with SMTP id d17-20020a05622a15d100b0042eb078ed96mr18630871qty.56.1710365747558; Wed, 13 Mar 2024 14:35:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365747; cv=none; d=google.com; s=arc-20160816; b=o/x0LOnjWmmUHQyjeO35qxTldMoPjQ4HrfTkDYh4+Ib8pF9cjiCuqBFv1LmVmRk619 gfxViQASbseeN14HnPwsg7ZYkNjNOpnsQGI1X6K7HqZ69CTwddT0R68ZnZL+fBwRDZsX 6UvbavudCQCvvdtH4pjCQGaztZNuCl1spMLBRdDOg0Hwfs7V/EVX96oHRvHHrByrGRl4 lrGUjxPta44rVGrcMk1eH0aLA1XKk4fEamJ5qSxdEpv5Sp8JlbJwZCYtf0c878DtV1/J tYZ+MNZYLFNqDygURJ/lt9QhIxHXII2POEjoKRs4ZlDgxHxBvp0rV37dR6otoLwVekT4 FnYA== 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=3uu686tnG06TpkmPsbRE86bvugnt/Usf4psLcD+gc/E=; fh=NiPOnP7QiwsuImgmTGBLBKTc/E2e/nSAPAae8cGGf1k=; b=FM3UcEZ5wCxoH1MS4V6WiCOyzZejcfXW+qEe1RN7Uaa2Ywbga4QeihzP8eWh/VxwhS HmAsNQN9BB/GGlLWBPqmi0ReUGnhy/D/f+JuGe8oi98dwmkVHCM/uOOLQJAOkPHC8hh5 q7B8Wjb9ZdBomuBnAa7g9OOf/zEivHymlAXjYxgFseNrMTL0fNXTgBS67Jm/uPBmnLWH vo5ZphB3fJRZXzZGDMfCoZ7ntMPa8UtPDUC7PNxnO7CYQ1ikXj8HmI70a3o6WlcHGdiq 6DKSD3UWqD9fpChianD3GdO72tach3n1y2auS+pbOwO2KqPgAp8H5BNf5K8RwqVVlE4J qN6Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AxGAq4QM; 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 w12-20020a05622a134c00b0042ee1dc8bc9si32604qtk.426.2024.03.13.14.35.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:35:47 -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=AxGAq4QM; 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 1rkWFS-0002cr-O0; Wed, 13 Mar 2024 17:34:54 -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 1rkWFR-0002c6-0E for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:53 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWFO-0007tU-KN for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:52 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4132a5b38fbso2086485e9.0 for ; Wed, 13 Mar 2024 14:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365689; x=1710970489; 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=3uu686tnG06TpkmPsbRE86bvugnt/Usf4psLcD+gc/E=; b=AxGAq4QMy5A/QgWF6JL6N7f6QdupQaZLQLmubj5JeXIupiTEq5RLWn5Ff6EmnDLSWH M8ZfAOBPk7puhI4zX0y2qnhy1FDXfn1QMbXHnsfxLK47k7fnz88svlMn/Fsg5sqQUzzq axBQfzpskT/4nn6WcC909jP/CX3DxdXCBI3hBKCXhMDWq6wpEHh6Cnx7CxKgX+4Jb7cX VhCrVdaOO5z7WH6mW5IIAAGH0OKlmTv7jP8/p2DkSDGcWSDK/5ItyCnGIN7WMdSKYO0n eVgxvk9as43UpE8NaCFAtJ8wr6DIFt8lMx0TWtFqVX/LjCvxcS4ELM3ZErJHcFKXhDBX 43aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365689; x=1710970489; 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=3uu686tnG06TpkmPsbRE86bvugnt/Usf4psLcD+gc/E=; b=XyE53FnlPG2Eygr7uExSxWsOCXsSD4LSNtHKnSpGLvOMDgjdiQbw0lCOd5oXSDLUIE B7PTGxwJqzvnZglQ6vatdu28C7qdZrg/zVntcAjmD+bUM+X8GrIMhFOtj0mfki1UnYoT +cHl0rR+EyTGMKEZx/f4IW/tW4EWXLp/MEasNrhKUHQJwG90M/4GzwM8EIwzqHt2vq8p I/cVkVsbPqmKKbw6tG8P+ZCDOiU589T2kGJmN6howK5lRGYcFUnQ0vU+QGY4vV0Rmr+E kNb7feYmzCWE/f7ltf6j7QcC8MXHnmKjiyPn8PK6M16c/iPiovaYlqA7ElqOjU/o84mu dQ8w== X-Forwarded-Encrypted: i=1; AJvYcCXESPyyxYal/YLsV6qHNQX69kOpxiSDtA3z8MjXtQKM7l+lIHuggX8zIuZo/uoXcwP78cGLRynJ29Syh5bQz5dfDWQA6XY= X-Gm-Message-State: AOJu0YyfT1kpLOVof+n5F38WcX44vTlRIVgF/As44QAIUU839/Ri3/QW Q6SkIN+8nA/vpMuBj1iKplYQnkiQBPoHu/3+aAzg29/B1khlzrgcZ7AqqBC/tmo= X-Received: by 2002:a5d:4c51:0:b0:33e:bf71:3665 with SMTP id n17-20020a5d4c51000000b0033ebf713665mr1085514wrt.8.1710365689065; Wed, 13 Mar 2024 14:34:49 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id t14-20020adff04e000000b0033e239040d8sm63824wro.84.2024.03.13.14.34.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.1 10/12] exec/cpu-defs: Restrict SOFTMMU specific definitions to accel/tcg/ Date: Wed, 13 Mar 2024 22:33:37 +0100 Message-ID: <20240313213339.82071-11-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org CPU_TLB_foo definitions are specific to SoftMMU and only used in accel/tcg/. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/tcg/internal-target.h | 26 ++++++++++++++++++++++++++ include/exec/cpu-defs.h | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h index b22b29c461..9b5cc9168b 100644 --- a/accel/tcg/internal-target.h +++ b/accel/tcg/internal-target.h @@ -12,6 +12,32 @@ #include "exec/exec-all.h" #include "exec/translate-all.h" +#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG) +#define CPU_TLB_DYN_MIN_BITS 6 +#define CPU_TLB_DYN_DEFAULT_BITS 8 + +# if HOST_LONG_BITS == 32 +/* Make sure we do not require a double-word shift for the TLB load */ +# define CPU_TLB_DYN_MAX_BITS (32 - TARGET_PAGE_BITS) +# else /* HOST_LONG_BITS == 64 */ +/* + * Assuming TARGET_PAGE_BITS==12, with 2**22 entries we can cover 2**(22+12) == + * 2**34 == 16G of address space. This is roughly what one would expect a + * TLB to cover in a modern (as of 2018) x86_64 CPU. For instance, Intel + * Skylake's Level-2 STLB has 16 1G entries. + * Also, make sure we do not size the TLB past the guest's address space. + */ +# ifdef TARGET_PAGE_BITS_VARY +# define CPU_TLB_DYN_MAX_BITS \ + MIN(22, TARGET_VIRT_ADDR_SPACE_BITS - TARGET_PAGE_BITS) +# else +# define CPU_TLB_DYN_MAX_BITS \ + MIN_CONST(22, TARGET_VIRT_ADDR_SPACE_BITS - TARGET_PAGE_BITS) +# endif +# endif + +#endif /* CONFIG_SOFTMMU && CONFIG_TCG */ + /* * Access to the various translations structures need to be serialised * via locks for consistency. In user-mode emulation access to the diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index 3915438b83..955cbefe81 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -54,30 +54,4 @@ #include "exec/target_long.h" -#if defined(CONFIG_SOFTMMU) && defined(CONFIG_TCG) -#define CPU_TLB_DYN_MIN_BITS 6 -#define CPU_TLB_DYN_DEFAULT_BITS 8 - -# if HOST_LONG_BITS == 32 -/* Make sure we do not require a double-word shift for the TLB load */ -# define CPU_TLB_DYN_MAX_BITS (32 - TARGET_PAGE_BITS) -# else /* HOST_LONG_BITS == 64 */ -/* - * Assuming TARGET_PAGE_BITS==12, with 2**22 entries we can cover 2**(22+12) == - * 2**34 == 16G of address space. This is roughly what one would expect a - * TLB to cover in a modern (as of 2018) x86_64 CPU. For instance, Intel - * Skylake's Level-2 STLB has 16 1G entries. - * Also, make sure we do not size the TLB past the guest's address space. - */ -# ifdef TARGET_PAGE_BITS_VARY -# define CPU_TLB_DYN_MAX_BITS \ - MIN(22, TARGET_VIRT_ADDR_SPACE_BITS - TARGET_PAGE_BITS) -# else -# define CPU_TLB_DYN_MAX_BITS \ - MIN_CONST(22, TARGET_VIRT_ADDR_SPACE_BITS - TARGET_PAGE_BITS) -# endif -# endif - -#endif /* CONFIG_SOFTMMU && CONFIG_TCG */ - #endif From patchwork Wed Mar 13 21:33:38 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: 780053 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136833wrb; Wed, 13 Mar 2024 14:36:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWkVusrREaSj2BFCssuErhkLUImIVNtG7QkdeVWFOcdr1vCm6iyPORkKuFsbfWeNqlWCNSVY9HWNgO+H3P4Cbry X-Google-Smtp-Source: AGHT+IGhMqxFtHV4cEuXoe9xRwyq1Xwals9rLMQfejDRLmKRCMqycXRlX3Bdhz+MZGbjVQAxF9YM X-Received: by 2002:a0c:e14c:0:b0:690:d5d3:c48a with SMTP id c12-20020a0ce14c000000b00690d5d3c48amr1279484qvl.13.1710365763833; Wed, 13 Mar 2024 14:36:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365763; cv=none; d=google.com; s=arc-20160816; b=uk67rlKN867shJFgjisYQIQAuLwON+T/OBb1t7fHriT+XjgNFSCDNW5O/8H2JvcxnF qNQSRzOoSsEoUqbGm0jnNXXbJLfBGlPAGb9hjFW34O5Gn/venyEnKGNhgeSo1/tm/ZK8 6hlUm6kbl/2wk6F2/FbeIf2l1CTzHw5MgxTPzZW193944/piJSKvyU12iCJDZ8TDH4VD e9MAVPD/13xJLdUAAvBoqhYll9nItzN3UzQMngAGTvcpIL3x14hHhSSWu6CG5vdMsHRx 2qMsU14nh7lYOc9P1q0+aMeCa9FdcjpyNf+cF3H6so+FCxfQqjvjxx05cYPuQZLjXl2Y XhlA== 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=VjFF/emaV5I47SwmDiH67MtfM0ApKa6V2RibuZZpLqM=; fh=xE33M1yfNm+vsYWbOx5YdYaSRJznnHjrtcx+hPITjRU=; b=UAAG3yTKaNBOoG/LSokQ7CCfvsBWUif55hFfuEQFZh1iL4poslfFMstNMfWNQh3qVA +0F89PWK1MUSw7zOlAEAD3tlA8rIuSWNfSYWDCP8Wchx1IX/TYEzxhvOr9/9Eg3nF51S uhvvznGdaj2RxTUm3YQ3/urM9G3b2H74DsCDgl2M54DXRM7Eady3zWJZDyFlv/2qaj+I jRELUzAaBNjUbmIWuzNWWAdJP3SpdndBOHA6XAbcenX97/KAYdPPlaxz+OjHThbYXZW8 qpzHMePCcWh8rBRTFL8CDfFX06XDZrguqomuJ3STJfl+4ynZp4BUk8w5KGlaPBODCnCV hJdw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RmRXLQTh; 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 e12-20020a0562141d0c00b0068f572a9c1esi101084qvd.153.2024.03.13.14.36.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:36:03 -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=RmRXLQTh; 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 1rkWFb-0002ny-PG; Wed, 13 Mar 2024 17:35:03 -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 1rkWFW-0002dk-E7 for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:58 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWFU-0007uM-MI for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:34:57 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-413eae3e60fso2356565e9.0 for ; Wed, 13 Mar 2024 14:34:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365695; x=1710970495; 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=VjFF/emaV5I47SwmDiH67MtfM0ApKa6V2RibuZZpLqM=; b=RmRXLQTh7PjdOFbSwzTizMysQCcL1WlTfo4aT63HDTtcS9vx/dHI8eS/2oggXM8DuG GCEN6L4jY/OuaO/6r8FeA3vdIPjleXC/0VioeBOZS/zSO3Ma4SqLEOkTFM4xnQMhAeA+ ByHK7dm7kd+yauPaM2BXHCPFEFhAX/gfnoR9zI7Pg3wg05YWRbUDcJ6BKLmTGGccvIb2 bc1G8+KtzSAVvDrC8ZN0SQmoegMCQ8wPaE4rvay6BXU4/AGwUCQ5YwB7aNCiuQWazk76 YdYnt1FS8LLECtnKkK6xJH8BIPs4x2EWfzBY724pYQDYwAqxLy2iAmp39D1PF6Hm0N5n gclQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365695; x=1710970495; 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=VjFF/emaV5I47SwmDiH67MtfM0ApKa6V2RibuZZpLqM=; b=VpksHky9UQPQywXL6JpQTf3hEaunIOcn16Q4g56z+VxTwEx3olVPSpgdbAHnZiB51J StrTL7PrMUlJspnWl4iyPNBPEkeJuHfSEw3wV9080rULzAo0nJYkdJTEBV5Vh61wBOkm o0bmNRFiAkk5BN3lOln2OyOlm1lwFx5NfmkmIq2FCSYjYqrgV616sQLo7P/rKhO9Y+I9 g0aJbTP6O0ncNWIcYNyy4i/RiwSj6klmHoSHX8ZijLHSK3Yhmpj2ZnmP/KapvAfncsP5 pysLJBgktTJNTJnJdqtAQHEyfxFPZ4Y02t/w8akUy4dJ4pKnhB1IDcgOeRMaWotgkQLY MZpA== X-Forwarded-Encrypted: i=1; AJvYcCV4x7tlW/urF/F4ClZSvqcfbOcq91dnXmYB+T+g+2g+MOtRsvm692CHZRegBdbXDvWQuwLJOhKAJomZnDaPKULd5GYJWEQ= X-Gm-Message-State: AOJu0YwQJQ1fjcAWBi2KXuOmFKJpF46f7NKxeHbpriVYfkE4qz0NDLGk Fj17/f0o/vo6RWRCMADOsZm5e5aH9wmivj5kOsZTRKX6igC2xIz1Niq2EdP8cjQ= X-Received: by 2002:a05:600c:3581:b0:413:2fce:3ed2 with SMTP id p1-20020a05600c358100b004132fce3ed2mr17746wmq.35.1710365695414; Wed, 13 Mar 2024 14:34:55 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id d20-20020a05600c34d400b00413f175aaabsm140030wmq.5.2024.03.13.14.34.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:34:55 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.1 11/12] tcg: Remove unused CONFIG_SOFTMMU definition from libtcg_system.fa Date: Wed, 13 Mar 2024 22:33:38 +0100 Message-ID: <20240313213339.82071-12-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- tcg/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/tcg/meson.build b/tcg/meson.build index 8251589fd4..b5246676c6 100644 --- a/tcg/meson.build +++ b/tcg/meson.build @@ -42,7 +42,6 @@ user_ss.add(tcg_user) libtcg_system = static_library('tcg_system', tcg_ss.sources() + genh, name_suffix: 'fa', - c_args: '-DCONFIG_SOFTMMU', build_by_default: false) tcg_system = declare_dependency(link_with: libtcg_system, From patchwork Wed Mar 13 21:33:39 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: 780052 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:ed0:b0:33e:7753:30bd with SMTP id ea16csp136739wrb; Wed, 13 Mar 2024 14:35:48 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUaq+yjQwCQwRFO54Jl8BcR6rKtuoPlp7ZPfmjxirGaJ84lu4WCiS2ULUP46DYDCOfj2X1ldEI/3TG0YlNZgUH1 X-Google-Smtp-Source: AGHT+IE/Wnl1+Iv+ZrH718Vr2gaaQFWdFnwU3A10kAsrzNvPpTF3LqqUJAY9sinukZ1V4gjTuBth X-Received: by 2002:ac8:5753:0:b0:430:9784:bff9 with SMTP id 19-20020ac85753000000b004309784bff9mr72171qtx.2.1710365748327; Wed, 13 Mar 2024 14:35:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710365748; cv=none; d=google.com; s=arc-20160816; b=Do0AzkJUjM/+g+dEPqJdf1W640RV481LnJrLVRj3tg/pEHSKilZEfFUVOd8cEIxV7c 1ltpzRbKT1DhynjOGzVJ3nAPYv8/dIuvJZKgnId61ei7SNpnnpRstwpIYO5cC3LeiEkW ciOpSOfGJFDNP2V5D8Lt4vLqo1p8KmGrLIsJzfisLL4/5qfGXx2Y2U/E6U6fz+r+BDqd uWytxjKHWrmwfutQhmUBhAEucoj2K4ZrW3yf6VgHNQcEHZXZBijIzvqkGQiXB6/ZTiP8 vAvYKVIHQfp/3qgCLfyFFqhXOUizhJTmHmutK7/WfMMWMXR4DguKrPskWcaflCSyg6mU WngQ== 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=31zF++x+VQQo9AGiWpkgP+Ino/mHE/CG+2PFzlMwNbU=; fh=laSsJrvgwy7L5KjEw9/kDVQsaRAHLonZOUJTeM4hXNo=; b=xETktDJFRzrGkNLM32CjN5zQsjNjYJrwRqLrvOYyvq5ODtSun4+cGUHykOOOb4O3vZ oIDUVuNJh1f2s/SoSITcscDhIHbwoTIy4n621mM6Ac+TvmaFFJ7NgX+AyDfC2uHEQW8s 2th3ItnlGT2W5NP71M0VStej2+iwHNiTzoEgvVqirSRhjYFTnlVooC/PHPiK8vvnbTWG 5mYWc7If69bcNX9u5CWdA1IdvuiG4Hl012HbEuzC0msE0LsL/5Y9kd5KQHbgzTFipKLY 4QBadetNn7TtQevlHomZjMoHYT+ps0moAWa0+k0pHr127GkemHNcpdpZskORUSmeGfYP eIVw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=caRXtBOg; 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 d7-20020a05622a05c700b0042ec79de2e2si29041qtb.597.2024.03.13.14.35.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 13 Mar 2024 14:35:48 -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=caRXtBOg; 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 1rkWG9-0003G6-HB; Wed, 13 Mar 2024 17:35:39 -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 1rkWFh-0002zq-RU for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:35:11 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rkWFe-0007vA-Ka for qemu-devel@nongnu.org; Wed, 13 Mar 2024 17:35:08 -0400 Received: by mail-lf1-x132.google.com with SMTP id 2adb3069b0e04-512b3b04995so356662e87.3 for ; Wed, 13 Mar 2024 14:35:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710365702; x=1710970502; 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=31zF++x+VQQo9AGiWpkgP+Ino/mHE/CG+2PFzlMwNbU=; b=caRXtBOgrpTqofTa/j3KCP/pkng1SKpnNsH0MQBM16qEINRXAGyrdN24Sv9teBLA/S mKkrXWaAPkWRaVsYcd/cewdxFcF2wf1p5yWEbb2C7g3GLzW8rXxbwxQRgYAHD0fGn158 lxfKlohGsMfXAXtOvwsGwlfTqkhikddraZT79sESyfBZL0OMbsEE62phcZMgUGVIj57+ N5d22tWLtFB0uFKXWb5kG55yvrTj+Q/K7f07DsI3fjuAShCMVB/fEKO+Jww9VSMbzJ3f QRir78/YEzT0tj2YScwEO/JBNIkXLX/BziQJlhnuwPLkhLaMEUkx8y0w0p6e/FfXNvm3 eFaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710365702; x=1710970502; 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=31zF++x+VQQo9AGiWpkgP+Ino/mHE/CG+2PFzlMwNbU=; b=EcMvvo1KVf4Qp5QfTp/5H5wbjLACrE8mBd0vX0zXoP1skX4tVzf2NwwAwEFBJt6Ff4 3KgU/qIZjJJdK6kYygbvvb74BzAHNVt/Kt9Z9a0iV/u+v6ATDp3C8AHbovAZOxw8/5Pz chv0oz0/yNVvlC3QfYAoJ65c+00Hzxq1YpVeOyJOIbZ9yp15STkKerxF3xihG9LbQWnE bbk8oarxOdnpb38zGMuG64n3Ve3qPwG/0iHXQw9h9GT0ZSsN68XjBwM6qEU5akpU518P JftLn6f396alwW3Zy1oS4gx5xyvG6TgHQm9hqgho0k3O2Z1TZcIspJywZRARjN5tzUID lszg== X-Forwarded-Encrypted: i=1; AJvYcCUxL77DsgbLbHZwFNbPyAwVVZ3nKBfN3E8OwzzkNnXmRNBaSs3ekG+kCd7xVANVONq/FpJaqOBXUrvfR3iKgERq8p7X68U= X-Gm-Message-State: AOJu0YwteM/z8IpJrjnSInarM9SYTJSgm139TouYvARaGk4MmbFg8WiZ 6UTHsB3qGTmzuNq3LYYPjD1HTVsttDThXOI29tMQz7eFrsLO3zSt1grS8N6b1Wo= X-Received: by 2002:ac2:59c3:0:b0:513:c826:c25f with SMTP id x3-20020ac259c3000000b00513c826c25fmr2090451lfn.2.1710365701890; Wed, 13 Mar 2024 14:35:01 -0700 (PDT) Received: from m1x-phil.lan ([176.176.182.179]) by smtp.gmail.com with ESMTPSA id n20-20020a05600c4f9400b00412f8bf2d82sm3467209wmq.28.2024.03.13.14.35.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 13 Mar 2024 14:35:01 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Richard Henderson , qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Paolo Bonzini , Thomas Huth , qemu-ppc@nongnu.org Subject: [PATCH-for-9.1 12/12] exec/poison: Poison CONFIG_SOFTMMU again Date: Wed, 13 Mar 2024 22:33:39 +0100 Message-ID: <20240313213339.82071-13-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240313213339.82071-1-philmd@linaro.org> References: <20240313213339.82071-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=philmd@linaro.org; helo=mail-lf1-x132.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, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Now that the confusion around SOFTMMU vs SYSTEM emulation was clarified, we can restore the CONFIG_SOFTMMU poison pragma. This reverts commit d31b84041d4353ef310ffde23c87b78c2aa32ead ("exec/poison: Do not poison CONFIG_SOFTMMU"). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/exec/poison.h | 1 + scripts/make-config-poison.sh | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exec/poison.h b/include/exec/poison.h index 1ea5633eb3..fbec710f6c 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -84,6 +84,7 @@ #pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_KVM +#pragma GCC poison CONFIG_SOFTMMU #pragma GCC poison CONFIG_WHPX #pragma GCC poison CONFIG_XEN diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh index 2b36907e23..6ef5580f84 100755 --- a/scripts/make-config-poison.sh +++ b/scripts/make-config-poison.sh @@ -9,7 +9,6 @@ fi exec sed -n \ -e' /CONFIG_TCG/d' \ -e '/CONFIG_USER_ONLY/d' \ - -e '/CONFIG_SOFTMMU/d' \ -e '/^#define / {' \ -e 's///' \ -e 's/ .*//' \