From nobody Thu Nov 6 00:14:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619120372; cv=none; d=zohomail.com; s=zohoarc; b=AcCReCzfVJr4uBbhPST8Gr2KlZCv9XVmyiS3TBBAvajCNlmvAOwitYRpHOn6keKrb973b8IU5524SnGoM1ezGDZSW/NO0jemS8vTjyp+ve6Sjk3CVhCYBWho2vtG0iJIHzVsiAmVc75aUMLuiEw5+yx3eqJeuCO9lwWDjauwAy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619120372; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AsKH3RYUFA9evmZE7qWhREuizy9iouUOsbLguH/0Dwo=; b=lrhhuqS/xOqSrm1hH2h4ZttSVPeMJkyFCsrnbW/8kLiR5jQVbf9Z3QYdCK3tubHcuLqSrqR3weCg1GyoZYR3um3DeicmH7DowbGEnDjuZWkgNxwe/FgNRItu4sf3hXMmL1opWtGpSJc/4nIAqef+yCyc3lca/McZDuY5TUFJMMU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1619120372525523.5355192918107; Thu, 22 Apr 2021 12:39:32 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id o9-20020a1c41090000b029012c8dac9d47so3892155wma.1 for ; Thu, 22 Apr 2021 12:39:31 -0700 (PDT) Return-Path: Return-Path: 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 d10sm5168077wri.41.2021.04.22.12.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Apr 2021 12:39: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=AsKH3RYUFA9evmZE7qWhREuizy9iouUOsbLguH/0Dwo=; b=c1otoi1WCXL6aNmuI6x5KXVJZOrEybgYc1TzaE25gCbJQKRm27GMyzgzjb2AYFrGFb mxZVVQiyEgzyrPF9vZ1wBXH1NlNBIy3uRymvro3LAaG1HTt36brCmIiE1ec+9GIUZgHV C2rt50wrYHSuh3C7TorkXFRyG+oi6ma1IOhpDmm755w1wK6Y5qvw33uDanUAOuC9fZvg y7JPK4w8uPq9yVn7TOu36zfhcwgE3sACA8NzCc2larv0WAjmPcma9BqJrDEgV5hi+9/D 6zvE/mt+6HGwz/Rg/z8IqZ5175pINYMvNNIpwlv2ToUesEfy9PyWwAZyYZVvKS26v60t VNyg== 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=AsKH3RYUFA9evmZE7qWhREuizy9iouUOsbLguH/0Dwo=; b=Qp/iXzJTCqulHA8uFv6ewmmyUMwkLKUj/9aeGFitUaIxqibtzlDcKu2iFrUCYTuy4U 0ufh0hd0icTslryblfCMIZOzByYr+/OOLbAjx2+30ycIK1fcCZxASLzJ6UvFs8iYLY9M mclaGsLsSENnvTraT1L/GgBXAnUD3Ht6wMa0UgnzPezsbGxLz3V3xW4Fh8ptfT+Ar9QY vfHyrmEW+b+nhh0kUPG2zxeEMvO1QvQQGHfR15fjBOpVyp4Iqnj0YtoknO6A8io9x7Cs zozFqeyH5OgTb8cWPAu5gJU2lppdteyNl0IEJEsc+14KNtEhW1/R+8G245KZmBkBx0Ux jIwg== X-Gm-Message-State: AOAM530/b35NkQqmxYpxpyLYLfiOs2YJVANwvcehssuYHPR3ajpC/dZu e3hDPE5xDJMRJIRLYHq5EGU= X-Google-Smtp-Source: ABdhPJxuKKgioOw/Ijp+w6NdSrrFnSOogH9XGu3pGAxKm7eRkzIJ/hI7iQ6RzIMA/+3ZMHVf25qo+w== X-Received: by 2002:a7b:ce09:: with SMTP id m9mr382732wmc.150.1619120370730; Thu, 22 Apr 2021 12:39:30 -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: "Dr. David Alan Gilbert" , qemu-riscv@nongnu.org, Juan Quintela , Peter Maydell , Claudio Fontana , qemu-arm@nongnu.org, Eduardo Habkost , qemu-ppc@nongnu.org, Richard Henderson , Laurent Vivier , qemu-s390x@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum Subject: [PATCH v6 05/18] cpu: Directly use get_memory_mapping() fallback handlers in place Date: Thu, 22 Apr 2021 21:38:49 +0200 Message-Id: <20210422193902.2644064-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210422193902.2644064-1-f4bug@amsat.org> References: <20210422193902.2644064-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) No code uses CPUClass::get_memory_mapping() outside of hw/core/cpu.c: $ git grep -F -- '->get_memory_mapping' hw/core/cpu.c:87: cc->get_memory_mapping(cpu, list, errp); hw/core/cpu.c:439: k->get_memory_mapping =3D cpu_common_get_memory_map= ping; target/i386/cpu.c:7422: cc->get_memory_mapping =3D x86_cpu_get_memory_= mapping; Check the handler presence in place and remove the common fallback code. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/core/cpu.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 1de00bbb474..5abf8bed2e4 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -83,13 +83,11 @@ void cpu_get_memory_mapping(CPUState *cpu, MemoryMappin= gList *list, { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 - cc->get_memory_mapping(cpu, list, errp); -} + if (cc->get_memory_mapping) { + cc->get_memory_mapping(cpu, list, errp); + return; + } =20 -static void cpu_common_get_memory_mapping(CPUState *cpu, - MemoryMappingList *list, - Error **errp) -{ error_setg(errp, "Obtaining memory mappings is unsupported on this CPU= ."); } =20 @@ -419,7 +417,6 @@ static void cpu_class_init(ObjectClass *klass, void *da= ta) k->parse_features =3D cpu_common_parse_features; k->get_arch_id =3D cpu_common_get_arch_id; k->has_work =3D cpu_common_has_work; - k->get_memory_mapping =3D cpu_common_get_memory_mapping; k->gdb_read_register =3D cpu_common_gdb_read_register; k->gdb_write_register =3D cpu_common_gdb_write_register; set_bit(DEVICE_CATEGORY_CPU, dc->categories); --=20 2.26.3