From nobody Fri May 17 10:44:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1696257574; cv=none; d=zohomail.com; s=zohoarc; b=aHJDqWpVpHe9vXuDyv/7AtTRfgI60h8HRLQCuXKfTnZbixYb0xMYPr5hvHBC9+YzS/4eWdmO9cyqev6pk64yhMBRiN5xGy52azQx1DkIQdNSqqMN8LMqx0lDYzp6mg9eCsA5XJuHdeux30TeqYLI41xutM6mFLnCC2JAspXGMIQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696257574; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9d8vWgoJe22IYAld81YZ4mtbQgSVMhoRd/0ohTdhkoY=; b=krl+IednIMq1hEHvpgUnLVpGcsnwdQPygZXarcm1zWOWnv3J/FlpPPb96pbo0MVSuIras+ElyI4kvt2YjR8Xrb5s8I2Z8f9G0BapiOnYHk2h4UT0QvSZwvevutObq2a0EtCudc8K16Z8Ya8gNrqri25IyvGUPsfM/XSSxMV+Lrw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696257574191732.5705925787803; Mon, 2 Oct 2023 07:39:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnK4i-0003q7-Sa; Mon, 02 Oct 2023 10:39:08 -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 1qnK4h-0003pR-No for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:07 -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 1qnK4f-0000Up-S2 for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:07 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-405361bb94eso171164475e9.0 for ; Mon, 02 Oct 2023 07:39:05 -0700 (PDT) Received: from m1x-phil.lan (sto93-h06-176-172-7-203.dsl.sta.abo.bbox.fr. [176.172.7.203]) by smtp.gmail.com with ESMTPSA id 8-20020a05600c230800b004042dbb8925sm7375187wmo.38.2023.10.02.07.39.02 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 02 Oct 2023 07:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696257544; x=1696862344; 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=9d8vWgoJe22IYAld81YZ4mtbQgSVMhoRd/0ohTdhkoY=; b=qL/86nIpAnQck3iKcF6De4mL5kF5imIEBlmtj8cXTp0Ma338cXE4ArhFiPU7mf6lTy 0ocG/PkcD174ILjf6GKmJJ4A8dgU5Goz0plAFwBLkkIUt+RtVYMSsq6E7GWG4Foh97ty n/R9FGspVeQuObsK2K3ijZSbMRctIU02zwo9AengJEEHYsFcKbnQRwnCnZS/P75X0RSm Wwf6lqxyffzjJl+W8rYtueDNx6HqKo6+ZflNqSX1v+ukQDxZcszo0L9zArLlKBPWGxqe u9ELGG26xYt9Tz2fMr8YzUlCtjE4grwh3XgKCmYdlWCTUb2xaKTxhxfJrLK4cjsJlBP/ UFBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696257544; x=1696862344; 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=9d8vWgoJe22IYAld81YZ4mtbQgSVMhoRd/0ohTdhkoY=; b=bbMWgIkZjZOadgk22yVPBJz8o12/0l+14I8wgJMbZ8Ii3fK7lEcQtfXsUm2qGehGVx cC3EfOPIDPz2yBoF5SF+QeyJFWDUA/HPYcCEFWY73udAL2+PPH5CTAMdclqBOYigviWK kWlU3WvW1b66pEcjvB4VCxYLMDLGjlYIkNodiYDH3lyMUhYcbx6vvq92piywZ8KVrshL csCXQapVBf/PcA5hhcihzne8INkuIbUxkF4ESBrfYDKfRphw0Qx7/QlBTrCH+E4SGIbU yb3I2HPWPk+8iWaWMEDa5Lth/is6rtvJYfF4WUlNV3+mm3CPCECDqYxxkVo1P+KztEXt Xppw== X-Gm-Message-State: AOJu0YxwohpCaxsYDVgOidXNZNqsbyVMXYKsRNPiBkjaiz0NkEbCXMUQ 77gCo3iHs/cI5pSmpnboFd8gtiiLyfaqwS/UVgfPZw== X-Google-Smtp-Source: AGHT+IFhzkQFGJnXNUZU8owVy7oYeNd+nZPjuDw5sHP+ObNdi889GdPtg4/abxvlSO6jGHbgDEk/HQ== X-Received: by 2002:a05:600c:5118:b0:406:599f:f934 with SMTP id o24-20020a05600c511800b00406599ff934mr8746281wms.12.1696257544167; Mon, 02 Oct 2023 07:39:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] hw/ppc/spapr: Add missing license Date: Mon, 2 Oct 2023 16:38:51 +0200 Message-ID: <20231002143855.50978-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231002143855.50978-1-philmd@linaro.org> References: <20231002143855.50978-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1696257575192100003 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=C3=A9 --- 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 278666317e..26d50d6543 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -1,3 +1,12 @@ +/* + * QEMU sPAPR hypercalls for 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" --=20 2.41.0 From nobody Fri May 17 10:44:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1696257604; cv=none; d=zohomail.com; s=zohoarc; b=eyhuCSDmlV16iVc09PD6Z4x/gzo+9HUdP33NCcWAZJZ+ERThBLcBes2+R3NmQtVklUKBiwqj2ytExDvSb22yJQxUrSJ5mvzY2W69AzsA64A25/wfrWPCw27XIFHk621lmDwPUFOmdqPrRIZI939j2Y6ZX5HyyPI9E2T04rOl5XA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696257604; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=omsG/Ra9+rfhsWhAh93SFQCufEzYS0VuVJVZ9wRmIqE=; b=ESua96yc2H0Jqzp8OLNhaXzXqfF+za7ZYTO27DRjQi855GyjGcQdcBqbt5eP2w6z3YKIkpqxgVWFN9MteI0fD+BYX+8tZAfFMJwhSo8xq01E4K5nEEGxcyEkt34jUtMHgsAnUyLlcBwfignhtQunSVKUFmg15SKsdXEJ6OOQzGE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696257604153648.9106420857463; Mon, 2 Oct 2023 07:40:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnK59-00044t-Cj; Mon, 02 Oct 2023 10:39:35 -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 1qnK4v-0003w6-R0 for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:24 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qnK4u-0000VU-A3 for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:21 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3231df054c4so12398882f8f.0 for ; Mon, 02 Oct 2023 07:39:11 -0700 (PDT) Received: from m1x-phil.lan (sto93-h06-176-172-7-203.dsl.sta.abo.bbox.fr. [176.172.7.203]) by smtp.gmail.com with ESMTPSA id k10-20020adfd22a000000b0032320a9b010sm20411236wrh.28.2023.10.02.07.39.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 02 Oct 2023 07:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696257550; x=1696862350; 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=omsG/Ra9+rfhsWhAh93SFQCufEzYS0VuVJVZ9wRmIqE=; b=Rxvg6srbW/yoBzlYuGc3JvjWWIwwOcA1ok+QdKg/P68Povy+9whPFNmTl9buZG7Afs L1xbaadO7VjtF5iAOsfDhSdAMciBhZKcz5/wNKN0LAW1E0gHmU8hV6OAuhEYEkzMFWM2 U+MMg77UmtRiCeir3OL+v4g/dILPRU9GZ2kvVGOjL+N50Qev2thhCvw6OU9Ot2u5DhqC Qx52XjVZNZPE3YdhU+8rQQb7cFlyeJNvzd7XdXEjDsbnDNJ3qvMebzhaYyRMO81j7HR2 6ljWnCIuY3nDRR7J3NFCJBDbUuDNtiqIYe/3vIJJvS7jK+s4wulh4hyubjLWY6d9gu70 RYTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696257550; x=1696862350; 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=omsG/Ra9+rfhsWhAh93SFQCufEzYS0VuVJVZ9wRmIqE=; b=S4ius3TanJ0k+6NWxPC9ZS001mpM6TnPAc1AL83y8ovavYCgC3PjiZNQQ6yKpsk/j4 3wTQ9EEwV4mWGyxJjJ6ZHsnjEYBgnweb56+YfI2qkID7INrGQCWGvfNjFgLbmwQCUmeh 0wlvj56PvIcfRka2V+y+NVkhagqCkEbFTW8j7gIjqlekJZJLOm7v/vyf4lC9GsbfwxmP 2A5HxkMU5S+XajDEuIrZAuuSI9IZBIBjJuFWFf+ixEJwbPitBJAL6yB3k/tWgI946vI7 InVDnT7Qe55fp+0OU/yLMpJGaPJe4H2iGvCDMlHnm6Kw3NPzpUu3cGObKVFeM1CyWvU8 BilQ== X-Gm-Message-State: AOJu0YywlFxl4nzZQsTHpA0XApDzu3wjGniqmcYpr+S3OjBStlVYeAAI bHzBVEEn+Hq/jAglN8wQx3jPyoLVqrW3Qne3uTCgMQ== X-Google-Smtp-Source: AGHT+IES/q7QDPWs0R6GoqKoyumzgzJut/Z9cO/MrEz5D9ejLGOrAt9q9QHnPvr6T7lF1p6rvzm0eA== X-Received: by 2002:a5d:68cf:0:b0:31f:e761:d47c with SMTP id p15-20020a5d68cf000000b0031fe761d47cmr9599047wrw.32.1696257550370; Mon, 02 Oct 2023 07:39:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] hw/ppc/spapr_hcall: Allow elision of softmmu_resize_hpt_prepare/commit Date: Mon, 2 Oct 2023 16:38:52 +0200 Message-ID: <20231002143855.50978-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231002143855.50978-1-philmd@linaro.org> References: <20231002143855.50978-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=philmd@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1696257605330100003 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=C3=A9 --- 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 522a2396c7..a860c626b7 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -124,9 +124,11 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *c= pu, =20 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); } =20 static void do_push_sregs_to_kvm_pr(CPUState *cs, run_on_cpu_data data) @@ -192,9 +194,11 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cp= u, =20 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); } =20 =20 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(); -} --=20 2.41.0 From nobody Fri May 17 10:44:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1696257632; cv=none; d=zohomail.com; s=zohoarc; b=JpIiiqkdoMXSgw0b4rjOOveySDBZ8OtykouXEkukBPkY88kJz8h7GvXfAIilmQmy7iIqzyXh36JXDzoJRIhkWvrimaSXP8D2mcD27ijY9kLi96LvcuurOiGTeV2QkAooKP8/BzWmYsYF2fjHQOVbBH1mLdXcp1GEtNQ9SGPyXp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696257632; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Bx1j9MYngwwS2T/Lm4rU/XnA8qiNHdbfi5q2qO33y8A=; b=kVqhIuTcjTmwKVCZNix9vdtxtJ1wbplpYmo/gk+vpUSqmcyQvoMUo+FMml5lzv7qP+CRMsBIRTyfdctI/O7BSGkfDU+Ykx6YEl8t/ktzqj5b+3rAPW4ZDhmz75u9m4pQ/3pYpq0N9fDE7Yr7M5rn808B8Q0vENVYv/M4wU6YWd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169625763227787.21038759468718; Mon, 2 Oct 2023 07:40:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnK5A-00049R-IB; Mon, 02 Oct 2023 10:39:36 -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 1qnK4x-0003y1-2m for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:24 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450: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 1qnK4u-0000Vf-A9 for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:22 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-32003aae100so1913781f8f.0 for ; Mon, 02 Oct 2023 07:39:17 -0700 (PDT) Received: from m1x-phil.lan (sto93-h06-176-172-7-203.dsl.sta.abo.bbox.fr. [176.172.7.203]) by smtp.gmail.com with ESMTPSA id b16-20020a5d4d90000000b0031fba0a746bsm8439481wru.9.2023.10.02.07.39.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 02 Oct 2023 07:39:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696257556; x=1696862356; 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=Bx1j9MYngwwS2T/Lm4rU/XnA8qiNHdbfi5q2qO33y8A=; b=fvCWN0N/z2+SKzRhh16FAGxaJQ8UlovJZ4JSbqofhHOatLWCCeIIu0uOF9Yg2omL6z CjGSjWiTW6B+pg0bTUl+ZWpmzHE5GA6HVkUlspypuuwOz530cxC+JtV6vk5Q2nlgj443 wGwsYe5zEML4TDVmurhxf1dCS6R2mvimQsJkcx5mou8xbfmIqxOejTZbWqCjHYxK6CzQ HbIb3hPowLlqiFIuoEjUa+sH03Vw20xHylHS9L6YLS23r/rPCSSZlkMe5RezkXT9TF7U I2SF/kddug/RgLQaqJcDIzo8d4GOO//fRM+eU+tS60KdBfu8zWvMhA98pwC/jebKnVXC jGQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696257556; x=1696862356; 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=Bx1j9MYngwwS2T/Lm4rU/XnA8qiNHdbfi5q2qO33y8A=; b=r98mJ17rHRDdhfiKGQyeskf2ZmM+hz2u51UWIwhrmQloGRF2wrJbEX3XEpafFdDPvB LgOMNk2tVXUzGRQoScmHRPDJASdxwTCXbb58cfZtQMKpDVoPeAcK5bWkreZ32QvTADKM pSGIDpMH06zMZm5Tk2U+euyueY99q+4ag/YiB4W+Qwa+itHnp6nBU7F2tq034wGdQYec LpLaHhzWhKLzC8sHzTXVPCX5nDrkjNyWh14Guiy3d2MeTKMlN2KoAt+bt9aLNh+yAcUH j9O52ACGAErPNfoFMh7ccc0ef4o0+pRsIliTQTcjZ4QyRyqklYcP5BGxg/NE5SJY7RbC KTmg== X-Gm-Message-State: AOJu0Ywo1nwbC1c+beWDlyb8RmRai0B/ZTY/o3Kox24aSxgrKHbRDjyq bkYMDDVdYTMYXkIsmFFViRt8cUY4Zy7x+0Kz8DfxPw== X-Google-Smtp-Source: AGHT+IFdEzpyeb8PlZwsc17fd5bIBLD19CoURLmFIpmqdxMtQ7tfme7wdP4pyJs0zLgbUJ7hEPqFJg== X-Received: by 2002:a5d:670a:0:b0:323:1ded:311f with SMTP id o10-20020a5d670a000000b003231ded311fmr9102454wru.25.1696257556690; Mon, 02 Oct 2023 07:39:16 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] hw/ppc/spapr_hcall: Rename {softmmu -> tcgppc}_resize_hpt_prepare/commit Date: Mon, 2 Oct 2023 16:38:53 +0200 Message-ID: <20231002143855.50978-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231002143855.50978-1-philmd@linaro.org> References: <20231002143855.50978-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1696257634463100003 We use the 'kvmppc' prefix for KVM specific functions: $ git grep \ kvmppc_ | wc -l 402 Following the same pattern for TCG specific functions, use the 'tcgppc' prefix (which is clearer than 'softmmu'). Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/ppc/spapr.h | 8 ++++---- hw/ppc/spapr_hcall.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index e91791a1a9..160a5823fb 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -634,10 +634,10 @@ void spapr_register_hypercall(target_ulong opcode, sp= apr_hcall_fn fn); target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); =20 -target_ulong softmmu_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 s= hift); +target_ulong tcgppc_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState = *spapr, + target_ulong shift); +target_ulong tcgppc_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *= spapr, + target_ulong flags, target_ulong shi= ft); bool is_ram_address(SpaprMachineState *spapr, hwaddr addr); void push_sregs_to_kvm_pr(SpaprMachineState *spapr); =20 diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index a860c626b7..7b0f2e2e1c 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -125,7 +125,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cp= u, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_prepare(cpu, spapr, shift); + return tcgppc_resize_hpt_prepare(cpu, spapr, shift); } else { g_assert_not_reached(); } @@ -195,7 +195,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 tcgppc_resize_hpt_commit(cpu, spapr, flags, shift); } else { g_assert_not_reached(); } --=20 2.41.0 From nobody Fri May 17 10:44:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1696257637; cv=none; d=zohomail.com; s=zohoarc; b=D2QQ/Ulp5F0Cd0b0jQDo0D85X675ufmHnsIedt6OqOm/RheoPSgXr42VkzG/ka/zZLoEPKwVOxW+ZRwjDZEtlUL3lP8Pe+3mWc/uJVzeZL8EleAfS7vcH5Aia1Ju7LhlCqqvImno1fi7HoACHTHMjed/QZ7fIzCZL57Ahqx8aJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696257637; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ThqHVCoODVLmBGg+zWINkZtXAF1PafSxS7H+BvfEo28=; b=Sgia8/keRM4TZyMqQbaBsCHAv82e/AJ96Uszk335rIhZkvRSNG+ELJj59gkez5jrhwNwfTgYTia95xDYA+d9zbAty672eaeAI1NDBMtm7Zp4oruXGwdfzbknS0RibjOXEA+Ux/rPxafybP/rNzymw0UuJw7MuU58FETYhusN/RE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696257637625111.7498421943643; Mon, 2 Oct 2023 07:40:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnK5B-0004Bi-Nl; Mon, 02 Oct 2023 10:39:37 -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 1qnK5A-000493-0D for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:36 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qnK4y-0000Xl-6f for qemu-devel@nongnu.org; Mon, 02 Oct 2023 10:39:31 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40572aeb673so137110545e9.0 for ; Mon, 02 Oct 2023 07:39:23 -0700 (PDT) Received: from m1x-phil.lan (sto93-h06-176-172-7-203.dsl.sta.abo.bbox.fr. [176.172.7.203]) by smtp.gmail.com with ESMTPSA id n20-20020a1c7214000000b003fee567235bsm7416660wmc.1.2023.10.02.07.39.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 02 Oct 2023 07:39:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696257562; x=1696862362; 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=ThqHVCoODVLmBGg+zWINkZtXAF1PafSxS7H+BvfEo28=; b=cI5nUXI/rJMlwKj9/JSxDJzBL2eUxECbF4yHQ/SUtgNWIN9vVpCLGxz2vEb5Se8Tzg yDmEevNvPx/slTW2XUi4hkCM78DZwlqdZet/+/OSIg1wSOpVgVnZz0Jprc3dyCL+aO3e LfBZVRy9jAnDl/ilOQLbgAFNai2rXiWUOJlVz3sU8QCMNNqKTv28hbtpE6ROjTiINcks p23QvBNGGSt/N7nTYKo08LobVr6P4k/GrdQvMlqzkYRQtKZv2sl/KUv9W4uk22mrVd3Q tPZCnFiskROFdu1ToLdGUdrjASoOJGknJ4RzqIlquhjMuL4jZ6jFZSRmBN1JgHuk6ZIe wXuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696257562; x=1696862362; 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=ThqHVCoODVLmBGg+zWINkZtXAF1PafSxS7H+BvfEo28=; b=cr/HHFeghrcBhpDyKsOsN+44socntDla1FrwyuiZvjx+USjTcC9M5cMkZG5jqMfEdV DDJ02LJ2X5SsU+P5GxS2YoUZY+2mLywwCxdDODmfmK8OJEDVpTeokner3XGMdQ4iYqg2 ri/TTgI0St2N6hzNlsJKOLtfBSss5viPSzW6CMyueNUBO1TsUvFqCsaDfjSPKzUuho6K 3VYYSfJhN8DM8D58mNMbE0jHpIPp9TCzMfjHPVMXuu5E0ZJ8Qns7TnKj3PMaDaSg961U KPid987CFHzCtV1z025ZhM7oPjWDJThmyP9UIknUlAxenozb0PrLvQ7PUQgjCTMKNFDE r5HA== X-Gm-Message-State: AOJu0YzdInDO07rmZK7B3aGcmFOs5AQcOWpz5GDt4a1LBwaJRsf+FXu0 Em8G/zNRZaw+V+O7bFziHqqjCzeRSS+R4rXJNdWwrg== X-Google-Smtp-Source: AGHT+IEsJpL3vRkZUj+Vut3HSFliNV61LQ2sWC4XuINGwZClwK18oOLPInPUOFS4igKoEoRDvyv8Lw== X-Received: by 2002:a05:600c:28c:b0:401:519:d2 with SMTP id 12-20020a05600c028c00b00401051900d2mr9381438wmk.23.1696257562112; Mon, 02 Oct 2023 07:39:22 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Harsh Prateek Bora , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] hw/ppc/spapr: Rename 'softmmu' -> 'tcg' Date: Mon, 2 Oct 2023 16:38:54 +0200 Message-ID: <20231002143855.50978-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231002143855.50978-1-philmd@linaro.org> References: <20231002143855.50978-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1696257637961100001 spapr_softmmu.c isn't related to having a soft MMU, but having the TCG accelerator. Rename it using the 'tcg' suffix. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/{spapr_softmmu.c =3D> spapr_tcg.c} | 0 hw/ppc/meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename hw/ppc/{spapr_softmmu.c =3D> spapr_tcg.c} (100%) diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_tcg.c similarity index 100% rename from hw/ppc/spapr_softmmu.c rename to hw/ppc/spapr_tcg.c diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index 7c2c52434a..281100a58d 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_tcg.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_LINUX'], if_true: files( --=20 2.41.0