From patchwork Fri Dec 16 14:57:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13075081 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0966C4332F for ; Fri, 16 Dec 2022 15:01:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6C9u-0003p8-65; Fri, 16 Dec 2022 09:57:58 -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 1p6C9p-0003kN-2o; Fri, 16 Dec 2022 09:57:53 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6C9h-0001zv-No; Fri, 16 Dec 2022 09:57:51 -0500 Received: by mail-ed1-x52c.google.com with SMTP id m19so3948919edj.8; Fri, 16 Dec 2022 06:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=7QrgXciOmyiSTsdYt3UoXwdRH/orhMrXOFwHsg7Kr3Q=; b=jQx6X7rVROm4EVAdOibxLcSY4YMTjtzVPoweri7PUkNnEzKHnL4aG5KmlEK+7/ovfk v9Q8WmTUyIZp7TJ8au9IGdXpYsQmPNwM0MVJ5OA/uh9O/5Kuq4IOxFoaHWpCpGpLAzqB QxPY1qrR6mnMaQb+kO7efKgb0lxQe9R+XybUQ2oy8sjulI5nacJVJmkmc7qAEiI/+gOI 20jX04wMK6AAekSlCtbDeCwBJz2GfUiN5O/8l6Ox31JlyXEd8VpRIC6Hcv1f71wZ9RUH 5tPcOFwqOMjuaaH3fRbk5q/Fj4Jjippt6UlYwpOESfU+AJQqOsWB6O1/E5wx+/W8Vxzt m4Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7QrgXciOmyiSTsdYt3UoXwdRH/orhMrXOFwHsg7Kr3Q=; b=GEjMaSXL+FDwIHih/gWUATBjM4TPzr9kJRtvBqTHGeT3ReewSTqaC611jKrUR9oltb 3IatdExnBOgUdna/2R+q6ttsVqWGbSm6X1DQVIOanRRbAEnHOQoEYlJaEdiLoyn7dPep B4hSjSO4661khvRkDSaYcS0FIrGxHoQpBN8DmVoaJ6Fi6inHpfuSIiQPUP90luSeBsxU tvwudP4ITyxThntaHJByChtuxuGP2B1Rn6Uo+426D7KtNH70UwJuI113/bsW5H8v0PEQ kTHBIuWtQvQUjlUJaTrxFNA1uakmtQB0Z4DqKSMGq0Isccpl6xMsxW94+x6Ih+kwyB9F XBKw== X-Gm-Message-State: AFqh2kpwn84AGjfMCCOO5G9tOvvZkVidMmrXpBjIG8+z8SZquv4u/K7A vZONzNTtkGxPwcnm4DCu6HyfWsdLS7Y= X-Google-Smtp-Source: AMrXdXu8zlWvJ8K1eWq8BInUXFcv/FhaCRNeWFodNxqRZfoZNUJUddglteFHinEsKz7mvEKbZWl/7Q== X-Received: by 2002:aa7:d6da:0:b0:474:c69:9af5 with SMTP id x26-20020aa7d6da000000b004740c699af5mr5697743edr.22.1671202662714; Fri, 16 Dec 2022 06:57:42 -0800 (PST) Received: from localhost.localdomain (dynamic-078-055-138-012.78.55.pool.telefonica.de. [78.55.138.12]) by smtp.gmail.com with ESMTPSA id g18-20020aa7c852000000b00467c3cbab6fsm942225edt.77.2022.12.16.06.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 06:57:42 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Laurent Vivier , David Gibson , Michael Tokarev , qemu-trivial@nongnu.org, Daniel Henrique Barboza , Greg Kurz , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Bernhard Beschow Subject: [PATCH 1/6] target/ppc/mmu_common: Log which effective address had no TLB entry found Date: Fri, 16 Dec 2022 15:57:04 +0100 Message-Id: <20221216145709.271940-2-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216145709.271940-1-shentey@gmail.com> References: <20221216145709.271940-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=shentey@gmail.com; helo=mail-ed1-x52c.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Let's not leave developers in the dark where this log message comes from. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- target/ppc/mmu_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 89107a6af2..49067c05e6 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -811,7 +811,8 @@ static int mmubooke206_check_tlb(CPUPPCState *env, ppcmas_tlb_t *tlb, } } - qemu_log_mask(CPU_LOG_MMU, "%s: TLB entry not found\n", __func__); + qemu_log_mask(CPU_LOG_MMU, "%s: No TLB entry found for effective address " + "0x" TARGET_FMT_lx "\n", __func__, address); return -1; found_tlb: From patchwork Fri Dec 16 14:57:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13075080 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C522CC4332F for ; Fri, 16 Dec 2022 15:00:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6C9u-0003qe-8Y; Fri, 16 Dec 2022 09:57:58 -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 1p6C9k-0003jm-1m; Fri, 16 Dec 2022 09:57:48 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6C9i-00020e-DM; Fri, 16 Dec 2022 09:57:47 -0500 Received: by mail-ed1-x533.google.com with SMTP id i9so3982095edj.4; Fri, 16 Dec 2022 06:57:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=tuw/66x1f/fkchUV1DAgnDH/FSTJzYemzBM1kUHlZ/o=; b=EJutQDFQUvgsDZ7FmF+cgif5ppxwiruDvngecjWBZoYdbdP82/lIklcIFoZQJsKzMg aUJ6GYsgEgS+hAoC9PhkAoQxCxV3S7+RfCSkVqsyf3NoUZOjVXRPGToI+NcDg7TfETLz 03HTRqJ3nFvXtCnbeQvYECcv9vqkQSxcvthugOdSxBdO3XGgJZJzLIsfCbjRiYDj+YPj Xc7DweS/EfDZ/zgYPT7nAjR44nNyQHuruP5EoM+WzDH1JFlWuDOg1eIztVQcPLUddwjJ PdjFjTT5L+KMylEayjdxbIcCiTQBN2b2c4NfCTTMU5J5WFwNMs9TvUtH/JMr/Wr5BeUj yfZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=tuw/66x1f/fkchUV1DAgnDH/FSTJzYemzBM1kUHlZ/o=; b=YZ7xp2Lvl8GNvAHIQKf5H3HbRfDQX/KL4xqQdMe0nJACLY/gM7EbTOI6t4GCbru3eZ DcxJu90n9Efx1jCLMwr01x/pEKEw/c746aQz95oSvZQTQ0atehm+W48BN1N97tbHh/Qt hufhCNNqzgtTFhdI6Ff4XW3qlCyn6hNirW06Xdip6hg9eKfa1clWeTv6jENPU/EdVpy5 JaT911AA95VctImhGOSqolta0+GxkFKsdryvyUvW/OpLIjzHOs3eiVtp4Zv2t1pQlq9Q 8B44EDnjgDxiwwWCKkhWdyAn+PvUiJOikr0rWIVEXaMTuOKW4N/FMTEsXPgQnYokIySv A5Ig== X-Gm-Message-State: AFqh2kqQn65Yin2J3xuhEKGyoiAj5PP4AaNiaJdaikfnerlA23I6DbM8 pEBUYyC8/4SI9lxBvmCwLE4O9iXSTvQ= X-Google-Smtp-Source: AMrXdXukhcG8H0our3pFSt0YSllrgSmee14ETKrYJ3fyDlYucqbzNqdZeLWgKyBFHPbvHFC10Q0WBA== X-Received: by 2002:a05:6402:1f06:b0:475:5591:b98f with SMTP id b6-20020a0564021f0600b004755591b98fmr3563112edb.35.1671202664014; Fri, 16 Dec 2022 06:57:44 -0800 (PST) Received: from localhost.localdomain (dynamic-078-055-138-012.78.55.pool.telefonica.de. [78.55.138.12]) by smtp.gmail.com with ESMTPSA id g18-20020aa7c852000000b00467c3cbab6fsm942225edt.77.2022.12.16.06.57.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 06:57:43 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Laurent Vivier , David Gibson , Michael Tokarev , qemu-trivial@nongnu.org, Daniel Henrique Barboza , Greg Kurz , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Bernhard Beschow Subject: [PATCH 2/6] target/ppc/mmu_common: Fix table layout of "info tlb" HMP command Date: Fri, 16 Dec 2022 15:57:05 +0100 Message-Id: <20221216145709.271940-3-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216145709.271940-1-shentey@gmail.com> References: <20221216145709.271940-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=shentey@gmail.com; helo=mail-ed1-x533.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Starting with the URWX columns the columns didn't line up. Before: QEMU 7.2.50 monitor - type 'help' for more information (qemu) info tlb TLB0: Effective Physical Size TID TS SRWX URWX WIMGE U0123 0x0000000000a80000 0x000000000105d000 4K 117 0 SR--UR-- --M-- U---- 0x0000000000100000 0x000000000114e000 4K 117 0 SR--UR-- --M-- U---- (qemu) After: QEMU 7.2.50 monitor - type 'help' for more information (qemu) info tlb TLB0: Effective Physical Size TID TS SRWX URWX WIMGE U0123 0x00000000b7a00000 0x000000000fcf5000 4K 18 0 SR-- UR-- --M-- U---- 0x0000000000800000 0x000000000fd73000 4K 18 0 SR-- UR-X --M-- U---- TLB1: Effective Physical Size TID TS SRWX URWX WIMGE U0123 0x00000000c0000000 0x0000000000000000 16M 0 0 SR-X U--- --M-- U---- 0x00000000c1000000 0x0000000001000000 16M 0 0 SRW- U--- --M-- U---- (qemu) Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- target/ppc/mmu_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 49067c05e6..8901f4d134 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -980,7 +980,7 @@ static void mmubooke206_dump_one_tlb(CPUPPCState *env, int tlbn, int offset, pa = entry->mas7_3 & ~(size - 1); qemu_printf("0x%016" PRIx64 " 0x%016" PRIx64 " %4s %-5u %1u S%c%c%c" - "U%c%c%c %c%c%c%c%c U%c%c%c%c\n", + " U%c%c%c %c%c%c%c%c U%c%c%c%c\n", (uint64_t)ea, (uint64_t)pa, book3e_tsize_to_str[tsize], (entry->mas1 & MAS1_TID_MASK) >> MAS1_TID_SHIFT, From patchwork Fri Dec 16 14:57:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13075079 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1E5B0C4332F for ; Fri, 16 Dec 2022 14:59:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6C9u-0003re-Kc; Fri, 16 Dec 2022 09:57:58 -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 1p6C9n-0003jp-Fs; Fri, 16 Dec 2022 09:57:52 -0500 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6C9k-00022B-Cm; Fri, 16 Dec 2022 09:57:50 -0500 Received: by mail-ed1-x52b.google.com with SMTP id i9so3982202edj.4; Fri, 16 Dec 2022 06:57:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=pYiiL9uEZUQsj2MEHzmEwuovZw38/E2BXqeIe9IDu4Y=; b=KIgAFAzp65aMz2yt6zJQ2BKZjTwV/znCzDCNw7TB6//fMyHTXm2fXdL+KiyHofz7NY ywtvIqwqG+Jm+7UXI+CaNbvDkjwNu9i3G3EqHEdUyIl4rzJpHy0CyTzuexgMJrJBppTp ulEACeWFRfMrVyvCA4lCMmojckooEjR2QqbVn7j6h4dMHijDWrLl0pC3MfG/Pd46o9sZ 0JN/NmVCyIaJq3JZKDiNvlNhyupSG+RQS1SE8YBxA9yLlPS40M0A5gtH0DvKb5s6rdCx WCASh6idLJwoML83vrRQfvE3ixlWDk2ZsTHuwTPFPhBFOZU/FpKuLqNqNq4hb3fZ856a vIJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=pYiiL9uEZUQsj2MEHzmEwuovZw38/E2BXqeIe9IDu4Y=; b=vMG/zglJR6Kb3IsRMwVMBJ1eub2NMbSxGPCGUnohdi76Mmd1qJ9VL/+A1575DsK4rQ x1GLXAQkspDk4jbWthwH+JUn7nRg1y6M3jQ2o2hPloM3EGeZt0V1JbYKfDNvIntwVIqt /c/HlBcgzYEnzUxiDOYdbLCXFOFbcFocF7GStglvJasB+EMrBGX6ZUEoyYpMHWYLw2sq 4nNK1A6R+syHg8CeDBrKE1oMyX6F6WEBSrRMAS68hvq3s1GlvNrTFcKxJfwSokrzSm4y CmDEOgS/MEgLMZUeMBGEaeY68a+uCydWqHBVtbwNuOs5jVtD2UuZCWbeHarHoWn7yDm0 NViA== X-Gm-Message-State: ANoB5pn47z2Kjfy3mwCfZ3kWt6S3CDiN2LMIryCzq4iBI0Dg/e3EW8JC csgLhTvJQNChOqNh8KEGN75n3UEsTNw= X-Google-Smtp-Source: AA0mqf7kNh4+Bqa+eRLW1VJozgM2kCGWcPBM1ns9cTPbilN7sid3/lksJytzouP1JScSZDuMOWzoLw== X-Received: by 2002:aa7:da85:0:b0:46c:b385:83d2 with SMTP id q5-20020aa7da85000000b0046cb38583d2mr42155826eds.0.1671202665412; Fri, 16 Dec 2022 06:57:45 -0800 (PST) Received: from localhost.localdomain (dynamic-078-055-138-012.78.55.pool.telefonica.de. [78.55.138.12]) by smtp.gmail.com with ESMTPSA id g18-20020aa7c852000000b00467c3cbab6fsm942225edt.77.2022.12.16.06.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 06:57:44 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Laurent Vivier , David Gibson , Michael Tokarev , qemu-trivial@nongnu.org, Daniel Henrique Barboza , Greg Kurz , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Bernhard Beschow Subject: [PATCH 3/6] hw/ppc/virtex_ml507: Prefer local over global variable Date: Fri, 16 Dec 2022 15:57:06 +0100 Message-Id: <20221216145709.271940-4-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216145709.271940-1-shentey@gmail.com> References: <20221216145709.271940-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=shentey@gmail.com; helo=mail-ed1-x52b.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Bernhard Beschow Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daudé --- hw/ppc/virtex_ml507.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 13cace229b..f2f81bd425 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -157,7 +157,7 @@ static int xilinx_load_device_tree(MachineState *machine, int r; const char *dtb_filename; - dtb_filename = current_machine->dtb; + dtb_filename = machine->dtb; if (dtb_filename) { fdt = load_device_tree(dtb_filename, &fdt_size); if (!fdt) { From patchwork Fri Dec 16 14:57:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13075062 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F0865C4332F for ; Fri, 16 Dec 2022 14:58:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6C9w-0003sg-67; Fri, 16 Dec 2022 09:58:01 -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 1p6C9p-0003kO-37; Fri, 16 Dec 2022 09:57:53 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6C9l-00022a-Q3; Fri, 16 Dec 2022 09:57:51 -0500 Received: by mail-ed1-x535.google.com with SMTP id r26so3930139edc.10; Fri, 16 Dec 2022 06:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=dS5n2fq1nBhOITgWTEOZdjZdz9mPAjrDpmZNofzIba4=; b=pu8S5YX3Mi8K5ZwB8FDpDxnCJ4WHvXM/V1w98nDhWoQ0cI65AA2s0tUy9M9jr2Do+E iwIszzYChGjFM28pKjTJSC/RKfxGlbAMcc0FbhCFnsKSnRoSHiDCELM1/ADdUq+ctnPk 1iYkwtMjw+TD9O5AF0rhUyKYYxgAttxs28I47S3Yrl3+nNyeexh1Ue60A83mAZRy7wES H0v3rgQ/DKYhcUciw4pBGIbBvf6Q2jZ50Xo5C9IKCRt6Oar3c9CeSIvPzImmyLWx+YsK rLDpoyP8A1dDN6w3vP49sbil9QdmEect078cPoPTqlmJcaOgyj0wTXusaolKxV/pEI7G TJHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=dS5n2fq1nBhOITgWTEOZdjZdz9mPAjrDpmZNofzIba4=; b=61H8oWwRirgwTOYfFaHzBL0aSIkABhFTNA8/buY9oPNnMKtXv43A1/fblU89xQ9LV+ +k6iFPXqLkDXIZf4hVOejW2E181uNY2Qf5qj49PXt1J1DSr+hWT8BVxHyimbtH/9c2D5 MMx3Jo6FoFmAry8jHlnG5FXX3OzDm3BMkf8xD8d44w6seaYI/O1H4aI83zXivy3dIlcv DkpXzaQhM2UbvqxDWLZlf03m/qsJ7NrEa8egCy2zi4lQt9qCbzQjLFcceIHF8rwb14na uzJD52xbydJpc1ifDnCk5mwwsZ9ta3AmcfJYzjnikzkY82PWgFjLqJPO2zff6lyso1Tu OkSg== X-Gm-Message-State: AFqh2kpWPOfzOs4IGAemyLxQi5ybKJKBmZ7EdB6HDkjj9/Gy3lYJOsf7 WyRFHr+DImsESZbaK8NxbSqMYM8NEUY= X-Google-Smtp-Source: AMrXdXseq/4pW/6RhZaLLO9ZCNOKERrBXihNkSlPkgjZIOHVUV6iwN05ZN0gbFfIeK42D72/py6JBQ== X-Received: by 2002:aa7:c649:0:b0:475:de4a:373f with SMTP id z9-20020aa7c649000000b00475de4a373fmr1866757edr.30.1671202666929; Fri, 16 Dec 2022 06:57:46 -0800 (PST) Received: from localhost.localdomain (dynamic-078-055-138-012.78.55.pool.telefonica.de. [78.55.138.12]) by smtp.gmail.com with ESMTPSA id g18-20020aa7c852000000b00467c3cbab6fsm942225edt.77.2022.12.16.06.57.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 06:57:46 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Laurent Vivier , David Gibson , Michael Tokarev , qemu-trivial@nongnu.org, Daniel Henrique Barboza , Greg Kurz , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Bernhard Beschow Subject: [PATCH 4/6] hw/ppc/e500: Prefer local variable over qdev_get_machine() Date: Fri, 16 Dec 2022 15:57:07 +0100 Message-Id: <20221216145709.271940-5-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216145709.271940-1-shentey@gmail.com> References: <20221216145709.271940-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=shentey@gmail.com; helo=mail-ed1-x535.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- hw/ppc/e500.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 2fe496677c..ad83924004 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -959,7 +959,7 @@ void ppce500_init(MachineState *machine) memory_region_add_subregion(address_space_mem, 0, machine->ram); dev = qdev_new("e500-ccsr"); - object_property_add_child(qdev_get_machine(), "e500-ccsr", + object_property_add_child(OBJECT(machine), "e500-ccsr", OBJECT(dev)); sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); ccsr = CCSR(dev); @@ -1002,7 +1002,7 @@ void ppce500_init(MachineState *machine) /* PCI */ dev = qdev_new("e500-pcihost"); - object_property_add_child(qdev_get_machine(), "pci-host", OBJECT(dev)); + object_property_add_child(OBJECT(machine), "pci-host", OBJECT(dev)); qdev_prop_set_uint32(dev, "first_slot", pmc->pci_first_slot); qdev_prop_set_uint32(dev, "first_pin_irq", pci_irq_nrs[0]); s = SYS_BUS_DEVICE(dev); From patchwork Fri Dec 16 14:57:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13075064 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1B2BC4332F for ; Fri, 16 Dec 2022 14:59:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6C9y-0003xh-6O; Fri, 16 Dec 2022 09:58:02 -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 1p6C9p-0003kM-2O; Fri, 16 Dec 2022 09:57:53 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450: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 1p6C9m-00024E-SL; Fri, 16 Dec 2022 09:57:52 -0500 Received: by mail-ej1-x62c.google.com with SMTP id bj12so6646757ejb.13; Fri, 16 Dec 2022 06:57:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=M+Y2J9PDP4DZ4iDoia/puViG/9DauPlN51y/+zVmrBg=; b=bSgYVQEBucb3IAA+n5YpWx2Oh3MZeFkuyOojYS2S9ws6LAMjAjZI5dLcwV2HifSFkQ CxPQ+amtPc+wX5F9QldKQPDHrEzYP3NctlfpWBGnUjgENdruX0vrmdb6d5L6fx7msqAr /nSeWw97hD0HpTomxqnK9y9KjUDJSIdTyPYgLp7M4+fAd951RZIjKjoGknARL14F/LyZ 98wX1Z6i/k5JD3rzAEx0n2I3Jzqg1/G4kAtIxmXYcYxLSelIrCy9JnZj1MvwkafpOerl t0t+Y2OwY4RuyMRYeQ0hAYXAQ5rJTyPdHYCB+Wv9XxW6FSai5QXOHB0ZDDCUiZ2oPXS5 selQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=M+Y2J9PDP4DZ4iDoia/puViG/9DauPlN51y/+zVmrBg=; b=BN8J4Khf4BPEE7sihpfXVWZepGrbwXbvJN20hWIKFxrMCpRs6JOGTQfNLb/7r4AlpB 4AeGA71iPdlcpXxsO/Px+Zm9eNJNSqodtnBnNoLIqvhTZgqRW6Fq0sEjG277W/nWeH9L VFvsnUZtNkMhw9y0Cotb3VDAB/S5Ukg+8Kn2Qr7h6Y2HJF3DRFo//Wb2h/7qyNe+FhgY 7eXQXheICtGIRa/6EigTRCyPq/Q9TPenoFKYDhf+5T9wvFDIkSpJEfTwMp7WSux4kzWJ fNS5ZSIT9yMHZTHoOgexahD3kbLajVBJySlEQC7fRopX7RNcv/xJIH5aCNRZnyidO5jn aQfQ== X-Gm-Message-State: ANoB5pm1BuR4T1NcVtAXykYnrkCuXM0AKJ28v2NxyfRYRL4VHxtGvEt0 d6W6wvgGsEKGCmeYGZD9KQZFrL9t/Hk= X-Google-Smtp-Source: AA0mqf7EtylOk2nnta7VowpXeOBUt/z0+Nkf93makFpS1oTX94E7BmPEFbGVwboQpstFseD7SLT3VA== X-Received: by 2002:a17:906:351b:b0:7c0:a6a9:64e9 with SMTP id r27-20020a170906351b00b007c0a6a964e9mr37948814eja.36.1671202668616; Fri, 16 Dec 2022 06:57:48 -0800 (PST) Received: from localhost.localdomain (dynamic-078-055-138-012.78.55.pool.telefonica.de. [78.55.138.12]) by smtp.gmail.com with ESMTPSA id g18-20020aa7c852000000b00467c3cbab6fsm942225edt.77.2022.12.16.06.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 06:57:47 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Laurent Vivier , David Gibson , Michael Tokarev , qemu-trivial@nongnu.org, Daniel Henrique Barboza , Greg Kurz , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Bernhard Beschow Subject: [PATCH 5/6] hw/ppc/e500: Resolve variable shadowing Date: Fri, 16 Dec 2022 15:57:08 +0100 Message-Id: <20221216145709.271940-6-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216145709.271940-1-shentey@gmail.com> References: <20221216145709.271940-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=shentey@gmail.com; helo=mail-ej1-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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Assign to the outer variable instead which even saves some code. Signed-off-by: Bernhard Beschow --- hw/ppc/e500.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index ad83924004..104a85ad22 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -883,7 +883,7 @@ void ppce500_init(MachineState *machine) bool kernel_as_payload; hwaddr bios_entry = 0; target_long payload_size; - struct boot_info *boot_info; + struct boot_info *boot_info = NULL; int dt_size; int i; unsigned int smp_cpus = machine->smp.cpus; @@ -938,7 +938,6 @@ void ppce500_init(MachineState *machine) /* Register reset handler */ if (!i) { /* Primary CPU */ - struct boot_info *boot_info; boot_info = g_new0(struct boot_info, 1); qemu_register_reset(ppce500_cpu_reset, cpu); env->load_info = boot_info; @@ -1217,7 +1216,6 @@ void ppce500_init(MachineState *machine) } assert(dt_size < DTB_MAX_SIZE); - boot_info = env->load_info; boot_info->entry = bios_entry; boot_info->dt_base = dt_base; boot_info->dt_size = dt_size; From patchwork Fri Dec 16 14:57:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13075063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D87B6C4167B for ; Fri, 16 Dec 2022 14:58:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6CA0-00043e-Vn; Fri, 16 Dec 2022 09:58:05 -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 1p6C9r-0003lT-Go; Fri, 16 Dec 2022 09:57:57 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6C9o-00024S-V6; Fri, 16 Dec 2022 09:57:54 -0500 Received: by mail-ej1-x629.google.com with SMTP id gh17so6749122ejb.6; Fri, 16 Dec 2022 06:57:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=FmssZAyQ2lc00tGSHG/xjnWcVgniYqgYRJkzWqESq0k=; b=LFo7EbjIMCBpgoR7hN09+87vQmsJZ1T3dot1CzNM4w6Q8pAyHX3MV+e18xYSbSruob 6v+wqZinOJ4CYgySuTCOwhz5U+krqp6+9htqDAcvmBqpDVReRvr9pvolWOck4cKkvWxQ K91+nJyO0uV55fJymzDnfSMCaBn3JEqRdWOHRhrW4PuS4idjEgVqn2bRhOg6YKWyjzud sL1/gPpWK6O/OHVFoD50iH9q8asvrCQzsYimoHkK7oWA/djiRW97+i02kh96OBjgu5/j 349XzbX9TH5KFbK6Km0FM+KnKG6EmN00q+IqN449HQamR/1q/lNrOlMtEatUOX+/tpPZ hIkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=FmssZAyQ2lc00tGSHG/xjnWcVgniYqgYRJkzWqESq0k=; b=e2+DgLM9kaTCCuiLrT4Nttoil5cy3r5upFzRnPFCyBYsaR5sfA7zP+WG283Q+g4V9R US91MId3TAIJwBWwBb4Q0F737oyE29sS+ydLdUyDdkH1SSCdISP2IBuUIKaRGgg2yVvh QEOYjPexEWiS6LnNasDbZZjGyzZ4Lw0EKMCB7B6/GTFHg1YGzqkNKvFEAOHNx+FzBbbG opAXqI6IeNZqLdirtpV4GyHgHJgV9yLZZCNSV0gsyndALY0ezE3OBt1Zw/8hshSPc5Ky iygbYohUvqFK1lHumuubZdI7dBng94MfQCuMlulhRMuoDQ4WtQSmeiQBc/bnuclfbPAx Ar+A== X-Gm-Message-State: ANoB5pnLhREUp3NBEU4y0CmzLJRLDg1ivnrJCfvVd0QN4BfiZbe+W+qS roDLAB48HENglsxH4NQq4Q8EHydKfcA= X-Google-Smtp-Source: AA0mqf4FygQgI8NX+FQafo6PPn6WxbaxxT1VL9952n4GfEk1tpHaRNZj69iU135WVHplbTbNhEY5jA== X-Received: by 2002:a17:906:b013:b0:7ba:fcc1:f284 with SMTP id v19-20020a170906b01300b007bafcc1f284mr28437358ejy.73.1671202670303; Fri, 16 Dec 2022 06:57:50 -0800 (PST) Received: from localhost.localdomain (dynamic-078-055-138-012.78.55.pool.telefonica.de. [78.55.138.12]) by smtp.gmail.com with ESMTPSA id g18-20020aa7c852000000b00467c3cbab6fsm942225edt.77.2022.12.16.06.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Dec 2022 06:57:49 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, "Edgar E. Iglesias" , Laurent Vivier , David Gibson , Michael Tokarev , qemu-trivial@nongnu.org, Daniel Henrique Barboza , Greg Kurz , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Bernhard Beschow Subject: [PATCH 6/6] hw/ppc/e500: Move comment to more appropriate place Date: Fri, 16 Dec 2022 15:57:09 +0100 Message-Id: <20221216145709.271940-7-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221216145709.271940-1-shentey@gmail.com> References: <20221216145709.271940-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.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 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The TLB entries are set up in mmubooke_create_initial_mapping(), not in booke206_page_size_to_tlb(). Signed-off-by: Bernhard Beschow --- hw/ppc/e500.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 104a85ad22..c6aeccce7a 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -692,7 +692,6 @@ static int ppce500_prep_device_tree(PPCE500MachineState *machine, kernel_base, kernel_size, true); } -/* Create -kernel TLB entries for BookE. */ hwaddr booke206_page_size_to_tlb(uint64_t size) { return 63 - clz64(size / KiB); @@ -723,6 +722,7 @@ static uint64_t mmubooke_initial_mapsize(CPUPPCState *env) return (1ULL << 10 << tsize); } +/* Create -kernel TLB entries for BookE. */ static void mmubooke_create_initial_mapping(CPUPPCState *env) { ppcmas_tlb_t *tlb = booke206_get_tlbm(env, 1, 0, 0);