From nobody Tue Feb 10 11:15:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614808097; cv=none; d=zohomail.com; s=zohoarc; b=OAFGfWk7DVZhs+E3/CDXlAlKEQ8WIX9AUeDiB51BymUD35UpDTpRR3QffRx2xw8N4poOTalGhQpvsuMxccMcFVVS9mf6Lpn/8u/qvQPVf+A6YJGsPbU/HaPNWc+DK2dvyeMIhX4UTN9vQhi6h83XIvFUEbkFHErs5dEkWPNYblE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614808097; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SGgvJvthMXD03HaoXNm8wXH0XCzERc2USBOw0EtbwiA=; b=Isq0lv3gFj0ZbFtCD3SG49644UJhTViPUvCIpYCZLQGy7LD0EBiclTN5JiCFFWgjkGaBp1afhGnPF8y7wKHgzcfXHA0mg/pyAYSl2WL6oniltL+q/vGHx/hiBnPvAXwST52/VE4T7bVsamJ4/L20F5QLWZRF8FECUmtmsYdFc94= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1614808097824830.5221981501988; Wed, 3 Mar 2021 13:48:17 -0800 (PST) Received: by mail-wr1-f42.google.com with SMTP id e10so25124295wro.12 for ; Wed, 03 Mar 2021 13:48:17 -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 p17sm6567070wmq.47.2021.03.03.13.48.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Mar 2021 13:48:15 -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=SGgvJvthMXD03HaoXNm8wXH0XCzERc2USBOw0EtbwiA=; b=Mc4d/acAmB+6BqJYXabbkaPu4sAg7su+vbKRsuJpl28QVvFI2w48rM+a6juPZXFknq cLCJ+zVdFbjIFyr9FKEjIGqw4Gcjo0LpyJNKu55vG8glS1GrM1RGJYqZH8SlSaQUtPZV /ell4udmI49GNj3Zv9jgDa8tOH2YE6pSGRcTdiYMUABCI48c9OczNnox7cQ445VnEXxD sHkue5Xo4hVndVoUg5cPRcUmyrvm4h8ORizDW1xq4769FaAZev8Cm9XadvWNw0L8LF5o jQuJpggthS7vkv2oe82rW9E1xVajhoGoikVmbO7PcbVay14cng3zrJaS3aNqpqy+IpIH wHxg== 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=SGgvJvthMXD03HaoXNm8wXH0XCzERc2USBOw0EtbwiA=; b=Ktcadlu7r31zL7Wsq3fC1ypowtoDipL0LDjg65NwG28yjr/4k78FeI63+On/OQzfB6 uTVgDonvSpIiBMn7M78k4pj4Lzf5CdnwGmGKDqTdYbq1UbahuKncIWwMjnYzoGJTKhVA NBiPjp0VYT/RKLz3xyWH5JUGwtLM4jNPMQx6cd6kbhoIO/3W0H7Q73P8xEVhcf25DQLH 1VOLlJxh5vnHa/FQE1wMBfjn1r3jR/RCVXJbBqqPpkUZPJB6GDW2LUDqO4xV1nJpy+cW mM0jRr9DQdvzlojX76HFWQB50pWOPD+ocu80G1CR6mWWth0witlqQrnvIWYh+6h3VAUG bK5Q== X-Gm-Message-State: AOAM533OTKSrChF/M6TKPHA4Wxt3Zi+RuD2Zy4Jc+7G9VzTcYjywNjCF toYocxEUVI5MwtrPERa2tF0= X-Google-Smtp-Source: ABdhPJxy6nmNPxPJ4qgF5x2edIw+9apnghtsUsx1OJKtIU9w7yoRpaOD+eauKex9Y1vj4ZL0oU7IsQ== X-Received: by 2002:a5d:6b0a:: with SMTP id v10mr668671wrw.183.1614808096132; Wed, 03 Mar 2021 13:48:16 -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: Claudio Fontana , qemu-arm@nongnu.org, Peter Maydell , Paolo Bonzini , Richard Henderson , qemu-s390x@nongnu.org, Thomas Huth , qemu-ppc@nongnu.org, Laurent Vivier , Cornelia Huck , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , Marcel Apfelbaum Subject: [PATCH v4 12/28] cpu: Move CPUClass::asidx_from_attrs to SysemuCPUOps Date: Wed, 3 Mar 2021 22:46:52 +0100 Message-Id: <20210303214708.1727801-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210303214708.1727801-1-f4bug@amsat.org> References: <20210303214708.1727801-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) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/core/cpu.h | 3 --- include/hw/core/sysemu-cpu-ops.h | 5 +++++ hw/core/cpu.c | 4 ++-- target/arm/cpu.c | 2 +- target/i386/cpu.c | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 0a2c29c3735..6713a615916 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -108,8 +108,6 @@ struct AccelCPUClass; * associated memory transaction attributes to use for the access. * CPUs which use memory transaction attributes should implement this * instead of get_phys_page_debug. - * @asidx_from_attrs: Callback to return the CPU AddressSpace to use for - * a memory access with the specified memory transaction attributes. * @gdb_read_register: Callback for letting GDB read a register. * @gdb_write_register: Callback for letting GDB write a register. * @gdb_num_core_regs: Number of core registers accessible to GDB. @@ -151,7 +149,6 @@ struct CPUClass { hwaddr (*get_phys_page_debug)(CPUState *cpu, vaddr addr); hwaddr (*get_phys_page_attrs_debug)(CPUState *cpu, vaddr addr, MemTxAttrs *attrs); - int (*asidx_from_attrs)(CPUState *cpu, MemTxAttrs attrs); int (*gdb_read_register)(CPUState *cpu, GByteArray *buf, int reg); int (*gdb_write_register)(CPUState *cpu, uint8_t *buf, int reg); =20 diff --git a/include/hw/core/sysemu-cpu-ops.h b/include/hw/core/sysemu-cpu-= ops.h index 60c667801ef..3c3f211136d 100644 --- a/include/hw/core/sysemu-cpu-ops.h +++ b/include/hw/core/sysemu-cpu-ops.h @@ -16,6 +16,11 @@ * struct SysemuCPUOps: System operations specific to a CPU class */ typedef struct SysemuCPUOps { + /** + * @asidx_from_attrs: Callback to return the CPU AddressSpace to use f= or + * a memory access with the specified memory transaction attribu= tes. + */ + int (*asidx_from_attrs)(CPUState *cpu, MemTxAttrs attrs); /** * @get_crash_info: Callback for reporting guest crash information in * GUEST_PANICKED events. diff --git a/hw/core/cpu.c b/hw/core/cpu.c index c74390aafbf..c44229205ff 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -116,8 +116,8 @@ int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attr= s) CPUClass *cc =3D CPU_GET_CLASS(cpu); int ret =3D 0; =20 - if (cc->asidx_from_attrs) { - ret =3D cc->asidx_from_attrs(cpu, attrs); + if (cc->sysemu_ops->asidx_from_attrs) { + ret =3D cc->sysemu_ops->asidx_from_attrs(cpu, attrs); assert(ret < cpu->num_ases && ret >=3D 0); } return ret; diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 0c06b9b1758..7edb9f581bc 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2262,6 +2262,7 @@ static gchar *arm_gdb_arch_name(CPUState *cs) =20 #ifndef CONFIG_USER_ONLY static const struct SysemuCPUOps arm_sysemu_ops =3D { + .asidx_from_attrs =3D arm_asidx_from_attrs, .write_elf32_note =3D arm_cpu_write_elf32_note, .write_elf64_note =3D arm_cpu_write_elf64_note, .virtio_is_big_endian =3D arm_cpu_virtio_is_big_endian, @@ -2307,7 +2308,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void = *data) cc->gdb_write_register =3D arm_cpu_gdb_write_register; #ifndef CONFIG_USER_ONLY cc->get_phys_page_attrs_debug =3D arm_cpu_get_phys_page_attrs_debug; - cc->asidx_from_attrs =3D arm_asidx_from_attrs; cc->sysemu_ops =3D &arm_sysemu_ops; #endif cc->gdb_num_core_regs =3D 26; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 403ed65fc61..4f64f9c2d68 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7388,6 +7388,7 @@ static Property x86_cpu_properties[] =3D { =20 #ifndef CONFIG_USER_ONLY static const struct SysemuCPUOps i386_sysemu_ops =3D { + .asidx_from_attrs =3D x86_asidx_from_attrs, .get_crash_info =3D x86_cpu_get_crash_info, .write_elf32_note =3D x86_cpu_write_elf32_note, .write_elf64_note =3D x86_cpu_write_elf64_note, @@ -7429,7 +7430,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc= , void *data) cc->get_paging_enabled =3D x86_cpu_get_paging_enabled; =20 #ifndef CONFIG_USER_ONLY - cc->asidx_from_attrs =3D x86_asidx_from_attrs; cc->get_memory_mapping =3D x86_cpu_get_memory_mapping; cc->get_phys_page_attrs_debug =3D x86_cpu_get_phys_page_attrs_debug; cc->sysemu_ops =3D &i386_sysemu_ops; --=20 2.26.2