From nobody Tue Feb 10 13:34:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) client-ip=209.85.218.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1614635598; cv=none; d=zohomail.com; s=zohoarc; b=ZrH+WjmeJEOIoiLUwp/lDnr3cgmx7ralkZxxFUB0s4RYWU4nNArJXwi3JrRxAZTVUZy3c8bOny2ae6NMwCe5Ua7Hd+rkEZQdJfLxOSHEAuBv/b0Yr7lTZeqIJfEN/7nmZ/+IjI4EbcSSG6sbKIMrhHCiNBB1mNKTrS9oGxXWzC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614635598; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Pw9WC6vACp5fmsq1o7bIBFCUdYDUl5sYsIdhjFrN0KY=; b=eNgr+upGslku0FhmOezCYqvBFY9UrAlGCV/nPST7dQm5y169rigk1RY/pThUVyL8x3P97WZrYr8tmGQqjcBEDtWlNtUgHMkpYDETG3T2NKbt75SiZFOvcc2bxsL6bwOdn6hVKPYSrs180YZJCaZuka03yPksTSDqKA+Kg/JIFsg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.zohomail.com with SMTPS id 1614635597995967.415419771463; Mon, 1 Mar 2021 13:53:17 -0800 (PST) Received: by mail-ej1-f48.google.com with SMTP id hs11so31190336ejc.1 for ; Mon, 01 Mar 2021 13:53: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 d6sm15594748eje.20.2021.03.01.13.53.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Mar 2021 13:53: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=Pw9WC6vACp5fmsq1o7bIBFCUdYDUl5sYsIdhjFrN0KY=; b=MGxFe2L36N+hppLecyhnAZ0T+o7raU+kemtTVvU5lLqmMNBspsPxpTQK9orkEX4eWE O5Q3Mo2mJydcaKT4Nm084bDstKf3+GaHyRH50eMbF2n9VptnxqFLQq3vtIX0BUneKOQQ qwwfwCmOpqZqIFTKI1ExBXIXvpbp87c4J8a5rH9Ahjew+ilLKR+mpRoDRRbiKB64ECA/ E5Nm8tsMEzB+b24jh7qs1yS9CwR6enC5BTUszF9MHuZXt1RWBIBjgBqCmu8jJP1oLKMC fm7FwW72VBb6tqLzFdbZglXvuO8Wp3m7rwRFjed7WQ4irGi78Vp4lrhD8BHDFbmb4opo mZ7Q== 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=Pw9WC6vACp5fmsq1o7bIBFCUdYDUl5sYsIdhjFrN0KY=; b=NxHSfMt8dtvTQFJu9v8OJ67l8W9d4JWK+tw1Qoer99s2HPSFYl+sE5mz9xqu2GOOAN PrXQ3Qymxyih1xlwqzfg40xxJ+JAcYruOkSAMZZK/uh1HM+lEN25ztka+Ck+rsM7EFVz 4kcDIoLLE5HQetuX+D/PKxwpalDeLPvfw24DScQrVW0rxUKwI1jzeWO+0B3PhfieEG5E L4xNQ3zuFaqogOd5wubFoejz8yr5z9nhNuBjy4HpHDyrEJhZ92F+9CK3OhEtfpewQx7s ZNzLaJgBi/pr030QCzvNiqXFb738ZZ+fLk9Sthit3jdJ3CoEZVAYFTKEMd4KdH/pku+D lkTg== X-Gm-Message-State: AOAM53279B7WIgBQgR3SpGU3TEHyehFvXwqw2ZMbk5ZG4zxAwsZWl41w dQV4+U7/9hw4MkiZ9elau7M= X-Google-Smtp-Source: ABdhPJzWwl3yvTIxpsoEa72kFgGUoyEOZXVTtimWN96EyKE+ic0eqAt5tXNvPRAoPeHxcPdcl3w2Cg== X-Received: by 2002:a17:907:3e06:: with SMTP id hp6mr17900073ejc.254.1614635596186; Mon, 01 Mar 2021 13:53: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: Michael Rolnik , Anthony Green , Jiaxun Yang , Peter Maydell , qemu-arm@nongnu.org, Marek Vasut , Paolo Bonzini , Stafford Horne , Palmer Dabbelt , Aleksandar Rikalo , qemu-s390x@nongnu.org, Chris Wulff , Marcel Apfelbaum , Yoshinori Sato , Aurelien Jarno , David Gibson , Sarah Harris , David Hildenbrand , Cornelia Huck , Richard Henderson , Sagar Karandikar , qemu-riscv@nongnu.org, Alistair Francis , qemu-ppc@nongnu.org, Laurent Vivier , Claudio Fontana , Michael Walle , Guan Xuetao , "Edgar E. Iglesias" , Artyom Tarasenko , Thomas Huth , "Michael S. Tsirkin" , Eduardo Habkost , Greg Kurz , Bastian Koppelmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Max Filippov Subject: [RFC PATCH v2 17/17] cpu: Restrict "hw/core/sysemu-cpu-ops.h" to target/cpu.c Date: Mon, 1 Mar 2021 22:51:10 +0100 Message-Id: <20210301215110.772346-18-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210301215110.772346-1-f4bug@amsat.org> References: <20210301215110.772346-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) Somehow similar to commit 78271684719 ("cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass"): We cannot in principle make the SysEmu Operations field definitions conditional on CONFIG_SOFTMMU in code that is included by both common_ss and specific_ss modules. Therefore, what we can do safely to restrict the SysEmu fields to system emulation builds, is to move all sysemu operations into a separate header file, which is only included by system-specific code. This leaves just a NULL pointer in the cpu.h for the user-mode builds. Inspired-by: Claudio Fontana Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC: improve commit description? include/hw/core/cpu.h | 3 ++- cpu.c | 1 + hw/core/cpu.c | 1 + target/alpha/cpu.c | 1 + target/arm/cpu.c | 1 + target/avr/cpu.c | 1 + target/cris/cpu.c | 1 + target/hppa/cpu.c | 1 + target/i386/cpu.c | 1 + target/m68k/cpu.c | 1 + target/microblaze/cpu.c | 1 + target/mips/cpu.c | 1 + target/moxie/cpu.c | 1 + target/nios2/cpu.c | 1 + target/openrisc/cpu.c | 1 + target/riscv/cpu.c | 1 + target/rx/cpu.c | 1 + target/s390x/cpu.c | 1 + target/sh4/cpu.c | 1 + target/sparc/cpu.c | 1 + target/tricore/cpu.c | 1 + target/xtensa/cpu.c | 1 + target/ppc/translate_init.c.inc | 1 + 23 files changed, 24 insertions(+), 1 deletion(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index d99d3c830dc..398696f0f2d 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -80,7 +80,8 @@ struct TCGCPUOps; /* see accel-cpu.h */ struct AccelCPUClass; =20 -#include "hw/core/sysemu-cpu-ops.h" +/* see sysemu-cpu-ops.h */ +struct SysemuCPUOps; =20 /** * CPUClass: diff --git a/cpu.c b/cpu.c index 64e17537e21..29dafee581f 100644 --- a/cpu.c +++ b/cpu.c @@ -29,6 +29,7 @@ #ifdef CONFIG_USER_ONLY #include "qemu.h" #else +#include "hw/core/sysemu-cpu-ops.h" #include "exec/address-spaces.h" #endif #include "sysemu/tcg.h" diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 7a8487d468f..da7543be514 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -35,6 +35,7 @@ #include "trace/trace-root.h" #include "qemu/plugin.h" #include "sysemu/hw_accel.h" +#include "hw/core/sysemu-cpu-ops.h" =20 CPUState *cpu_by_arch_id(int64_t id) { diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index d9a51d9f647..f6b4bb14cc5 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -24,6 +24,7 @@ #include "qemu/qemu-print.h" #include "cpu.h" #include "exec/exec-all.h" +#include "hw/core/sysemu-cpu-ops.h" =20 =20 static void alpha_cpu_set_pc(CPUState *cs, vaddr value) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 6cd546213de..7fa22a6beba 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -35,6 +35,7 @@ #if !defined(CONFIG_USER_ONLY) #include "hw/loader.h" #include "hw/boards.h" +#include "hw/core/sysemu-cpu-ops.h" #endif #include "sysemu/sysemu.h" #include "sysemu/tcg.h" diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 040d3526995..89de301fc2b 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -24,6 +24,7 @@ #include "exec/exec-all.h" #include "cpu.h" #include "disas/dis-asm.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static void avr_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/cris/cpu.c b/target/cris/cpu.c index 77f821f4d9a..ed944094cf3 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -26,6 +26,7 @@ #include "qemu/qemu-print.h" #include "cpu.h" #include "mmu.h" +#include "hw/core/sysemu-cpu-ops.h" =20 =20 static void cris_cpu_set_pc(CPUState *cs, vaddr value) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index 7de37aadd4d..304a975eddf 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -25,6 +25,7 @@ #include "qemu/module.h" #include "exec/exec-all.h" #include "fpu/softfloat.h" +#include "hw/core/sysemu-cpu-ops.h" =20 =20 static void hppa_cpu_set_pc(CPUState *cs, vaddr value) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3519cef8fba..1e8ee015bfc 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -60,6 +60,7 @@ #include "exec/address-spaces.h" #include "hw/i386/apic_internal.h" #include "hw/boards.h" +#include "hw/core/sysemu-cpu-ops.h" #endif =20 #include "disas/capstone.h" diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index eaf5f34d22c..96fe37e84f1 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -23,6 +23,7 @@ #include "cpu.h" #include "migration/vmstate.h" #include "fpu/softfloat.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static void m68k_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index a21f15192ae..ad3996cd90e 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -28,6 +28,7 @@ #include "hw/qdev-properties.h" #include "exec/exec-all.h" #include "fpu/softfloat-helpers.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static const struct { const char *name; diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 285564b4d5b..ab3b6a76b1a 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -34,6 +34,7 @@ #include "hw/semihosting/semihost.h" #include "qapi/qapi-commands-machine-target.h" #include "fpu_helper.h" +#include "hw/core/sysemu-cpu-ops.h" =20 #if !defined(CONFIG_USER_ONLY) =20 diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c index 47b8735bb75..9c450fc9a61 100644 --- a/target/moxie/cpu.c +++ b/target/moxie/cpu.c @@ -22,6 +22,7 @@ #include "cpu.h" #include "migration/vmstate.h" #include "machine.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static void moxie_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index e5cbf43d6ee..6e89d3a7abd 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -26,6 +26,7 @@ #include "exec/gdbstub.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static void nios2_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index c666e86e919..fceacf97203 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -21,6 +21,7 @@ #include "qapi/error.h" #include "qemu/qemu-print.h" #include "cpu.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index eaf7c13e5a6..f24b033426d 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -29,6 +29,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "fpu/softfloat-helpers.h" +#include "hw/core/sysemu-cpu-ops.h" =20 /* RISC-V CPU definitions */ =20 diff --git a/target/rx/cpu.c b/target/rx/cpu.c index d1a7a5f6877..458553b8fba 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -25,6 +25,7 @@ #include "exec/exec-all.h" #include "hw/loader.h" #include "fpu/softfloat.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static void rx_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 30117fc8cd7..511e9b2aa6f 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -42,6 +42,7 @@ #include "sysemu/arch_init.h" #include "sysemu/sysemu.h" #include "sysemu/tcg.h" +#include "hw/core/sysemu-cpu-ops.h" #endif #include "fpu/softfloat-helpers.h" #include "disas/capstone.h" diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 843f39de41c..273bf3fbe8e 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -26,6 +26,7 @@ #include "migration/vmstate.h" #include "exec/exec-all.h" #include "fpu/softfloat-helpers.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static void superh_cpu_set_pc(CPUState *cs, vaddr value) { diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index c8a115c886a..ce9cc6469a9 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -25,6 +25,7 @@ #include "exec/exec-all.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" +#include "hw/core/sysemu-cpu-ops.h" =20 //#define DEBUG_FEATURES =20 diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index 0c4b5021e79..4709854a0aa 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "qemu/error-report.h" #include "migration/vmstate.h" +#include "hw/core/sysemu-cpu-ops.h" =20 static inline void set_feature(CPUTriCoreState *env, int feature) { diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index 44a4524bc0a..7e24cb3269f 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -34,6 +34,7 @@ #include "fpu/softfloat.h" #include "qemu/module.h" #include "migration/vmstate.h" +#include "hw/core/sysemu-cpu-ops.h" =20 =20 static void xtensa_cpu_set_pc(CPUState *cs, vaddr value) diff --git a/target/ppc/translate_init.c.inc b/target/ppc/translate_init.c.= inc index d38d194fe87..591fae52410 100644 --- a/target/ppc/translate_init.c.inc +++ b/target/ppc/translate_init.c.inc @@ -42,6 +42,7 @@ #include "disas/capstone.h" #include "fpu/softfloat.h" #include "qapi/qapi-commands-machine-target.h" +#include "hw/core/sysemu-cpu-ops.h" =20 /* #define PPC_DUMP_CPU */ /* #define PPC_DEBUG_SPR */ --=20 2.26.2