From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFE03C433B4 for ; Thu, 22 Apr 2021 10:53:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D81D961452 for ; Thu, 22 Apr 2021 10:53:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D81D961452 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lZWxH-0004IW-RK for qemu-devel@archiver.kernel.org; Thu, 22 Apr 2021 06:53:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZWrt-0005kK-LC; Thu, 22 Apr 2021 06:47:34 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:36509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZWrs-00050m-7S; Thu, 22 Apr 2021 06:47:33 -0400 Received: by mail-wr1-x433.google.com with SMTP id m9so31565452wrx.3; Thu, 22 Apr 2021 03:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y73DhisXrZCkQN7S3qTtV5uihkPH6tpgdxs7MXvhbiA=; b=undSZNoGnciSySVrOpga/wm4OMA7T7l91EHCRUVeSb8dRpaKKZaLBSLlUb5ilRqF5/ X4h+62CD/GXfIg3IIIBk16+Um/9QVK0kEvSmV2YJYb9g1fJr9H+8qSaBxckOLhx0+OQe ZvltPLaewLuiI4FiCokosjwWArim01IEVrLaJrI68Yoi92nKq0fHcjecSb8lpSbOIBrn dR7xJgXRjd+ELG83Jxupjgv6t4YRwtwc3ua0CaKC8TV2eWP5WeDadqAhk6IxP3D/4JFc 0ZeOefZ+dt19jFYtrac1FtSN3mTyYlpy3uCrdGzKpd2gO1TE58cgLncDLxEY39zg00nb f+sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Y73DhisXrZCkQN7S3qTtV5uihkPH6tpgdxs7MXvhbiA=; b=H/uYckKpO7svOq/qop//hME2DBvJRzP0Ka+1TvrxfgsVp/Z8AWw7f0ty/OfwOLdd2W HOi3CZfZvqG2L3IqFnp4/o6k+u0klwr24oup+24E8PlNQgGQ+jNEfBN9szNlByR04WDO LeOFfRFcdeALz1ca032nwm1pDnPpYwGu8DrdxmEaP5DgcM2ESHubPfovKMYveAhxBF92 Fl65FPuCcOvk9q00s3h0fdKKFdYwG93eZ49nQtsKBs4BnZTkMN5IzyHX5dzLMzyBe73M sIues9rohLVk4RINczLNeIhyAkZCtgdduRHQkcGrwqDtDo/2/MH0IP0lfz49dI64N/tW XyUg== X-Gm-Message-State: AOAM5300EZrUISBZOFTz+ta5G7wLU1LbQ2IGYGMI5UgV51kJRoYZn74a HzuzFSC3HJ6+jLYQkqBPk69XwyT9EAGxEw== X-Google-Smtp-Source: ABdhPJx72+wi4LyhqOEl+CCrKDQyMmLDmXOtS+MIAtPg7mFF/nBWScy18VBztKeu1wFvLYW2S6kPyg== X-Received: by 2002:a5d:5146:: with SMTP id u6mr3309964wrt.408.1619088449329; Thu, 22 Apr 2021 03:47:29 -0700 (PDT) Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id l7sm3280863wrb.35.2021.04.22.03.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 03:47:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v5 04/15] cpu: Directly use get_paging_enabled() fallback handlers in place Date: Thu, 22 Apr 2021 12:46:53 +0200 Message-Id: <20210422104705.2454166-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210422104705.2454166-1-f4bug@amsat.org> References: <20210422104705.2454166-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-riscv@nongnu.org, Eduardo Habkost , Juan Quintela , "Michael S. Tsirkin" , Richard Henderson , Greg Kurz , Laurent Vivier , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Claudio Fontana , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" No code uses CPUClass::get_paging_enabled() outside of hw/core/cpu.c: $ git grep -F -- '->get_paging_enabled' hw/core/cpu.c:74: return cc->get_paging_enabled(cpu); hw/core/cpu.c:438: k->get_paging_enabled = cpu_common_get_paging_enabled; target/i386/cpu.c:7418: cc->get_paging_enabled = x86_cpu_get_paging_enabled; Check the handler presence in place and remove the common fallback code. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/core/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/core/cpu.c b/hw/core/cpu.c index a9ee2c74ec5..1de00bbb474 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -71,11 +71,10 @@ bool cpu_paging_enabled(const CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); - return cc->get_paging_enabled(cpu); -} + if (cc->get_paging_enabled) { + return cc->get_paging_enabled(cpu); + } -static bool cpu_common_get_paging_enabled(const CPUState *cpu) -{ return false; } @@ -420,7 +419,6 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->parse_features = cpu_common_parse_features; k->get_arch_id = cpu_common_get_arch_id; k->has_work = cpu_common_has_work; - k->get_paging_enabled = cpu_common_get_paging_enabled; k->get_memory_mapping = cpu_common_get_memory_mapping; k->gdb_read_register = cpu_common_gdb_read_register; k->gdb_write_register = cpu_common_gdb_write_register; -- 2.26.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1lZWrw-0005mr-Q8 for mharc-qemu-riscv@gnu.org; Thu, 22 Apr 2021 06:47:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lZWrt-0005kK-LC; Thu, 22 Apr 2021 06:47:34 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:36509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lZWrs-00050m-7S; Thu, 22 Apr 2021 06:47:33 -0400 Received: by mail-wr1-x433.google.com with SMTP id m9so31565452wrx.3; Thu, 22 Apr 2021 03:47:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y73DhisXrZCkQN7S3qTtV5uihkPH6tpgdxs7MXvhbiA=; b=undSZNoGnciSySVrOpga/wm4OMA7T7l91EHCRUVeSb8dRpaKKZaLBSLlUb5ilRqF5/ X4h+62CD/GXfIg3IIIBk16+Um/9QVK0kEvSmV2YJYb9g1fJr9H+8qSaBxckOLhx0+OQe ZvltPLaewLuiI4FiCokosjwWArim01IEVrLaJrI68Yoi92nKq0fHcjecSb8lpSbOIBrn dR7xJgXRjd+ELG83Jxupjgv6t4YRwtwc3ua0CaKC8TV2eWP5WeDadqAhk6IxP3D/4JFc 0ZeOefZ+dt19jFYtrac1FtSN3mTyYlpy3uCrdGzKpd2gO1TE58cgLncDLxEY39zg00nb f+sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Y73DhisXrZCkQN7S3qTtV5uihkPH6tpgdxs7MXvhbiA=; b=H/uYckKpO7svOq/qop//hME2DBvJRzP0Ka+1TvrxfgsVp/Z8AWw7f0ty/OfwOLdd2W HOi3CZfZvqG2L3IqFnp4/o6k+u0klwr24oup+24E8PlNQgGQ+jNEfBN9szNlByR04WDO LeOFfRFcdeALz1ca032nwm1pDnPpYwGu8DrdxmEaP5DgcM2ESHubPfovKMYveAhxBF92 Fl65FPuCcOvk9q00s3h0fdKKFdYwG93eZ49nQtsKBs4BnZTkMN5IzyHX5dzLMzyBe73M sIues9rohLVk4RINczLNeIhyAkZCtgdduRHQkcGrwqDtDo/2/MH0IP0lfz49dI64N/tW XyUg== X-Gm-Message-State: AOAM5300EZrUISBZOFTz+ta5G7wLU1LbQ2IGYGMI5UgV51kJRoYZn74a HzuzFSC3HJ6+jLYQkqBPk69XwyT9EAGxEw== X-Google-Smtp-Source: ABdhPJx72+wi4LyhqOEl+CCrKDQyMmLDmXOtS+MIAtPg7mFF/nBWScy18VBztKeu1wFvLYW2S6kPyg== X-Received: by 2002:a5d:5146:: with SMTP id u6mr3309964wrt.408.1619088449329; Thu, 22 Apr 2021 03:47:29 -0700 (PDT) Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id l7sm3280863wrb.35.2021.04.22.03.47.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 03:47:28 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Claudio Fontana , Juan Quintela , Greg Kurz , Laurent Vivier , qemu-riscv@nongnu.org, "Michael S. Tsirkin" , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Peter Maydell , qemu-arm@nongnu.org, Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Marcel Apfelbaum Subject: [PATCH v5 04/15] cpu: Directly use get_paging_enabled() fallback handlers in place Date: Thu, 22 Apr 2021 12:46:53 +0200 Message-Id: <20210422104705.2454166-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210422104705.2454166-1-f4bug@amsat.org> References: <20210422104705.2454166-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-riscv@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 10:47:34 -0000 No code uses CPUClass::get_paging_enabled() outside of hw/core/cpu.c: $ git grep -F -- '->get_paging_enabled' hw/core/cpu.c:74: return cc->get_paging_enabled(cpu); hw/core/cpu.c:438: k->get_paging_enabled = cpu_common_get_paging_enabled; target/i386/cpu.c:7418: cc->get_paging_enabled = x86_cpu_get_paging_enabled; Check the handler presence in place and remove the common fallback code. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- hw/core/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/core/cpu.c b/hw/core/cpu.c index a9ee2c74ec5..1de00bbb474 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -71,11 +71,10 @@ bool cpu_paging_enabled(const CPUState *cpu) { CPUClass *cc = CPU_GET_CLASS(cpu); - return cc->get_paging_enabled(cpu); -} + if (cc->get_paging_enabled) { + return cc->get_paging_enabled(cpu); + } -static bool cpu_common_get_paging_enabled(const CPUState *cpu) -{ return false; } @@ -420,7 +419,6 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->parse_features = cpu_common_parse_features; k->get_arch_id = cpu_common_get_arch_id; k->has_work = cpu_common_has_work; - k->get_paging_enabled = cpu_common_get_paging_enabled; k->get_memory_mapping = cpu_common_get_memory_mapping; k->gdb_read_register = cpu_common_gdb_read_register; k->gdb_write_register = cpu_common_gdb_write_register; -- 2.26.3