From nobody Wed Nov 19 04:32:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) client-ip=209.85.221.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614357189; cv=none; d=zohomail.com; s=zohoarc; b=dIygfmbuhS/BHOtSafp4lyKGo95F9lgsTlj2dJi5YOtMog0UbMKYvZmB+lqf1gCIH3NdHs+w/AkiZhr+6ZUcRE25oDUidKswB7lJSkKTsTGFhaPHi9wdNkboQsqxnFS+8kGFd6K82hLVfJFLsc1AtXKUKZvPjVsvxaxBBTMbU0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614357189; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iDkHmNWDJUjsisDNEA+tDXF79jqbgWv+Yeaa+F2Cdm4=; b=ngSZwEg/L4yIxoTSmWWBopA7BHWJsIt7ezsyzNcyA9pAtehSVY5BrXOK3bpCLniOsaJQGTWwDm009vN12lMor6lXmRHXyy3ZrRjeqKGzbGsDBb0XlFtYoDONG7KdJJJ+boA6x/qKyOTz8uYVHNUThTVVXYmSWo2X8vTtk006lmU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mx.zohomail.com with SMTPS id 1614357189004551.9940443023239; Fri, 26 Feb 2021 08:33:09 -0800 (PST) Received: by mail-wr1-f48.google.com with SMTP id n4so9179358wrx.1 for ; Fri, 26 Feb 2021 08:33:08 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id u4sm13542416wrr.37.2021.02.26.08.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 08:33:06 -0800 (PST) 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=iDkHmNWDJUjsisDNEA+tDXF79jqbgWv+Yeaa+F2Cdm4=; b=rhVyMHsN6sD4XaBIDbOSPH1f1Gxr3TD8f2RxmMFKtq7gJOLr9b9PCG7lF2RGJdV+a3 EPKU5+KwYMhmhmFfgwQ846SFNCq9yEwx90M2M4mamOpZr0rr3DuqHZyHUaX3z9qovWfY fLc+IKIokbn1R+jlLTV1aJ+ZbjWU/3ZDv3zn4RoRCAWR9uxMY6YYaK9G/381qbrMSbIl 2NfWE/eMlHxRTeiJog1gV8HCQO7afmWuqVXh1gAOqHWTwX8LkGaXz8xt6Ie5vadA6U2c WeFjXCAvr79dn/okef5E+E3lmQMd4G0ygdkqSUHgf12ErIe1czDxwREOBsGJ2/e3F0gd PPsw== 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=iDkHmNWDJUjsisDNEA+tDXF79jqbgWv+Yeaa+F2Cdm4=; b=L6JG+Oqsm8AYwnXkw0Ysb8ozs9rmR2gYqobRKaDtDqkSNfb9ZwWD73of+ZBixWvdiG BLubNpjxU4pFQNi8Pj7+IeLGtAZXDNnod47iYh2V3nx2iXedar/9H8G6F3qAs4DVrZWT KcP6CEkqJVdRkAaoK9MrzPqYbCqrCpVtOH7amb8JM5CgfMQ2S+rdiZ/HnS4jtqNxGAiu NhcfHd26f/3GcJK12LhRnrgZ3xhgvnUhKm5q8g5h0mDpryzpfK9x+ieZ/i46l80jN1Iu +/iA9xvWI0IA8WcUqNGYgbdn/7SlWemg1iuQWIw9A48fUyJSkoxHC/H6hX0MinFvrlpG koNg== X-Gm-Message-State: AOAM532kgvP9PODis7lrgUGpwaiCw3tyxj9A4pvYX6nvO+cwovdoetXu /0UTYaRuNxqHuuol5V8H394= X-Google-Smtp-Source: ABdhPJxqjSMsXYtj2QXQr+6zgeLmiV+MsnF1M83EQ0njAM80bc1w/PXXjJ1efpDeWkDlTSCXO7L4pQ== X-Received: by 2002:adf:dcd2:: with SMTP id x18mr4226702wrm.361.1614357187210; Fri, 26 Feb 2021 08:33:07 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Sarah Harris , Paolo Bonzini , Max Filippov , Yoshinori Sato , qemu-s390x@nongnu.org, Michael Rolnik , qemu-ppc@nongnu.org, Marek Vasut , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , Michael Walle , Guan Xuetao , Laurent Vivier , Anthony Green , Palmer Dabbelt , David Hildenbrand , qemu-riscv@nongnu.org, David Gibson , Peter Maydell , Cornelia Huck , Jiaxun Yang , Richard Henderson , Chris Wulff , "Michael S. Tsirkin" , Aurelien Jarno , Aleksandar Rikalo , Sagar Karandikar , Claudio Fontana , Thomas Huth , Artyom Tarasenko , Greg Kurz , Stafford Horne , Bastian Koppelmann , Mark Cave-Ayland , Marcel Apfelbaum , "Edgar E. Iglesias" Subject: [PATCH 06/16] cpu: Directly use get_memory_mapping() fallback handlers in place Date: Fri, 26 Feb 2021 17:32:17 +0100 Message-Id: <20210226163227.4097950-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210226163227.4097950-1-f4bug@amsat.org> References: <20210226163227.4097950-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. 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.2