From patchwork Mon Feb 19 08:29:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 774079 Delivered-To: patch@linaro.org Received: by 2002:a5d:4943:0:b0:33b:4db1:f5b3 with SMTP id r3csp1052541wrs; Mon, 19 Feb 2024 00:32:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU8W8M0+CDUu28gdvCIvI95ljTj5WQtkiMX9Z2ImlBdQ6/lmVoOJ2+Gwm6BmmjrHjnyH/VcBhuLeupP/Ij7sQD5 X-Google-Smtp-Source: AGHT+IEKcpsHefl1f27MJPsrMPWHFV13KuKSuoxyAFJpkZ/dq41DWmYRi3+u7MDBhFcTcfxbvETe X-Received: by 2002:a05:6870:71c1:b0:21e:ff3f:937f with SMTP id p1-20020a05687071c100b0021eff3f937fmr64297oag.45.1708331523648; Mon, 19 Feb 2024 00:32:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708331523; cv=none; d=google.com; s=arc-20160816; b=cjb5ygmEfB98IV//Oe38Sy0u2hg3s5DTqxxxgybvtvpHqYpxjclMB2SRxZNM9v3AW0 Wr5Srx+xQNbtH0coGYqCNLDc7mwcQvm4ddInXEILNeR2gOn6j54dzzgdhj5JrFwKdA0K R9a35i0NoYhPbKjXX+F9E43YgRMig6JubR25Of8RRP/PE9YEsw9IDaUhLhW2YRPmX/qI sdiqdRfUNZx8xqbOFIOKJdxan/LgMZUu1Oh1ebzSzxvFANOheZsvKKyCb3hFy7i6Xy0e t4Qaxx5Rva2ODwSZl+Q6E7HKvXok9wBS2wIwer0Gh3AmxxwId9TPOf6M8aFtxfO1TsgO cI1g== 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=p/uWlpyLjbwpL//Tp94l/d17ZDvOpZ1Q/CQ+bpb2Coc=; fh=AMq49MhWGAbHe+OM0/dUh70necLSQdMXwXEcdfZTm3Q=; b=jd5sYu2SysqA3UtcoGSoZksYR1z7eRp2z4CLDXHL8JmWZFFNZC/OmPE15ykRPXnI+/ RCv4w50afjKH+szYtd2oQPkEI56/KX5Ql8CgA00qvvHcDcM8S9uc6bbFNK/nHNyMZyEh 8MAm7iu0EkKOmsnAWHfP2fa6saY4Mmn3oDCTj+ikTSsrpe5yi6HgLTrcdhzrWWLd0J+7 fUKtfLFL6ziVpVBpi8bcK0nOI9Q713umIshPBzE4Mmi7O59FrrrfKovzEN6P1eJmPCVL CYd/KqUex4OxGP77kHRu4m7W+9XBYpb+Q9VDBXClusFM46D06yDTqko9rBD19V3zfp7y FiqQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UxHLBKPo; 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 x10-20020a05622a000a00b0042c00c09c03si6178794qtw.285.2024.02.19.00.32.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Feb 2024 00:32:03 -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=UxHLBKPo; 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 1rbz3K-0000oo-DB; Mon, 19 Feb 2024 03:31:06 -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 1rbz3I-0000f2-JJ; Mon, 19 Feb 2024 03:31:04 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbz3G-0002I4-EG; Mon, 19 Feb 2024 03:31:04 -0500 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1d7881b1843so34361745ad.3; Mon, 19 Feb 2024 00:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708331460; x=1708936260; 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=p/uWlpyLjbwpL//Tp94l/d17ZDvOpZ1Q/CQ+bpb2Coc=; b=UxHLBKPoNiCMNkIahUPVG5YDuXnq98rXNI1mkMcvk2F1vsD0Ia5yTTMGqVCrJouVDv PcI0SjA/tjVz3OP09h8Yo0/Ve+QPgUs8noDc/R919nm54JVHZ42AlVZNMVxkFKx1Gmnw YCa/zhSNtwkbIbeLqOzUpkXgatHMJKrn2BGMDVtGPlV1SNl7Oa94nERaTGX+Lvi6Pxce iannIkzkCWzcGcBP/8AHroN3pq3zqj+qrbD9vHILUDEgOEurh5Rp3vHjCnddf8I0RHn6 wwAdfN0o4oBd0v21pjEdw8/jz3JeQ7qjPzK+Z5L1zbruVUidj6D7LfdxLQOYaUgVHWOP mvfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708331460; x=1708936260; 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=p/uWlpyLjbwpL//Tp94l/d17ZDvOpZ1Q/CQ+bpb2Coc=; b=w1QUG4SwSEkomn9hi5b1IjFcsUoKy9jL5vPZ2rzlxdxDMD9LRkB1vu1tWFco8lQ1ic Ns5bqpRHIw+uj5cYAANW+47UE3OlQslUOwcdeayYW7At0ypmiBBu4+KiUoD2Voz0Y32j 2438X3ZFt00viT+seQLnTPoELDL4+HKE6TiwRS2cxVR41W5gCCK33lGso2wWDsLezsme AEZkSG980M61Y8BL+BlZwj4i59QR8/TRBvjP/oCssimVvVVv1h2XDS+xvPz7CFlDrXb8 IoqxXJpjWEcfc16wbD1s/Stylm2akezBMiS4h74rZRwDi8RbiO1g6oJF91ZPfT62Ed7V vnQA== X-Forwarded-Encrypted: i=1; AJvYcCU0l9L+SYWXdXvgEOmpkvWE3ECNTuow7PA99+MyjpC71s0j6cq+x+/4jzh5eLuEmIQwRTn+2hLh+4wyuJ/CYh0AFn0C X-Gm-Message-State: AOJu0YyHiUoqjuUUyzjzMqAYdLH8e2g56Lr3V6uwNy/cZVzUX1CuCEJz W7kuJVKxt8aRTERXUL+kLgiRPGC0LVxHcdaB0lzKtmJcl1ZWlMCCL9vKe1zF X-Received: by 2002:a17:902:db0e:b0:1d9:b9da:ea8f with SMTP id m14-20020a170902db0e00b001d9b9daea8fmr16265356plx.2.1708331460007; Mon, 19 Feb 2024 00:31:00 -0800 (PST) Received: from wheely.local0.net ([1.146.38.93]) by smtp.gmail.com with ESMTPSA id mo7-20020a1709030a8700b001db5ecd115bsm3838348plb.276.2024.02.19.00.30.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 00:30:59 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 13/49] hw/ppc/spapr: Add missing license Date: Mon, 19 Feb 2024 18:29:02 +1000 Message-ID: <20240219082938.238302-14-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240219082938.238302-1-npiggin@gmail.com> References: <20240219082938.238302-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=npiggin@gmail.com; helo=mail-pl1-x636.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.] Reviewed-by: Philippe Mathieu-Daudé 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 Mon Feb 19 08:29: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: 774082 Delivered-To: patch@linaro.org Received: by 2002:a5d:4943:0:b0:33b:4db1:f5b3 with SMTP id r3csp1054347wrs; Mon, 19 Feb 2024 00:38:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUfUA/etdb+4TT5KYFWfN/hR7Ug+IqpUSFxBNVN0P8vgJNzqlo8THdmSvw+0VIBa1EbC29vDXiZxkIoIiJS1sTs X-Google-Smtp-Source: AGHT+IEqX9wrNumdL0z27I5+aQJkH7Uc69B+3brnW6FWjiaiewv4gFRMYNn11wRn7ITsiy+vlR3S X-Received: by 2002:a05:6214:20a4:b0:68f:1aa5:fb2f with SMTP id 4-20020a05621420a400b0068f1aa5fb2fmr6386684qvd.20.1708331894080; Mon, 19 Feb 2024 00:38:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708331894; cv=none; d=google.com; s=arc-20160816; b=OUDOhkrJ6mG32V/vjIrQrW+ovQcaCTKtgKGIuk6ou10OQUn7bhDM9z7H75tNLJMR9E 8l/r0R/ZGejvraZDC0wuxvoEdFvVwcbVELumkQfZ0PqMyfOspLmjkVbCP9FBN7ho0MfO 5Hf9PCH3Prex9ltdqFAz99C4GEUV5cwzPamvMFHpcbW3ScFYNHIM1fwV26grpiFZiWaL CpEbHIc9hPTBNtRbn3+GgspUxoY3MxvAKi+nNWV4YPU5eFyIAEFw1vi7LG++NBUrI7Mr SBp/csvFH1ZEvAUwHbpZYEIhbqX19+cgnSthKe65K8ir4td7mzJB2SPlvmjj2gt511Fq 6u0A== 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=BO+f3hPKeL5HSk7HpmCD/7SFZU9TBIYTsIyIXJfwhsQ=; fh=JfYOK3PNAYtYFW8aiubrelQKouPb86lGrRQr89uUb+Q=; b=b8rlTZ8k2nuKlf7FKSYhO1Q/sNdMqVTol1VEu7WLVr/NzFCWKVjdyKZ3XLntvvkgY4 nPWID0HkGvTcPPSUj0UD7IUallZrIpHJlAcrzZ1GEmfYnOolT1zvN4bUEOIGAtTRW71K 9zEpk0I4hp3+tXB0ACgE/WFux25DBraOkqWwj/PQ/zCNy0aWEMHmsZAGMq8yvIyvrX0p 6Hmz5cOHuvd7Jny4E6eJIPc4F1hOqGPzSvBg4cFJxPTcLs1q3Pv9PfLn8sPvGsJ/UBXY 2iFgGkMcsGc0sklGlHFkwHMi5+t1Scg4P1UcCJjWgWP2C6KgluJ5N25BxkAot3Khgd7F zsbQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=UOpU48J2; 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 fo10-20020ad45f0a000000b0068cbe9b517bsi5905745qvb.409.2024.02.19.00.38.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Feb 2024 00:38:14 -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=UOpU48J2; 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 1rbz3W-00012q-D7; Mon, 19 Feb 2024 03:31:18 -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 1rbz3L-0000tb-O4; Mon, 19 Feb 2024 03:31:07 -0500 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbz3K-0002IO-7y; Mon, 19 Feb 2024 03:31:07 -0500 Received: by mail-pl1-x62c.google.com with SMTP id d9443c01a7336-1dc09556599so405325ad.1; Mon, 19 Feb 2024 00:31:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708331464; x=1708936264; 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=BO+f3hPKeL5HSk7HpmCD/7SFZU9TBIYTsIyIXJfwhsQ=; b=UOpU48J2e2eMrjC4iqWff/63sFPhbGlYhSJomsk/rKLNmcAEjRxKmJ1hne/OpOIKTh f+I+SQppJ+bEwpzyoxPsLKqhbfhtnHei0JCSDJRMgL7QP3+5CvR8AImAl2lDN7WS9T2q CUryTPZTfwBhubq9c8mh+8SmrZ/KhqUFnGJzCDWymyYwMEZLU66KJrrHUhvVsvuGRx0B Q2FHutjr90nW4tbtOlij6vc2mGdtaYH5Uz0oeZe8HyziAuMcfvMGoFPe5IOTDUxW0cCV AlZR5Co8K92RfTr52JORorKDQY6oMJD78ZDmlPKJLoKtmJHSeJCTj3Z0OhOTOaM+70Wu BLXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708331464; x=1708936264; 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=BO+f3hPKeL5HSk7HpmCD/7SFZU9TBIYTsIyIXJfwhsQ=; b=Jq30zKGXtqXdfxDWjUOm6ljThKl7w1l9tKAG3MjAj7mRqh7HxfLjaIJBIsP1RYNs0A +jXMiIckFhip6E6uhqik1IXR1GkbuNhRrDGNEAhS5A2Gi80+4c8RtQBzSul9l8l93F86 Pqa8fWAkFXB53lGJ7IKLdaO1QgfCO/nMLOtLhF8tnysKUBRExi7wwr68lTng0EcBqQTH 0xJud0vjBTgwrtanwNCsW+gUq4R/UuAGdLeMbe1GspieFMG09CwNTgnXqpNnrynXFsAy WrEga0yHgmt4+meQuef1jKzR/PYJs86LwUxpvZ6kLOxEemFwllV8DPEZSCuZth2eZW7N jsaA== X-Forwarded-Encrypted: i=1; AJvYcCVFJuJ//jNGJgJ0O8GB/x17hYihWI4V3q9K25QUkuvtQzMwGbY6381DH2uJGNR/kSldLH87hhvV1UsWusKRND10p6yY X-Gm-Message-State: AOJu0YxFSLlbocDhA8Xne4vZLeCp3chQ9nNN7dlz5ZlD7d8X07mjWStN rwrNRofB1VNAapSqGzNKwRbAzSDB3On+/KgRNVJihVUtX/bBa4zTaXiItDfu X-Received: by 2002:a17:902:e809:b0:1db:de93:464e with SMTP id u9-20020a170902e80900b001dbde93464emr5959121plg.10.1708331464474; Mon, 19 Feb 2024 00:31:04 -0800 (PST) Received: from wheely.local0.net ([1.146.38.93]) by smtp.gmail.com with ESMTPSA id mo7-20020a1709030a8700b001db5ecd115bsm3838348plb.276.2024.02.19.00.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 00:31:04 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 14/49] hw/ppc/spapr_hcall: Allow elision of softmmu_resize_hpt_prep Date: Mon, 19 Feb 2024 18:29:03 +1000 Message-ID: <20240219082938.238302-15-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240219082938.238302-1-npiggin@gmail.com> References: <20240219082938.238302-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62c.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. Reviewed-by: Nicholas Piggin 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 Mon Feb 19 08:29: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: 774081 Delivered-To: patch@linaro.org Received: by 2002:a5d:4943:0:b0:33b:4db1:f5b3 with SMTP id r3csp1053701wrs; Mon, 19 Feb 2024 00:35:50 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWJTBOVSudL+z0VppB1rF7/2QgRNVmWM3YVQodWiKfECO/u+1HtJvNXUDF9BgpwKWEsJVZRWs7esdLZAm3QiTmw X-Google-Smtp-Source: AGHT+IH5L+/9x1n2hEJMf+us9i5FZykErJXoHNwXeGC985DMVg0FNwBNuteG9zl4VcxJ2AlGY1fo X-Received: by 2002:ad4:5f0e:0:b0:68f:634d:443b with SMTP id fo14-20020ad45f0e000000b0068f634d443bmr5412144qvb.2.1708331750304; Mon, 19 Feb 2024 00:35:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708331750; cv=none; d=google.com; s=arc-20160816; b=dGPSw+PkEdg7AeTG5gqgH5RySIvBJUIelz88uUbGLScNiS7bifUhscEV8HJf/iUY5K CwtKq4jmiL4fda7pbeVuEkhYlxfwxxWPQlXBIdKMtdHnYTUC0iQlS92Y0AQnBAkiHWIq yl4uRADf/J2I2KAoK0EKhWvZuWycJykaFxCTw+GMGhhWUz2dEdWFtYaS4d84CR5rgEka o7NPBEkLMxFp7xNGrmCd6Er6jEQJu2obDVqJgkznpYQmFHEMRXylLK49LWAyQch8rsmk ABEtsTugdQH+0+5XSwMpd8Ik517YB+Fa61yJQJ3IwObfHfLG2VqL6ihMoTdd8aK+8QhO h6LA== 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=7/DLuXky9FQDqFdM2qoHQOMo5LuNUVQuzkj5LQTCSNQ=; fh=WMhwx7Xbc6jpNDx4MgbUQnA+Z5NPykuC1wXqKakvevc=; b=jyW1bm6HY6fK+oWP8dIm2iqUaQJckseEw17DDFRSNk0i9YHIq+Y8blru0XPpTSBdmd QUo6J6N1Yl0jtqSTRtZZCwIyzDYOQ107GD/9ZkYfM79YhRX9ZDyT1myc2ei4rL2+jvoC F8GlezB7m+ptQ9OVXebwuo7yeDUmGRszGh8Q9xJtUgAcu0ffdCIJ2O8j3IPm3lf6hFp2 QUo7CuH3MXXWUxolb6Y7QxisDHPv2eY3Y4z93ogIhltUoDcHFHpxYXoNoxEnXX3uzFru c6ouIHWrPFtkVfXXf/YB9Stci4yzQqdLqL9AR5gevEGSdqQ8MZEQYIp6SI8MAIOpvwyT dxjg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iTlPi7s1; 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 q15-20020ad4574f000000b0068f52cb8bd4si4267267qvx.363.2024.02.19.00.35.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Feb 2024 00:35:50 -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=iTlPi7s1; 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 1rbz3i-0001XZ-1x; Mon, 19 Feb 2024 03:31:30 -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 1rbz3Q-00010g-U6; Mon, 19 Feb 2024 03:31:13 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbz3P-0002In-5C; Mon, 19 Feb 2024 03:31:12 -0500 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1da0cd9c0e5so37032125ad.0; Mon, 19 Feb 2024 00:31:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708331469; x=1708936269; 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=7/DLuXky9FQDqFdM2qoHQOMo5LuNUVQuzkj5LQTCSNQ=; b=iTlPi7s1ITsC6Z66zXFt4P9d5xuDeNOUGja5p6/YbKzCZNIFJRZJKjmVaPuFo6KTq8 98pfGSnnuLeFdCPfhPc811XyBChN5cjQJf7TT3OVgQAcvCHPuDDLKN93hAmOcPpaCW+f Lh/x9frdrpFXTHKBDYu9jfrEd1bWTDXKJJAbiT6ZsJ9KO/dxTo1qIOfjNbmx8CrdWh27 WJStEsb5NHF88MxoVRUZVQdUjSEaPOv9zR44egeqJTx5q2eO2NFQWGknE9ChrbYpOEG2 FuNAdY36/E6g05js1OLOsslfL7FfUyKxxxVBFyfAbL49SH25pEwTAvaMcYL9MWrKF+Vn mdEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708331469; x=1708936269; 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=7/DLuXky9FQDqFdM2qoHQOMo5LuNUVQuzkj5LQTCSNQ=; b=kMqmMVoJLUuQtW5CYYxFAQoM4kwRBkItccFJgAX+/SzEEhZX/NJ9jFKVbIBOjVhl34 hbyyClvoR/qxT0t5y1HCoYM+NX5nRMokbxzjbNhVDad793SzEWGeFhewFrjGczdb3wYO ObIaaj2hSFjDQhTcaJ/Ei6BGFY0WP1uBHbKHRlpNAQifoxN3ySRzeTyc5ozg/fA6dBDx i37dwYzI9yUN7hUC9vpQxtHGv3cvnQJW4sJaAyj0xZJj6RRFXEsTuDaAwYF3L68rqDE2 cjWnaJuE8BwB9hpZ5eM4+naTyE8V6FBeFemLXay/38/sK/jgVg0pQ1f5iulKUiJjn/xb 1WMQ== X-Forwarded-Encrypted: i=1; AJvYcCWkvrFm8RyzGrIjxBoJZA+cb2Nk9QCF5fdyxYkrE+28ZAi70okFsMdugSePgfIQ2d78LD+KKJ9j/fW77WhBC4GBpLwE X-Gm-Message-State: AOJu0YwOiquOPit+hl8VyPJSckPj7c7kewcP+WoMQyMoALe0UWAUUfus mSatZMW5+AqdhmShTGYIFGpzf852tXeOzPb1j94q75lN8ztRfu5gvfMi3v9f X-Received: by 2002:a17:902:d512:b0:1db:cf64:7331 with SMTP id b18-20020a170902d51200b001dbcf647331mr6469868plg.13.1708331469270; Mon, 19 Feb 2024 00:31:09 -0800 (PST) Received: from wheely.local0.net ([1.146.38.93]) by smtp.gmail.com with ESMTPSA id mo7-20020a1709030a8700b001db5ecd115bsm3838348plb.276.2024.02.19.00.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 00:31:08 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 15/49] hw/ppc/spapr_hcall: Rename {softmmu -> vhyp_mmu}_resize_hpt_pr Date: Mon, 19 Feb 2024 18:29:04 +1000 Message-ID: <20240219082938.238302-16-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240219082938.238302-1-npiggin@gmail.com> References: <20240219082938.238302-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=npiggin@gmail.com; helo=mail-pl1-x632.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_. vhyp_mmu_ is chosen because the code that manipulates the hash table via guest software hypercalls is QEMU's implementation of the PAPR hypervisor interface, called vhyp. Reviewed-by: Nicholas Piggin Signed-off-by: Philippe Mathieu-Daudé [npiggin: Pick a different name, explain it in changelog.] Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_hcall.c | 4 ++-- hw/ppc/spapr_softmmu.c | 4 ++-- include/hw/ppc/spapr.h | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) 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) 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); From patchwork Mon Feb 19 08:29: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: 774080 Delivered-To: patch@linaro.org Received: by 2002:a5d:4943:0:b0:33b:4db1:f5b3 with SMTP id r3csp1052972wrs; Mon, 19 Feb 2024 00:33:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV8F4OzS5SgQrzw/oGNgUC2JiHSB5KM7jQU5NSyZ1Xhl0+rmU8XZhGHC6IY+g9l52MbaLjoJG0hY4MbRiB8yi5v X-Google-Smtp-Source: AGHT+IHXZHrsftQPC4lB8JZ8Um1bOm0VNIhrjliM6H1r0JxQWEUVsNcIqqnRnsJsZSxfjuk8iVw8 X-Received: by 2002:ac8:7f05:0:b0:42c:7aef:615c with SMTP id f5-20020ac87f05000000b0042c7aef615cmr14648916qtk.21.1708331604460; Mon, 19 Feb 2024 00:33:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708331604; cv=none; d=google.com; s=arc-20160816; b=zVRJMCC9tAO5/wo5drfUzS+wjUs7uoYipLqP9VjYZ/MTkBkH1iisLfcL0ybT5q05fC ZBa9Bq9/MRyhhZnnl6yZCn5BdKvndIwELQmRh42ydZBNfoMcytiRsGb2MZAo1Td/hshT cQci1tFcIo/juF+kWQh2kg9pDP/WifROw1Q52M3+NyLc8giC7DJ97rbB9YS1jGLIRPOP 01QRvP3eqSnTIFcCN9lVi7f3JP392Q4ZIFSD4NwoQskPgaJoh4kiPBakZ+VJusJknoBu scnz8lNwPnwdXaC+WK3+5BHpHYq4LxKc3jpjRTHjnA0hjZAIa/RbAYX+DElI9g+sRm8A oavQ== 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=UUiOJ1pK7QPyHQ5yGzK2wb+2Id3GEQyb+loYbOgfWOI=; fh=rLaw4pGt0TBV+6KEMVUXKsWCsogHezLypIoOp2BgV4U=; b=gjy//kDr8IgghgBWhEuGkodaG1UzOpIR1Q+Yw/FlrI9ilLxOVZYm66W+g3mASw+4pR JXnQil1KNO3BZsLOkFFhe6f/gpKsYzua5wA3RLRyYixWMOrpF2NcmoRQvbjB2RNpom00 H47ghNoqFa5l+rPy90IYRzwHf/+JznFEH+um6yxVs4x1Ph3ng6nLmmCbi/SNPge6jQzU zoeWTWfo+sHsw55pm1pX3O+2dGIja6RnW8u/ViNXPfWPMi1jjDuf7SDnwaZHJt9/wLHL ezj6yrtl3ZnH2gclURIL7I5tu2vPf7LiyBZESpM4WFpnXN1ERdJTHH30prh/CZxLQra7 4Pqg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=edqL7Fh5; 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 h22-20020ac87456000000b0042e12996421si1469104qtr.154.2024.02.19.00.33.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Feb 2024 00:33:24 -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=edqL7Fh5; 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 1rbz3j-0001hp-66; Mon, 19 Feb 2024 03:31: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 1rbz3W-00016K-TF; Mon, 19 Feb 2024 03:31:19 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rbz3V-0002JK-BL; Mon, 19 Feb 2024 03:31:18 -0500 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1d7232dcb3eso19279555ad.2; Mon, 19 Feb 2024 00:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708331474; x=1708936274; 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=UUiOJ1pK7QPyHQ5yGzK2wb+2Id3GEQyb+loYbOgfWOI=; b=edqL7Fh5SH19B6SRFjzgJQ8uK9YJg1WzVez+P+uQNz1BmJAzK7BUvxCvMMpdxLX6E9 D4GXzKFvVmTehyB9X8jkqmTIQvjAxSRc+qxbE7lxGuhJAJAeuorZg2Y/ZCJDZS+FtGO8 dghqv+ID4OOesuKzrAkeA16Iv1+asfpp/VJxOm6cbb/xtONJA27RajOWMI6zbcdAYoJx hDW5y+qsQLwMKYIkfQUJj8d6yXjooZMfxtlWjR7hTmxnjGoviR/zJOlNve+S1AQny7YW wDcg20cuW4GZ/85XVu8SjOOS/0BA0FCXLhmkJtY/aH8tE15vSe4ffT6mnpwABTN1MTTr nGGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708331474; x=1708936274; 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=UUiOJ1pK7QPyHQ5yGzK2wb+2Id3GEQyb+loYbOgfWOI=; b=XXUsAzDtuiHfyt7Xoaaf8JxpScCZbEBqI92zGvnHyPyFFEBUvdfC9ybkg/RLnxD1Tm HYILouisgJFn+yi+8mv2B2awDVX99dw7PrYU68LSk4SL1lVeDDIW7tShStP6rupcV7PX X1kntu4byPZZqCQKrUrPjxKbYWmUKsNzegeF+sGarNBcPeeN0pjozX6e3dxhEZ3NUDFG SabeiqzrxHJju/XGqLjSYufNzuc4oc7kbQR/+1lCF7uFVZ6lgqVJlRHrx4Zg06roij+v Y7Yx8rRiOM2xlZkrJaXodoWqgl1Zjl69RV0iY7dTyKcohjfki3Egwgn5aVyZqpJKnddZ U0zw== X-Forwarded-Encrypted: i=1; AJvYcCVrhj8VBTvPQ1Qw+4H2PxnEBa3DoYwMe4kD4ii7M4vrzZh0DBt0t5+3s4RyD5JA8ZUZgbAafOM6IFSfEUi9GFle16f8 X-Gm-Message-State: AOJu0Yx0MV5HsodzHApLMQizt9zxZm3/WQv5u/e/2Fx5OqHWUbi0QWaJ izzORRwyLWJIGeb7TbIgWRK0kXDvBpDBwt3644tuyqS2GzfFjYvlRmLbKFG4 X-Received: by 2002:a17:902:d54c:b0:1db:a0f1:0 with SMTP id z12-20020a170902d54c00b001dba0f10000mr12094328plf.28.1708331474152; Mon, 19 Feb 2024 00:31:14 -0800 (PST) Received: from wheely.local0.net ([1.146.38.93]) by smtp.gmail.com with ESMTPSA id mo7-20020a1709030a8700b001db5ecd115bsm3838348plb.276.2024.02.19.00.31.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 00:31:13 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 16/49] hw/ppc/spapr: Rename 'softmmu' -> 'vhyp_mmu' Date: Mon, 19 Feb 2024 18:29:05 +1000 Message-ID: <20240219082938.238302-17-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240219082938.238302-1-npiggin@gmail.com> References: <20240219082938.238302-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=npiggin@gmail.com; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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é To reduce the use of the term 'softmmu', rename spapr_softmmu.c to spapr_vhyp_mmu.c. Reviewed-by: Nicholas Piggin Signed-off-by: Philippe Mathieu-Daudé [np: change name] Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/meson.build | 2 +- hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} (100%) 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' 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