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)