From nobody Tue Feb 10 20:07:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.52 as permitted sender) client-ip=209.85.208.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614697147; cv=none; d=zohomail.com; s=zohoarc; b=DEGtwXnijgdkcYTIEH1zFdITbbeNGNP8AZXep5kmka/4+5UNnEkHwNnywSEm1i1W3x9raYOTC8gxlp99n7QiApk5LseL8Lxkd2w1E2Jtg1xID5xH1letO1e9K2sYNmGYBkHGxprWnZuZFIP8fOuVwqoPdeL9NSNyMxKIu4wIS14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614697147; 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=MZdbWrxzeHZsQqXP9J/x+NOJnaXT2r48aghTnRU4umI3w3Y5weqc1205/MGyml5VmvregmCItlqdlq+rZBuYouFRvV34UmTDoHlfTpcxBJeOHYP1iLrGjP5N1uutRpJHtZCPT7Rlc0b8fznTVEirygeERNjOkoc0b6lcMw3w67k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.zohomail.com with SMTPS id 1614697147385853.5863557396373; Tue, 2 Mar 2021 06:59:07 -0800 (PST) Received: by mail-ed1-f52.google.com with SMTP id l12so25539983edt.3 for ; Tue, 02 Mar 2021 06:59:06 -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 q18sm16520383eji.100.2021.03.02.06.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Mar 2021 06:59:04 -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=kVLUnHspJyIvBEWj+E9qUPp1Qh5iHn8Q6lrsAKp62fcgX68jBggwX11G1ZAH9z1aNP 0qOa6D00MSG8x1QfGX4KtJ5wmVdYjJqG1q0eQ3wcCTSTlPC2oEu7EcsN1XnnBIcganWL Pp82N59mH2X/rQkDVrOH60/8vLmkwzpUcufFs1wqDwhlXmf9zfOprsvWim4cZSUgDlv2 Xocj4eO9T3rSSNwP8D+/WfQ7KQpmRskv8Qb2EUsSt8ykorI4su7z5oP68sO07KRYx3Ph WJw/P62qZoiR0O4MulWLzB3kE/znOJrT32WwDceFa60fBE5QeUInZuzfMo3FArMDYNEU pz4g== 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=R0RlL0i4qg+V40rCnuKPe7IqK+sdY5nN4oS3+TCDF6u96E/N8xp9AjQz9mojJmTM3R v4CNytfU/2EhqVjWorbe30z/67tu1dx/qRzA6wlR5HQw4MLqB8dAyZiAzrJUWDztBS5I p2wxYvRIuw4wChXfXPWa9MbLLXsaSyhkMi0x/opTjd1MbrdkzhjDF42hrDnF4n7rSj/0 YzhnSRqAZq1d4mpXC1LKqGPu7Jcoqqm+dys6ktmdJF/1oEW27ai1QRJddAy8+TRFF2ZU E1BNYPOSV2yP32n710Q5hdY6wCPfCl/SXRBwViGOsmS7Phigm7sf0Of9oprgeqca5dRT 2mRQ== X-Gm-Message-State: AOAM533Zz1JOWtuxNGx2CsupF5xmMtHqkA8m+cJvw12VXbfPd03ZURtd BwU2tvs0AtT8vI10mal7ruo= X-Google-Smtp-Source: ABdhPJz6BIFMUMLQH5Qh9VKBfT7syr5VibvnTHgVfIgpPM6beywX8pSQQk+mYAjVUchMlmtY4TZBvA== X-Received: by 2002:aa7:d642:: with SMTP id v2mr19207256edr.257.1614697145594; Tue, 02 Mar 2021 06:59:05 -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: Thomas Huth , qemu-arm@nongnu.org, Max Filippov , David Gibson , "Edgar E. Iglesias" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Guan Xuetao , Alistair Francis , Michael Rolnik , Palmer Dabbelt , Richard Henderson , Laurent Vivier , Paolo Bonzini , Greg Kurz , Stafford Horne , qemu-ppc@nongnu.org, Anthony Green , Aurelien Jarno , Jiaxun Yang , Cornelia Huck , Claudio Fontana , Sagar Karandikar , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Walle , Marek Vasut , Marcel Apfelbaum , Artyom Tarasenko , Peter Maydell , Aleksandar Rikalo , Chris Wulff , David Hildenbrand , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-s390x@nongnu.org, Sarah Harris , Eduardo Habkost , Bastian Koppelmann , qemu-riscv@nongnu.org, Mark Cave-Ayland , "Michael S. Tsirkin" , Yoshinori Sato , Taylor Simpson Subject: [PATCH v3 06/27] cpu: Directly use get_memory_mapping() fallback handlers in place Date: Tue, 2 Mar 2021 15:57:57 +0100 Message-Id: <20210302145818.1161461-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210302145818.1161461-1-f4bug@amsat.org> References: <20210302145818.1161461-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