From patchwork Thu Jan 18 13:32:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 763624 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp782044wrz; Thu, 18 Jan 2024 05:32:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IFo+AnGWf0W7yWTt0fhnu1FTkT+9WRs+6iw4uvgzbxgFwUqBNLpqJ2ejEB/8upWVqTeb0zs X-Received: by 2002:ac8:5994:0:b0:429:e2fa:fdc0 with SMTP id e20-20020ac85994000000b00429e2fafdc0mr762524qte.43.1705584767178; Thu, 18 Jan 2024 05:32:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705584767; cv=none; d=google.com; s=arc-20160816; b=LBqTf74CesnmPLN8e1VEbJ/dFVz/SB4b3FqgyjzTbyW9FXwlgJcYSLWh3T1TYGJKsH VUN3dRQNuGORw+eMaxLBycDnwUWBSXD0O8Cq6BQL4oFYWtQtIkLldezwP4G9ryFy/rm4 OoS3DXBboOTfqIGp/avNyO/Cd/FPybEgFThxBqYq41h1zrXFmdYkoywalT919E5dXhaY AtZso1qiynkwci0FUrAERbfoFMGAlQIiZCmz2u5uHwNcvH98wC0JbTNt++KhUoT6VAId 5truptPM8pMAo+2NlzDzlkHV3aNaUo0QnUDcPseqti0IwtJ3xCflcEkyEgdHiM5sfxUb 7ANA== 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=tFCXVTcmuilSkmSKJd/6D+1Ho9O5iJCIW5d0ENXqJY4=; fh=I3CvSagWLJO+wpDcc6HvKrGvnEkWHf6M8nazzdiVDKs=; b=y/FHb1eD0PZBhDzhpOVo19zxq0R0usgq0D5V+J+8utV+NhxTDULlI/x/S6bj5nhmhA iWRGm9FTzA5o8L0d26ARI+d25gkIKim6i3PAaYgWET0fiwnGgqXBD8ByB1kiSwTL6iHg +kOHOD6yUqoXi2GkFOsBu5h5al0wPjZqwbkAVnN4FBBaJ+OTfJp85TO9QvyRTjI7lzx2 xH5ZBWHtBdMXNdsDlhNgO7D3Cdt3EFawwE1s/n/EhqbKfqypIbQ7eenLkPN4VSuYJgXZ zs7QMMMKth6ag9lro9ORTWn9ERnDdOni7f+/XxyLA8wr4Y8BM4InDaPGkBIzo49DQa6g e4Zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=a27uHmtR; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o5-20020ac87c45000000b00429f469eafbsi7118116qtv.254.2024.01.18.05.32.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 05:32:47 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=a27uHmtR; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVR-0004wB-LV; Thu, 18 Jan 2024 08:32:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQSVN-0004s9-9i; Thu, 18 Jan 2024 08:32:26 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0: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 1rQSVK-00021X-6o; Thu, 18 Jan 2024 08:32:23 -0500 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6dbb26ec1deso135921b3a.0; Thu, 18 Jan 2024 05:32:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584740; x=1706189540; 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=tFCXVTcmuilSkmSKJd/6D+1Ho9O5iJCIW5d0ENXqJY4=; b=a27uHmtRlU391PB8tIhxh5Azle2d6GhleBl4FnJQJUT9oSY7NWmncuHJYImV14KQx+ QR0saEOQYUX00coUF3APRH/o+z6n6LiAd2IhVRxEnSqDnzmlHB/6IKxT6qBaAyaD3w9B GKXWIWxoxxq0hl3UD6Helg5ByREYv3hrdpFg9AiVQ5UIxJ9MzmjqId0m2pLti7Z9qtlc 1QJAW9pfl8HPENPnukeRZKDVHQAj+/I1/US6i91i1RaUtQ8eXMYjDBq0R2/rr4y5k8hP HS3LrxbjNOrKrRQwpFkrlH8df3NkxF+SRu+qTLD45rGeE0cIJWQN2BliZlMuvcfSO/sN FhfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584740; x=1706189540; 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=tFCXVTcmuilSkmSKJd/6D+1Ho9O5iJCIW5d0ENXqJY4=; b=KuYMCTSDmL5Qu/FQ9ruWpzSmSsKl3x2AJVvgY/YCvG3uOZlgACTuNqEPIDNgWzDgEc Uy1/r5j/KgVsKcP1dYFJEMTa4duFJitIQdnBIY0VyR5I6a/tTui983CowiYoDqD+3Nfz uwnh2lilgynN+1iusurf15njhQjjpCCxRrcA4FL8+ddDR1d9SL9y/dCHkoYt6NMzZglB zIQWCEQkakM3Z85GIszwYm+bdDw71tG78Mm7LgfFXueywDShG37SklzpNwuj+m0ei+9E O9hJNbgWQFTmo2axeueNuddulVh0smN3mJB4KMpSWjxTv15Gp1KbVhVvhIDTeSSb2N2m DtzA== X-Gm-Message-State: AOJu0YyPt+aeuPV+/MLDKp2pEiQs9tAcl3X3tSwU1JuYpuKda3h0YtVF GYyeFREf3kTUj7mfqkPJlKAk+6MJ7Kc+8o0TiRG2t1MWfrRhBf9cBIFLzYS4 X-Received: by 2002:a05:6a00:13a7:b0:6db:722c:cdfb with SMTP id t39-20020a056a0013a700b006db722ccdfbmr886194pfg.22.1705584739923; Thu, 18 Jan 2024 05:32:19 -0800 (PST) Received: from wheely.local0.net (124-171-76-150.tpgi.com.au. [124.171.76.150]) by smtp.gmail.com with ESMTPSA id a19-20020aa780d3000000b006daf1ded817sm3282551pfn.209.2024.01.18.05.32.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:19 -0800 (PST) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , David Gibson , Harsh Prateek Bora , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 1/4] hw/ppc/spapr: Add missing license Date: Thu, 18 Jan 2024 23:32:03 +1000 Message-ID: <20240118133206.158453-2-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118133206.158453-1-npiggin@gmail.com> References: <20240118133206.158453-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=npiggin@gmail.com; helo=mail-pf1-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, FREEMAIL_FROM=0.001, 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 From: Philippe Mathieu-Daudé Commit 9fdf0c2995 ("Start implementing pSeries logical partition machine") added hw/ppc/spapr_hcall.c, then commit 962104f044 ("hw/ppc: moved hcalls that depend on softmmu") extracted the system code to hw/ppc/spapr_softmmu.c. Take the license and copyrights from the original spapr_hcall.c at commit 9fdf0c2995. Signed-off-by: Philippe Mathieu-Daudé [npiggin: Update file description.] Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_softmmu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index fc1bbc0b61..2fade94029 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -1,3 +1,12 @@ +/* + * MMU hypercalls for the sPAPR (pseries) vHyp hypervisor that is used by TCG + * + * Copyright (c) 2004-2007 Fabrice Bellard + * Copyright (c) 2007 Jocelyn Mayer + * Copyright (c) 2010 David Gibson, IBM Corporation. + * + * SPDX-License-Identifier: MIT + */ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/memalign.h" From patchwork Thu Jan 18 13:32:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 763627 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp782587wrz; Thu, 18 Jan 2024 05:33:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXgjZSoUatBnBFoqMePpLm48lhGG/gxhzNVom6Gpys0jjUdsHsL/Tp75l4O65on19U99KU X-Received: by 2002:a0c:f551:0:b0:681:8c26:d763 with SMTP id p17-20020a0cf551000000b006818c26d763mr712357qvm.91.1705584831649; Thu, 18 Jan 2024 05:33:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705584831; cv=none; d=google.com; s=arc-20160816; b=nxbpNEYbvDBzYf5gcnU+PD6WAvTeNDdbyV9J/J2wK5psXyAKqKQWsuTYovFxz+WCFc aCevQ+iCLDvFghOSAQPBB3MGtmCRc+AU2Ie+6eYuAvduSkJlh+fu+Ph82MEUo+M89p5b JnFHLePKGz0Du/I/ziSfUxjK3byjKqozGFQNsHIQ0h0JcaSRL8LqooRKCU8y6S4/xeq4 9zLY2eP4s9haRv9YvBxszi/mkYlYvXlFz0zZg5y3N/FupPMD2TnMxz2PoayiRWHmA9fa 68jVeyB2eu5A3lCGVO2ctmYpZ1wPWWHpueDoqf3qiUGuiERprDHHG16pzhGe7FRBDW8j RA8g== 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=18FTOOuT/UCqVddP9iv7m0yXr2Iq7DkLdl484P+3gU4=; fh=I3CvSagWLJO+wpDcc6HvKrGvnEkWHf6M8nazzdiVDKs=; b=XmXSvi6bSiDZsMbUCzQ+X3e7r4vy5COXhjaENRkCvxklhJ2ECHv9oMDwdWLdJzunY0 lkEEJ/zi3TVB+wWwcHFaRDzKu+hXpaisviNnkhUxkL/vUPKk1Zau6IKSlMmFnbH/ouRR FX7QZVC2iuXfD7j8cP8AFShPKuAyEfUY7ArCZ+F3ghClQ+LRbTDSVaI2XjsJTIuuPHjG a7ohALKBjV1vzEwfU1pGvBRnQheV6/1JrHFveIrIHGM+8XC+F3/FhjGFifhAENrS9p0o t7Zwf5zfOLJYmyhqJvipwnHYHt9bynVLjIdg+aLtNIn5LUhKYBBculnil5fxAw2QLQ7N RXaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BWgQu8bC; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x3-20020a0cc503000000b0067f9da638afsi13639595qvi.293.2024.01.18.05.33.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 05:33:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BWgQu8bC; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVT-0004wm-Jj; Thu, 18 Jan 2024 08:32:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQSVP-0004ui-Jt; Thu, 18 Jan 2024 08:32:27 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQSVO-00021u-08; Thu, 18 Jan 2024 08:32:27 -0500 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5cfaf7ef393so27029a12.3; Thu, 18 Jan 2024 05:32:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584744; x=1706189544; 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=18FTOOuT/UCqVddP9iv7m0yXr2Iq7DkLdl484P+3gU4=; b=BWgQu8bCpu/cab5dZfr0KSo+BKsAqcgxNbN8olwOfGwaPoMlirqjJSBbRyZfdoPcz8 3B7Ji1BNf6ioe1Ddn6JVi5z39sOU0avsPd0QmCvI7aqkrN1vpO0+1ABkSv6af68Z8ohR OndV9XYZ5Fi5zM7O74YKgzdhNpO0+HCCAvXPOqV3yQtjkuSrl2hPe9c5RvLIuM2WYVYY tGEEZhvAshPgDqlo9XX43Di0eI3JbxObW1dcYrVrGpseBeCfygbk0HwBEmqyZSrUlk2B EZSTA4Sd3vtC6xZyWzKF+s9AAeGv3t8lJ2OORRdqFiyBKPb5asehplgeuG8Gk3ME/SAl UXoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584744; x=1706189544; 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=18FTOOuT/UCqVddP9iv7m0yXr2Iq7DkLdl484P+3gU4=; b=vrGrleZu0DgzYvQYFECpa+BGvb7gmgGlBzR47KnfBQMsON6RCPkSDATDrojDEFqg/B qJfmdqPgejP8BUJEQrmRtphO9RNTAKVyqz8DL4Xqj1GgBNBXEX0fYEDp+5IG+Xq2QZYG 2a9fmW31mgtGluxb45HQ39q/l/xCoIHrtIk/xCiuDrmZxLWfTXf8qg8JB21ZDPiesBJW wlJ62PtkdpJ63H0b6DCaHBsWmSutm0QfCV2oycHW10fMlMAR+HYMjqEdTXaZVTnCVkIl 6s8b1VnC4awdmF4cOCQfte/Ly2NFfTXAVsf0dSOZ444xxy/XHUuccEaJEG405igif+dA F43w== X-Gm-Message-State: AOJu0YxB2R0ltrgMxsyv0tOO/hLtdLnrJZ/yBVLuPsd9FTRThFLYFFNy Krm8t3Atot/yXF7eQI2jEm30rNAZfLSSupRVSmoDJze6r1M9zRKyHzumS8+U X-Received: by 2002:a05:6a20:a9c:b0:19a:536e:64f5 with SMTP id b28-20020a056a200a9c00b0019a536e64f5mr536679pzf.67.1705584743913; Thu, 18 Jan 2024 05:32:23 -0800 (PST) Received: from wheely.local0.net (124-171-76-150.tpgi.com.au. [124.171.76.150]) by smtp.gmail.com with ESMTPSA id a19-20020aa780d3000000b006daf1ded817sm3282551pfn.209.2024.01.18.05.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:23 -0800 (PST) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , David Gibson , Harsh Prateek Bora , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 2/4] hw/ppc/spapr_hcall: Allow elision of softmmu_resize_hpt_prep Date: Thu, 18 Jan 2024 23:32:04 +1000 Message-ID: <20240118133206.158453-3-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118133206.158453-1-npiggin@gmail.com> References: <20240118133206.158453-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=npiggin@gmail.com; helo=mail-pg1-x52e.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, FREEMAIL_FROM=0.001, 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 From: Philippe Mathieu-Daudé Check tcg_enabled() before calling softmmu_resize_hpt_prepare() and softmmu_resize_hpt_commit() to allow the compiler to elide their calls. The stubs are then unnecessary, remove them. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_hcall.c | 12 ++++++++---- target/ppc/tcg-stub.c | 15 --------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index fcefd1d1c7..0d7d523e6d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -123,9 +123,11 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; + } else if (tcg_enabled()) { + return softmmu_resize_hpt_prepare(cpu, spapr, shift); + } else { + g_assert_not_reached(); } - - return softmmu_resize_hpt_prepare(cpu, spapr, shift); } static void do_push_sregs_to_kvm_pr(CPUState *cs, run_on_cpu_data data) @@ -191,9 +193,11 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; + } else if (tcg_enabled()) { + return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); + } else { + g_assert_not_reached(); } - - return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); } diff --git a/target/ppc/tcg-stub.c b/target/ppc/tcg-stub.c index aadcf59d26..740d796b98 100644 --- a/target/ppc/tcg-stub.c +++ b/target/ppc/tcg-stub.c @@ -28,18 +28,3 @@ void create_ppc_opcodes(PowerPCCPU *cpu, Error **errp) void destroy_ppc_opcodes(PowerPCCPU *cpu) { } - -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong shift) -{ - g_assert_not_reached(); -} - -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong flags, - target_ulong shift) -{ - g_assert_not_reached(); -} From patchwork Thu Jan 18 13:32:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 763625 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp782106wrz; Thu, 18 Jan 2024 05:32:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBfsDTjQXbKGWsqefipdRrbd1qiXMljbFj0bD7AuF6H6q9jq3pe0JNjZL1wOgy9ILP8jUw X-Received: by 2002:a05:622a:19a1:b0:429:c653:ae7b with SMTP id u33-20020a05622a19a100b00429c653ae7bmr857720qtc.86.1705584776325; Thu, 18 Jan 2024 05:32:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705584776; cv=none; d=google.com; s=arc-20160816; b=dCGCM5SZzp5bVWMwRnJzEciJjHlEqlHupGXSIJEaeYB3nanAlq0JBx26v0zZ2ecPpP jW1i59PuSiy5A5PjTZBpaDj2VJY7JHbB0opqOExSf0ZNjdMUFVVcDGhZ/FR8hYYQXygE aAkpgB92BeBv4tXI90fStDfVgDm2XCytNeRHi4iZ/DhrIHdY3Ao2pa4LEBnft2sCEbFC 9e9ExvHAws+GiquagX8cRT753BaSjpErY4F8HMoiE6ur9JaC4gBT3D03eqmZhwtHHVrX yAtQYvclqmEDJsX7sJAbWqDr27ShLoZqntzKyH3AR46Z1YAiAqsM0YyooKqy4tBdYBk+ 3ZKQ== 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=Gp4VqctlcOHDSbky/1yqB0zizFgsvSyeOkwNaVp6158=; fh=I3CvSagWLJO+wpDcc6HvKrGvnEkWHf6M8nazzdiVDKs=; b=D8gv5PgDGFyPsqQyy9pkDTvPOnPsK8ZLAWJ0D3tDzOJsfV+EDHHVHH8Iip5XHHJ6eO LMaZxdW+Um3babZi/fccJc/9CAKX4VO25Xx7l4Q+GLDNycNRzeAqwMFZ0BuX7nZI7oDN KEMDjGj+jxKBrXOTctB0DNfPNE/lr1fNbT2LWT7V9uxj+KxYzeHyh951Gxj9YKIRfg14 xusQ6R/4MVaCWze2AFc/UFoqYmxDIVAKBq2h8pxc+Dtv7Ct3ABJQN3ijafg1EVVudGq8 bSdYtLO7aDFIQHudEtCaSVKhPi3IyWUoAGVT2B5VMRmH6qUaGGrZvSfqY6HZZeTPhK5G KIQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eQ7W85Fa; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 1-20020ac85701000000b00429c656270bsi13522507qtw.72.2024.01.18.05.32.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 05:32:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eQ7W85Fa; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVW-0004xs-9L; Thu, 18 Jan 2024 08:32:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQSVT-0004x2-Tu; Thu, 18 Jan 2024 08:32:31 -0500 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rQSVS-00022f-8o; Thu, 18 Jan 2024 08:32:31 -0500 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6d9cdd0a5e6so7110202b3a.3; Thu, 18 Jan 2024 05:32:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584748; x=1706189548; 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=Gp4VqctlcOHDSbky/1yqB0zizFgsvSyeOkwNaVp6158=; b=eQ7W85Fa5AXvFUo2xz826Kq4iheg+5mjI4PrBMzkTDhbbgnspEwfIB4+BnmxVhO35N kWk6bTnS9ddq3TwumhgwxzV5nNK9YIBg5gA03FOlXJholrBiVphcsvNryo0+7/CJxDsZ isAosXLXSrP0xhO9saFaJF78WhVdWs17xWw1h6724IsG2nEzgImRWST/fOOo82zpmaYB sr0QSx3rS60hCxDQCKEn+BbVCedt1KD7CfUR+s5wcJJ2BORxf0dmq2qW3oCgpl083XQW ZbSYhBQrF4dwDPP1G9PT74F9udRp63sh9YW95U2yYvVLNBMjOfswLn0dH6b8yu9XBX+U EmGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584748; x=1706189548; 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=Gp4VqctlcOHDSbky/1yqB0zizFgsvSyeOkwNaVp6158=; b=b9BpwaTdcDoFb2aZjpyhyZP0d/+qlTEleY5uxyAjStHkTOBafecLimTntQv+nglT+t n6pJVDiZM0KRjVpeuvQOufcuqpDytKdlEZM2+qEV5Bkyq6DANudjJrpph03GZ5o7Pm0y GhhKSwsVLI4mDHqBv0fV61eswEawSbMiWLlSpjygQnmfdvXaBi0KIUWOf/qznlvY0LqK 36oeSNUcTxcCpVhJApPkET+U+1ClpvSPsQuCvHipmBGQV26dych6Zqcy7Gvl3SgMuCix R8EI+F+EpVZHqimfRu8MtYENwLZVWNZL1F6pkz4BgDKV0VSffo0A6v4NaUjOyINqcM79 xh4w== X-Gm-Message-State: AOJu0YybrWN7U+FJPTsMC1J8BJi1x6JV9jdc2kTXfeQd/F0/cXcWzlK3 FPucuWuBeMAwmhZ+jjzGHQgpBv6FWlqwfMeTzJFuaWAVCWsBVUjw4/vLjruF X-Received: by 2002:a05:6a00:2a0a:b0:6db:1038:ee52 with SMTP id ce10-20020a056a002a0a00b006db1038ee52mr905999pfb.16.1705584748103; Thu, 18 Jan 2024 05:32:28 -0800 (PST) Received: from wheely.local0.net (124-171-76-150.tpgi.com.au. [124.171.76.150]) by smtp.gmail.com with ESMTPSA id a19-20020aa780d3000000b006daf1ded817sm3282551pfn.209.2024.01.18.05.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:27 -0800 (PST) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , David Gibson , Harsh Prateek Bora , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 3/4] hw/ppc/spapr_hcall: Rename {softmmu -> vhyp_mmu}_resize_hpt_pr Date: Thu, 18 Jan 2024 23:32:05 +1000 Message-ID: <20240118133206.158453-4-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118133206.158453-1-npiggin@gmail.com> References: <20240118133206.158453-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=npiggin@gmail.com; helo=mail-pf1-x431.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, FREEMAIL_FROM=0.001, 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 From: Philippe Mathieu-Daudé Since 'softmmu' is quite a loaded term in QEMU, rename the vhyp MMU facilities to use the vhyp_mmu_ prefix rather than softmmu_. Signed-off-by: Philippe Mathieu-Daudé [npiggin: Pick a different name.] Signed-off-by: Nicholas Piggin --- include/hw/ppc/spapr.h | 9 ++++++--- hw/ppc/spapr_hcall.c | 4 ++-- hw/ppc/spapr_softmmu.c | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index e91791a1a9..5b5ba9ef77 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -634,10 +634,13 @@ void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn); target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, +target_ulong vhyp_mmu_resize_hpt_prepare(PowerPCCPU *cpu, + SpaprMachineState *spapr, target_ulong shift); -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, - target_ulong flags, target_ulong shift); +target_ulong vhyp_mmu_resize_hpt_commit(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong flags, + target_ulong shift); bool is_ram_address(SpaprMachineState *spapr, hwaddr addr); void push_sregs_to_kvm_pr(SpaprMachineState *spapr); diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0d7d523e6d..75c2d12978 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -124,7 +124,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_prepare(cpu, spapr, shift); + return vhyp_mmu_resize_hpt_prepare(cpu, spapr, shift); } else { g_assert_not_reached(); } @@ -194,7 +194,7 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); + return vhyp_mmu_resize_hpt_commit(cpu, spapr, flags, shift); } else { g_assert_not_reached(); } diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index 2fade94029..b3dd8b3a59 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -378,7 +378,7 @@ static void cancel_hpt_prepare(SpaprMachineState *spapr) free_pending_hpt(pending); } -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, +target_ulong vhyp_mmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong shift) { @@ -562,7 +562,7 @@ static int rehash_hpt(PowerPCCPU *cpu, return H_SUCCESS; } -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, +target_ulong vhyp_mmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong flags, target_ulong shift) From patchwork Thu Jan 18 13:32:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 763626 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e5d:0:b0:337:62d3:c6d5 with SMTP id j29csp782233wrz; Thu, 18 Jan 2024 05:33:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEjP+3miGaCsYuMZaw8d4GEaHhnkc5ma3CzeMUF9PUgh1r8tW/TE99YMAVWjKkBLzG2klre X-Received: by 2002:a05:622a:138a:b0:42a:cd0:f351 with SMTP id o10-20020a05622a138a00b0042a0cd0f351mr695353qtk.51.1705584791207; Thu, 18 Jan 2024 05:33:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705584791; cv=none; d=google.com; s=arc-20160816; b=XGtCTs3h9zgutR6syMC/K4/HEqTCsayBtHQj3mEA0SHVx9Kqlh0LuzySnp1yTexLW/ 4+Qb2+sE6RB7PPXQfVr/XtE1PDgvFEqnBQW1XC5U9tg+5n/PhSz8NdoBFMCRjZd1wFA6 AwzZKm05OUgRMlRPpfT8iDnQ29g46+bOG/W5DFgXr20CdvKEtRmJ6lIKzRLawC0WBDuR 6IvYfbsNNC3grBSIgtIaYwCeFPYpwheRN7sFq7ZOlK2AjaUi2YkPkDJ00h9bLI7pg60Q wjKLKqdGLXTdmJ6KMHqmgRR7Zo8+hP3CjXCmya4DCyMp6iJGxaDLIvmXCA6r5EBLl9Nw S6NA== 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=vHaAra0yiJpjPl5M+0aVbS5rb6YYjPPEl4Zi1Bp8Ct4=; fh=I3CvSagWLJO+wpDcc6HvKrGvnEkWHf6M8nazzdiVDKs=; b=zNiJfdCfohL7TUG4Lx4umoCtPozldVxQwYJX4FLM9pzywBsyuOV7lgVIMXnfgoHwIN +Fwlc73dwVaFuDIOAgLzDPtUwjOU7C4cFPYQ+taAh8EF7G4fUjXFj3C6u5pPD8x3BF1A PfKZ2mF45eC4jtpRs5NkiPzRpgdShHeeaNfsXb01T8iqBGb1xxM1oILCv+ewu9ZbxqYv uXqmXT+N3fL+WHHFbrFOAnZCHQMu2cxFDri2NjjpX2bUuOcNzD/1iQrJHMPyV7SNTULM 0f+CjVDPtlzOPK0M4cR1sTvFfQiQ5qbjk/C5s7jozp/NY6oecG3BQmDlWxmCh8R3VhTl /8qA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YQ2qhE+r; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f30-20020a05622a1a1e00b0042a09dac018si4311790qtb.193.2024.01.18.05.33.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Jan 2024 05:33:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=YQ2qhE+r; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQSVd-00056X-0D; Thu, 18 Jan 2024 08:32:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rQSVZ-00051I-CD; Thu, 18 Jan 2024 08:32:37 -0500 Received: from mail-pf1-x42b.google.com ([2607:f8b0: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 1rQSVX-000232-It; Thu, 18 Jan 2024 08:32:37 -0500 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6da4a923b1bso6726548b3a.2; Thu, 18 Jan 2024 05:32:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705584752; x=1706189552; 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=vHaAra0yiJpjPl5M+0aVbS5rb6YYjPPEl4Zi1Bp8Ct4=; b=YQ2qhE+rNeuaS44IPtWZ4nsHGb7EAa7w5JCodlMByHiJEPCh7X+as9n4k8N5v1GXQS hmBJWkvux5Big9W8CGiGCgg4ozIqRcMNqom0m4uTA9d1cRzVeAEdHuC4E0AL0BVEmX0d +a1Ag9Gobj7+hjK9lSGXysgmA9JtFXU34pc7FTyZUgvDbuOa5y6+CJbP2GNTjOJaInB4 UjgTVnBfHf/rwXLQBzIJIWJ2Fe3FiW2LZs6nvPACwVPpxcbRf0g/eZoGwxQogK9NlFp4 tQZbmG2uif5Fvlzobz+yj2MSJZ7XgZGkrWW03qg8dFOpMCAfqMPWeFEMUcnt88UYtCX+ kKQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705584752; x=1706189552; 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=vHaAra0yiJpjPl5M+0aVbS5rb6YYjPPEl4Zi1Bp8Ct4=; b=BaHCuek3IHXMnsYa5pkJD62cKeRTOGx8tYdGa3YmyBTHYe2GnzBT7Yys0VKMxCrVEX X7t9SvqIvbMkQaGjgbQbTHM92omjuOwIY+a39aqqbQxrJ1R63JSUaGelYoXxtX0XvAgi T6oiNA1oXhsIv1HjNVA6eADEmjK3lJ18qMzFlCvzyccRRessT/m74sGggECyf2UlGbms 0zGGoCeO7v9EJMBffmGO4KRRVx9FNv1NVnaeKuC6mpi0XkNkbH1SHJv2JrJwXw85DQji IyLPZXcsvK/UtFVRQHyqDTTqCn1/B9DSclbwwpVqy3FoPuk4/JGC733SD62k7pTU+i+z BeoQ== X-Gm-Message-State: AOJu0Yy7krv0H70MyH2LPnPPlnbBBw3DDREKrTFAlOrT/StUS9N6aECK diZXDnD1p8m59Brm18vQTZNcv8L70QGXZTd6Gj388pIf5IBfnKEGKiPYU/SQ X-Received: by 2002:a05:6a00:3995:b0:6db:ade0:4bc9 with SMTP id fi21-20020a056a00399500b006dbade04bc9mr523623pfb.31.1705584752432; Thu, 18 Jan 2024 05:32:32 -0800 (PST) Received: from wheely.local0.net (124-171-76-150.tpgi.com.au. [124.171.76.150]) by smtp.gmail.com with ESMTPSA id a19-20020aa780d3000000b006daf1ded817sm3282551pfn.209.2024.01.18.05.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 05:32:32 -0800 (PST) From: Nicholas Piggin To: qemu-ppc@nongnu.org Cc: Nicholas Piggin , David Gibson , Harsh Prateek Bora , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Subject: [PATCH v2 4/4] hw/ppc/spapr: Rename 'softmmu' -> 'vhyp_mmu' Date: Thu, 18 Jan 2024 23:32:06 +1000 Message-ID: <20240118133206.158453-5-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240118133206.158453-1-npiggin@gmail.com> References: <20240118133206.158453-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=npiggin@gmail.com; helo=mail-pf1-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, FREEMAIL_FROM=0.001, 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 From: Philippe Mathieu-Daudé In the spirit of reducing use of the term 'softmmu', rename spapr_softmmu.c to spapr_vhyp_mmu.c. Logically, the TLB loading code that walks the hash table is the implementation of the ppc hash MMU, and the code that manipulates the hash table is the implementation of the PAPR hypervisor interface (called vhyp). Signed-off-by: Philippe Mathieu-Daudé [npiggin: Pick a different name, explain it in changelog.] Signed-off-by: Nicholas Piggin --- hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} | 0 hw/ppc/meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} (100%) diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_vhyp_mmu.c similarity index 100% rename from hw/ppc/spapr_softmmu.c rename to hw/ppc/spapr_vhyp_mmu.c diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index eba3406e7f..30bd2aaccf 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -31,7 +31,7 @@ ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( 'pef.c', )) ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files( - 'spapr_softmmu.c', + 'spapr_vhyp_mmu.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) if host_os == 'linux'