From patchwork Mon Oct 2 14:38:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 728551 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp1696377wrt; Mon, 2 Oct 2023 07:39:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGxj5mkqy8XhefNTPRiYlMsbywYJ9ESL7HeGNRyqVyndDyFSrt39g1vt+59KasB8ViPsFZE X-Received: by 2002:ac8:5e47:0:b0:417:a9dd:e87a with SMTP id i7-20020ac85e47000000b00417a9dde87amr15198785qtx.27.1696257572822; Mon, 02 Oct 2023 07:39:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696257572; cv=none; d=google.com; s=arc-20160816; b=Zl0xymRnd4INhdhYsyQb+rAkDwhwQ/8XDkSlaotQtDifVO3/948MUQSayFuLYnnD55 6TL7EMw6mvt2diEzdWq67vML2wtXZuSrzvFtzRj/9fzSi0nA6QsRoO8soZv3Lr31zUi/ DJ6XqvmoNVg8cu10C2kwiH1Uut1cncicGd/ZBCXNxL8J/xccaz5Bt7wJDnUDcBJwdf7t XL46nS9AmDfmCT/lfVIyGTSztVvnVKEVJ/JggTLhIzJf1HKziSVPQq0oZl8T199q+3h2 O+uaYEm6K1FAZnmoe/kRI7ubzae1506CteBeoF4roz10kkdYQKo5ulgh8WS3SPw44aM+ zNtQ== 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=9d8vWgoJe22IYAld81YZ4mtbQgSVMhoRd/0ohTdhkoY=; fh=bhLjEczjNDWf+xDs9FPR7/N1Vo49SFnn35dyotb6ST8=; b=rESgoW5zV8WALV7sH4HZVJesyvE0GVFnaNBeTG9tRJqfJ+BAWPaszjL6yjVa/A/KAr UPvAv/266Lk2oBGIjG2ikrbF3bumoHaxWYhmYaPfcXI7XLd97VaamksCuKHnwSypTQS+ gHde0lsLeY9h4t2fsE2t31Bg/GJFO/Dbc+iS6Alr4dKlN28CUfe6ExpbTJd7AEqSJQ1y cCvEDYievExKRPSqweYC1ymm4gMs4RQ+g7OMpEFV1pWygdcs5Y6t1tMGHoJJCjxEAHOh BZGiSzLS3cDpqIDEt7H2ik08lhUKCuKcjWMb6zt5QKoJwQPd5w/F6hQWyyVrv+97pYe8 eeWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qL/86nIp"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c10-20020ac87dca000000b004195716fc55si5206169qte.711.2023.10.02.07.39.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2023 07:39:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="qL/86nIp"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-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_Le_Goater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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" From patchwork Mon Oct 2 14:38:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 728552 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp1696583wrt; Mon, 2 Oct 2023 07:40:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUamnoiPm2CT0bKrONnC2tZiZU3W04tHfSDQrucmeqJd5tcYew93/DASpnQRAfvDfTHhAz X-Received: by 2002:a05:6358:52c3:b0:143:5383:af8b with SMTP id z3-20020a05635852c300b001435383af8bmr13935616rwz.11.1696257603607; Mon, 02 Oct 2023 07:40:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696257603; cv=none; d=google.com; s=arc-20160816; b=e5ZaDLKHx35uv+MCP4Zw/V4wdS72i6QTO4X0IvC6HMADLHWbniDErQlgW4TmH8aNgV NfuuMAtolGGUt2gWtJpph9P8ml1/SghfPS0aa8rj8A6Lnm0y7YzT1hsm/2rhDdOI/qvS 4+9VSqM7P6Gmm396BhFuSBUk5RvUJARPun5QDWAdY0QiWwzClQpSD/UIve7O0T8JQbeg ff/s4gH9R2DwVxXiSusORCPWbNCoA1dG2qXyEq+AAaJbmDacU8US/3yfO+3jHEGo1jTm fHh4ZBKDBF5wSbuhULaYQNEMLZYo10V0RnLr8Ajs2kVQ1rTb7wy13czTBepiu1lxG+1H IuOA== 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=omsG/Ra9+rfhsWhAh93SFQCufEzYS0VuVJVZ9wRmIqE=; fh=bhLjEczjNDWf+xDs9FPR7/N1Vo49SFnn35dyotb6ST8=; b=NLoEqfW53cWuh/dOdMQmvtJYloDHQXkY7MjyPqr4eq7qSmmLOeXxvraZ0r9GV2Og4L rlVOcJQhWySrdUfjpcw5LnIlTg4CE41oQShF83TfyZSpEHB/nvY7XULBiK5yLFC4eV4k Pm317K/a1pBIExy+Invs8jOwMgiQpgHTnpBGVVHDA4lofJ/MPJ3E2zteL7xRrUYkrFGW TnIkD4AXTIWQaM6y+px9j3l1NaUi4qmozi33+pZWygjdrIlqVk7YJSi6dUJr9kVYuPrL ZPKtgzu4uMa1eZKZ++Vdaytz3R8UvuL9Y6oW/EmJHM3I6wTQkXnUG59rtp4qTEzy/sj5 AFgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rxvg6srb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s15-20020ac85ccf000000b0041773edb414si1293928qta.655.2023.10.02.07.40.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2023 07:40:03 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rxvg6srb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-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_Le_Goater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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 *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) @@ -192,9 +194,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 Oct 2 14:38:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 728553 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp1696768wrt; Mon, 2 Oct 2023 07:40:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNnBtqpPvYLVF38vOCZOHqWK37q7Oky9OmB4pCgN9TWL5T9lhlcD4TtRBAKBjSqsuexsgc X-Received: by 2002:a05:6214:2427:b0:658:c5aa:459e with SMTP id gy7-20020a056214242700b00658c5aa459emr12093183qvb.14.1696257631488; Mon, 02 Oct 2023 07:40:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696257631; cv=none; d=google.com; s=arc-20160816; b=1Fmkl+nBJ9CIVvy0iB02Q8o3StgHmstLej4dKD6jl/yyEnxqGJP0+WyopvQfooYQIy dRnGJwIYdJXR/lpOH3kOIMi2/uu3KVpv0izOVJfF1PpuMr6oVHmnxZucsi09wFrhzb1k 1v8+rGceoKqq1vDZ5H6xvLdwVDVhQvXVbgP8vwVJ5eELVttcm7e1C/fp3FR0e8U5AJa8 y9treCeet5jT5XvHLq1lPopMuJwFyycKLqPsDI7cYoexKkmoKGzVPE2+abvCJGt/xhL7 +Gef7o+hb4qgiBoA1823W9KVl+KEOm7vAJNWP8+eGXTL0nAqTzswiH6Grv80VL8xolXu QscA== 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=Bx1j9MYngwwS2T/Lm4rU/XnA8qiNHdbfi5q2qO33y8A=; fh=bhLjEczjNDWf+xDs9FPR7/N1Vo49SFnn35dyotb6ST8=; b=0EIuhvXhmSfZJ/HE60tbUzXuIdgBRq1zjIYSTs2AYlMaP4bsFL5bbEXZr6iAb3UUm/ SQA2ud6PD8YId/WG+VPZ7LvhgSIkuWFbtvzrnYmLIuRaXXcc438mjTRFDqOy8NPoqJ9o X6NB5P7lzWGqO7Bdo2FLVUCXXM1PdkrNYxn2kVt0Z35u/SDG8C1mvEI/rSd2txUTDXMi KuEfr2jTK/dHIG1YlaNfDllkcrbR1tSxJQd6QIuIVuaF1gl8uXmP0mqlPuE/K2lWlApB 23EW8AcWJxlhQcOFDj2/1+rGMXDSyIu8toECuutE96DG/QZxWKqY8mqVurenAOK5HjPm Ztrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fvCWN0N/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i2-20020a0cf482000000b0065b0fa8e11csi7170716qvm.128.2023.10.02.07.40.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2023 07:40:31 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fvCWN0N/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-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_Le_Goater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- 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, 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 shift); -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, - target_ulong flags, target_ulong shift); +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 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 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 *cpu, 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(); } From patchwork Mon Oct 2 14:38:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 728554 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp1696815wrt; Mon, 2 Oct 2023 07:40:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQ1jlHJZ2BCBVrJVk85gEOje/Sv03flgzOv4mYCRTJB9tH8T4liGBKG4I+HCVd629uLw1f X-Received: by 2002:a05:620a:23a:b0:76d:a8a8:edab with SMTP id u26-20020a05620a023a00b0076da8a8edabmr11578689qkm.75.1696257637206; Mon, 02 Oct 2023 07:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696257637; cv=none; d=google.com; s=arc-20160816; b=XQObs9CqyyGHS7QakmDzwdcuRARw4r+lVp48/PW7+vDkiKqveAxVIwQSGnvT+PAgEF WVfTT1ch8qYfAbHX2BPTj326sqO4QhlyV9rqBlYOnpc2Pwj7Ab5SqL4uf8IcN+oFrlio Fogd7E6PHsWyIcpik4KM2Mzme8GbcOVnW9oYLrsNYaKHZ0owpLijsYZCdOon/MIRrVYi 0Sixy0MfqzOE5loxCTZQBgPq1NoGsL82wObpoMZwFYL7ED8eC1kHawSSa2czNbmCMgpc USEd9NPlJ1D7pt/uHQINc4lKF2xN9bhPEQgG8XMtBGJdfz6dJk+DO7EbZhdtHktgt49I lsBw== 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=ThqHVCoODVLmBGg+zWINkZtXAF1PafSxS7H+BvfEo28=; fh=bhLjEczjNDWf+xDs9FPR7/N1Vo49SFnn35dyotb6ST8=; b=kqKEvrJNf99EboRCGesSjYyV3kjflPq5eDFP6pBsSRkcIGZEMU2y0PE+nDe/l41CUN LMJ8csv+TP57Sb2d1Ft1aOdatVhUmjU5LHKgo3iY+C3DHtjXfkGcaoX7lyni79MFSVYD Cec1bvTPx4d7ciPbZQgEpjSCJEG4ht9ckrpllu3mbLSkieeAq7KsZqHuY5ShjPvU5kMA QTwLxon4OUKXYjtbI6wfPGvqq9IWvpgjeeuCod8lbOIr8jfUbBC6IoHfF3SjgjH9/92y d5hyoJj77qOF+JAB4Np9fPxng5xotyexoLCisWmCGiiFComVHaUrh8/DL6hFc08M+ucJ 2CQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cI5nUXI/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bm5-20020a05620a198500b00773d05a1403si7031940qkb.542.2023.10.02.07.40.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Oct 2023 07:40:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cI5nUXI/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 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) 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-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) 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) From: =?utf-8?q?Philippe_Mathieu-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_Le_Goater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é --- hw/ppc/{spapr_softmmu.c => spapr_tcg.c} | 0 hw/ppc/meson.build | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename hw/ppc/{spapr_softmmu.c => 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(