From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806734291942.0351198228832; Thu, 16 Sep 2021 08:38:54 -0700 (PDT) Received: from localhost ([::1]:54514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtTR-000743-2a for importer@patchew.org; Thu, 16 Sep 2021 11:38:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLQ-0001E6-13 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:36 -0400 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:34466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLK-0002Mb-Cj for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:35 -0400 Received: by mail-pf1-x435.google.com with SMTP id g14so6302947pfm.1 for ; Thu, 16 Sep 2021 08:30:28 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Za07j0Y47GbP3hPdPAHTpHPNXYMHqLxdsq6WQb/v+yc=; b=ioJ7RRMH6AO6+XGdcojFGv1YpcJ4RMSjhwTxOgvN38Rh/EoEqamaq0c1WNAxCggl17 XfhAI65DeHT3DXEZnlweEIMYuvi1IAH8oDNKDZDNRgZFo3a7KaTjUG46Mz8grj5vJ45k C9Tg/+lMH7eVchcATpkByEZwxaXvIXYz4sUr6KDZsKtcp8q8n00SmP3aayIN0tnOeOIw 25eXy3On6oubLPdl984Zu8jpIiEaR73grZZo5bEkYzq+JTbkyo56itYpv+5qGdCUaPhk SSt9bj1JX7m7+om0ThhOC8lO41SB4sySdU09TLtTZvCME5EMXZ09+CWLwyuSRPacBKug wuww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Za07j0Y47GbP3hPdPAHTpHPNXYMHqLxdsq6WQb/v+yc=; b=6ktCX+k0AlDWBoQtEtbZJ2ofMl6idy+e8eEF9E5sHimZ1jEWj5BbzaRVjicn/+/wY4 k04V7xrfnEJ+MIbiV3PITF4IepEqJmjybsEL9bO6GArM3FBp18tX75Y6qBZCbr94Xgi0 FKErOXQoldg64g/yxgyEFr+aey8pYyFnivyC4dg0iwqjwSQ1WNnc0rSKyqUqxqVK/FNp wanuV/aQBCLidcJTbDZ+Z+im/8S0WtCk0Faah8y+7LvvCfv4MCpwJ7Rao8/YRWBsT+Lp DLvEMxDqiXWVoCu5gm5tE7xrEVfNkM3XIdC9+JMuJsJP+fu3bqqSAuFnfO/7GdhGOebW MC4A== X-Gm-Message-State: AOAM532q8NIXO795aGEe1LQuUxM4E0UnyQgcqFjKEc0ossygMDnX1jhY x6KwU4f4KZJISOKvZ1UHsw9UrLYE0Sszrg== X-Google-Smtp-Source: ABdhPJzc1XDnQkwkiBQNZuH01yV4BaNnup1Es1WQEZH5gJxa9q6IaSe6m6GzsY2poPgsaSyb4/+ZIw== X-Received: by 2002:a63:6e03:: with SMTP id j3mr5470403pgc.465.1631806227007; Thu, 16 Sep 2021 08:30:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 01/35] include/exec: Move cpu_signal_handler declaration Date: Thu, 16 Sep 2021 08:29:51 -0700 Message-Id: <20210916153025.1944763-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::435; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, Alistair Francis , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Warner Losh Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631806735637100001 There is nothing target specific about this. The implementation is host specific, but the declaration is 100% common. Reviewed-By: Warner Losh Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis Signed-off-by: Richard Henderson --- include/exec/exec-all.h | 13 +++++++++++++ target/alpha/cpu.h | 6 ------ target/arm/cpu.h | 7 ------- target/avr/cpu.h | 2 -- target/cris/cpu.h | 8 -------- target/hexagon/cpu.h | 3 --- target/hppa/cpu.h | 3 --- target/i386/cpu.h | 7 ------- target/m68k/cpu.h | 8 -------- target/microblaze/cpu.h | 7 ------- target/mips/cpu.h | 3 --- target/mips/internal.h | 2 -- target/nios2/cpu.h | 2 -- target/openrisc/cpu.h | 2 -- target/ppc/cpu.h | 7 ------- target/riscv/cpu.h | 2 -- target/rx/cpu.h | 4 ---- target/s390x/cpu.h | 7 ------- target/sh4/cpu.h | 3 --- target/sparc/cpu.h | 2 -- target/tricore/cpu.h | 2 -- target/xtensa/cpu.h | 2 -- 22 files changed, 13 insertions(+), 89 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 5d1b6d80fb..9d5987ba04 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -662,6 +662,19 @@ static inline tb_page_addr_t get_page_addr_code_hostp(= CPUArchState *env, } return addr; } + +/** + * cpu_signal_handler + * @signum: host signal number + * @pinfo: host siginfo_t + * @puc: host ucontext_t + * + * To be called from the SIGBUS and SIGSEGV signal handler to inform the + * virtual cpu of exceptions. Returns true if the signal was handled by + * the virtual CPU. + */ +int cpu_signal_handler(int signum, void *pinfo, void *puc); + #else static inline void mmap_lock(void) {} static inline void mmap_unlock(void) {} diff --git a/target/alpha/cpu.h b/target/alpha/cpu.h index 4e993bd15b..ce9ec32199 100644 --- a/target/alpha/cpu.h +++ b/target/alpha/cpu.h @@ -287,7 +287,6 @@ void alpha_cpu_do_unaligned_access(CPUState *cpu, vaddr= addr, int mmu_idx, uintptr_t retaddr); =20 #define cpu_list alpha_cpu_list -#define cpu_signal_handler cpu_alpha_signal_handler =20 typedef CPUAlphaState CPUArchState; typedef AlphaCPU ArchCPU; @@ -440,11 +439,6 @@ void alpha_translate_init(void); #define CPU_RESOLVING_TYPE TYPE_ALPHA_CPU =20 void alpha_cpu_list(void); -/* you can call this signal handler from your SIGBUS and SIGSEGV - signal handlers to inform the virtual CPU of exceptions. non zero - is returned if the signal was handled by the virtual CPU. */ -int cpu_alpha_signal_handler(int host_signum, void *pinfo, - void *puc); bool alpha_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 09d9027734..751141915d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1121,12 +1121,6 @@ static inline bool is_a64(CPUARMState *env) return env->aarch64; } =20 -/* you can call this signal handler from your SIGBUS and SIGSEGV - signal handlers to inform the virtual CPU of exceptions. non zero - is returned if the signal was handled by the virtual CPU. */ -int cpu_arm_signal_handler(int host_signum, void *pinfo, - void *puc); - /** * pmu_op_start/finish * @env: CPUARMState @@ -3015,7 +3009,6 @@ bool write_cpustate_to_list(ARMCPU *cpu, bool kvm_syn= c); #define ARM_CPU_TYPE_NAME(name) (name ARM_CPU_TYPE_SUFFIX) #define CPU_RESOLVING_TYPE TYPE_ARM_CPU =20 -#define cpu_signal_handler cpu_arm_signal_handler #define cpu_list arm_cpu_list =20 /* ARM has the following "translation regimes" (as the ARM ARM calls them): diff --git a/target/avr/cpu.h b/target/avr/cpu.h index 93e3faa0a9..dceacf3cd7 100644 --- a/target/avr/cpu.h +++ b/target/avr/cpu.h @@ -175,7 +175,6 @@ static inline void set_avr_feature(CPUAVRState *env, in= t feature) } =20 #define cpu_list avr_cpu_list -#define cpu_signal_handler cpu_avr_signal_handler #define cpu_mmu_index avr_cpu_mmu_index =20 static inline int avr_cpu_mmu_index(CPUAVRState *env, bool ifetch) @@ -187,7 +186,6 @@ void avr_cpu_tcg_init(void); =20 void avr_cpu_list(void); int cpu_avr_exec(CPUState *cpu); -int cpu_avr_signal_handler(int host_signum, void *pinfo, void *puc); int avr_cpu_memory_rw_debug(CPUState *cs, vaddr address, uint8_t *buf, int len, bool is_write); =20 diff --git a/target/cris/cpu.h b/target/cris/cpu.h index be021899ae..6603565f83 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -199,12 +199,6 @@ int crisv10_cpu_gdb_read_register(CPUState *cpu, GByte= Array *buf, int reg); int cris_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int cris_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); =20 -/* you can call this signal handler from your SIGBUS and SIGSEGV - signal handlers to inform the virtual CPU of exceptions. non zero - is returned if the signal was handled by the virtual CPU. */ -int cpu_cris_signal_handler(int host_signum, void *pinfo, - void *puc); - void cris_initialize_tcg(void); void cris_initialize_crisv10_tcg(void); =20 @@ -250,8 +244,6 @@ enum { #define CRIS_CPU_TYPE_NAME(name) (name CRIS_CPU_TYPE_SUFFIX) #define CPU_RESOLVING_TYPE TYPE_CRIS_CPU =20 -#define cpu_signal_handler cpu_cris_signal_handler - /* MMU modes definitions */ #define MMU_USER_IDX 1 static inline int cpu_mmu_index (CPUCRISState *env, bool ifetch) diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h index 2855dd3881..f7d043865b 100644 --- a/target/hexagon/cpu.h +++ b/target/hexagon/cpu.h @@ -129,9 +129,6 @@ typedef struct HexagonCPU { =20 #include "cpu_bits.h" =20 -#define cpu_signal_handler cpu_hexagon_signal_handler -int cpu_hexagon_signal_handler(int host_signum, void *pinfo, void *puc); - static inline void cpu_get_tb_cpu_state(CPUHexagonState *env, target_ulong= *pc, target_ulong *cs_base, uint32_t *f= lags) { diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 7854675b90..d3cb7a279f 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -319,9 +319,6 @@ static inline void cpu_hppa_change_prot_id(CPUHPPAState= *env) { } void cpu_hppa_change_prot_id(CPUHPPAState *env); #endif =20 -#define cpu_signal_handler cpu_hppa_signal_handler - -int cpu_hppa_signal_handler(int host_signum, void *pinfo, void *puc); hwaddr hppa_cpu_get_phys_page_debug(CPUState *cs, vaddr addr); int hppa_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg); int hppa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 7dd664791a..c2954c71ea 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1947,12 +1947,6 @@ void cpu_x86_frstor(CPUX86State *s, target_ulong ptr= , int data32); void cpu_x86_fxsave(CPUX86State *s, target_ulong ptr); void cpu_x86_fxrstor(CPUX86State *s, target_ulong ptr); =20 -/* you can call this signal handler from your SIGBUS and SIGSEGV - signal handlers to inform the virtual CPU of exceptions. non zero - is returned if the signal was handled by the virtual CPU. */ -int cpu_x86_signal_handler(int host_signum, void *pinfo, - void *puc); - /* cpu.c */ void x86_cpu_vendor_words2str(char *dst, uint32_t vendor1, uint32_t vendor2, uint32_t vendor3); @@ -2020,7 +2014,6 @@ uint64_t cpu_get_tsc(CPUX86State *env); #define TARGET_DEFAULT_CPU_TYPE X86_CPU_TYPE_NAME("qemu32") #endif =20 -#define cpu_signal_handler cpu_x86_signal_handler #define cpu_list x86_cpu_list =20 /* MMU modes definitions */ diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 550eb028b6..a3423729ef 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -177,13 +177,6 @@ int m68k_cpu_gdb_write_register(CPUState *cpu, uint8_t= *buf, int reg); =20 void m68k_tcg_init(void); void m68k_cpu_init_gdb(M68kCPU *cpu); -/* - * you can call this signal handler from your SIGBUS and SIGSEGV - * signal handlers to inform the virtual CPU of exceptions. non zero - * is returned if the signal was handled by the virtual CPU. - */ -int cpu_m68k_signal_handler(int host_signum, void *pinfo, - void *puc); uint32_t cpu_m68k_get_ccr(CPUM68KState *env); void cpu_m68k_set_ccr(CPUM68KState *env, uint32_t); void cpu_m68k_set_sr(CPUM68KState *env, uint32_t); @@ -563,7 +556,6 @@ enum { #define M68K_CPU_TYPE_NAME(model) model M68K_CPU_TYPE_SUFFIX #define CPU_RESOLVING_TYPE TYPE_M68K_CPU =20 -#define cpu_signal_handler cpu_m68k_signal_handler #define cpu_list m68k_cpu_list =20 /* MMU modes definitions */ diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index 40401c33b7..13ed3cd4dd 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -385,16 +385,9 @@ static inline void mb_cpu_write_msr(CPUMBState *env, u= int32_t val) } =20 void mb_tcg_init(void); -/* you can call this signal handler from your SIGBUS and SIGSEGV - signal handlers to inform the virtual CPU of exceptions. non zero - is returned if the signal was handled by the virtual CPU. */ -int cpu_mb_signal_handler(int host_signum, void *pinfo, - void *puc); =20 #define CPU_RESOLVING_TYPE TYPE_MICROBLAZE_CPU =20 -#define cpu_signal_handler cpu_mb_signal_handler - /* MMU modes definitions */ #define MMU_NOMMU_IDX 0 #define MMU_KERNEL_IDX 1 diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 1dfe69c6c0..56b1cbd091 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1193,7 +1193,6 @@ struct MIPSCPU { =20 void mips_cpu_list(void); =20 -#define cpu_signal_handler cpu_mips_signal_handler #define cpu_list mips_cpu_list =20 extern void cpu_wrdsp(uint32_t rs, uint32_t mask_num, CPUMIPSState *env); @@ -1277,8 +1276,6 @@ enum { */ #define CPU_INTERRUPT_WAKE CPU_INTERRUPT_TGT_INT_0 =20 -int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc); - #define MIPS_CPU_TYPE_SUFFIX "-" TYPE_MIPS_CPU #define MIPS_CPU_TYPE_NAME(model) model MIPS_CPU_TYPE_SUFFIX #define CPU_RESOLVING_TYPE TYPE_MIPS_CPU diff --git a/target/mips/internal.h b/target/mips/internal.h index eecdd10116..daddb05fd4 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -156,8 +156,6 @@ extern const VMStateDescription vmstate_mips_cpu; =20 #endif /* !CONFIG_USER_ONLY */ =20 -#define cpu_signal_handler cpu_mips_signal_handler - static inline bool cpu_mips_hw_interrupts_enabled(CPUMIPSState *env) { return (env->CP0_Status & (1 << CP0St_IE)) && diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 2ab82fdc71..88a511209c 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -193,7 +193,6 @@ struct Nios2CPU { =20 void nios2_tcg_init(void); void nios2_cpu_do_interrupt(CPUState *cs); -int cpu_nios2_signal_handler(int host_signum, void *pinfo, void *puc); void dump_mmu(CPUNios2State *env); void nios2_cpu_dump_state(CPUState *cpu, FILE *f, int flags); hwaddr nios2_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); @@ -206,7 +205,6 @@ void do_nios2_semihosting(CPUNios2State *env); #define CPU_RESOLVING_TYPE TYPE_NIOS2_CPU =20 #define cpu_gen_code cpu_nios2_gen_code -#define cpu_signal_handler cpu_nios2_signal_handler =20 #define CPU_SAVE_VERSION 1 =20 diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index be6df81a81..187a4a114e 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -320,11 +320,9 @@ void openrisc_translate_init(void); bool openrisc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); -int cpu_openrisc_signal_handler(int host_signum, void *pinfo, void *puc); int print_insn_or1k(bfd_vma addr, disassemble_info *info); =20 #define cpu_list cpu_openrisc_list -#define cpu_signal_handler cpu_openrisc_signal_handler =20 #ifndef CONFIG_USER_ONLY extern const VMStateDescription vmstate_openrisc_cpu; diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 362e7c4c5c..01d3773bc7 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1278,12 +1278,6 @@ extern const VMStateDescription vmstate_ppc_cpu; =20 /*************************************************************************= ****/ void ppc_translate_init(void); -/* - * you can call this signal handler from your SIGBUS and SIGSEGV - * signal handlers to inform the virtual CPU of exceptions. non zero - * is returned if the signal was handled by the virtual CPU. - */ -int cpu_ppc_signal_handler(int host_signum, void *pinfo, void *puc); bool ppc_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); @@ -1371,7 +1365,6 @@ int ppc_dcr_write(ppc_dcr_t *dcr_env, int dcrn, uint3= 2_t val); #define POWERPC_CPU_TYPE_NAME(model) model POWERPC_CPU_TYPE_SUFFIX #define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU =20 -#define cpu_signal_handler cpu_ppc_signal_handler #define cpu_list ppc_cpu_list =20 /* MMU modes definitions */ diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index e735e53e26..465142616a 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -356,7 +356,6 @@ void riscv_cpu_do_transaction_failed(CPUState *cs, hwad= dr physaddr, char *riscv_isa_string(RISCVCPU *cpu); void riscv_cpu_list(void); =20 -#define cpu_signal_handler riscv_cpu_signal_handler #define cpu_list riscv_cpu_list #define cpu_mmu_index riscv_cpu_mmu_index =20 @@ -372,7 +371,6 @@ void riscv_cpu_set_rdtime_fn(CPURISCVState *env, uint64= _t (*fn)(uint32_t), void riscv_cpu_set_mode(CPURISCVState *env, target_ulong newpriv); =20 void riscv_translate_init(void); -int riscv_cpu_signal_handler(int host_signum, void *pinfo, void *puc); void QEMU_NORETURN riscv_raise_exception(CPURISCVState *env, uint32_t exception, uintptr_t pc); =20 diff --git a/target/rx/cpu.h b/target/rx/cpu.h index faa3606f52..4ac71aec37 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -134,13 +134,9 @@ int rx_cpu_gdb_write_register(CPUState *cpu, uint8_t *= buf, int reg); hwaddr rx_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); =20 void rx_translate_init(void); -int cpu_rx_signal_handler(int host_signum, void *pinfo, - void *puc); - void rx_cpu_list(void); void rx_cpu_unpack_psw(CPURXState *env, uint32_t psw, int rte); =20 -#define cpu_signal_handler cpu_rx_signal_handler #define cpu_list rx_cpu_list =20 #include "exec/cpu-all.h" diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index b26ae8fff2..3153d053e9 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -809,13 +809,6 @@ void s390_set_qemu_cpu_model(uint16_t type, uint8_t ge= n, uint8_t ec_ga, #define S390_CPU_TYPE_NAME(name) (name S390_CPU_TYPE_SUFFIX) #define CPU_RESOLVING_TYPE TYPE_S390_CPU =20 -/* you can call this signal handler from your SIGBUS and SIGSEGV - signal handlers to inform the virtual CPU of exceptions. non zero - is returned if the signal was handled by the virtual CPU. */ -int cpu_s390x_signal_handler(int host_signum, void *pinfo, void *puc); -#define cpu_signal_handler cpu_s390x_signal_handler - - /* interrupt.c */ #define RA_IGNORED 0 void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t r= a); diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index 017a770214..56f7c32df9 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -213,8 +213,6 @@ void superh_cpu_do_unaligned_access(CPUState *cpu, vadd= r addr, int mmu_idx, uintptr_t retaddr); =20 void sh4_translate_init(void); -int cpu_sh4_signal_handler(int host_signum, void *pinfo, - void *puc); bool superh_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); @@ -250,7 +248,6 @@ void cpu_load_tlb(CPUSH4State * env); #define SUPERH_CPU_TYPE_NAME(model) model SUPERH_CPU_TYPE_SUFFIX #define CPU_RESOLVING_TYPE TYPE_SUPERH_CPU =20 -#define cpu_signal_handler cpu_sh4_signal_handler #define cpu_list sh4_cpu_list =20 /* MMU modes definitions */ diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index ff8ae73002..6b40d02237 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -649,13 +649,11 @@ hwaddr cpu_get_phys_page_nofault(CPUSPARCState *env, = target_ulong addr, int mmu_idx); #endif #endif -int cpu_sparc_signal_handler(int host_signum, void *pinfo, void *puc); =20 #define SPARC_CPU_TYPE_SUFFIX "-" TYPE_SPARC_CPU #define SPARC_CPU_TYPE_NAME(model) model SPARC_CPU_TYPE_SUFFIX #define CPU_RESOLVING_TYPE TYPE_SPARC_CPU =20 -#define cpu_signal_handler cpu_sparc_signal_handler #define cpu_list sparc_cpu_list =20 /* MMU modes definitions */ diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h index 4b61a2c03f..c461387e71 100644 --- a/target/tricore/cpu.h +++ b/target/tricore/cpu.h @@ -362,7 +362,6 @@ void fpu_set_state(CPUTriCoreState *env); =20 void tricore_cpu_list(void); =20 -#define cpu_signal_handler cpu_tricore_signal_handler #define cpu_list tricore_cpu_list =20 static inline int cpu_mmu_index(CPUTriCoreState *env, bool ifetch) @@ -377,7 +376,6 @@ typedef TriCoreCPU ArchCPU; =20 void cpu_state_reset(CPUTriCoreState *s); void tricore_tcg_init(void); -int cpu_tricore_signal_handler(int host_signum, void *pinfo, void *puc); =20 static inline void cpu_get_tb_cpu_state(CPUTriCoreState *env, target_ulong= *pc, target_ulong *cs_base, uint32_t *f= lags) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index cbb720e7cc..646965f379 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -584,7 +584,6 @@ void xtensa_cpu_do_unaligned_access(CPUState *cpu, vadd= r addr, MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); =20 -#define cpu_signal_handler cpu_xtensa_signal_handler #define cpu_list xtensa_cpu_list =20 #define XTENSA_CPU_TYPE_SUFFIX "-" TYPE_XTENSA_CPU @@ -613,7 +612,6 @@ void check_interrupts(CPUXtensaState *s); void xtensa_irq_init(CPUXtensaState *env); qemu_irq *xtensa_get_extints(CPUXtensaState *env); qemu_irq xtensa_get_runstall(CPUXtensaState *env); -int cpu_xtensa_signal_handler(int host_signum, void *pinfo, void *puc); void xtensa_cpu_list(void); void xtensa_sync_window_from_phys(CPUXtensaState *env); void xtensa_sync_phys_from_window(CPUXtensaState *env); --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806573; cv=none; d=zohomail.com; s=zohoarc; b=UKNU7vUf1qVsICL1vmH+2rBgJJvEOJ5Eu8AP9u1Kt1CKiPlZVZHTw8an1r05g0zd3E/U2lgJFSX8zVZ2atQs85XgeXJSHBmfk5ijoJ22npHFYPdK+lky3Fb9Mtff87IOCSMedzS9MYPowsAZ5Y28GxGndIskMOBLJBV0LSF/hwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806573; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4+zrbrroX1D6vS/SQV3E4mdDvw0CWYvps+W1iwdat2U=; b=AfzebinFt74pkSR4+NBrivBveJ7X6UeK0fVZDZZnNSzZlbOIBgYrmcOVKpFFrcqVM3Xv4xpUSCgP5xsGxaJtqUjij8gyK7shf0n4gRWtnzB51yn5BZ2GTESBEzilZ2WwQdnwd9ms8y97W42U3ZlOufoUDWn1HSK07aVZzuw927o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806573739563.6385195516559; Thu, 16 Sep 2021 08:36:13 -0700 (PDT) Received: from localhost ([::1]:44052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtQq-0008Br-O0 for importer@patchew.org; Thu, 16 Sep 2021 11:36:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLM-0001Ds-9u for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:35 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:46876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLK-0002Mf-CM for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:32 -0400 Received: by mail-pg1-x529.google.com with SMTP id w7so6441582pgk.13 for ; Thu, 16 Sep 2021 08:30:28 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4+zrbrroX1D6vS/SQV3E4mdDvw0CWYvps+W1iwdat2U=; b=yjmIsUl9SCGcAdlA4RzFE2AkEQZyx1XSdMJmFBpEgas3D9QBN3H43THHkqMHC1Adj3 PsOxF3AFxa6w86E4rungnP6MpHanLcwuZ8l72s7oPT09PR8Qu2rOfSPQDm3mXdSv8GU4 jdXkJS30MhTnEFLCSoTWAupFrgO3Vu/pG5YuWArJQi55q5g0HjQkrYQLEFB6yrl7LOnW fzOqRtSDvM4IoqQP1xULtkdIXGyw8CfbIOwCCBGXZkxlcBFZW0WswX+8WZ8YzZ/d8GK2 swVSTOQ8XZ/5eslyK+HI5PUDhnyXmAJl/WAZc1YTvcZU9JvhgfCGem2jQoavINeKa384 7+Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4+zrbrroX1D6vS/SQV3E4mdDvw0CWYvps+W1iwdat2U=; b=R7OUZ6xjllbDnL2gCfvgUaDjDX55FDxfxAcMW1tjerX6TzW40x9B2Fd77by+U+IfGw 752g0YLWrG0r1Q+hl3KDYhASYr46iEJbbT+bf3KhwZ2jfwmFFwVFPpqcJKIHWsZBdJIf zseuID1/fNce7+8JEzCnry8PG5hULY/Ard+7kuTKxUJ3BJYLpZ171/aj6A+0YnJ5rK7m VORTqB7iH3CI5ancyrcA77Y4hwTK5XON5WGvW4i72VseTyWnSTfp6jTd6YckSaCMTkYo BiFvME+SZ1R7uP910TmvH2Srk9jQp0INCGntd1iIDyEWxdn9OXA4WVWx5VgEw3xfPXRD u61w== X-Gm-Message-State: AOAM530evjeBuFGgkOU4yMjkAaa2cOJM6aFbUEuk6tLd+ldP7iAAbCE5 POZLyRCZDTO59Y6yB81Ag8MsCy/FwFN8Zw== X-Google-Smtp-Source: ABdhPJz9zJLaVl//SeRNowTVvlag7uwuKvZJFbF3o90xfvNsR4/1XcVOHDLJK126dxiZWq5NA1kagQ== X-Received: by 2002:aa7:9395:0:b0:438:9980:5c94 with SMTP id t21-20020aa79395000000b0043899805c94mr5752945pfe.81.1631806227746; Thu, 16 Sep 2021 08:30:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 02/35] accel/tcg: Restrict cpu_handle_halt() to sysemu Date: Thu, 16 Sep 2021 08:29:52 -0700 Message-Id: <20210916153025.1944763-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806575232100001 From: Philippe Mathieu-Daud=C3=A9 Commit 372579427a5 ("tcg: enable thread-per-vCPU") added the following comment describing EXCP_HALTED in qemu_tcg_cpu_thread_fn(): case EXCP_HALTED: /* during start-up the vCPU is reset and the thread is * kicked several times. If we don't ensure we go back * to sleep in the halted state we won't cleanly * start-up when the vCPU is enabled. * * cpu->halted should ensure we sleep in wait_io_event */ g_assert(cpu->halted); break; qemu_wait_io_event() is sysemu-specific, so we can restrict the cpu_handle_halt() call in cpu_exec() to system emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-2-f4bug@amsat.org> Signed-off-by: Richard Henderson --- accel/tcg/cpu-exec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 75dbc1e4e3..5fd1ed3422 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -588,8 +588,9 @@ static inline void tb_add_jump(TranslationBlock *tb, in= t n, =20 static inline bool cpu_handle_halt(CPUState *cpu) { +#ifndef CONFIG_USER_ONLY if (cpu->halted) { -#if defined(TARGET_I386) && !defined(CONFIG_USER_ONLY) +#if defined(TARGET_I386) if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { X86CPU *x86_cpu =3D X86_CPU(cpu); qemu_mutex_lock_iothread(); @@ -597,13 +598,14 @@ static inline bool cpu_handle_halt(CPUState *cpu) cpu_reset_interrupt(cpu, CPU_INTERRUPT_POLL); qemu_mutex_unlock_iothread(); } -#endif +#endif /* TARGET_I386 */ if (!cpu_has_work(cpu)) { return true; } =20 cpu->halted =3D 0; } +#endif /* !CONFIG_USER_ONLY */ =20 return false; } --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806658; cv=none; d=zohomail.com; s=zohoarc; b=B9GIbvfJwCcXV8dNgbFx4OZjdkCyFqivwrHbYcn+KVCwgPWX1ka4iOn+XPjsUah7+m5SGbP6+zxMoc60NKGug7UsS3sxWlm32c63zVnOXHXbgJNkE4YEiUhDvSZjMOGq4wjXvT7D2dAS1is1I2+1AsVTlJXzTtSB/14n2+Mfr8k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806658; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/b65paiPCJASFJfCtunYkpNY6XJIYqckezX/cCSvcrY=; b=On3UVjFmZDFzvGVUERH9GcaluWjzr8DDeJCGJdvOeouEtu0qDaDlOviWGZ6oPIoLjNynWH4QaNLJeSnvd0LvVWRHt1WYok7tt7eEzyd31hT12TKgUUxqxA5kKSYhtKH0NkI7cML0KeSFb6ZlqoWdT/JCp/wmsIHyO53eCybKcas= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806658512529.5096658198134; Thu, 16 Sep 2021 08:37:38 -0700 (PDT) Received: from localhost ([::1]:49630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtSD-0003dX-C7 for importer@patchew.org; Thu, 16 Sep 2021 11:37:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLP-0001Dv-4R for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:35 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]:40875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLK-0002Ml-IA for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:32 -0400 Received: by mail-pj1-x1034.google.com with SMTP id n13-20020a17090a4e0d00b0017946980d8dso7791040pjh.5 for ; Thu, 16 Sep 2021 08:30:29 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/b65paiPCJASFJfCtunYkpNY6XJIYqckezX/cCSvcrY=; b=eQCOAoqWDMQN3xZsEWy9jOI8Eeir3e/tkrzegQWiRoWuEXfMhCO6K681BVoFe/di58 7ejKDnxDGWZeAfY5DVW0K6Y3rtFiv0MxMNvl2+SR5ZCiTDp0vlcaNRUvSPiIsbj6osps uLmbArvdm+H7lmFVZJiGEN4Wz+2zNEX6TVres+uBlj9oMCwB7u2fzLWp69P4J6O+QSST Y8mAJtljl9D0Pe2aUWAcKqbK3difRqarnFLGGX4QSnKlVTYCfpUfY8vXa+zVlk2SybsJ 6SmZ2pL+nJelKpnYnV20IR9raE/wvADCjaFFNuQq7QLerDkPKdwU1TEH/SLmfSzLBaV2 DA5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/b65paiPCJASFJfCtunYkpNY6XJIYqckezX/cCSvcrY=; b=ChOKYG/8IFwMF/oyrGhTcBiEaOUtVu3S3L4MV+q15au9VdjVJHtAmlBQCHMp2sdKL8 WAnDp34WQSvyf5wKR8VlQCRN0Ta5RHe1e/goyj0qAIADIy9z5bw+1lj6RfUUed9yc4bm 8XEJqRzFPETYbg5adzXhWFEHhGnsBy5iOph9/gfG1myorSBXXcuOs5A2iRuI4WJ4D/TY MCtjcN6hxN9zmqb15Hq4CrAVcY4uZBspMfWN+9InmOB2LYRIWC4BacsWTbPukrCyr3nk TcKCclOLFu5aknCeaoH3x4sM8j8lIF1nISXwygqtQYcFuRCBOghSc93hhoyUPOmEwpsg Dqgw== X-Gm-Message-State: AOAM531xXOyFv0ieBJcfWu32VZdyJ6GrIJMnYTPHoA7d0OYJSi8ug6sj xY1GCbAO1R2y9G/BfwWKnPNILL01pbQZTQ== X-Google-Smtp-Source: ABdhPJzWVoOBu+hsJS3BU/NfU2+6rZADyNViunL42Evw6kaBjPzRpgA5aA+MG3OaWFHOtCet98aFjg== X-Received: by 2002:a17:90a:bb09:: with SMTP id u9mr6707819pjr.165.1631806228395; Thu, 16 Sep 2021 08:30:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 03/35] hw/core: Restrict cpu_has_work() to sysemu Date: Thu, 16 Sep 2021 08:29:53 -0700 Message-Id: <20210916153025.1944763-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1034.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806660029100001 From: Philippe Mathieu-Daud=C3=A9 cpu_has_work() is only called from system emulation code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-3-f4bug@amsat.org> Signed-off-by: Richard Henderson --- include/hw/core/cpu.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index bc864564ce..2bd563e221 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -538,6 +538,22 @@ enum CPUDumpFlags { void cpu_dump_state(CPUState *cpu, FILE *f, int flags); =20 #ifndef CONFIG_USER_ONLY +/** + * cpu_has_work: + * @cpu: The vCPU to check. + * + * Checks whether the CPU has work to do. + * + * Returns: %true if the CPU has work, %false otherwise. + */ +static inline bool cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->has_work); + return cc->has_work(cpu); +} + /** * cpu_get_phys_page_attrs_debug: * @cpu: The CPU to obtain the physical page address for. @@ -636,22 +652,6 @@ CPUState *cpu_create(const char *typename); */ const char *parse_cpu_option(const char *cpu_option); =20 -/** - * cpu_has_work: - * @cpu: The vCPU to check. - * - * Checks whether the CPU has work to do. - * - * Returns: %true if the CPU has work, %false otherwise. - */ -static inline bool cpu_has_work(CPUState *cpu) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - g_assert(cc->has_work); - return cc->has_work(cpu); -} - /** * qemu_cpu_is_self: * @cpu: The vCPU to check against. --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806885; cv=none; d=zohomail.com; s=zohoarc; b=W4focMWhkmk8JwOhe+ZG2P4rxtfcBWAWc6p36DrhHPDzLZC+36ffYL87SHZF8/Ik5Nt4oSDTL/ebWhXHrtF6vs5ak3aX4h/+sSGIASJqav1YOAqBNXwGoTnQhD37jQa+HbWvvwe5Gi/9K7skHnP0OMfhVCWpnJGOTFO6c+q2bi4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806885; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VtxRpJ0CcK/sAEcE4Sv89p9y9iZvEmtHp37kJ5kh0xo=; b=TQJgeOIEpDaRvVQcNsYZCRxXv/uVyFNl4KZnCc0iQx875zxJQw3D3U7z6IekELfQwVoBaIMkWAtTKZO72OmjCYJ/SlxItIA7Q/z3AacpTMueZZ2hkn70qnEhOr6alnESI8SvPrUnlhBrz8bmQlPtnJ0/kbgO47DRcw63GVGGKos= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806885842682.3613088209397; Thu, 16 Sep 2021 08:41:25 -0700 (PDT) Received: from localhost ([::1]:60700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtVs-000373-KE for importer@patchew.org; Thu, 16 Sep 2021 11:41:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLR-0001IM-IL for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:37 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:53169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLK-0002N6-W3 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:37 -0400 Received: by mail-pj1-x102f.google.com with SMTP id v19so4815288pjh.2 for ; Thu, 16 Sep 2021 08:30:29 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VtxRpJ0CcK/sAEcE4Sv89p9y9iZvEmtHp37kJ5kh0xo=; b=cdUGAF2M5jMcbbKPmfEWnLrP/wNrAn1m6sjWJ1qT1HIjZi9uBpwSCq4AMoK+j47A6F 7zD54D0SljmKQfUjR6VyZMkE8NmvIvHSrMc54Y2f6dvvbRW9Kt84neEDIWkzczDHOr0Q 5emcudIeCY5igtl601Fg9Qjdk9G7RQxavm9RECRItP/KgMYha+bqm91eZkq81k/FAlBp 2bt8LCFeGrvPGXWtKRTGw3pL1LJPJ9nZx5qovruHYboqoCwlH81Rf9INFzXHnByjKjXh iMR4xkxPFmNFeT9yBNrEmgyCe8BmrmVRsEQoT5oEpG/FW311WDaB3txsAFcjkW1RgWKO Iwlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VtxRpJ0CcK/sAEcE4Sv89p9y9iZvEmtHp37kJ5kh0xo=; b=zF9Fdb6HAvhKAmIQkVK7wQdN8xtga+tywJrBAoXZwBlYpbvBZyfq/VVvGkLVuxIezj r1epyfgtFz4rhSALi2KmIC1uTpGiWBrbvaSIi2+C6Z9SNAWGOpjk7X+0QaC3ZX8sloZF 0go+UNibO4XI2sb039DZ5MYEQC+LcYwi+RR+8+ZKclUzefVfvhOPN1W9c5l8DDO9UMwL cahh3PC+UwU50CPRYfXpyBuaLTs0diptR0LnSB/bLM+1dvJxMOBumlusi14rpR77Rcud 4x4aG+6WFCHhs3LFUkfYMAWvcuPX4NlK2ir0wQnpwE/47oOuqz4+ZTw/PaE2leXGdtqU 4z0Q== X-Gm-Message-State: AOAM533lIGnDsr7taCG5Rf2YzYB9B/yI+rLZfNW6l2XGaz6jrZIUJ0vG aGG7QqVoiPFxetaimBgkfSkFb6OMBg1wmA== X-Google-Smtp-Source: ABdhPJy6f6OqWmd9/c9h//0IcfAVjb2mcB8O/fb1JGwwXpTgTLP8hju7zE5c98h326mHX9ZjKc+AbA== X-Received: by 2002:a17:90a:d596:: with SMTP id v22mr15731489pju.51.1631806228967; Thu, 16 Sep 2021 08:30:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 04/35] hw/core: Un-inline cpu_has_work() Date: Thu, 16 Sep 2021 08:29:54 -0700 Message-Id: <20210916153025.1944763-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102f.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806888078100001 From: Philippe Mathieu-Daud=C3=A9 We want to make cpu_has_work() per-accelerator. Only declare its prototype and move its definition to softmmu/cpus.c. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-4-f4bug@amsat.org> Signed-off-by: Richard Henderson --- include/hw/core/cpu.h | 8 +------- softmmu/cpus.c | 8 ++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 2bd563e221..e2dd171a13 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -546,13 +546,7 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flags); * * Returns: %true if the CPU has work, %false otherwise. */ -static inline bool cpu_has_work(CPUState *cpu) -{ - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - g_assert(cc->has_work); - return cc->has_work(cpu); -} +bool cpu_has_work(CPUState *cpu); =20 /** * cpu_get_phys_page_attrs_debug: diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 071085f840..7e2cb2c571 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,6 +251,14 @@ void cpu_interrupt(CPUState *cpu, int mask) } } =20 +bool cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + g_assert(cc->has_work); + return cc->has_work(cpu); +} + static int do_vm_stop(RunState state, bool send_stop) { int ret =3D 0; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806599; cv=none; d=zohomail.com; s=zohoarc; b=KaZkXyrZVnsiaAL0Nl9D0bM91zT4eS6Q8DR43MSAQdTRbp2k+25NX4aM6CBhhzZ7F5f36yM5gGFmeq+YacCXb8WnycTz8RbhaogT+Y7y7jZXySvvTEt36ZBXoXCYFroMjt92EVC5wLsL7nM6r9SXXuQTSyTg/PXtt//1QTszt90= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806599; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kZ2VcPtLko9Bov3EWMO38HipWq5pDjJDr/5HXHOEyEY=; b=ZA5usXbl5O5AphvIFfPvkR81yzLPJdNsY3nb/+ChR+zB5tpaOqdjyxNNr2vwBegZ1n6q9jpx2lEbUHhmbDbukvaKqRa226c/Wd3FrNFNNev9W8zsbjUJct9rOhlxEQJ9QgqMeC/vUOHXqYzKi3UuxTlcyzMN0baBP4RdiQVIqIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163180659934678.9785044721001; Thu, 16 Sep 2021 08:36:39 -0700 (PDT) Received: from localhost ([::1]:46082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtRG-0001Du-C3 for importer@patchew.org; Thu, 16 Sep 2021 11:36:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLP-0001Dw-54 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:35 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:38472) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLK-0002O5-W9 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:32 -0400 Received: by mail-pl1-x62b.google.com with SMTP id 5so4101993plo.5 for ; Thu, 16 Sep 2021 08:30:30 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kZ2VcPtLko9Bov3EWMO38HipWq5pDjJDr/5HXHOEyEY=; b=U/kmVse9pnGo3yBBJVKIvJTwXw+EOBLtslNLebgeXsm1WkQFnKo4hMXwNggux30wcq WjLSHaMtnzL72OXhFIeHyAOfxzNXprClw56i88xPU8G7+AlG67ICuOSKpZLlcoDIAA2O UJoDYolq4RL0Aa7SO7cV0R/+YIDOUg/UmnphJzs2Tb1Au4t/mAtTd1AD4vpIXY37mBC0 GDzv9+I8DuIagn8LXnOmtXHfhLxDeQDBwJUnq/nFGgWObNes5AY++j04mYmFA60Bo9s3 4fGu4LtNJ3egwlMjpWs868IHKNpDvXk4CMbjI6ZbWoYVX3fsOP7PrgBQbJmZwNZQiFlZ 8POQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kZ2VcPtLko9Bov3EWMO38HipWq5pDjJDr/5HXHOEyEY=; b=nn5AjmZ+MgB8EreP0fkuZ5ysDdD8U6KfA2NngyN7zh60pxVdyY+Kvyu6r7VgL4d5o3 TRdS7teVautL5z4Z5EAurJOeVvjnSXzO27OEx99F+tyI0ggAK3cPwy1wzDJeWczzcmS+ 0lgOKj4a0sHb2lqw1lY/22NjNTfyHmoBItRzb9aH9VMVnPEaLasoEbTx+In3aX6fog9+ rquLu9sbb7gxKl4rJYlZYCcNhHMV9XpRZlK4+3KMl2MWpNvup4ckCwF3cwQwCpjZ64QX Zf5VzS/doknuVu23dv4NpaIqKFG3zRmF2/vDOS5xMSGLfSObpLJSqjx8to4LFPEjwQVP mSzg== X-Gm-Message-State: AOAM53223eYCpOmytltAme718tXJ16meTUoP5Rj5deyoDcSpEe06RqZy w1nKwqtGlwCq1GeDb71IjXFNgnK0TlNUcg== X-Google-Smtp-Source: ABdhPJywfLyHbPGHACadRmY8z00MH4H6g5luzemVJEYhPraROo8p8m+S9USV5MGJ76RrYy1CCV5o4g== X-Received: by 2002:a17:90a:1610:: with SMTP id n16mr15525033pja.59.1631806229600; Thu, 16 Sep 2021 08:30:29 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 05/35] sysemu: Introduce AccelOpsClass::has_work() Date: Thu, 16 Sep 2021 08:29:55 -0700 Message-Id: <20210916153025.1944763-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62b.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806600699100001 From: Philippe Mathieu-Daud=C3=A9 Introduce an accelerator-specific has_work() handler. Eventually call it from cpu_has_work(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-5-f4bug@amsat.org> Signed-off-by: Richard Henderson --- include/sysemu/accel-ops.h | 5 +++++ softmmu/cpus.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/include/sysemu/accel-ops.h b/include/sysemu/accel-ops.h index 032f6979d7..de83f095f2 100644 --- a/include/sysemu/accel-ops.h +++ b/include/sysemu/accel-ops.h @@ -31,6 +31,11 @@ struct AccelOpsClass { void (*create_vcpu_thread)(CPUState *cpu); /* MANDATORY NON-NULL */ void (*kick_vcpu_thread)(CPUState *cpu); =20 + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); + void (*synchronize_post_reset)(CPUState *cpu); void (*synchronize_post_init)(CPUState *cpu); void (*synchronize_state)(CPUState *cpu); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 7e2cb2c571..2a61dfd628 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -255,6 +255,9 @@ bool cpu_has_work(CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); =20 + if (cpus_accel->has_work) { + return cpus_accel->has_work(cpu); + } g_assert(cc->has_work); return cc->has_work(cpu); } --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806695; cv=none; d=zohomail.com; s=zohoarc; b=LB6Iyk5sRSC010d8V6c53WuHUe3Uk5CIwNr5QtEpC0djJwkM0UNV72OcwZs5ChCaGBNzq6PKURgX8TqjUKe1Oj6zIWIO11RxMAiwWKBHWmrJlDIrjaD9iKV4WJbl3DCUmtcc4bT4MwUz4oUS5VSophgJyn0IYxeYIqHRoa5Bx9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806695; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OAb8lar0gsn2p9u8wn1vUp6jj9gu5rLadFKsG/mZhGI=; b=Q23/JroLBtqFHrz3RF3OI9XAvMHB503+SDHZK3Rsz7LDgJevmiIT3EMg76Dr2hp+4r5Za10GkhrnA7VWa/Pciz8+BTua8+fA92uzA4dYAeN+GvWScKGRh2nGJZbPzCfh76R+SXnTMvXA6NnfvtONOwCYdFBnnO1fDRz1JtcZd1w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806695100870.417640111894; Thu, 16 Sep 2021 08:38:15 -0700 (PDT) Received: from localhost ([::1]:52288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtSo-0005Ty-1H for importer@patchew.org; Thu, 16 Sep 2021 11:38:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLQ-0001F0-C6 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:36 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:41830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLM-0002PL-N3 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:36 -0400 Received: by mail-pl1-x62f.google.com with SMTP id v2so4089174plp.8 for ; Thu, 16 Sep 2021 08:30:31 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OAb8lar0gsn2p9u8wn1vUp6jj9gu5rLadFKsG/mZhGI=; b=iCf6s4eRJxBD75pQDp5vtzub8JQjh60bfdnsaGVpJK7PcJdEUQTLvFi/DRrqeCJEil gS61h9B+cCwm+NPCf/XAo6Tw1dU8Hph2STqVGRWJIAckocH7YhUUE5xovXgwi4KHY6s0 rgVBDUUZqErL+Ep1Drji3w52L53FGhnjjJgqHvxqaMJo802wYypk97n+ck6ChhnujcmD cXzt8/n+ifZokIvO5cjXgdJCUhb0nruc6gLMNegT/3+nc6ooAvvlClTgsKH8PE7Wkgkl 1qHeJkpiKpuw4YzU8XXr4SW9vOzm4NqvFAl54ruFQQfiMmykOYpW1iBR9l4bQTRx9pnl d8xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OAb8lar0gsn2p9u8wn1vUp6jj9gu5rLadFKsG/mZhGI=; b=CzGo15JYpzbQvQQ7EXdgbWjHKXAQJpTFIwWGMO4+uoQuv+M3y5wNdjuelm4MvKTdu7 OqgSnQUnBAIiXqANhKdGyKr+bZGfMJ502xVElbhkb1d+b61lFwc7yKkMRgsRwypXi0Pp YhtXrM8AaUuT4yJbfJ6o7vTNSRTLvJyP+QGye0wppMQLRfuLQF1EYGYSkfeNsSnYN39g rZNH6sDYG6X9alRlTiMxjNDEV7gMicDEkZUlcBejmfzh+AUYaQjjNgz/M6R2GDvmxOjw D/28x4Yoj2nNjuIgsrdYe4wLHy1Pcxiaftdzic6Mg7S40gDq40WHAVA3+riREuiT02JY G3KQ== X-Gm-Message-State: AOAM531leo+zbGwVGTtk5rtLJ9NXx2ASab5TK6msR44Si/u5Zqx7X5iS XtBM+sW39k50ezYnde/q7TEkLUwTHrM96Q== X-Google-Smtp-Source: ABdhPJxmcH+5vY+dSSBpzzXiKyIFFuVf50wnDJuTddffSr+CwGjroYOGRdKiVn6wrr5yc9agFZcu0A== X-Received: by 2002:a17:90a:1950:: with SMTP id 16mr6530482pjh.126.1631806230214; Thu, 16 Sep 2021 08:30:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 06/35] accel/kvm: Implement AccelOpsClass::has_work() Date: Thu, 16 Sep 2021 08:29:56 -0700 Message-Id: <20210916153025.1944763-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62f; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806696360100001 From: Philippe Mathieu-Daud=C3=A9 Implement KVM has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-6-f4bug@amsat.org> Signed-off-by: Richard Henderson --- accel/kvm/kvm-accel-ops.c | 6 ++++++ softmmu/cpus.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-accel-ops.c b/accel/kvm/kvm-accel-ops.c index 7516c67a3f..6f4d5df3a0 100644 --- a/accel/kvm/kvm-accel-ops.c +++ b/accel/kvm/kvm-accel-ops.c @@ -74,6 +74,11 @@ static void kvm_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } =20 +static bool kvm_cpu_has_work(CPUState *cpu) +{ + return kvm_halt_in_kernel(); +} + static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -83,6 +88,7 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, voi= d *data) ops->synchronize_post_init =3D kvm_cpu_synchronize_post_init; ops->synchronize_state =3D kvm_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D kvm_cpu_synchronize_pre_loadvm; + ops->has_work =3D kvm_cpu_has_work; } =20 static const TypeInfo kvm_accel_ops_type =3D { diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 2a61dfd628..3db7bd4eb4 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -90,7 +90,7 @@ bool cpu_thread_is_idle(CPUState *cpu) return true; } if (!cpu->halted || cpu_has_work(cpu) || - kvm_halt_in_kernel() || whpx_apic_in_platform()) { + whpx_apic_in_platform()) { return false; } return true; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807027; cv=none; d=zohomail.com; s=zohoarc; b=Y2GhYUPvA9pYZOOJMj0do3HbYLvxvswGqUFRBdKIYmIG7HnvGQVDt8aX/FaTA/8CEntxkddkukSFz1TCfU6xdZgQosv9YR8LP52UHl6tx1emUjWoi+aa89C0fESdo9jDz2qX4QXnDb0q2r6m528wnLM+ieeDPee+3FDsQbAeu0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807027; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1ujtoHmWANpUUSk4HPJATTFV4O1b/xtgCUsvKjJvcGw=; b=ebftYYZ5bnB1aBo2rA62gyIRGMxA4NqKeCgZoGhTn7XgjvQEarDeH3eXK5ct/9xnQiAgUTDqwUDtV1Auo5yiZ2UiUooBYK77SvxKKEza9N9cRtq6RdVbivqy8KOKkNRM5/hvFWCjOnFg+rXV4FAh92itAKE1daFDLNq2LS9sNbk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807027974508.2418980320267; Thu, 16 Sep 2021 08:43:47 -0700 (PDT) Received: from localhost ([::1]:40720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtYA-0000TK-WE for importer@patchew.org; Thu, 16 Sep 2021 11:43:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLS-0001JW-17 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:39 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:53172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLN-0002PZ-CP for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:37 -0400 Received: by mail-pj1-x1032.google.com with SMTP id v19so4815356pjh.2 for ; Thu, 16 Sep 2021 08:30:31 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1ujtoHmWANpUUSk4HPJATTFV4O1b/xtgCUsvKjJvcGw=; b=d2H+8HhrodxXptlwYf4BGIzvlTvUJt5pysQDsX9FuJ7KV06wzYhoDw2n+9ufcam4ob otBUXg1egQBBS0utDdMjWcUIJFy6Jp3OqT7eK/VPv76cB34Wp3BV4dDN9kOpqxTE3q0y mh0WLoaXkdr/NE8mewtE6OwLrACbVhALdNTXiRNk9k8O19ieV6KsCyvZ0uVI+73YXG24 mSyJI4b5C3ijQ3X2xjrpiUxllFveMzJhxb/ktb/JLMzby7UvgFEKjBht62Y0mkqs8sSK 9QXlhczxraqW+Cpc4VN4cVj9Lh3oaUpg9EktSaMHMLXEY+TL/b0Ko9Xe2TnrBEh7noEv f5tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ujtoHmWANpUUSk4HPJATTFV4O1b/xtgCUsvKjJvcGw=; b=A47gQUgEmuwsVUFKnZe9S4AV0P8s7JsfDgf73CcRGn52qWn6b9v7xbkMQXwqV7S6qH RsH6CcvF6hY7LhgQE0M5ECWtpFhRQyJ7xIEjktpus0UOU4GqsW1+x6PRFMLrtlYOwM0x TH01mKtJeC346dpaZJfJ466mtgm/1tQv7vIQj6g4a4VLcREdFl0ji4Qfttqkm4sEGjXa NkTi85Bda2xvW/V+ilMqxv1rSBVPRkQa07DAv1+cxDpCruwOoTLxe2vwfxurT+HZGZGY 3fuxa51xxSb2b8/HWn1T84Q5fJzvPjNMdW6CL+lpea/GGDkO5qWKhAR1tan87I4R0FJe +F3w== X-Gm-Message-State: AOAM530whb8NoKz6PHiT1ORzGvwoXc9bKgopi/iZ/f033LdYzX3ZcOhr LnBLH1IN5oALGwT+j0eCtycnITh/o/g4/A== X-Google-Smtp-Source: ABdhPJwr4rwSwkpmzP16VwAbZAo19koHNHw9/jte9OUzw1glE0WEnehebC32I1xVqCDK294VMlF4lw== X-Received: by 2002:a17:90a:7f01:: with SMTP id k1mr6813591pjl.156.1631806230843; Thu, 16 Sep 2021 08:30:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 07/35] accel/whpx: Implement AccelOpsClass::has_work() Date: Thu, 16 Sep 2021 08:29:57 -0700 Message-Id: <20210916153025.1944763-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807028991100001 From: Philippe Mathieu-Daud=C3=A9 Implement WHPX has_work() handler in AccelOpsClass and remove it from cpu_thread_is_idle() since cpu_has_work() is already called. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-7-f4bug@amsat.org> Signed-off-by: Richard Henderson --- softmmu/cpus.c | 4 +--- target/i386/whpx/whpx-accel-ops.c | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 3db7bd4eb4..6bce52ce56 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -41,7 +41,6 @@ #include "sysemu/replay.h" #include "sysemu/runstate.h" #include "sysemu/cpu-timers.h" -#include "sysemu/whpx.h" #include "hw/boards.h" #include "hw/hw.h" #include "trace.h" @@ -89,8 +88,7 @@ bool cpu_thread_is_idle(CPUState *cpu) if (cpu_is_stopped(cpu)) { return true; } - if (!cpu->halted || cpu_has_work(cpu) || - whpx_apic_in_platform()) { + if (!cpu->halted || cpu_has_work(cpu)) { return false; } return true; diff --git a/target/i386/whpx/whpx-accel-ops.c b/target/i386/whpx/whpx-acce= l-ops.c index 6bc47c5309..1f9c6d52c2 100644 --- a/target/i386/whpx/whpx-accel-ops.c +++ b/target/i386/whpx/whpx-accel-ops.c @@ -83,6 +83,11 @@ static void whpx_kick_vcpu_thread(CPUState *cpu) } } =20 +static bool whpx_cpu_has_work(CPUState *cpu) +{ + return whpx_apic_in_platform(); +} + static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_post_init =3D whpx_cpu_synchronize_post_init; ops->synchronize_state =3D whpx_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D whpx_cpu_synchronize_pre_loadvm; + ops->has_work =3D whpx_cpu_has_work; } =20 static const TypeInfo whpx_accel_ops_type =3D { --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806422; cv=none; d=zohomail.com; s=zohoarc; b=m8l9+5fTj9n/LbzhdjIaOg6qUyEWiFhAmgpuV3Ek7FoMYdTqAuSLLjLMca20XZmUe7oxl4H2sFcmOY5UBO2BfrnlGy8+lAkQOBh9Uja5heZN2dd1ar/Mj5xvIx9Jw8rfqjs+MQfXu3FC0MRQRTTEYpt/vcK5ua42cQg56JhU6mI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806422; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+2Hxp80Fi+o3vSY5VLA0rrEE2x+zxZah+yk4DEWnBqQ=; b=ky0bi9iKziOqtVI4ReB4t1z0y0dO5WnhyYLV9xx58ASMNLiKGZpvB5WRS2jwaH0RJ81Db2FpYyl14/CPVZew4uqxMCX/dhFt6R3akAuZbJKg+g7+3K5Luw6qNXUMJkS1d+58/jaWmslrw7K6bqlvu6VCtT/mD2oqEub8ZPuisAA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806422832948.2409048207329; Thu, 16 Sep 2021 08:33:42 -0700 (PDT) Received: from localhost ([::1]:39254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtOP-0004kw-Me for importer@patchew.org; Thu, 16 Sep 2021 11:33:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLR-0001HI-50 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:37 -0400 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]:41872) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLO-0002Pn-2q for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:36 -0400 Received: by mail-pg1-x531.google.com with SMTP id k24so6474200pgh.8 for ; Thu, 16 Sep 2021 08:30:32 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+2Hxp80Fi+o3vSY5VLA0rrEE2x+zxZah+yk4DEWnBqQ=; b=n/bBt6FqUP/oIaWoyfHhqzVjfad66TEbRLTvpe+XZkQLJTJ7j5SzOzmEnu8ALBzD5V Bys7O3m04CaI4NWXab0TNlJepZsPngHhFjlx9kFp3qQlQoFwGEjrfVyp58IAQhBvBGUh kS/IdG1PkKU5WtI9rw6lPYg5XW1QQ1Z4hRxEkr7S9Oqh0JABKhT0o/3ah71sI0ybgfhk fAqA9pw5mk5rbpo/bJSH2adNA9vhA5mkboJoh2qCplU6E7Yq+uGM6vtslDIpNOdacdcC lj2WMIpn0/S9woDbB5gFg/rpCGPrRfV3CaMhIyBdCK1f/lAXGmU7MbREnA35HVDr3r71 MqXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+2Hxp80Fi+o3vSY5VLA0rrEE2x+zxZah+yk4DEWnBqQ=; b=0dMmh45NrPMZajNlTj0VtqvCd8J2ea1qShvVlCoqi9RJHuqNTCS9UO9DnlfsV8UP/q 37dKkIUq1TbUq0PCStDD9LnlloDxTsV6GH0UrtiKyBZsaMAdpmcGXW86fEWNnHpO0lUa 2zBRk5dlDv0sXw5l4EfOT0YUlE8DOld4iCBylpGgnmx8+/0qCOp8au3gH+sazdYM4JfI vCmQTnCyKIyuRF+iA+nz288nWvYLFYsn9zSVeyvb7Zvwd/vGRZ3N5tqc4hq1agzBy24M G1Ay9FPpAEGFxmBby/AGnB6kHO8ljpGVkiizUQ8tgAtvZoOYd6leW960h/UoKtYWyiVF TWFQ== X-Gm-Message-State: AOAM5326OUVCTsOL34kLJmQNOuEsBiWwebggrl92m4MZhXWx4/ACZIoK syclJ73XZSw79eIt4NwdjnV1FMcRRpp94g== X-Google-Smtp-Source: ABdhPJwAIa7UZPSCM52vgDOzhUFTtdLXDM3q9tuRuozVs2Puc49jhPwCdSOOiJqub3VuEo1T8wKm9A== X-Received: by 2002:a62:4e0f:0:b0:3ee:668d:b841 with SMTP id c15-20020a624e0f000000b003ee668db841mr6122077pfb.48.1631806231697; Thu, 16 Sep 2021 08:30:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 08/35] accel/tcg: Implement AccelOpsClass::has_work() as stub Date: Thu, 16 Sep 2021 08:29:58 -0700 Message-Id: <20210916153025.1944763-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::531; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x531.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806423895100001 From: Philippe Mathieu-Daud=C3=A9 Add TCG target-specific has_work() handler in TCGCPUOps, and add tcg_cpu_has_work() as AccelOpsClass has_work() implementation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-8-f4bug@amsat.org> Signed-off-by: Richard Henderson --- include/hw/core/tcg-cpu-ops.h | 4 ++++ accel/tcg/tcg-accel-ops.c | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/hw/core/tcg-cpu-ops.h b/include/hw/core/tcg-cpu-ops.h index 55123cb4d2..4a4c4053e3 100644 --- a/include/hw/core/tcg-cpu-ops.h +++ b/include/hw/core/tcg-cpu-ops.h @@ -66,6 +66,10 @@ struct TCGCPUOps { void (*do_interrupt)(CPUState *cpu); #endif /* !CONFIG_USER_ONLY || !TARGET_I386 */ #ifdef CONFIG_SOFTMMU + /** + * @has_work: Callback for checking if there is work to do. + */ + bool (*has_work)(CPUState *cpu); /** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exe= c */ bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request); /** diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 1a8e8390bd..ed4ebe735f 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -32,6 +32,7 @@ #include "qemu/main-loop.h" #include "qemu/guest-random.h" #include "exec/exec-all.h" +#include "hw/core/tcg-cpu-ops.h" =20 #include "tcg-accel-ops.h" #include "tcg-accel-ops-mttcg.h" @@ -73,6 +74,16 @@ int tcg_cpus_exec(CPUState *cpu) return ret; } =20 +static bool tcg_cpu_has_work(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + if (!cc->tcg_ops->has_work) { + return false; + } + return cc->tcg_ops->has_work(cpu); +} + /* mask must never be zero, except for A20 change call */ void tcg_handle_interrupt(CPUState *cpu, int mask) { @@ -108,6 +119,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->kick_vcpu_thread =3D rr_kick_vcpu_thread; ops->handle_interrupt =3D tcg_handle_interrupt; } + ops->has_work =3D tcg_cpu_has_work; } =20 static void tcg_accel_ops_class_init(ObjectClass *oc, void *data) --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806928; cv=none; d=zohomail.com; s=zohoarc; b=Cu6wV6ALyYN89/kf3BmuwVxZQiNfDOfWGiPBi9iw1cRFCXKocsbegf9bf+qgCIVYYPaQFpUQ+Cecm2i22QOk0XjTGRtEFqaHdN22sUeLqcBNqtryFYC+pm/Fkr9f7xusYH3j4OYgi+E5a50DzERBuBGtCLrpg4w8BgVcp87wmr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806928; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v+sL6u8bXsTKjedcptTkC5TsAqmI7f7iPpsRjw30zQg=; b=GBeDk1XlPk7UkYB8MOWr9tEzCY0n1HkTPYv1k90ZSjHf8EHjry5kTXmC9mlnfv2UaoSYnv2nE9Q9lgBVP3M8mChS0XZaI4+2LxoyQ32CMRQOisuHXeGPfQyznY/mVBQ1QD1zpjfcT11AfaQcJlDzBbf1/smu2G+sB5NC/CJ9V3U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806928241910.8684524836198; Thu, 16 Sep 2021 08:42:08 -0700 (PDT) Received: from localhost ([::1]:34830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtWZ-0004rz-5f for importer@patchew.org; Thu, 16 Sep 2021 11:42:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLQ-0001Fp-LZ for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:36 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]:40477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLO-0002Qp-OT for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:36 -0400 Received: by mail-pg1-x52e.google.com with SMTP id h3so6479691pgb.7 for ; Thu, 16 Sep 2021 08:30:33 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v+sL6u8bXsTKjedcptTkC5TsAqmI7f7iPpsRjw30zQg=; b=QE+qMyCSwLWL5uZLgEsUmXsngvI9g0Dc+Lc36Wlz/jCrWnR2aRJx1t+1vIfqcg5rQa stdniSM7jXDJZr1PcpJ2nT96ah7R5l/zZUfzi6WrluzV5NN3N89KYicx37WJTC64YQQ0 I0rlBAvQxABFvpWZXIhoEAdWoxR+NwCZvcQcoA34YAngG9s+xQCsUlQlKcNGkN+D2PBY b47GiskaQ+KYmHcMgcm1o+Op4Bg6cNb+i0o5F+U8/d1/TZkPHRclfDcrhkdPPijnCjl0 HpZ0r/Drc4KyQoAngou1ksloTx2gYHaM4gMdUmBUG3Y+YpcNnXQOBgN+EYsX5j4+3ntO +24A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v+sL6u8bXsTKjedcptTkC5TsAqmI7f7iPpsRjw30zQg=; b=k/QaK2Ccw+dBgIcoISILWyWzwMFIdP4/OmV2pbA7qoPg00Ouxrm5XrGoQb1gtytpRY GI927eEnLIR78tMDwkWIqgqo73dVmLTqZ2wZi5pyI1JDsdH4Mz6b/pegJPhQCp4hy4uu f6f1inDV0iyUdXlzDaINCqvC1gy9lxbPuhz7W19RGa/bZWDg6/XKLexYWTYwX4gH38QP QZO2RWmTYM2JUBk4A8kihZO8GSs7O/fMSDcAYOxWha+QRpUEFu/Y5pIf6X07H3aT1Xjm 5/A8DR4GruGneq9ltUrMJjmqKnxlwqF/c/5hXc+Vp+NxZwCRRE2IS1LXtVmTPppWx4Q/ FpAg== X-Gm-Message-State: AOAM530hMqxKUcIYwrmcFiU11FJNyU1f98wmpBwPiZtLoTqvKFIqlwG7 8eYwQ2Ay3UB6gjQqPh1blhZ2gw7D3rDNwg== X-Google-Smtp-Source: ABdhPJwtKqWaJGMgAf98dmO2Scka+91pjs3jkOlsTXPFYiL9C3cKSAE2MtrWK6kSb9ZEnsa3c8CRlQ== X-Received: by 2002:aa7:8893:0:b0:416:4ed7:e4c4 with SMTP id z19-20020aa78893000000b004164ed7e4c4mr5729264pfe.83.1631806232446; Thu, 16 Sep 2021 08:30:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 09/35] target/alpha: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:29:59 -0700 Message-Id: <20210916153025.1944763-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806929487100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-9-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/alpha/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index 93e16a2ffb..1ca601cac5 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -33,6 +33,7 @@ static void alpha_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool alpha_cpu_has_work(CPUState *cs) { /* Here we are checking to see if the CPU should wake up from HALT. @@ -47,6 +48,7 @@ static bool alpha_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_SMP | CPU_INTERRUPT_MCHK); } +#endif /* !CONFIG_USER_ONLY */ =20 static void alpha_cpu_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -221,6 +223,7 @@ static const struct TCGCPUOps alpha_tcg_ops =3D { .tlb_fill =3D alpha_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D alpha_cpu_has_work, .cpu_exec_interrupt =3D alpha_cpu_exec_interrupt, .do_interrupt =3D alpha_cpu_do_interrupt, .do_transaction_failed =3D alpha_cpu_do_transaction_failed, @@ -238,7 +241,6 @@ static void alpha_cpu_class_init(ObjectClass *oc, void = *data) &acc->parent_realize); =20 cc->class_by_name =3D alpha_cpu_class_by_name; - cc->has_work =3D alpha_cpu_has_work; cc->dump_state =3D alpha_cpu_dump_state; cc->set_pc =3D alpha_cpu_set_pc; cc->gdb_read_register =3D alpha_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807088; cv=none; d=zohomail.com; s=zohoarc; b=GC/bOUImG/DfLyqT4CUrk7A0Hct0CRtkFdCK0h8ZUVMFrvbBNBmCIVL7mTAqWZVjt/7cyHrDvJFutybSxsPCdeM5cVdLbRIvR7vs2PifKkUZJt63wR3PvpMaAeaIl6A1iQ5iU/yjbNxXFnrYEpcy7qSDpVnnrt89bqK442JFVEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gP5Ac48Ygfft0H1EsMdA6mk0u3/jlbxiZGs/HX9oV80=; b=aV7XhcSElic++lhrgyf+EgrQnlo/M15DC0baOjP3OG5Y8c6+Zul1HKscIHmC4HriVBzFIzSFzWbnsWaZM+Iwc8BuUv+XqAvnycYnEKw4GdKzcuUTptgDWRULD2dptpABKwXpTka60Q8XrN3vbDpVdrgri9F+9yp/k5JS5WBsSSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807088434288.6175545742781; Thu, 16 Sep 2021 08:44:48 -0700 (PDT) Received: from localhost ([::1]:43090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtZ9-00026A-9U for importer@patchew.org; Thu, 16 Sep 2021 11:44:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLT-0001KS-Q6 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:39 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:41835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLP-0002S0-EW for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:37 -0400 Received: by mail-pl1-x634.google.com with SMTP id v2so4089297plp.8 for ; Thu, 16 Sep 2021 08:30:34 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gP5Ac48Ygfft0H1EsMdA6mk0u3/jlbxiZGs/HX9oV80=; b=reRTrn4YS09XgwIqmIE5sE98aKB3UCDjos5N0DV+fGXi5UbkooZpUCpGT/DVAqjaHv uAbxYFOAaZ0uVMSks9KwJdvfHna1TKk0KutR+6wcZi15ZVSmB+blM4s6S20CntmCHFzW +8oeARJtDhzDTJtFqx9wdKEVfd981jTwx3+jJ1Mn8iluVLIXEpP73HfTKlED3fiSD26T MGdxgbiiFtzn834NK4/fhxAU0oIL41G+9wIpBCa5UQ/tz8rrVL0fM4nqC+nXLpezZh+z Mgbhu5lEtqfFNHnlFwEkKfZDVp2KLbV446/I761f62qE90hLyzybi4DKqUcxL41qVxjl fYwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gP5Ac48Ygfft0H1EsMdA6mk0u3/jlbxiZGs/HX9oV80=; b=yh215zoFz/oHIfS6wE6oAgzfmrkjlAP2TAw/BX4WSdISxjnurEbGQOzNr5h7hg+h7P FidFSEGnDMRtj5ZC3vq4H4uflZPSq+/j1Xl8Bc9/kUix6NU7CucWxMrJgqoFp/shCd8v 8F7MtBkWcLDLHrLT6jZ55xwCbceGEMzhgBHuM5a2F+PGL1pXpJ2wFDnsw/rCg4wVKrBi IJDQf2AXyfmmzXVTx+3UWkhQjwtFZwp3m7ko7PVp1ZSYKCdl36r82GdLjfBw8YaHkXZ+ Pgp5+jP+PJtmxm8Ao8vzBxsmoR0vEIflUhepTgZgC0DR3y0I3poKy3+egCQa7akwuXk4 wleQ== X-Gm-Message-State: AOAM533kufZs/oU6VO50mQ7N+U2fxdJKDf1qcoVTQ9h0QIhmhpd61sYM a+vWfbX0ioBv2bBGhmjZSO/y3SHGZLJ+XA== X-Google-Smtp-Source: ABdhPJxQfJ1aZaZSQhXGc3os7lisS2XUXPuCHr1evdplTwCHACHcih9H2OJEo64aQGgZrHU0xHQVeA== X-Received: by 2002:a17:90a:578e:: with SMTP id g14mr15720522pji.184.1631806233275; Thu, 16 Sep 2021 08:30:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 10/35] target/arm: Restrict has_work() handler to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:00 -0700 Message-Id: <20210916153025.1944763-11-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807090167100003 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-10-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/arm/cpu.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index ba0741b20e..e11aa625a5 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -73,8 +73,8 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, env->regs[15] =3D tb->pc; } } -#endif /* CONFIG_TCG */ =20 +#ifndef CONFIG_USER_ONLY static bool arm_cpu_has_work(CPUState *cs) { ARMCPU *cpu =3D ARM_CPU(cs); @@ -85,6 +85,9 @@ static bool arm_cpu_has_work(CPUState *cs) | CPU_INTERRUPT_VFIQ | CPU_INTERRUPT_VIRQ | CPU_INTERRUPT_EXITTB); } +#endif /* !CONFIG_USER_ONLY */ + +#endif /* CONFIG_TCG */ =20 void arm_register_pre_el_change_hook(ARMCPU *cpu, ARMELChangeHookFn *hook, void *opaque) @@ -2017,6 +2020,7 @@ static const struct TCGCPUOps arm_tcg_ops =3D { .debug_excp_handler =3D arm_debug_excp_handler, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D arm_cpu_has_work, .cpu_exec_interrupt =3D arm_cpu_exec_interrupt, .do_interrupt =3D arm_cpu_do_interrupt, .do_transaction_failed =3D arm_cpu_do_transaction_failed, @@ -2041,7 +2045,6 @@ static void arm_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_reset(dc, arm_cpu_reset, &acc->parent_reset); =20 cc->class_by_name =3D arm_cpu_class_by_name; - cc->has_work =3D arm_cpu_has_work; cc->dump_state =3D arm_cpu_dump_state; cc->set_pc =3D arm_cpu_set_pc; cc->gdb_read_register =3D arm_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807254; cv=none; d=zohomail.com; s=zohoarc; b=TX+oqZ4Dqg/iv1u0aquKarR+hd5qxu9oNAkMipGoNB4dC3gcnAoc3m9Y65wN3wfUVHCqr6LGWVIB/eajZaIaPGGTkJeShWnYM8pkL1B/4UdccNmFa5isSRRST+ByvLhW6i+iqwTkf++U2P8IT/d6VZzqYNmS398VWGN0ifp3Qb0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807254; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dwPWLEp4Zz1Osmk2eBXqla8Z9DrCfYKS2P2ajgRsNfc=; b=ifWArfziaq8KO7MLoZZQaKkCakz6ADLtgEJklYiwaF1zBW024QxQYmPA2STuZM0uu4JLAhuQZk7AtBwNaRg0eSl2xvXvrVVH61b+qOwSfOQHa/ahl+Mo715CrfzRZEjMZucPnHd/hNooL6OdCZ4u7q05RVea7uLmffmmk8S4qdg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807254875259.3579005478732; Thu, 16 Sep 2021 08:47:34 -0700 (PDT) Received: from localhost ([::1]:49020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtbp-0006Ej-PU for importer@patchew.org; Thu, 16 Sep 2021 11:47:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLV-0001Nk-PV for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:41 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:41837) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLQ-0002Sh-IR for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:41 -0400 Received: by mail-pl1-x636.google.com with SMTP id v2so4089346plp.8 for ; Thu, 16 Sep 2021 08:30:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dwPWLEp4Zz1Osmk2eBXqla8Z9DrCfYKS2P2ajgRsNfc=; b=N7/sGb/hWpZ5624+O8nYysGBZ1D64df1KE1/KFRWPFcFQyFQAYONjwwXst0Czz1fjx IkwLCnq/+FSVyMCDwf7bv6Dk/oUJqXHgRz35KQKrVpmrxJ5tAeq1DGkfRcM+DBQP7nS1 ddpl2M70dloUToNCkiB6S5mHeNBzMNVjOD5C/l6Ae/H8DqhRqpDMhIbMEtPSMIsr6NA0 2evABzihJ0c5Yd/GSgLA31DLf0BTcaj8IOrWGEuuHKBa3pGF1/Wt4GjroCuQ26vXuPq1 bMp7kZTZlpBEiY1bH2M/BGEcib+Z9iXAAWT6PHTpwP+qDwTWqLgVXzHsziVTQqbYxAin 7Ikw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dwPWLEp4Zz1Osmk2eBXqla8Z9DrCfYKS2P2ajgRsNfc=; b=ZD3Uaz0OVoeJRupO2QSbgvCyQIPwPthbXSCG5KVoizAeEtEkL9o2uLo/LwCqJ0W15n 1qY7VZwUz+hZZUs9HL5Szhv68O0Dl8uafUvKpuEfGJ+UA0ooH57kUZDbhbE4Y4N95YNK kQUphQHpQeZU/Tw1spLA16dCjyFj6oL30Ha4F8idDHz6pD5wp+wRIsoIGc7KHChiRPaJ 8vnGNO+FCc44rxuQqLGQGXIU6J+pt8/DEvrBMiuzq/vsseC5eZ40kTpODdbbl36iuOq7 UHUACiVAyVNGlDibSSsWt5pTlAdyYLubQ7UWBKdmsy3wQm28EpvE35qOftbEZL6YGdG2 +UBA== X-Gm-Message-State: AOAM530ZzhXJVciP0dZBYTht6Pksp1oSPjXBfRr6LvrojZFq4mUYTSfz MoI3iQLwC4o8thX2oih6y+cyCpx80usxFQ== X-Google-Smtp-Source: ABdhPJxkKzMhvCUwzZli/7HFILEJVa/12GQS4T3gVnuRi34YOmDwuJ2hkT7XBWhC/rSkx0O0paDqxg== X-Received: by 2002:a17:902:bd42:b0:138:d3ca:c387 with SMTP id b2-20020a170902bd4200b00138d3cac387mr5202976plx.51.1631806233885; Thu, 16 Sep 2021 08:30:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 11/35] target/avr: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:01 -0700 Message-Id: <20210916153025.1944763-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807257182100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-11-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/avr/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/avr/cpu.c b/target/avr/cpu.c index 5d70e34dd5..6d51f91ca2 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -195,6 +195,7 @@ static const struct SysemuCPUOps avr_sysemu_ops =3D { static const struct TCGCPUOps avr_tcg_ops =3D { .initialize =3D avr_cpu_tcg_init, .synchronize_from_tb =3D avr_cpu_synchronize_from_tb, + .has_work =3D avr_cpu_has_work, .cpu_exec_interrupt =3D avr_cpu_exec_interrupt, .tlb_fill =3D avr_cpu_tlb_fill, .do_interrupt =3D avr_cpu_do_interrupt, @@ -211,7 +212,6 @@ static void avr_cpu_class_init(ObjectClass *oc, void *d= ata) =20 cc->class_by_name =3D avr_cpu_class_by_name; =20 - cc->has_work =3D avr_cpu_has_work; cc->dump_state =3D avr_cpu_dump_state; cc->set_pc =3D avr_cpu_set_pc; cc->memory_rw_debug =3D avr_cpu_memory_rw_debug; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807502; cv=none; d=zohomail.com; s=zohoarc; b=hfVbBiVlISCqweH5Kl+os/q7PT5qclEOhuAo2HErm6U7BEMFDWWocqg+B0GkSnPScEPFVM5J8FfJEjepCISozE4F0WB5tUzdeE4FngeQpubl2mpifDCMcvxVZUZCl6xrJEqraZtYM2ZjskCFqKioaSSJ4Zb/O4F9RWBzU9XmmsU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807502; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=M/fz3nm2YLKytQPDTi7ONHRlfHiXRDVxp1klTgoeiA4=; b=d0BVIfX51j8t1faK+QlSqlsICsIhg7LPThxvaJHLFN5WCLKV23Qmu8JIWBzruggTyqZllkZH6SyQeCBOXvlS4DnDp4ZI3Jm5DmeSM3ecniZPpbcSyyQc+aFfOAqTk8Q+OeQn60l1nlM1xF1jJe9rPGtk+AKqdu3LVC7eZjjCL5w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807502213836.6054851892009; Thu, 16 Sep 2021 08:51:42 -0700 (PDT) Received: from localhost ([::1]:59738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtfp-00051w-22 for importer@patchew.org; Thu, 16 Sep 2021 11:51:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLV-0001NW-Nc for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:41 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:50726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLP-0002Sd-VS for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:39 -0400 Received: by mail-pj1-x102e.google.com with SMTP id k23so4847871pji.0 for ; Thu, 16 Sep 2021 08:30:35 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M/fz3nm2YLKytQPDTi7ONHRlfHiXRDVxp1klTgoeiA4=; b=RCzKU9EyUQ92DjLO8DRwCv8r8x5prQ3hGEc5UwjJkVvZDlY3JkE+nNHrInaY9/9j8N Krs+ZGyUrWEUEfn86EnBze381H69SoAv96Ae6qL0xe9SlHfbu4NUYbrfip5IpXDPnHlS qyNozVifkqBvbcsJ4sZUYubmLOiuLlISVdDNInCYimZsy9LjMS2WetrDZDdcM9M0dJ30 fPl3M0CMPYSXG3p7dkwwNmUXghJnSdV5aWljnFsZSTh5NPxSL5EBsmIwM5vXk/KAF8WF QblYi1szvQzIGi7HqGSwJ6DaHVRM40PuHQ1pTrQf5XAWRurLIo2hh50eaVBNNUrtUIHS rYjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M/fz3nm2YLKytQPDTi7ONHRlfHiXRDVxp1klTgoeiA4=; b=GOAyGbtS6eVn/soi9rTibpWsNoNzBSj51v55R7OxGyo0/JaIcE6H/IQ1akUNVfjtC9 as/Z7PR0B1C8++jCsmJl5stU7RNkXwbPNd1m/gsALS2UPV0+PL2kB559NrgoHdA3VxYD 0s+HoFlMxyVu936jl8PZnrO04srE7l3nep/IoNKkj3OeIbUx6lac6p9Au8V9vF6BxBuB mdG8b+mwWDeQv2EBW0KoS///3CwJKlHWWOH/NNxRxu3F0SGRrfIY8cGSGmIbt8Yv93l4 pgfXDLGlHC5lVaFV1IEZDLmslsyLWH9ItMBKorEpzpgwmCBwtvXFwlSmhDmWQfrrDdm4 NALg== X-Gm-Message-State: AOAM533NNKrjyqsM8VXrX3wyA/66dL7Epg2GkViZUMFUoKBMkribCbyG 9GDykjYfDsagYUryeNh4TSyO8X13iTQhKA== X-Google-Smtp-Source: ABdhPJwRd3v0b/DfomGbZmqlL6bx4a+HRKP2PVKsRm/08/C3j3DLDsdUmxgbTRskZpffyicA6dCJnw== X-Received: by 2002:a17:90a:c58b:: with SMTP id l11mr6626853pjt.134.1631806234738; Thu, 16 Sep 2021 08:30:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 12/35] target/cris: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:02 -0700 Message-Id: <20210916153025.1944763-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807503608100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-12-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/cris/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/cris/cpu.c b/target/cris/cpu.c index c2e7483f5b..b9f30ba58f 100644 --- a/target/cris/cpu.c +++ b/target/cris/cpu.c @@ -35,10 +35,12 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool cris_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } +#endif /* !CONFIG_USER_ONLY */ =20 static void cris_cpu_reset(DeviceState *dev) { @@ -208,6 +210,7 @@ static const struct TCGCPUOps crisv10_tcg_ops =3D { .tlb_fill =3D cris_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D cris_cpu_has_work, .cpu_exec_interrupt =3D cris_cpu_exec_interrupt, .do_interrupt =3D crisv10_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -294,7 +297,6 @@ static void cris_cpu_class_init(ObjectClass *oc, void *= data) device_class_set_parent_reset(dc, cris_cpu_reset, &ccc->parent_reset); =20 cc->class_by_name =3D cris_cpu_class_by_name; - cc->has_work =3D cris_cpu_has_work; cc->dump_state =3D cris_cpu_dump_state; cc->set_pc =3D cris_cpu_set_pc; cc->gdb_read_register =3D cris_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807298; cv=none; d=zohomail.com; s=zohoarc; b=JlwiI/6RCgHXGQA4oLX6HlLzfuqemfo9vdcucnpJC1tyUrd9ZVQYXtpQnlaSZjCeqUNNt/uBGi5Ty4XoBl+7Y3WD+w+kXLI3QyQuDWTNoLnUDaQAHlrp6DgoWRdDIR5wdYJRJikQExA1sPAU69SPqPyEdZMRFo8yJQei25C7Pl8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807298; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jAI1XCWGYN+pfAsCZFTEnAEoAetKy0IcJx6ab0+wDcg=; b=D55pqtM4q6zKSQxZ6I3DQ8kxi+bn6OGNlErt0fF/VK/Hk6IdpK1uLTn/KTG6g8IkWHWVip9Z0IAe2nchKjlPrM2oNLdBoLtoA6oRHs3L1kJLdYKDZZyieQcuirWNx8VkoRxZ04IoFtYxtjb4Q43olM450LAgf93Qa/2Onfn97a4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807298268107.81810316541896; Thu, 16 Sep 2021 08:48:18 -0700 (PDT) Received: from localhost ([::1]:51286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtcX-0007lv-0F for importer@patchew.org; Thu, 16 Sep 2021 11:48:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLV-0001Ni-Oj for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:41 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:42516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLQ-0002Sr-Qb for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:41 -0400 Received: by mail-pl1-x631.google.com with SMTP id n4so4081699plh.9 for ; Thu, 16 Sep 2021 08:30:36 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jAI1XCWGYN+pfAsCZFTEnAEoAetKy0IcJx6ab0+wDcg=; b=TBdmkxtq2CIedgYBkpubctNylv4K0FRXEIb4ZxzRTzQKYTi0ngXTmpFYUGCYF2SgND lZ6pf0mdlihvz+Ui2y9nFtkCcYL/IoAlkm94/n2ZcRHnoVMFD1aiBcPy53RnHzvPgmay z1i7WzW4yfNvFxIyx4qmBdL6CpqV55O83Qzr4Pa5VrsTkz7vLnm0eyLuuIrFX/3X5Frr 2UgCYZFhs99GyAEE1PEnVSe9YaEiumcitP3hOfmne0eb46tJVbSOoRDAwMYfS6okmDwL hyK0gsa+2KF1flFx81DTd2tEK3kemS6Ft6cRpPuUiLnRg/w27jFtVumM3UfiL/eQ7WBU dE+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jAI1XCWGYN+pfAsCZFTEnAEoAetKy0IcJx6ab0+wDcg=; b=LANVUyiVtxCXeIo8a7OIsY7JFAjfMNBo46m/miq5hylJnPlvSWpz3FeDTKxK4QlLby Dpb44+cy4xjXPGy3BrBuA6nDCiP1AEZK5+8BtKLu9NafGXwUH/fb9ZTzDBjXhHWiuXVy inCfJYzv6Mw/h1ENPRXfQHe1BLK2r8VMd92p2CV27Dzb6cS7BRavJAqRYUWCRXh2QIBX oL+d6RRan8d+wElmd1YeZSk717WLn0gKIVkV9rtHqdGuIcGVyVI6DJpE8dRPgUEA6V30 +VnMCLLng66E4UYkjF3b4tZigkmcrNnQKKdW1/ZVAwbzQu2JxPLxlUESP/8mA76N0VL6 02gA== X-Gm-Message-State: AOAM531IgZkJGDCfHNIWrPvpAfqHblSNexhhzYi6d3dwWgDoqRspvr9o JDbkcQVGD7aqb/XPSnsJapiUIKS/AfUJKg== X-Google-Smtp-Source: ABdhPJwEe/kKX98Lcuz83h2dgghHa5/Jn9n0tQZMAjcj1Mna4ytGUQVsvdujj2caalgRuAwNLPNIfQ== X-Received: by 2002:a17:90a:e7cd:: with SMTP id kb13mr5262807pjb.52.1631806235338; Thu, 16 Sep 2021 08:30:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 13/35] target/hexagon: Remove unused has_work() handler Date: Thu, 16 Sep 2021 08:30:03 -0700 Message-Id: <20210916153025.1944763-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807300579100001 From: Philippe Mathieu-Daud=C3=A9 has_work() is sysemu specific, and Hexagon target only provides a linux-user implementation. Remove the unused hexagon_cpu_has_work(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-13-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/hexagon/cpu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c index 3338365c16..aa01974807 100644 --- a/target/hexagon/cpu.c +++ b/target/hexagon/cpu.c @@ -189,11 +189,6 @@ static void hexagon_cpu_synchronize_from_tb(CPUState *= cs, env->gpr[HEX_REG_PC] =3D tb->pc; } =20 -static bool hexagon_cpu_has_work(CPUState *cs) -{ - return true; -} - void restore_state_to_opc(CPUHexagonState *env, TranslationBlock *tb, target_ulong *data) { @@ -287,7 +282,6 @@ static void hexagon_cpu_class_init(ObjectClass *c, void= *data) device_class_set_parent_reset(dc, hexagon_cpu_reset, &mcc->parent_rese= t); =20 cc->class_by_name =3D hexagon_cpu_class_by_name; - cc->has_work =3D hexagon_cpu_has_work; cc->dump_state =3D hexagon_dump_state; cc->set_pc =3D hexagon_cpu_set_pc; cc->gdb_read_register =3D hexagon_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806777; cv=none; d=zohomail.com; s=zohoarc; b=FL1J+tXEnJmZmJULpj9AZ7R43CSe1exoTUbTbdw4FS+ZLhCfhgAhj/bFeFKDV4tMdu5HBy3nK1viIuWOrymTDR65E9v+pZT2SsHUdetVSaVsiNsnMj7XgRO0zayYDaPcsSQ2WUcvv/cmGXuBNZsmVh7iAQtTvnC9qnMgksH3vnY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806777; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ePy6aN6lFva1+oLoEnr79Yb8aPoSMIJ8GBwpmOsa/Yg=; b=ckozOfka404Zve1SRUiOej3488IUgJktW8LFZpBAS5od9vmItYBwktg5NiLM2fRl66Y9XhdHh2chKfQG8ohFR7NyBKjh/URRAPsqEGObInTX2bSQCF+rzqJpfwS2fwAXv0mM6NAWjU+URXDwGTOoTvG9p5Cdr61kIOAz/H+bqsQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806777920300.6732099108052; Thu, 16 Sep 2021 08:39:37 -0700 (PDT) Received: from localhost ([::1]:57882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtU8-000129-MM for importer@patchew.org; Thu, 16 Sep 2021 11:39:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLZ-0001Q2-IC for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:46 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:34400) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLR-0002Ui-DY for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:44 -0400 Received: by mail-pj1-x1029.google.com with SMTP id on12-20020a17090b1d0c00b001997c60aa29so6334303pjb.1 for ; Thu, 16 Sep 2021 08:30:36 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ePy6aN6lFva1+oLoEnr79Yb8aPoSMIJ8GBwpmOsa/Yg=; b=zM61HbEkl1c783RInvmFY7x5NS3QLwdH0K05kzTFWbwzhedwGSt86lrY8eaOfJtHmt S0QlgAg/kjW0E4DFwi+n1rcg0GbZ3LATp5karnfKDubX3st6XZbdQHzOys53C/O/YneE Tde12SaNrqiPLqb0LofT4jnIzpFtu/fv90w6TxUVkA7KuMKwgpO60EBWtU36kiriEycV RR+OGfYLIaHwkiqq3DAP2633nNkv3nvnEGsADHUktWcRVHnD2ZNf8aqWvmpDI+d8fqla 4Fi9Y8m+51r/n3bgD86UWr6AJBZPgojwOg3AQB80Y+jM9c0jyphFxshn5wi9RqbbiFM4 sxCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ePy6aN6lFva1+oLoEnr79Yb8aPoSMIJ8GBwpmOsa/Yg=; b=wEfLN3la72BwYrSnrC7Ef4GKW169yNJLjLuiealypMGj9L5SxRj/uOtMHyz0afy4Wc behi4mKIp0bJ7tkgi/j0j2jYokrf8VzQrJwAJynXda0dDvE012zplwZZbgWlvJP6sZ0k ADa8mx9NI4N+sYrzqrPNztif3xXyWqB0sBBqUkREluXqQP1jqPkjz842/LxafGXIE/Vx +jTlYjFongUo6wBLV2KesDFUc+gBWDWSALgKvoPUoVI35eAam1GdtIhvXhqQ8NyRN4DI keFYZx4ONlJvZn1VAvXsWyhHeSBx74olO2oNf0OC6ZNazFEaB+UpfZgmjMM5axUQyFn7 PSsQ== X-Gm-Message-State: AOAM533dN32CRCNJ+joDr1Y2qdwujPCu8A2Immwr2v5n0jnHRtvli3rM VOjJp6aD50Kwt7fY+nBDPseXdzxu2XtQwg== X-Google-Smtp-Source: ABdhPJyxGaznb3O46qykn/DiYMW2e4MtkftaOSr6EyirSNlczSv+3JRw3eigazXuk7Cg55kgm5haKw== X-Received: by 2002:a17:902:8ec5:b0:13a:2789:cbb0 with SMTP id x5-20020a1709028ec500b0013a2789cbb0mr5274397plo.60.1631806235961; Thu, 16 Sep 2021 08:30:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 14/35] target/hppa: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:04 -0700 Message-Id: <20210916153025.1944763-15-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806779123100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-14-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/hppa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/hppa/cpu.c b/target/hppa/cpu.c index e8edd189bf..be940ae224 100644 --- a/target/hppa/cpu.c +++ b/target/hppa/cpu.c @@ -60,10 +60,12 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, cpu->env.psw_n =3D (tb->flags & PSW_N) !=3D 0; } =20 +#if !defined(CONFIG_USER_ONLY) static bool hppa_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } +#endif /* !CONFIG_USER_ONLY */ =20 static void hppa_cpu_disas_set_info(CPUState *cs, disassemble_info *info) { @@ -147,6 +149,7 @@ static const struct TCGCPUOps hppa_tcg_ops =3D { .tlb_fill =3D hppa_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D hppa_cpu_has_work, .cpu_exec_interrupt =3D hppa_cpu_exec_interrupt, .do_interrupt =3D hppa_cpu_do_interrupt, .do_unaligned_access =3D hppa_cpu_do_unaligned_access, @@ -163,7 +166,6 @@ static void hppa_cpu_class_init(ObjectClass *oc, void *= data) &acc->parent_realize); =20 cc->class_by_name =3D hppa_cpu_class_by_name; - cc->has_work =3D hppa_cpu_has_work; cc->dump_state =3D hppa_cpu_dump_state; cc->set_pc =3D hppa_cpu_set_pc; cc->gdb_read_register =3D hppa_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807396; cv=none; d=zohomail.com; s=zohoarc; b=Ov2Nsk7HFnBEB/hO07MrLRzyI0t+HAj3q0mr9XI+m8/THgsHr5Y1CcIwYKh1RZdk830jqpnnETPZjxtrPkAm2EXKbqqzP5qDWVcrcEkicpy9wvBFw8oSDq72whecqN4uEF1J8z8jjifBBS9UoyPbmbXOAmjrJISx/Ghmay498q8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807396; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lXET+xYBNc1lxlyCwf5bn3A4DBRHEif1uqzxMzBFnFs=; b=hn2pYvBQYnOdhzoPACxW42Rj0QXlXCrvHo2KNYFEOAs8MGqq3Uk60oaVGWA4XyZ6UheBeDC1V/+cKn9JO3GBqTVdWyZ/u1YxfA2JRmRhm2K1FeFGlITBp1GFAkzAQ1cdL+NRq7gba+6nHK2uzjbM8sSfFDEHnud6w3tqJItFtmo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807396612998.6456214961407; Thu, 16 Sep 2021 08:49:56 -0700 (PDT) Received: from localhost ([::1]:57434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQte7-0003VG-6Y for importer@patchew.org; Thu, 16 Sep 2021 11:49:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLZ-0001Q0-HY for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:46 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:54928) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLT-0002Vo-H3 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:41 -0400 Received: by mail-pj1-x1029.google.com with SMTP id i19so4804122pjv.4 for ; Thu, 16 Sep 2021 08:30:37 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lXET+xYBNc1lxlyCwf5bn3A4DBRHEif1uqzxMzBFnFs=; b=Q2M6igR1R6mGzSQo3coGw/qT5opTTCVsIUKm4TiseTLdufLRFPF0kLK9+F3aNcMXPc z8igq8Tz9bKMkXEdeFiotExifd9oywfb/q9v4fwsN1+6sCbcsTSBsmEEOsdz0Ul0R7Kl TAUftkB2eW9hpQXOSMqmJb5eSFL9uZfEwfkQGsFmvNk2fozZFpLDFb+WyHGoj+Q2sGXQ Y5uTlieXEUCT6tkhWbJbmjSiwgH8CDDpdaQO80pggpIMz2cpy785VmL5urusZ9s7HNXh aZrPtiwjG7iJzsa3weSGFlq5SnNmwP5QmYeccbMDkL1ThcdC8RnmB2d7Wyugbsd23YqG kDJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lXET+xYBNc1lxlyCwf5bn3A4DBRHEif1uqzxMzBFnFs=; b=NHWVqd5JTUlC1dik0xuJx6OUgLXkfOUEPltqFQ9U04WKvq+57V3whb8MGpFq8Hsbny T7XkdzSFsbdTycSft9uLqoCbBi29FKWs9Dn056zy3jJNbvIg5ezck2g86DBa3orsAHly XFpoAyx/f46lpizURW1KndAln931RpwUdaF6/ttOKftGDCbxqaj4atg/E8sgHlv1VJ8Z tT2Fs4YDGXuaF+4yJ9sVp0Rt/MCQy9zNq9odiSyowTdVm1R7Eseb0TNU84KIjkYOzZ0g EJz5HoIRBEFBW05Pa3NHr3Uq/wEDcJ5GLXWk9lcILVOklXHPPC/h6SAoEjsdDq1NrET+ mgmw== X-Gm-Message-State: AOAM5331bNZSf9k1kXp0j6Dbrul6+GHdqlUfuIlBOyby7x5u/QIBeg+z HQ4l/ErBdu1qqIFPVMF+1Q0Ytssi4ivYtw== X-Google-Smtp-Source: ABdhPJz7XBJVsjpdaIpU3JlCx79fValD4Q6fOtp6eUL1uEgSQkBu3Bz3ESQKmHja8LDRND0z1fQRqQ== X-Received: by 2002:a17:90b:168a:: with SMTP id kv10mr15320695pjb.35.1631806236568; Thu, 16 Sep 2021 08:30:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 15/35] target/i386: Restrict has_work() handler to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:05 -0700 Message-Id: <20210916153025.1944763-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807398235100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-15-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/i386/cpu.c | 6 ------ target/i386/tcg/tcg-cpu.c | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6b029f1bdf..36a1c5f3fd 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6554,11 +6554,6 @@ int x86_cpu_pending_interrupt(CPUState *cs, int inte= rrupt_request) return 0; } =20 -static bool x86_cpu_has_work(CPUState *cs) -{ - return x86_cpu_pending_interrupt(cs, cs->interrupt_request) !=3D 0; -} - static void x86_disas_set_info(CPUState *cs, disassemble_info *info) { X86CPU *cpu =3D X86_CPU(cs); @@ -6763,7 +6758,6 @@ static void x86_cpu_common_class_init(ObjectClass *oc= , void *data) =20 cc->class_by_name =3D x86_cpu_class_by_name; cc->parse_features =3D x86_cpu_parse_featurestr; - cc->has_work =3D x86_cpu_has_work; cc->dump_state =3D x86_cpu_dump_state; cc->set_pc =3D x86_cpu_set_pc; cc->gdb_read_register =3D x86_cpu_gdb_read_register; diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c index 3ecfae34cb..aef050d089 100644 --- a/target/i386/tcg/tcg-cpu.c +++ b/target/i386/tcg/tcg-cpu.c @@ -55,6 +55,11 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs, } =20 #ifndef CONFIG_USER_ONLY +static bool x86_cpu_has_work(CPUState *cs) +{ + return x86_cpu_pending_interrupt(cs, cs->interrupt_request) !=3D 0; +} + static bool x86_debug_check_breakpoint(CPUState *cs) { X86CPU *cpu =3D X86_CPU(cs); @@ -63,7 +68,7 @@ static bool x86_debug_check_breakpoint(CPUState *cs) /* RF disables all architectural breakpoints. */ return !(env->eflags & RF_MASK); } -#endif +#endif /* CONFIG_USER_ONLY */ =20 #include "hw/core/tcg-cpu-ops.h" =20 @@ -76,6 +81,7 @@ static const struct TCGCPUOps x86_tcg_ops =3D { #ifdef CONFIG_USER_ONLY .fake_user_interrupt =3D x86_cpu_do_interrupt, #else + .has_work =3D x86_cpu_has_work, .do_interrupt =3D x86_cpu_do_interrupt, .cpu_exec_interrupt =3D x86_cpu_exec_interrupt, .debug_excp_handler =3D breakpoint_handler, --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807673; cv=none; d=zohomail.com; s=zohoarc; b=mw59qJXJG4m87unapC1w+egF4H1HNN0NBpPU3VzCVCJY32bQ3syy9gnxa+dlBiJFnQjAeee6nLD8soyb+PaThEzbJNBW+Q+BbhrSlgQVE2VzYUqVsFa/mOQ5YjnYwR6UBWMJPkmqcCwV7RA0Jeu7Vrr3v3ohJ9EDWzqLKPuRSyY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807673; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LMAaN3fIk1+CGVDUh2TqRwq0ThOKp39rivwNuMj/4tA=; b=NjN9nT8jgGLnfuSRwEDDSXeQo2vBlzBVExUh/7ewvuCaY3VskR2k1yb6pUJ2NhsOPxigNU2zfWW3PyY5gLuy6y2kpV5Bz1ukMmsJ1tqJNxminwOkzhAUvTuvL3ezN7ve9R9BmlQ4/28HLucOuj8nAUxaWFI+VIxX6pMcZG4HHMg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807673601193.44911377164078; Thu, 16 Sep 2021 08:54:33 -0700 (PDT) Received: from localhost ([::1]:39900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtia-0002Ig-Jf for importer@patchew.org; Thu, 16 Sep 2021 11:54:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLd-0001T8-7U for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:50 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]:50730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLT-0002W9-IK for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:46 -0400 Received: by mail-pj1-x1032.google.com with SMTP id k23so4847941pji.0 for ; Thu, 16 Sep 2021 08:30:38 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LMAaN3fIk1+CGVDUh2TqRwq0ThOKp39rivwNuMj/4tA=; b=RAa9NDJMTgTNx9GpkVNLwqJ0LDfAQd3EDopF/VYylBs5PbuS+oHwwqa+4ZTgAokNOr 7aZFNwNNgcwp2z8fLITj5eHsPvzOfBj0rpyX91IDECwsfbfUHhrFtn5zjoHuMQUQx1Ql tX1yNokFkclN89E/8C1Nv5zCuvlml7/+/8VI1uYiENrfi0bZZE/I38rC+QwmCLm0IfWO z1X28JAEkG4HI+CQgcpdwZR0+i7O0SyFi2N0ncJR0xYvzCrQ4beubW4af8pTgs7o7dee p1baKyOLRc9EX9XO9KXHofOzmDtLMEhxrEPzdG4C1c1Afrrm91H7l5Ao9fIEWX4P4yBz Heaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LMAaN3fIk1+CGVDUh2TqRwq0ThOKp39rivwNuMj/4tA=; b=AbNM1ThZIztU1ALhfhQrseWuFdv4dVfuF9bmYw5hcbDVZeEb0wmSreUGGrVd9qcJVt xSu6GQ4tvqS660R3vmH3y3Nj+DH3hZPUitIXJZxGsLRs+h9quVy9MgOTgiyGZIQTr8wC /vfmRyyoUSN+tTgx3jhWq+3MUuR6z4dlGt78YEwTbsInPiWpASsftqSBI/qM840nv/Ew i3aFeeidBK//28TuCzsfvOLLXvLFEGfc9ys/c0cK57ug6Ng9krXhbhpj9/QgJX9Z5Q+h C14vS8bPmt02UIpuF4O3Cg+Nfqj6Xcm4ql5vzcYLWEv4fIrs/ocWW9OrsHHDXQn1lVLM AOQA== X-Gm-Message-State: AOAM530cJ44BuZdkiwaL7rRlHcKN0WLl/Ia6QNw1P3J9rc1IdtfSu9/6 sH76KMWt7T86+DaZTLyN7a2n6PChT8NKhA== X-Google-Smtp-Source: ABdhPJyMLBP8wMMZS3DY4URaFRPkov4TowUv8nFUGJElK33V+mzwq/QVP6cQ2AJcyT12GM6O+GLjYg== X-Received: by 2002:a17:902:b202:b0:13a:2f9a:bd97 with SMTP id t2-20020a170902b20200b0013a2f9abd97mr5381598plr.2.1631806237373; Thu, 16 Sep 2021 08:30:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 16/35] target/m68k: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:06 -0700 Message-Id: <20210916153025.1944763-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807675844100003 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-16-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/m68k/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c index 66d22d1189..ad5d26b5c9 100644 --- a/target/m68k/cpu.c +++ b/target/m68k/cpu.c @@ -31,10 +31,12 @@ static void m68k_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool m68k_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } +#endif /* !CONFIG_USER_ONLY */ =20 static void m68k_set_feature(CPUM68KState *env, int feature) { @@ -518,6 +520,7 @@ static const struct TCGCPUOps m68k_tcg_ops =3D { .tlb_fill =3D m68k_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D m68k_cpu_has_work, .cpu_exec_interrupt =3D m68k_cpu_exec_interrupt, .do_interrupt =3D m68k_cpu_do_interrupt, .do_transaction_failed =3D m68k_cpu_transaction_failed, @@ -535,7 +538,6 @@ static void m68k_cpu_class_init(ObjectClass *c, void *d= ata) device_class_set_parent_reset(dc, m68k_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D m68k_cpu_class_by_name; - cc->has_work =3D m68k_cpu_has_work; cc->dump_state =3D m68k_cpu_dump_state; cc->set_pc =3D m68k_cpu_set_pc; cc->gdb_read_register =3D m68k_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806753; cv=none; d=zohomail.com; s=zohoarc; b=Fx8NaeNyk7zseL7evhITw/br7lGd78UTuAks5Txhv6B9yN8rvJ76JEY7HBflO8pMJWqvm77ydeFw9BTtnM0sow8KyxWj5qJr+fJPlJxfyVv66purjaVqHFAp4bYGu4fga7idbX+9fmraOfZmTLXUjaGqZ7Evnw/ahiYdPXhjd6M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806753; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=B7rWuZpn/SMFqm/jKpkO+UpJH/x3OABwCOd9KRMVg2I=; b=m/6fFGEyom+P9UQeNIHicvomLPhJ1Viv12QsqbZba34zh10NGkhmuEbtBK54fB9mhh0AW4Gdcdeiotro232bIOahNri4rO+ENZyq6hvvWTAd35ZhU7DQ+unPLQQxfdK4cLDxN9c8iFcVYfcnqBHPckXsmAB/2IgLAyqPsVVcBoY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16318067532761021.7900123073119; Thu, 16 Sep 2021 08:39:13 -0700 (PDT) Received: from localhost ([::1]:56030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtTk-0008Aa-5w for importer@patchew.org; Thu, 16 Sep 2021 11:39:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLk-0001Zy-58 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:56 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:43856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLT-0002WG-Hv for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:53 -0400 Received: by mail-pf1-x431.google.com with SMTP id c1so3324124pfp.10 for ; Thu, 16 Sep 2021 08:30:38 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B7rWuZpn/SMFqm/jKpkO+UpJH/x3OABwCOd9KRMVg2I=; b=SJc92Y7DkgPZuwceESqn/Lpd5GNepRRd+GOIpkXai9Pjf/tF1wml/B+x/ejN1dxUOg hg9lEhddLF/RYyVj7wUy8jz6s5FaTHbWZFmwmBsOlt0yku/5uD/RX0Vm0YzjYU3+iC/V 23U+xdppmItvm/PIzh9zF8If6HCyV7m37eYtR2IMmFRn+Xi6np5pN2Rid9XGifnoTvsV 3DkrjipYHEWwtedEtNtIjTDCB+s+zzvdefg28hxNBX4Cg/PxaYyHDLcKQvKP7KF4GB0E dM4jKTXDUZzAzNc12ZW2zH/sWLP4nzJjZKIcYbx7JdrycJXF7ImbJfZi21t4fF7Psq/C 5iKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B7rWuZpn/SMFqm/jKpkO+UpJH/x3OABwCOd9KRMVg2I=; b=ovUtzlox4+Ot4CoZqwuqD0qDETBYWOiKKzJN2Dnbrt0G/KWhteyNokNkwptwtmcIpw GnA90cvhjCCnWcu2K3BoQbTd/wqVdruyh1WPcl4DBF4QtJxbCm6T4VZRZpWnOyInYQhl T6+8/WA/hEumTht4raMRnLB9Z4Hh/xf5oh7QrNnxzBWP8NvvVshW4PJym87N9U92dwJy CW4Ch6xnVTIPgWbiYOv+gO9lbCYZsB2/bMTIKAhiIpQQeXEYfDsJOGIbGSxz7KSYm0Rd kbcWJAcBrlo9z0j+GeOaC5DAOXgvJniTp696KCZePDwsiWdJPCUYvysfl3EWNJ2Wlqet ZwqQ== X-Gm-Message-State: AOAM531rsZcmQ7cM9gOSNcxKXxyoDN3QwZucFov35jHvF3m3wnzV5ql5 K+jxoRxIk+Ii68JnYvFnMmjOZXWVUl+sHw== X-Google-Smtp-Source: ABdhPJyw4VQSYtTDbTfoKhXHR664yAO7Uo39d9SUpUu81Cwp55FMighk3FJG/hImiUlzCh31DIdJMQ== X-Received: by 2002:a63:c045:: with SMTP id z5mr5459758pgi.374.1631806237987; Thu, 16 Sep 2021 08:30:37 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 17/35] target/microblaze: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:07 -0700 Message-Id: <20210916153025.1944763-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806753768100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-17-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/microblaze/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/microblaze/cpu.c b/target/microblaze/cpu.c index 15db277925..36e6e54048 100644 --- a/target/microblaze/cpu.c +++ b/target/microblaze/cpu.c @@ -92,12 +92,13 @@ static void mb_cpu_synchronize_from_tb(CPUState *cs, cpu->env.iflags =3D tb->flags & IFLAGS_TB_MASK; } =20 +#ifndef CONFIG_USER_ONLY + static bool mb_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } =20 -#ifndef CONFIG_USER_ONLY static void mb_cpu_ns_axi_dp(void *opaque, int irq, int level) { MicroBlazeCPU *cpu =3D opaque; @@ -142,7 +143,7 @@ static void microblaze_cpu_set_irq(void *opaque, int ir= q, int level) cpu_reset_interrupt(cs, type); } } -#endif +#endif /* !CONFIG_USER_ONLY */ =20 static void mb_cpu_reset(DeviceState *dev) { @@ -368,6 +369,7 @@ static const struct TCGCPUOps mb_tcg_ops =3D { .tlb_fill =3D mb_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D mb_cpu_has_work, .cpu_exec_interrupt =3D mb_cpu_exec_interrupt, .do_interrupt =3D mb_cpu_do_interrupt, .do_transaction_failed =3D mb_cpu_transaction_failed, @@ -386,8 +388,6 @@ static void mb_cpu_class_init(ObjectClass *oc, void *da= ta) device_class_set_parent_reset(dc, mb_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D mb_cpu_class_by_name; - cc->has_work =3D mb_cpu_has_work; - cc->dump_state =3D mb_cpu_dump_state; cc->set_pc =3D mb_cpu_set_pc; cc->gdb_read_register =3D mb_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806980; cv=none; d=zohomail.com; s=zohoarc; b=KN7+j2lnNzlB7TF636N6Cq45gP0BBuTwEejrFEWWA69cCfQ/cciL4ZyKhxwiwGynQzzdzs1mDkcj090aYa9BGZpt4CgQxQAfrHF7d3ME2xLlaeh8r4ZLrJXi5DhDLAqlNz6PRy4PFYC5kfVVucWgAEECmDXJapw03fBXt97ALSc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806980; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lL5fiNGlIY2Cx7URLhUqVO158bdYKQAqHd9ebRpcjXE=; b=CxkV9b4ng1y9vZJTza31VYZqw0ScwYSwoXelhROsYT/RkCEwq7eK5hN+USTciuPrzhxfGcl8Sc6OhjBn/qpqgUOoNNasIijrbnBU+llSgziV4GFMQRahGMidw165GFeJNX+7Mk65ow/+KmzNCW9AG8VbBAefC+GQBsSEaCYrITg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806980416294.3813257758567; Thu, 16 Sep 2021 08:43:00 -0700 (PDT) Received: from localhost ([::1]:37938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtXP-0006zm-EV for importer@patchew.org; Thu, 16 Sep 2021 11:42:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLd-0001T0-6l for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:50 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:46879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLU-0002WM-7U for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:48 -0400 Received: by mail-pg1-x52b.google.com with SMTP id w7so6442282pgk.13 for ; Thu, 16 Sep 2021 08:30:39 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lL5fiNGlIY2Cx7URLhUqVO158bdYKQAqHd9ebRpcjXE=; b=I482VBxoG22zQJUKBn36XsjhMlvJJnNyCt6ohJnf0IoWDBMdY2z7Nqeg9CVk8xnZQE lxHZ+swCm6oohdN/yj2OWibCjdQo5E780T/I5XDq/ma/Ww3Jv0QBtBnKUd7qgWefNz2M sMMR834R1mfpd45TvtXZGgYTxTu2j2OUq4fgG3mr25Z/Dm5XMNsqV6etTXNJc5RzlLM1 PONUkt5f9f4JzUZ53Yq3Fp+xHxK64P5SXKIFsQFNdjLm0UPNabtI20xEwufj5hf5qXO6 pNkIrLU3cWzR6tKcrjQHIqkKdv/e319pXwrdvr3UWm8Nss4YJto58cm2ZyP+WFA9y8Nk PxVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lL5fiNGlIY2Cx7URLhUqVO158bdYKQAqHd9ebRpcjXE=; b=HJr5OFWfJW4eGEgrsNJ0bBzJAkofASKkRuo5rQWRqEu724oFQmWXE/xtIoLuvdBh/p kIst5gCixSNUWHPbGvA/jgj+TzcLxLIdSaWEBDNAKwna9/r0phR95KP9SuVy59gGmbBS WrfGClhcAYvpu0GelQzE9iGD+hUY1n6fBTt8z7US1YhykpTZ/Yqs3FcEBPcQIyFXxq+v ez8XyOhWrorvIFCWpUQXLBUhT6jc955uvd+gbwLItkQ2QnmFcR8jj7w/AN31x6Zs+xdS hbpiSNjUT30YmNXtrCb+aQUPge7aazAL2br2dtfFRYOQx9q/90j5z7fuJwQ/XEA6f8hq UEHQ== X-Gm-Message-State: AOAM5310ho05y6DOZD//Rlcl1gT2obdTODGoBee8F6t8HtKuAETulueX zhxLBtVKrdlGSpIvwmKZ3vFBo3EfObE4TQ== X-Google-Smtp-Source: ABdhPJzcAi8eSI0NqBNk7X/911jaIUZDtRqa5GmgD9zO0WYHxdZYGkWa5dPgfD3D0jU5xvX3Lw7w5g== X-Received: by 2002:aa7:9542:0:b0:434:5a64:bc8 with SMTP id w2-20020aa79542000000b004345a640bc8mr5666157pfq.30.1631806238594; Thu, 16 Sep 2021 08:30:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 18/35] target/mips: Restrict has_work() handler to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:08 -0700 Message-Id: <20210916153025.1944763-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806981302100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-18-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/mips/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 00e0c55d0e..3639c03f8e 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -128,6 +128,7 @@ static void mips_cpu_set_pc(CPUState *cs, vaddr value) mips_env_set_pc(&cpu->env, value); } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool mips_cpu_has_work(CPUState *cs) { MIPSCPU *cpu =3D MIPS_CPU(cs); @@ -172,6 +173,7 @@ static bool mips_cpu_has_work(CPUState *cs) } return has_work; } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 #include "cpu-defs.c.inc" =20 @@ -542,6 +544,7 @@ static const struct TCGCPUOps mips_tcg_ops =3D { .tlb_fill =3D mips_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D mips_cpu_has_work, .cpu_exec_interrupt =3D mips_cpu_exec_interrupt, .do_interrupt =3D mips_cpu_do_interrupt, .do_transaction_failed =3D mips_cpu_do_transaction_failed, @@ -563,7 +566,6 @@ static void mips_cpu_class_init(ObjectClass *c, void *d= ata) device_class_set_props(dc, mips_cpu_properties); =20 cc->class_by_name =3D mips_cpu_class_by_name; - cc->has_work =3D mips_cpu_has_work; cc->dump_state =3D mips_cpu_dump_state; cc->set_pc =3D mips_cpu_set_pc; cc->gdb_read_register =3D mips_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806635; cv=none; d=zohomail.com; s=zohoarc; b=WH5Nuo2pEyMgEwlLmKAXRZKKq8JlPOCnevqyjWIHlak63bquTAZEOPk+Io0j/iOGo/WcQbQIiWIlZEudF4h7fdPLE5w1G3mRFgHKQ66IHcYkRijKbox0LFzR9bkW5Njmgh9SPrklabJWZVmUCnRiohD7yBwB7QU9XkDKN9ldsv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806635; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zQBj6R6mNHBuNIdCp6TRGb9J98g6c/du643Q8y+hiXM=; b=eiPBx6e3DspeXZK7sjEPORPeavk5U9Uct3ZYFyXB+OQmt2gyMoF0iuN9TywLUym0o97Bkw8usFUwS0QBeHaMVwd7cMGP5Z3+saa3GCWFcQcQ4F6cMkZZKaLZ/OwL07BhmNDLD+s3Pw47vkILfIbiFgqpczLPM5Xk+CpDpI4iuIE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806635673989.4203249520948; Thu, 16 Sep 2021 08:37:15 -0700 (PDT) Received: from localhost ([::1]:47742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtRp-0002LG-Fw for importer@patchew.org; Thu, 16 Sep 2021 11:37:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLd-0001Sv-6O for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:50 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:33455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLV-0002YC-7a for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:45 -0400 Received: by mail-pl1-x636.google.com with SMTP id t4so4147093plo.0 for ; Thu, 16 Sep 2021 08:30:40 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zQBj6R6mNHBuNIdCp6TRGb9J98g6c/du643Q8y+hiXM=; b=LfnWUeN+AnGOQVNkE6d7OdMt7+ZH3VvDJqSy6Vg6hl96ewEeWK9WMT7fuptOL0gCQ6 LCdD2Md40M4E874Orm+AgimauILpK79dEC6PtNoleFXMEqVXyCFL8Q8AmgL8hPRxgBsG Co5VcvifHuBK/bjUX2u5xwBZhXOrU1q8NSNi09pUNEqAZazqxwzCf2rFujB4fVfBiXv6 otgSq5wzH6gEYNlYtpUKJMgqaGbYaYpu5zyQUACpac5aPJWZURB2KjDzWA/0NJDeiVD2 pfcZGIrrYbywfke0egRi0/hTWJXoff4/AAqqMsoWb304ieze1c3iwNhF/KNOVLK+bCKQ xKnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zQBj6R6mNHBuNIdCp6TRGb9J98g6c/du643Q8y+hiXM=; b=JSbgINO1ZXjAeuBT+8i06Nsj/Bg4JUPicDLnWAI8EcJwl2x4DZEchniian5MYzWZ2M KZiVlMUG304THD2JBXrBsNVHVSCCX6lwYoazT+fqLdW7vplXBcgkNEUfbeYLjGpGvRL7 amPEz9tJj76/bMHCThmAmOeXz56fZqeYv65yjtnz02NZN+9eE9aODPPVXcLFN9dVYy63 hk+SwUbEpzP4IuAgWzQILQ3AYE+J7ipJsZDLSyYaMRPikoz8R3wWFv2NXkaGixYqNlij 2ZxQEAUPNS2eCkzGTsShdZzrj83LWqHDzdAjZV35RoN5dw1fD7xZl/EuZ9DEehTAAq3B yAHA== X-Gm-Message-State: AOAM531jJVeld1CwNeEiFmU6Fu0/prj+/+FZrQ1CFvgg7fDK9ijtjr2P gIhBt9QtzCwptMSnmL4LdByXMWZuQAaK2A== X-Google-Smtp-Source: ABdhPJzsdasiJm6YJtSt/jXrmPPI34WmLY8OgiR925auDiQos9gw3hqwzp4haz5KL1yLZ+u9X3WSUw== X-Received: by 2002:a17:90a:7bc9:: with SMTP id d9mr6581287pjl.129.1631806239433; Thu, 16 Sep 2021 08:30:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 19/35] target/nios2: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:09 -0700 Message-Id: <20210916153025.1944763-20-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806637393100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-19-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/nios2/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/nios2/cpu.c b/target/nios2/cpu.c index 947bb09bc1..9938d7c291 100644 --- a/target/nios2/cpu.c +++ b/target/nios2/cpu.c @@ -34,10 +34,12 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value) env->regs[R_PC] =3D value; } =20 +#if !defined(CONFIG_USER_ONLY) static bool nios2_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI= ); } +#endif /* !CONFIG_USER_ONLY */ =20 static void nios2_cpu_reset(DeviceState *dev) { @@ -223,6 +225,7 @@ static const struct TCGCPUOps nios2_tcg_ops =3D { .tlb_fill =3D nios2_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D nios2_cpu_has_work, .cpu_exec_interrupt =3D nios2_cpu_exec_interrupt, .do_interrupt =3D nios2_cpu_do_interrupt, .do_unaligned_access =3D nios2_cpu_do_unaligned_access, @@ -241,7 +244,6 @@ static void nios2_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_reset(dc, nios2_cpu_reset, &ncc->parent_reset); =20 cc->class_by_name =3D nios2_cpu_class_by_name; - cc->has_work =3D nios2_cpu_has_work; cc->dump_state =3D nios2_cpu_dump_state; cc->set_pc =3D nios2_cpu_set_pc; cc->disas_set_info =3D nios2_cpu_disas_set_info; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807192; cv=none; d=zohomail.com; s=zohoarc; b=cu5UQTbrlYecD2SgjxFsJkvSwjBWUpT1jRNZiZ8Wefsbt7PTcfRdEHFiOyQccMBfUhB2g8QL+kl5MBnhJe+uIRLlDZgb9Ca8rsURDPChUx6mRbU1gCikhmrwdRCIdui7WVag9xyrsggjSyJGGjgc8QcfVTqDfmXQMAJIKDqYL6w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807192; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r/Nt2deQEM4uyDo8RGvA8xthDggEvZqmw8YagLLQ3b4=; b=HkKHJwHelqDYjpZRDqc7V6yPiEq9Il+jjpOnUW+AqHvlHk4H3SXZ3KpDxS9SL9/L1eITlJTZiL+HILOsf1QzQB+jRsXeFB/kwP6a5H5zC6gBNtTs3TZwjumLFrF4d+saRMjLKabhREUZ1Fm+rAo8Q7FlREYym0FhnrKUi8qrs90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807192582884.8404600070967; Thu, 16 Sep 2021 08:46:32 -0700 (PDT) Received: from localhost ([::1]:46530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtap-0004QP-Hk for importer@patchew.org; Thu, 16 Sep 2021 11:46:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLi-0001Xr-Ou for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:55 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:44854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLW-0002Yv-6P for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:51 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d18so4069185pll.11 for ; Thu, 16 Sep 2021 08:30:41 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r/Nt2deQEM4uyDo8RGvA8xthDggEvZqmw8YagLLQ3b4=; b=Lv7yyag9vyK2KwngmY71nt8wdxIxgWbE6/azJy29oWMPBqczh34W4989gx77LkvhwV RFdnfgjt/Qnu1NBvk8l77/I2/EU6YkZedrxPg5z3sH0LxPHOCTllQeBcVaxXTY6q5llB zIHz6WNhaBPCy0H+6EAfRUKT/YyCSFy+fsZfKdXfu+EuajaD90aOatyteMyA6LNAhyk3 3g83/jm5WQHY1aYbRBmgbUkQLiOu7MheXfnsMcakmKnQv8x18+XaxBhVIcfeT45YA8yh dh5j1PEmJImqMYSOegDd94cgxrTirRowX8hb70P7P70wdNIupr+fUbi+8bDFKbr/zLIs o0og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=r/Nt2deQEM4uyDo8RGvA8xthDggEvZqmw8YagLLQ3b4=; b=XmvWTkJA7h/RNaBo6fOSkImqDns6aGPpx+9zxyENU9deQaLPY9rJlltpyjrJdZLUpb IDWELT/GswzjrSWW8vv79KPGRF2GdKlfAl1EDrIX0TCwB78MYKaxmX4ScFv9SxcKccre ZH5oQ2sL8HV885RKkTu0vm05tnNCwyrVypKHg9YQQBYRnpuO0nhtjjPQa6oDv0S6jylP +klHOtHwRJZPNNgQLm/vseeOGB8IZTlCEtvhgDN7RdJF63/NfJAMMzlR29j2rB3XB44L 8UuQz7DAzoNnFo0SxS50i+MqTxjsRs9g62fQVktieMEf1c8I3EogNRMhUNa17KTHRdqM De0w== X-Gm-Message-State: AOAM531RH+ECFdFZgznbXvx4Nstsl9WtKLFJBx7ZMuWHXrss/7RX/D9y k1xIB6QIarrxeZRtiarEtM/fThZEPSXwMw== X-Google-Smtp-Source: ABdhPJyaR+j9gb0n5Rn716h9zeBO8CrOTfgSvvKWja4EYZAMxizoVB2U+ayPPGjENbVDv1eoyeI51Q== X-Received: by 2002:a17:90a:301:: with SMTP id 1mr6762410pje.65.1631806240255; Thu, 16 Sep 2021 08:30:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 20/35] target/openrisc: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:10 -0700 Message-Id: <20210916153025.1944763-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807193073100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-20-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/openrisc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/openrisc/cpu.c b/target/openrisc/cpu.c index 27cb04152f..3c368a1bde 100644 --- a/target/openrisc/cpu.c +++ b/target/openrisc/cpu.c @@ -30,11 +30,13 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr val= ue) cpu->env.dflag =3D 0; } =20 +#if !defined(CONFIG_USER_ONLY) static bool openrisc_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_TIMER); } +#endif /* !CONFIG_USER_ONLY */ =20 static void openrisc_disas_set_info(CPUState *cpu, disassemble_info *info) { @@ -189,6 +191,7 @@ static const struct TCGCPUOps openrisc_tcg_ops =3D { .tlb_fill =3D openrisc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D openrisc_cpu_has_work, .cpu_exec_interrupt =3D openrisc_cpu_exec_interrupt, .do_interrupt =3D openrisc_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -205,7 +208,6 @@ static void openrisc_cpu_class_init(ObjectClass *oc, vo= id *data) device_class_set_parent_reset(dc, openrisc_cpu_reset, &occ->parent_res= et); =20 cc->class_by_name =3D openrisc_cpu_class_by_name; - cc->has_work =3D openrisc_cpu_has_work; cc->dump_state =3D openrisc_cpu_dump_state; cc->set_pc =3D openrisc_cpu_set_pc; cc->gdb_read_register =3D openrisc_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631806958; cv=none; d=zohomail.com; s=zohoarc; b=SgDyNhKZTGdHTG+kMiZsgvBQ9tR20ZXLK9uI+67HlSLUBwZLll2HFKeXhJqXZsNWfgrK3gIAcbPyoojYLKXVLU24+cz7j6ai2o2r36+lgNX1Lrrqh+U2Jriw5ZMwZTiwgJqqw2q42RXsB5DKu3SrNDgPp2PWVqIr3QofP6MTb/E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631806958; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=R7BRXEWvxWUGmwl0JiVhEapCxr/L2l4nPcG0jEXDrDU=; b=e1nm7Tc9OPAuY4R7wBNo3OaV5FOIa0e/vB/5fUxTYJgRMSG7GOjzK+WXdZwZdorg4n6FmMK5XAyKOe0e5c9NypwY97JB5nEd/hYTqCkad4y/rgXrCZKiulITQgyQJr3T0tD/kV+yOsLyAfoAWqodwmu1qJF0Kr6pIq8waTakax8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631806958436134.60665686823802; Thu, 16 Sep 2021 08:42:38 -0700 (PDT) Received: from localhost ([::1]:36116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtX3-0005lE-FQ for importer@patchew.org; Thu, 16 Sep 2021 11:42:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLk-0001Zm-4H for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:56 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]:43605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLY-0002ZA-KX for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:52 -0400 Received: by mail-pg1-x52b.google.com with SMTP id r2so6474600pgl.10 for ; Thu, 16 Sep 2021 08:30:41 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R7BRXEWvxWUGmwl0JiVhEapCxr/L2l4nPcG0jEXDrDU=; b=ILll7l8l0832sU+IQQE1ndDm8dBYqmgusQUSdgvvgUDz5ki8ZB7TJsWR5HPt31ui8T AvYJNHWCVd5kLue2i4eRO42HM3INtoCD3M+zhpkmLmL6m14x2ygQinOnHJvVIOWhsVPb WoFws7GR5okAfQwGKK0xsDcW9nC7K6rRx64f87tpsRlAaR4uYpd0MH2i+bRGjeI/7g2h pSpUOleUYN+kcECFskq2+j9/2EZ2aheNRoElkBOnLnOY97Isjl5acNywblHtiHzvkekC VtpehcmkL6shfh5SiDhdsltMV7HwWY0nWwDWHdkOOHkMgtPxgGdcnC+Kul8fmaovlnUA ATSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R7BRXEWvxWUGmwl0JiVhEapCxr/L2l4nPcG0jEXDrDU=; b=vH0yFVBUj1Rd1Ug+IjYF6bhp8GzsS7PBoZKLyzZubeZZ1WhBgw4Id/xF6mRdjrd/mA po3WuIdiPgvQI7KvpDbxK/pAMfDP0/1j56RJdJfQiDWcTBF2h/ZCWBBTyf8Bll1oIopE lvpFVuc8aLrUZVMXjH+4HSOV2Mfm08KlPsbXJQd3RkPx1f1T2MfHQY4mpmYUI4XhRXE7 IOSTtYFO5XpxjkpHdK7Ci6sy2RgKdHA/wqmERHXocYubl/6ZxRooUikqdgLuRYrhTHC6 5a738ceo3wjz5h9uqr4vFWiy7/+V26h9e/LQSPhiJqF11vCNoYGYaz+JImTG1H1intgS t81g== X-Gm-Message-State: AOAM531uu3rkDreWK3MHgHkHrad86gigelnGW80AMWjCb0E0ogsW409X leRh9bDlRIHRaqFW5leX2p+rCspFk6B/JA== X-Google-Smtp-Source: ABdhPJzacPRc9xBXBGpOaarSorzaejxPnKHUPDBucTAuJ+OUed0TBPcrp8F/YuJrPArUG+N1e7+qXg== X-Received: by 2002:a05:6a00:c83:b0:43e:d99:7e1e with SMTP id a3-20020a056a000c8300b0043e0d997e1emr5791538pfv.43.1631806241083; Thu, 16 Sep 2021 08:30:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 21/35] target/ppc: Introduce PowerPCCPUClass::has_work() Date: Thu, 16 Sep 2021 08:30:11 -0700 Message-Id: <20210916153025.1944763-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::52b; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631806960453100001 From: Philippe Mathieu-Daud=C3=A9 We're moving the hook from CPUState to TCGCPUOps. TCGCPUOps is a const structure, so to avoid creating multiple versions of the same structure, simply changing the has_work() handler, introduce yet another indirection with a has_work() handler in PowerPCCPUClass, and ppc_cpu_has_work() method which dispatch to it. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-21-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/ppc/cpu-qom.h | 1 + target/ppc/cpu_init.c | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 5800fa324e..3611011250 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -188,6 +188,7 @@ struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; + bool (*has_work)(CPUState *cpu); #ifndef CONFIG_USER_ONLY unsigned int gdb_num_sprs; const char *gdb_spr_xml; diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 6aad01d1d3..2f7d262b17 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7621,7 +7621,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER7"; dc->desc =3D "POWER7"; @@ -7630,7 +7629,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER7; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER7; + pcc->has_work =3D cpu_has_work_POWER7; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7789,7 +7788,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER8"; dc->desc =3D "POWER8"; @@ -7798,7 +7796,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_= 2_05; pcc->init_proc =3D init_proc_POWER8; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER8; + pcc->has_work =3D cpu_has_work_POWER8; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8003,7 +8001,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER9"; dc->desc =3D "POWER9"; @@ -8013,7 +8010,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER9; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER9; + pcc->has_work =3D cpu_has_work_POWER9; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8212,7 +8209,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); PowerPCCPUClass *pcc =3D POWERPC_CPU_CLASS(oc); - CPUClass *cc =3D CPU_CLASS(oc); =20 dc->fw_name =3D "PowerPC,POWER10"; dc->desc =3D "POWER10"; @@ -8223,7 +8219,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER10; pcc->check_pow =3D check_pow_nocheck; - cc->has_work =3D cpu_has_work_POWER10; + pcc->has_work =3D cpu_has_work_POWER10; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8790,7 +8786,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip =3D value; } =20 -static bool ppc_cpu_has_work(CPUState *cs) +static bool cpu_has_work_default(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); CPUPPCState *env =3D &cpu->env; @@ -8798,6 +8794,14 @@ static bool ppc_cpu_has_work(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } =20 +static bool ppc_cpu_has_work(CPUState *cs) +{ + PowerPCCPU *cpu =3D POWERPC_CPU(cs); + PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); + + return pcc->has_work(cs); +} + static void ppc_cpu_reset(DeviceState *dev) { CPUState *s =3D CPU(dev); @@ -9037,6 +9041,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void = *data) device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, &pcc->parent_unrealize); pcc->pvr_match =3D ppc_pvr_match_default; + pcc->has_work =3D cpu_has_work_default; device_class_set_props(dc, ppc_cpu_properties); =20 device_class_set_parent_reset(dc, ppc_cpu_reset, &pcc->parent_reset); --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807869; cv=none; d=zohomail.com; s=zohoarc; b=NhXKLlwCRZtoW99QHvAVP0aGGNB6d74hZfFqkwt5S/BrC4vuypHir58l8ECd862hHKls3IbyUOjAmEoUEgXAdKhLb4ph84nNPWS0q3Yo4ZoQKOdqhUOU7Ob9VrVtvNMZe3QndLfKVwWMprHGaGJ9HRTl4vuW9Ho1GkBMd9DgCZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807869; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0hwaVqaKz38vUrAyliZJndyCYKt8BX36m2eIR+cLHnk=; b=duabO6NJvHd278aF3Eqo/sPZOCat0wAdV1HSiJCSwFoxIRVPK2fMrvHcFeK7fw87EKTnTk3PAp42bbwh0W1fmi5yyYx4WxQRvU767hIbnT/Rdt7JbNBahGHFV9Dcm1vzqAq2V0OUw/my5MENnQHY8PNnq95/1bPteJ09ggZm4Mg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807869196362.77162842410905; Thu, 16 Sep 2021 08:57:49 -0700 (PDT) Received: from localhost ([::1]:48306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtlk-00088n-2k for importer@patchew.org; Thu, 16 Sep 2021 11:57:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLk-0001Zx-5E for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:56 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:40485) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLZ-0002aH-64 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:55 -0400 Received: by mail-pg1-x535.google.com with SMTP id h3so6480194pgb.7 for ; Thu, 16 Sep 2021 08:30:42 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0hwaVqaKz38vUrAyliZJndyCYKt8BX36m2eIR+cLHnk=; b=Bh+BfcQq7JMQ+SKJJIV9o8dB5G4ujbjrjS9DGUWawwU3tBrXLjVHXk5M2zfLRN4Y6H ugyxQ83hOg9Ule7vywlkgv+JNkeZT4XKs9L+xDKVc8eVnluaMehliyzCJ0DnIl6rDny/ TrTncUxsihBTb+KzIdtsVWVXzeM6aMPxCkVX1alLaA8JqKTQnfl86S9V2sqvtCHCcgPx Jp1IcgowzH2XDZdZbjfJn6Y0HFChuVcEmyMCgsz203nJkgMqpBozISweijoJ4nNGFs3A uR7HVgTnTF80qo53G5It7zQwBcUMkTwIuUq5FwjFt+1h59lVUPHN4eaCpp2TWGtaLJMQ 1Lpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0hwaVqaKz38vUrAyliZJndyCYKt8BX36m2eIR+cLHnk=; b=QqrTe2PCE8HdfupkpZNnJMWSDXr9veS77r0G29HWDalGPIOhYIPGlSe7k6MIBSIpNO WWao3CybI9CtE3qy6sO3861gQ1Zhf5H3D5RT0yma2/2eF1klCVABKWOxrOyMSW1H+KAg qyYOqvAoIEE9xHFdhVMdNS8Jyv2M4+O8/d5X6qbb1fsHDwfmWmxwyR96mQOigVaFKqDR 1XxABW/aXYXOIMIB6uf30vt37tew5QU8Ii+iW2KY3CUBmv4lb/9PnYSz1jF7lam+wz+A z5ziYPVpWf5R2eX7/n/JhZlinF0sk07ntW2I8im6/bhqkVgXVCtYjt6HrRMNRxvqzWPw s/kg== X-Gm-Message-State: AOAM532QFi7jpatXcR063ZQyhPUF2e7uvBFnkAEXxMcCxw8beHfc3iwb e7OrDr2+xr2w7jxYpf5VHpIGMEPIMf+YYQ== X-Google-Smtp-Source: ABdhPJwiP5u+1ACekHz/yCpdGtS+jDEBqFsbeXe7WPb7EQz6fSxaNfzpsGIQMSPPXhYfKFYWuSb5sQ== X-Received: by 2002:a63:cc01:: with SMTP id x1mr5453611pgf.304.1631806241880; Thu, 16 Sep 2021 08:30:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 22/35] target/ppc: Restrict has_work() handlers to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:12 -0700 Message-Id: <20210916153025.1944763-23-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x535.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807870498100001 From: Philippe Mathieu-Daud=C3=A9 Restrict PowerPCCPUClass::has_work() and ppc_cpu_has_work() - SysemuCPUOps::has_work() implementation - to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-22-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/ppc/cpu-qom.h | 4 +++- target/ppc/cpu_init.c | 24 ++++++++++++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 3611011250..ff2bafcde6 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -188,8 +188,10 @@ struct PowerPCCPUClass { uint32_t flags; int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; - bool (*has_work)(CPUState *cpu); #ifndef CONFIG_USER_ONLY +#ifdef CONFIG_TCG + bool (*has_work)(CPUState *cpu); +#endif /* CONFIG_TCG */ unsigned int gdb_num_sprs; const char *gdb_spr_xml; #endif diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 2f7d262b17..5c134adeea 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -7583,6 +7583,7 @@ static bool ppc_pvr_match_power7(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER7(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7616,6 +7617,7 @@ static bool cpu_has_work_POWER7(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) { @@ -7629,7 +7631,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER7; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER7; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7672,6 +7673,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2; pcc->mmu_model =3D POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER7; pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =3D 32; #endif @@ -7742,6 +7744,7 @@ static bool ppc_pvr_match_power8(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER8(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7783,6 +7786,7 @@ static bool cpu_has_work_POWER8(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) { @@ -7796,7 +7800,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =3D PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | PCR_COMPAT_= 2_05; pcc->init_proc =3D init_proc_POWER8; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER8; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -7846,6 +7849,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) LPCR_P8_PECE3 | LPCR_P8_PECE4; pcc->mmu_model =3D POWERPC_MMU_2_07; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER8; pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->lrg_decr_bits =3D 32; pcc->n_host_threads =3D 8; @@ -7939,6 +7943,7 @@ static bool ppc_pvr_match_power9(PowerPCCPUClass *pcc= , uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER9(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -7996,6 +8001,7 @@ static bool cpu_has_work_POWER9(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) { @@ -8010,7 +8016,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER9; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER9; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8059,6 +8064,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OE= E; pcc->mmu_model =3D POWERPC_MMU_3_00; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER9; /* segment page size remain the same */ pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->radix_page_info =3D &POWER9_radix_page_info; @@ -8147,6 +8153,7 @@ static bool ppc_pvr_match_power10(PowerPCCPUClass *pc= c, uint32_t pvr) return false; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_POWER10(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -8204,6 +8211,7 @@ static bool cpu_has_work_POWER10(CPUState *cs) return msr_ee && (cs->interrupt_request & CPU_INTERRUPT_HARD); } } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) { @@ -8219,7 +8227,6 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) PCR_COMPAT_2_06 | PCR_COMPAT_2_05; pcc->init_proc =3D init_proc_POWER10; pcc->check_pow =3D check_pow_nocheck; - pcc->has_work =3D cpu_has_work_POWER10; pcc->insns_flags =3D PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB= | PPC_FLOAT | PPC_FLOAT_FSEL | PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE | @@ -8271,6 +8278,7 @@ POWERPC_FAMILY(POWER10)(ObjectClass *oc, void *data) pcc->lpcr_pm =3D LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OE= E; pcc->mmu_model =3D POWERPC_MMU_3_00; #if defined(CONFIG_SOFTMMU) + pcc->has_work =3D cpu_has_work_POWER10; /* segment page size remain the same */ pcc->hash64_opts =3D &ppc_hash64_opts_POWER7; pcc->radix_page_info =3D &POWER10_radix_page_info; @@ -8786,6 +8794,7 @@ static void ppc_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.nip =3D value; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool cpu_has_work_default(CPUState *cs) { PowerPCCPU *cpu =3D POWERPC_CPU(cs); @@ -8801,6 +8810,7 @@ static bool ppc_cpu_has_work(CPUState *cs) =20 return pcc->has_work(cs); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 static void ppc_cpu_reset(DeviceState *dev) { @@ -9021,6 +9031,7 @@ static const struct TCGCPUOps ppc_tcg_ops =3D { .tlb_fill =3D ppc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D ppc_cpu_has_work, .cpu_exec_interrupt =3D ppc_cpu_exec_interrupt, .do_interrupt =3D ppc_cpu_do_interrupt, .cpu_exec_enter =3D ppc_cpu_exec_enter, @@ -9041,13 +9052,11 @@ static void ppc_cpu_class_init(ObjectClass *oc, voi= d *data) device_class_set_parent_unrealize(dc, ppc_cpu_unrealize, &pcc->parent_unrealize); pcc->pvr_match =3D ppc_pvr_match_default; - pcc->has_work =3D cpu_has_work_default; device_class_set_props(dc, ppc_cpu_properties); =20 device_class_set_parent_reset(dc, ppc_cpu_reset, &pcc->parent_reset); =20 cc->class_by_name =3D ppc_cpu_class_by_name; - cc->has_work =3D ppc_cpu_has_work; cc->dump_state =3D ppc_cpu_dump_state; cc->set_pc =3D ppc_cpu_set_pc; cc->gdb_read_register =3D ppc_cpu_gdb_read_register; @@ -9078,6 +9087,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void = *data) =20 #ifdef CONFIG_TCG cc->tcg_ops =3D &ppc_tcg_ops; +#ifndef CONFIG_USER_ONLY + pcc->has_work =3D cpu_has_work_default; +#endif #endif /* CONFIG_TCG */ } =20 --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807356; cv=none; d=zohomail.com; s=zohoarc; b=b7ASQ9Ul9FCKtnm+yPNd2c0hTWp/jJlJuvlVgvPDwa8Mqlzbd04XiTDxuBXJI+3HnFtdbYrRhYF9jpVAYRQCuti1M48KXTvH3RIEVIGR5heR0pzObIGDeRZtrpo+wo/5NL8C7yLVfo6dBRtugR57tSmReXfm+3+AEsfbLxZjxaw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807356; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/h2t7iFSfX1gtAhd6k9niCF0SPBIUY92gpdkPQq/Z1o=; b=L9ylLnEIHLxSlw9o/HHdygC0+eQ0LOOwq7o9hSCtG0swqj1UkmJ1Yd7r/W+XnDSWdQkZ+MEvEAjkVCxQ9N27RBpE51SDj73fGMh/05ke0ObR1V+LH3PotnEtvbzPpYkuaLtJdkw4TO1eJNMcJIWODD6nv7CZbsJeE61Ev/f4FFI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807356526269.53381134835786; Thu, 16 Sep 2021 08:49:16 -0700 (PDT) Received: from localhost ([::1]:54926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtdT-0001qy-GV for importer@patchew.org; Thu, 16 Sep 2021 11:49:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLk-0001ZL-1i for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:56 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:38893) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLZ-0002ah-5w for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:54 -0400 Received: by mail-pg1-x529.google.com with SMTP id w8so6486197pgf.5 for ; Thu, 16 Sep 2021 08:30:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/h2t7iFSfX1gtAhd6k9niCF0SPBIUY92gpdkPQq/Z1o=; b=mg7GdO2mmqVUEKzB3EjE3GpHETqpdw2XOG/GbE0Uf97+m+thauE9rFCdz0GmesGa90 Bf1tRYa+LEukgfX6cYiFOdKD1XKlxIdz8oAeOmKx3HOpmvfCDbwL8ITkTSytASehnQUl JEN7Np7MWw0mSBg3ts2BGf/YE7GQUykEMQtKzK9KQ5S8wwJFiljXkS9VKW34UvUTWrDB V2h6Q37eqoKchknJo3Bb7e+XvtC29DObbw/wVVnJk/ArbVL671IYAwaEhVHCy80wsDxj NIHOBPQThiz0o1omMOgu1bQCdEaaXTP/XQfI1etYNbMUHSgPtWl7+kowcFBJDvV1TVev 8Zpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/h2t7iFSfX1gtAhd6k9niCF0SPBIUY92gpdkPQq/Z1o=; b=bX+in59FThVNwtSBkcfnQJQMhXpmyGmBIGebj/pvr4dCm3fBS1mGq9usfFBX+3T1fZ irOX2+/R+DFw856Ar4ad0POFc5inG/wx24DRSjPuOTwOASik/XzWHqhsT2GjDi9GyM8z hD1GBXP6OzThpca2asLPm6yNP4EqYPk7wJ4J+BumhcdDrAKRPMNlvYto5RY+qXJcXKUz 6P66+bkM5DARufrIIyyZeK1lXL3Fj7mrAWp5TPUaVQ/RKXRwtbe3o89+9HRX+pFkqk1n XOJCVtSGvIRvTU5hfmNW2bJZKeB9rhOew0MwmHQWQFJsUw5AGzVnmRiXdYf4ZNZ+EMWt JQJw== X-Gm-Message-State: AOAM531fNmD4KhiTtOUYoVZ/sa7eQTEEDVCEdbRPNJo40Gx1YCek+y9D eZDeon0Z1z8JqU6KECTWXZrWixE5ZjEZeA== X-Google-Smtp-Source: ABdhPJxUu40UsFtbEWRfms8U9wc926GSsOZqdu7rgMkD+f34gX49UvIHH0r6Ki/btJP8lUPfJhzbbQ== X-Received: by 2002:a63:f817:: with SMTP id n23mr5442467pgh.250.1631806242490; Thu, 16 Sep 2021 08:30:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 23/35] target/riscv: Restrict has_work() handler to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:13 -0700 Message-Id: <20210916153025.1944763-24-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807357160100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-23-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/riscv/cpu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index 13575c1408..abb555a8bd 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -335,9 +335,9 @@ static void riscv_cpu_synchronize_from_tb(CPUState *cs, env->pc =3D tb->pc; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool riscv_cpu_has_work(CPUState *cs) { -#ifndef CONFIG_USER_ONLY RISCVCPU *cpu =3D RISCV_CPU(cs); CPURISCVState *env =3D &cpu->env; /* @@ -345,10 +345,8 @@ static bool riscv_cpu_has_work(CPUState *cs) * mode and delegation registers, but respect individual enables */ return (env->mip & env->mie) !=3D 0; -#else - return true; -#endif } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 void restore_state_to_opc(CPURISCVState *env, TranslationBlock *tb, target_ulong *data) @@ -647,6 +645,7 @@ static const struct TCGCPUOps riscv_tcg_ops =3D { .tlb_fill =3D riscv_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D riscv_cpu_has_work, .cpu_exec_interrupt =3D riscv_cpu_exec_interrupt, .do_interrupt =3D riscv_cpu_do_interrupt, .do_transaction_failed =3D riscv_cpu_do_transaction_failed, @@ -666,7 +665,6 @@ static void riscv_cpu_class_init(ObjectClass *c, void *= data) device_class_set_parent_reset(dc, riscv_cpu_reset, &mcc->parent_reset); =20 cc->class_by_name =3D riscv_cpu_class_by_name; - cc->has_work =3D riscv_cpu_has_work; cc->dump_state =3D riscv_cpu_dump_state; cc->set_pc =3D riscv_cpu_set_pc; cc->gdb_read_register =3D riscv_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807105; cv=none; d=zohomail.com; s=zohoarc; b=DCTJiDLj5TzGb0Pw2H6cHVZ7BNSPiJkHaAr3XBUEnlfGP74rtPvZ1oyQmV/hfvlE+vN1AQSTon+oYWT1f1RJiENnqfdb/SF3FW9Y19CkbUSw20MgnR3uwh1n4VEwBixxOlXspJRVL2xQyjITOH9CTLNMPagkStYRMPB9n5GdnoE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807105; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=54hnQT1IlwQI1vqo01dQd8XkfxGimuQYo48f9SWydvk=; b=VDhQNaWWroRT7QljYswXRY75zb/axug5YQywvAt8N/3Wj1F0sF8j50qTkqLk0mR5ZQwYw8IviKiZCF9wlq0BLXVnXXG1p6DuzYODecoEFCxnFW8mFWoG+lZVPVmoACe0SisYLKVGOyueHcQ4b/XqbPcKkkjbpaVGj1i+e2OBsjA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807105087558.9041088391779; Thu, 16 Sep 2021 08:45:05 -0700 (PDT) Received: from localhost ([::1]:44592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtZQ-000375-1P for importer@patchew.org; Thu, 16 Sep 2021 11:45:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLk-0001a1-8p for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:56 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:36511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLZ-0002ao-TG for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:55 -0400 Received: by mail-pf1-x42a.google.com with SMTP id m26so6284144pff.3 for ; Thu, 16 Sep 2021 08:30:43 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=54hnQT1IlwQI1vqo01dQd8XkfxGimuQYo48f9SWydvk=; b=Hjrgstxnep7o/Hr+KHF+lb6Ag0brMUDSrBglIPfYKX9JZOID81wcKhTOO/EHj3nVIp 4Fe4Dyx2sjAnhb0bBDb1XXhDLE0XqcPWwlSiOdsPk8lWCtZi4pu8Keex3G+NDCevy6kQ rGSMc3HfhlL9KX/4WKnzufDc/wHgM1Z5Hlsq5uPlt+YrOJCApdSvPmbGhPs+k39oHR7R S0kEJqKeUVBvQBvUjN2WNXnzNtmdLJxldGnHCxAYPsqCZvcFEXa/gCct/4QIVc9waPS3 DDjJIcIPRSdnILbfuhEj6FIV4ndiVN/ZIsaRfUtBaD5BFtaL+XoyqwX0zrM7w2Ap2mbJ se8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=54hnQT1IlwQI1vqo01dQd8XkfxGimuQYo48f9SWydvk=; b=KRhOe4DSJx2NQoYivzK/uA7omhU3A3xNgBfsNvN1ht0UXfSBDjOM34PLbvS84wiKt6 bBI9+reTdJcvTYk7uXdv/5BOWZ6klomvLR5GURoNVdxNnWJ6Wr7h8GV9dlIUaKCz3aaC 28ZA5xO0veBh9nY0VrP5jfkv/LBxM2lwpdAtkUbmrXy9MS/MS8ymws0NYW3yR3nKlIG0 HS3yBwmVFiMNBLnP7zXWn+pdA3waU5NxR8wdp1XchdmFxhb/S0OivS69pGpkPac0+8N6 OIDn8iEefURy0fPoHAPUxaDvNyCwETiQ79F0bVbdiN64mkjQkmX/LgJUxk86ygOd2NmH u3WA== X-Gm-Message-State: AOAM533TJSWOYcfE9RA5WKNue64agc2LUsGrqM9cqeYdGHZf9EEmLPL7 yITlJftKW7aTnHrO2/8HPKi21XqsLjweHA== X-Google-Smtp-Source: ABdhPJznvrVM/7KN1w1zyK8/pRyZoEgvz5N/BAFUMwQED9LA3bO5Es5XGut6uk5Qlz5vCMavsXEKRA== X-Received: by 2002:a62:18c1:0:b0:436:2125:e79e with SMTP id 184-20020a6218c1000000b004362125e79emr5734063pfy.68.1631806243108; Thu, 16 Sep 2021 08:30:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 24/35] target/rx: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:14 -0700 Message-Id: <20210916153025.1944763-25-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807106223100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-24-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/rx/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/rx/cpu.c b/target/rx/cpu.c index 25a4aa2976..ac6b40b271 100644 --- a/target/rx/cpu.c +++ b/target/rx/cpu.c @@ -41,11 +41,13 @@ static void rx_cpu_synchronize_from_tb(CPUState *cs, cpu->env.pc =3D tb->pc; } =20 +#if !defined(CONFIG_USER_ONLY) static bool rx_cpu_has_work(CPUState *cs) { return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_FIR); } +#endif /* !CONFIG_USER_ONLY */ =20 static void rx_cpu_reset(DeviceState *dev) { @@ -189,6 +191,7 @@ static const struct TCGCPUOps rx_tcg_ops =3D { .tlb_fill =3D rx_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D rx_cpu_has_work, .cpu_exec_interrupt =3D rx_cpu_exec_interrupt, .do_interrupt =3D rx_cpu_do_interrupt, #endif /* !CONFIG_USER_ONLY */ @@ -206,7 +209,6 @@ static void rx_cpu_class_init(ObjectClass *klass, void = *data) &rcc->parent_reset); =20 cc->class_by_name =3D rx_cpu_class_by_name; - cc->has_work =3D rx_cpu_has_work; cc->dump_state =3D rx_cpu_dump_state; cc->set_pc =3D rx_cpu_set_pc; =20 --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807332; cv=none; d=zohomail.com; s=zohoarc; b=P8vOIAKjWJxdu3ZC+1rXK4ZFrHHbf24qHtlm9xsxE8UocsqNB8WVp9X67w88/xhHiYyaAiMAXtjiBK7G+qmLvAdrQfxWsSew2hDbQiygpUdZCrggUp+Pgu1SgMvs2n4il6hHRUQ4ENK7tVg2MQODKzqaYAPNuKjh6VPU+94Vezo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807332; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yqnQxPNNPW3cXaX5Uop3j/apP2OYNx8szUJcSd+WiRU=; b=T+CC7OQ+bLHPCuqD22Ya7f7k42PXKzhLkVMn/RqlJVymwu/R3eo7FSTIGFn/S8pjDMUF/3u7l55nhaPy3F3LQDNskVpn+GmNROJ1AjUdO9lBDFTa6YEXUpf2gVcpTdjp83PkxIhke8QJW2kbAE9mKuGDbZWIlllShjQBQ781N40= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807332029137.18026910693277; Thu, 16 Sep 2021 08:48:52 -0700 (PDT) Received: from localhost ([::1]:52836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtd5-0000Pu-08 for importer@patchew.org; Thu, 16 Sep 2021 11:48:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLm-0001ji-UC for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:58 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:44000) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLd-0002at-0g for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:57 -0400 Received: by mail-pl1-x635.google.com with SMTP id v1so4073753plo.10 for ; Thu, 16 Sep 2021 08:30:44 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yqnQxPNNPW3cXaX5Uop3j/apP2OYNx8szUJcSd+WiRU=; b=HdaTNicbghT2Nv/qVmD8NK8+XhuFByIPSHH10YCHWY9Rh5NcE/xOQ2lG2ynitnFbZU L16A8Y8RU0eN8LnDJtwM+FfbYkoMgyEgWmJe/6OOL31m2eBalhM7buCdbYa14EdMe1FS zPNO8PtF4ET8/fNJf+UacC3ckupe8w0vvf8vsv2kDeZSl3beFCCKjRnLihecsIiJwPwd JCu/r4OIpX+A15vXJbXSjcdtfsG9fBRJvVv6JVh8/m50xYIRQNX2iBqZPxTdxxiVU/Bo fmyzsWfHPDmOA41J/svIFQ4RbdQVTdJaLnS5SZyS6IUKCQpx8+fvoYmlVoQl3CSLa2PW otRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yqnQxPNNPW3cXaX5Uop3j/apP2OYNx8szUJcSd+WiRU=; b=VbB3JqUAiAp6/ZSbxxz/Jp2OkVwm5gz8R9zlH4V15AyuLYPwFuLCKtS3Xa4YGGKn3B xUgBeF2ktYfPoACdVfCaF1XzebvBRe5rqFt6ztzERA+qjwCXBgVn+GzcFSkhLWrKjV4K OSbr8ESMch7oQPag+JzHWyJhpM3vwOWOMO3V5T35ZRXtFz1wz0uDSenyff18oRRFjb1D gw6JdRKstg1yNEAE42SiqCJB0EpVvvrQGcLG+tpOQ5Qrlso34GCvukPetPthykAL+/Z8 OVpdvGnGFbiNcTdmUUwlozyjMmmGKD7f9ImESIS/n06lkhq2rp/fr+rOhASWtB0F4P6e FOIg== X-Gm-Message-State: AOAM530p5ocAbXvEUoT2w1Td1vGGEZKnw6LK3Ugrdub8H2KLIr/rGJtm q7TDDrmf7uhAkbDSMf6kP6ZeIXV/YAtNcg== X-Google-Smtp-Source: ABdhPJygPJtD9IUnGjBVvS3JBN6/4oAjmM0uvEyyV6xzJg1KRof9aG+u44Jf4OycD9vTPZiJQH5rVA== X-Received: by 2002:a17:903:1c2:b0:138:b303:7b95 with SMTP id e2-20020a17090301c200b00138b3037b95mr5243574plh.78.1631806243716; Thu, 16 Sep 2021 08:30:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 25/35] target/s390x: Restrict has_work() handler to sysemu and TCG Date: Thu, 16 Sep 2021 08:30:15 -0700 Message-Id: <20210916153025.1944763-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807332390100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to TCG sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-25-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 7b7b05f1d3..df8ade9021 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -88,6 +88,7 @@ static void s390_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.psw.addr =3D value; } =20 +#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY) static bool s390_cpu_has_work(CPUState *cs) { S390CPU *cpu =3D S390_CPU(cs); @@ -104,6 +105,7 @@ static bool s390_cpu_has_work(CPUState *cs) =20 return s390_cpu_has_int(cpu); } +#endif /* CONFIG_TCG && !CONFIG_USER_ONLY */ =20 /* S390CPUClass::reset() */ static void s390_cpu_reset(CPUState *s, cpu_reset_type type) @@ -269,6 +271,7 @@ static const struct TCGCPUOps s390_tcg_ops =3D { .tlb_fill =3D s390_cpu_tlb_fill, =20 #if !defined(CONFIG_USER_ONLY) + .has_work =3D s390_cpu_has_work, .cpu_exec_interrupt =3D s390_cpu_exec_interrupt, .do_interrupt =3D s390_cpu_do_interrupt, .debug_excp_handler =3D s390x_cpu_debug_excp_handler, @@ -292,7 +295,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) =20 scc->reset =3D s390_cpu_reset; cc->class_by_name =3D s390_cpu_class_by_name, - cc->has_work =3D s390_cpu_has_work; cc->dump_state =3D s390_cpu_dump_state; cc->set_pc =3D s390_cpu_set_pc; cc->gdb_read_register =3D s390_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631808011; cv=none; d=zohomail.com; s=zohoarc; b=Hn1OSvF2nT2UqPY7yKMS0qlQJy40DwJjbq1AnuBSLsc7daOUq4v2FXyseqeaUd8HymHD1F3KlVtzrvj+tIY4Cd9Rvh+BfJbVKcv4ry0ODcbxCswulbQjMjaXzrnDBCx5zxzn4Tuck2bdKJAAwK5PN05m4gdeFkMFmBIoWNaTLGQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631808011; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=RwS32umeuTKtPdFMznfukznJpzAEayn9YEvDSjPds5w=; b=CM1mbpKWuyXEYHt2p2MStF5uyQPd6nwx+Rb1SsHt1en8BB+s/E2ijPNQVMctNakTQPmCJ6+SJnRv0YojFyLwA9JvGty88nU6eBEnFXVenMuWizozMbZMnfewWpnYbw3fykbCrQqLX4P4YRWQZnrpvLQs0aWD4UwHi3S7EO8KoWI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631808011740723.0410595653051; Thu, 16 Sep 2021 09:00:11 -0700 (PDT) Received: from localhost ([::1]:56546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQto1-00057H-06 for importer@patchew.org; Thu, 16 Sep 2021 12:00:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLk-0001bZ-Ff for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:56 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:54064) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLb-0002b5-1l for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:56 -0400 Received: by mail-pj1-x1035.google.com with SMTP id j1so4804315pjv.3 for ; Thu, 16 Sep 2021 08:30:45 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RwS32umeuTKtPdFMznfukznJpzAEayn9YEvDSjPds5w=; b=ttN/Vs2FPJnOu1F6W/xNZnzNo0PSBw5JWVzpEGcvXqe4sKOWGgwArcH4W2hUa0LIVo DoyY5KTc9mf3L/Cx0r3SWKCJ4EDPjvc8ywzJJgmN5Z4E/jSeVeKSiNfZgESQaTPyoG87 SqlTzCrYCr2Ir6LyfJkH6edUON76xBU0fDyhSuwrVz8l6znywEGweSsdUZR/5F42s52q mNPoznlHJmmTmEuZsV519eE6S7zdKCIcElWrsAAQ/Xht7rrV4LaQkizzCUwhoDLPOOku GlUls5kuDX0/3huiUVj2CAU61kcAAgvpFBjp3kKJBWCr6OmtU4DuCDE7DmP461CAZsbK xzLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RwS32umeuTKtPdFMznfukznJpzAEayn9YEvDSjPds5w=; b=IACRJMLm3U0i/i65KfAMjjCYSsu1vCT6gvhjWcLZgA0Wj5/SOIrwmbjSR3fSmNMJzC Z/HOAjmkWeTTBeDJ/9DTKwvc1RXg2ZO7EoZZbMvjLpFTUGCBL/OxYDzsivEwAywHMhzf yivInozO0qwcqafZ3mgqgim0MwZH1lEW+sPGgnK5cxLXHkTbEyRBgPdTU+j5B3TRbQW8 WGvjj8k4vE1y30wwVVDZeZ34S0BNaf0QHp46vEXkrh97Ih3+XFWOErdxXkRnZgCE/5Rn hHJbZcje/cIaVv87PQD+wrYXEpw4N8J4o/GswnaeXvvVyqiYmqB+xQUSz+V4bWyqPNv3 XWFA== X-Gm-Message-State: AOAM533/q7B3qclT7Y46LzQXpCam67NrpzkUr2t41fQ55RUyalJWcRKE 5halVY3Mud6GTdigzN8T64OmKnqLxxMoyg== X-Google-Smtp-Source: ABdhPJzgRupjKFEAi1j0uKbb+EIAbyHovwR6CjDEVYndz4qcrgDDPVYPKj6sQbWryxD8/Jn6gWO91A== X-Received: by 2002:a17:902:7e05:b0:13b:7282:957f with SMTP id b5-20020a1709027e0500b0013b7282957fmr5341637plm.50.1631806244328; Thu, 16 Sep 2021 08:30:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 26/35] target/sh4: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:16 -0700 Message-Id: <20210916153025.1944763-27-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631808013060100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-26-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/sh4/cpu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c index 2047742d03..fb2116dc52 100644 --- a/target/sh4/cpu.c +++ b/target/sh4/cpu.c @@ -58,13 +58,14 @@ static bool superh_io_recompile_replay_branch(CPUState = *cs, } return false; } -#endif =20 static bool superh_cpu_has_work(CPUState *cs) { return cs->interrupt_request & CPU_INTERRUPT_HARD; } =20 +#endif /* !CONFIG_USER_ONLY */ + static void superh_cpu_reset(DeviceState *dev) { CPUState *s =3D CPU(dev); @@ -239,6 +240,7 @@ static const struct TCGCPUOps superh_tcg_ops =3D { .tlb_fill =3D superh_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D superh_cpu_has_work, .cpu_exec_interrupt =3D superh_cpu_exec_interrupt, .do_interrupt =3D superh_cpu_do_interrupt, .do_unaligned_access =3D superh_cpu_do_unaligned_access, @@ -258,7 +260,6 @@ static void superh_cpu_class_init(ObjectClass *oc, void= *data) device_class_set_parent_reset(dc, superh_cpu_reset, &scc->parent_reset= ); =20 cc->class_by_name =3D superh_cpu_class_by_name; - cc->has_work =3D superh_cpu_has_work; cc->dump_state =3D superh_cpu_dump_state; cc->set_pc =3D superh_cpu_set_pc; cc->gdb_read_register =3D superh_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631808581; cv=none; d=zohomail.com; s=zohoarc; b=ChTgi+O0Jj4g6iCyHfD4fhe8N6jS8DEtQik/eK0iTg6vgQ8S1pZgy8mixkYNXiItxB/IlUjlKs/rFVvmPIEb+7NEzIXYBZxR/UrDAvEc+EdVTK6ssUDj0UuVq539opIFKUppy2IKm1AG61aCJ0iZcyrgnsC+yy7GtGP4SuwPlHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631808581; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fsDKJ9HWSGf+3RAOS+lcZoApkaAa44EIIs8LfeqvPUs=; b=NEYrFtiiu/qgQKFEjV/OYjm6BUs6BJ0BHeTSotU/OQdTZM3yLEA8FNE5GpSLoubPynFV0SnjOHbdN0jeCMaqMkICyqXkzrrI5U8ieT6qcwfxLW/1yfrxCzUkBjj3M7Dl/hVZpqh+UbvTQBltbf2IFqlCDpTytOgc92wRf30SWWA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631808581367782.6100451083354; Thu, 16 Sep 2021 09:09:41 -0700 (PDT) Received: from localhost ([::1]:45538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtxD-0000PK-7g for importer@patchew.org; Thu, 16 Sep 2021 12:09:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLm-0001gc-Qf for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:58 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:45728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLd-0002bV-20 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:57 -0400 Received: by mail-pf1-x432.google.com with SMTP id w19so6172939pfn.12 for ; Thu, 16 Sep 2021 08:30:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fsDKJ9HWSGf+3RAOS+lcZoApkaAa44EIIs8LfeqvPUs=; b=A8o4gkh2HlKqrSiW9/NotWlTZKXNfwGEI+zBRtuRJv8c8BPR48zj+Dc/hAvUQGIkyn 9LTIyrVmqZLR+W+g4uIY5CZvhU0ocWaLFl8Yis6/gHbGcqMa9yvtzW9DaoORyO5QU67U b1mSCHcrM7hiJl3QV+7EDSqxwuYH5/30xmERHzC5tcMCBJRIELF9hNo2CPQC9qEiFpaR W4+6H3WMdmnpivzx9LFm6jDWq0KoGrmqiPQoKVV71vasKzzWwsqsxQLgIqvAcMZY6kaG OT4FQGWxmhljC7TaOoQceQPVqqKhJKzQbdQbt33GcBMePUxpM98KCKAAGnrUOnhHK4UV SFNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fsDKJ9HWSGf+3RAOS+lcZoApkaAa44EIIs8LfeqvPUs=; b=0ccMB2h7y51niW+n1qyRFxxZ0EOm1//8bPW9/9ToU3j7zG8vtrMLiWk6Zmw1EzZIxT BV4b7Ai1Pgsc2F33NDsrVz6gCqm7oMKhK3cSIVx03pn3V7UgDhrpfNOA7tBfM67b7bQN 05AFMEd4v/Zuu/tb7puaYsk4l2mnp83ZZvgmoPq5H3IsXq0u47w7ag8eTZVz1sPYQ1V1 zRmTGbQbTRuyg0QDONXGj1WzIIGhajjcREudFhQkFtNxkPqWYCmjcI7nMeujNdAQ+zhp Bd3bu7onlBFwwF69ayVN+mr/wFnCX5nhG8t0UStElDLvhLaitaJfU9yopx8FfZpOc5gj PWCA== X-Gm-Message-State: AOAM530ZAVMqz6qb8/o1LVdvegYAtTO8Yg6Y8hDwLMrRNAJMUgTRbEO4 KGTfQUm9hXh77QdcoO1bFDxzcPn5Nn7Q4g== X-Google-Smtp-Source: ABdhPJwG/6Mw3hTQ9jX3Wbv2f5XfjX9/Xq2iWf5NNeW2pZF0vryKKYFqv3bZBfEzpdH0FdNjWP11Pg== X-Received: by 2002:a62:1e42:0:b0:442:2a4b:e0e1 with SMTP id e63-20020a621e42000000b004422a4be0e1mr3135843pfe.19.1631806244993; Thu, 16 Sep 2021 08:30:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 27/35] target/sparc: Remove pointless use of CONFIG_TCG definition Date: Thu, 16 Sep 2021 08:30:17 -0700 Message-Id: <20210916153025.1944763-28-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631808582749100001 From: Philippe Mathieu-Daud=C3=A9 The SPARC target only support TCG acceleration. Remove the CONFIG_TCG definition introduced by mistake in commit 78271684719 ("cpu: tcg_ops: move to tcg-cpu-ops.h, keep a pointer in CPUClass"). Reported-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-27-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/sparc/cpu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 5a8a4ce750..e83e305aa9 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -859,7 +859,6 @@ static const struct SysemuCPUOps sparc_sysemu_ops =3D { }; #endif =20 -#ifdef CONFIG_TCG #include "hw/core/tcg-cpu-ops.h" =20 static const struct TCGCPUOps sparc_tcg_ops =3D { @@ -874,7 +873,6 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .do_unaligned_access =3D sparc_cpu_do_unaligned_access, #endif /* !CONFIG_USER_ONLY */ }; -#endif /* CONFIG_TCG */ =20 static void sparc_cpu_class_init(ObjectClass *oc, void *data) { --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807641; cv=none; d=zohomail.com; s=zohoarc; b=cCRsrm3dnOtNFghJoUpCbVysffNU+2CPaLYcTcFmrf8jhoLZzchPPHoKSHBENws2tze8xPuyHffwo9GmV0HN1/VASDxiByqTuG/QOmwHjJlUvNUzrygHtzwFuKp56Nt4NQAdt5Stqcq4UIZcnx99cSV3rJuhMHAHGp6hOCI0BVA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807641; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=J6Fp0tDii68JisdtRr/m4W+R/ln8amHARXVC+ekHe9o=; b=F9dV2K0j6IAAi4aUg/24i5Fx+fXjVeTv89gDd+Bi4mno0HTNUnSDpC24UYviemKlG2p9jJoNjGCzyU9C2bRBtdMdUUXWBkCF6yyUT8nkPU6COFK8ZxLsaIZjF4QtLGTsmHkP/sGTDe3rkbBkJhevMjUjODg5qwe+wK0nvqGs+ag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807641172624.3383451706417; Thu, 16 Sep 2021 08:54:01 -0700 (PDT) Received: from localhost ([::1]:38198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQti4-00018x-0p for importer@patchew.org; Thu, 16 Sep 2021 11:54:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLm-0001hr-9l for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:58 -0400 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]:47033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLd-0002cE-1B for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:57 -0400 Received: by mail-pj1-x1029.google.com with SMTP id lb1-20020a17090b4a4100b001993f863df2so5013293pjb.5 for ; Thu, 16 Sep 2021 08:30:46 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J6Fp0tDii68JisdtRr/m4W+R/ln8amHARXVC+ekHe9o=; b=WTvC0Zu1HO26hOb/3VCLaOCMMhA1eibvJCwWN1PFp2f7DXcod18wNsNdRagrebcH2V j3+FmgYv69PJ5H1iJKYBQ+jAlTtRC10ZfxZLCd81zPyNysCoIHLWPwnxCBhxW9z9aTVV Ls1cCFJx88ZG7EVu/ON/sF0r47ZpSYJt2TJozbxBliQYqiFLs5w0NOCkoLDy2ubYPIJj j+5JMMtZ990cw8Ql88PfWySp0A/sIM5mVobPRU2txVm+yVY1i0ivzdx5awxPBhWav/jT 3ZfLqpxhWnfsfBYLAOg4/x12Vscw/suxhHEcl/U8svSqcG2uDrQZQrHO80/VlpaKzJlh 21YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J6Fp0tDii68JisdtRr/m4W+R/ln8amHARXVC+ekHe9o=; b=bhT5IbBof7lG9NEReM9wgWDabqCia7Vrva94e49OYcp4sLCQT9CkTTfMa9s/zL+aud /GZjJKZzKsVxTm+rss4z058kTFPBwVvzvi8dlOnieXKa5bybwHLza8fuGWMUn/wx6yZt LqLr3Feluzf2zIgiXhiU+mTCpoDaCX5K5r7CvZlbuR8dwPefk/SE1IGB0eJBQ2O2iIFB T3WYF7qECnsjsGOS/T/TEuhiEPE79xg+3DYDoOb2YDRhF95FXPwQq4Z3421llw4gLYpw stFvGl0/V9OyjPm4a4rMuXJ4UzrO05rra7bsxsZukjIk/ZkBPTIxHTSkvZTxiiB33beE o3Rw== X-Gm-Message-State: AOAM5336NTuvx5g2GKl9+gsEnQT3cDm7Be2mmGRiTR9SNmzVwqv5Nj9h LEZqpk6d1SjT9QDR8n9TNl+HoVoJ3FzOlQ== X-Google-Smtp-Source: ABdhPJwMphJAwjQpz3jQwZTS9c/6yBRmKtk7fJbG9iw16vk+2gwS4XP2c90gx7lUqY1BhqEzq61PFQ== X-Received: by 2002:a17:902:9a91:b0:138:efd5:7302 with SMTP id w17-20020a1709029a9100b00138efd57302mr5226284plp.35.1631806245799; Thu, 16 Sep 2021 08:30:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 28/35] target/sparc: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:18 -0700 Message-Id: <20210916153025.1944763-29-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1029.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807642469100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-28-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index e83e305aa9..4a63ed1264 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -702,6 +702,7 @@ static void sparc_cpu_synchronize_from_tb(CPUState *cs, cpu->env.npc =3D tb->cs_base; } =20 +#if !defined(CONFIG_USER_ONLY) static bool sparc_cpu_has_work(CPUState *cs) { SPARCCPU *cpu =3D SPARC_CPU(cs); @@ -710,6 +711,7 @@ static bool sparc_cpu_has_work(CPUState *cs) return (cs->interrupt_request & CPU_INTERRUPT_HARD) && cpu_interrupts_enabled(env); } +#endif /* !CONFIG_USER_ONLY */ =20 static char *sparc_cpu_type_name(const char *cpu_model) { @@ -867,6 +869,7 @@ static const struct TCGCPUOps sparc_tcg_ops =3D { .tlb_fill =3D sparc_cpu_tlb_fill, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D sparc_cpu_has_work, .cpu_exec_interrupt =3D sparc_cpu_exec_interrupt, .do_interrupt =3D sparc_cpu_do_interrupt, .do_transaction_failed =3D sparc_cpu_do_transaction_failed, @@ -888,7 +891,6 @@ static void sparc_cpu_class_init(ObjectClass *oc, void = *data) =20 cc->class_by_name =3D sparc_cpu_class_by_name; cc->parse_features =3D sparc_cpu_parse_features; - cc->has_work =3D sparc_cpu_has_work; cc->dump_state =3D sparc_cpu_dump_state; #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) cc->memory_rw_debug =3D sparc_cpu_memory_rw_debug; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631808304; cv=none; d=zohomail.com; s=zohoarc; b=XSBmWTKjBb6yJL3Or3XnM9NHrX4WhRwTU2D2qxAGV1PO4Fhmx9BegxmIIXU1szzakIwJNxCOST0Duq7xiFNs+snLMPZanzKSIft+HCXQXhP+I/ceDWEf/RLTQwhWGU7qX0cMcK/Ujv2hZQvn56p44SnoawJqlMwpAeJpwRy4ab4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631808304; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+b0ulkNTfnCVlv+G/yTL5zdVouYmE4FD5mdoMaQi2iI=; b=BEH7FZPaD81RnS0KcEnbmQduoBS5ebOl5EBch+2ynKcMYpLsjTqHRfQ9XBOGqMBTGU16JCtvQRdxYEqdR5UH3VnSMFFvhJ9hsktib559WV6FkK0IzPDT7o+qbo6aCIjjuW2pOjOCAl+FYHn4e2dsYOZSmRXKEJOtyZvVcTaN4k0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631808304072468.5822682933997; Thu, 16 Sep 2021 09:05:04 -0700 (PDT) Received: from localhost ([::1]:36990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtsk-0002ZP-Pu for importer@patchew.org; Thu, 16 Sep 2021 12:05:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLl-0001g3-KE for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:57 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:42942) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLc-0002dD-W3 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:57 -0400 Received: by mail-pj1-x1036.google.com with SMTP id w19-20020a17090aaf9300b00191e6d10a19so5047934pjq.1 for ; Thu, 16 Sep 2021 08:30:47 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+b0ulkNTfnCVlv+G/yTL5zdVouYmE4FD5mdoMaQi2iI=; b=nEfCprHOv0v/MdBPh8Pq97c85TbHXMkRFa/oOTWd+fHcIytN/3ZoiqmTfW7EniPqB+ 2hX3/R3xd8zVGZq0LnU9cBDYN3XGMoBsrFpORljVXWtKlpUez+Ep/BseZ5FcRwRI5D+e ixCN/qVcISPbk7S0v4AHASiR+JEVu72/W4C/RkedgLFiXRk5nn0fneKr5G7E7lv11jMR 8Uk3+n4Q+SWTZumWIBVEUWCjSLnnCQqdMdisFc04NyljAVagbkjzsBBf7JMTDi10V4+8 dPBnu1gAWR8LJk/QS8R1lgxjOTseZF1pbb5gq4qb3JI1PIaCuuJzIFbBdx62Un392lsb 2Cvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+b0ulkNTfnCVlv+G/yTL5zdVouYmE4FD5mdoMaQi2iI=; b=rc+6xnY7ySWO0PcQoHa1mwaAY4G4j3dcZZvkeW3q8IXMZm1I2D/vf0YTwm7gtTTBU2 1K1Z/9LcBZfkAUCiNm46frWYCTa34DuCkbfC4npSZTEMGSZvjORxu7omu2j4l3F1I2NQ JNAbF+K5x+ZEJ7R4g6NSj5QDYITi6maEIuzJI4L+mXD2WE2pRG6FCzXjS2XjWtw76MQh qxKUokCnIX91lK66FbfHWpj6ntiLfKhurxLXb/Xgx3TRdj2BACJT3NC4rW9WLmNBensk 7MdtiH16WtYSsWpUkv0XKxE67RaDH0UHQPEGdJRBWzUm4dZfezRJbgYXA5fzIsnfUvvM 0mjw== X-Gm-Message-State: AOAM5320aGwLQwJewxZwiJzk503drFU+JxGmrM/ennuUs4cYIUSu80EO eDjuSm/CQleQNzQZbPhS8RS+18Ekrc00wQ== X-Google-Smtp-Source: ABdhPJxrDjxJaj0VwdUPxA4B94GhAuqZy2uKjizvhiYLHDj68ZxvA34WZtreAgGaRxqETU2uwbFi2g== X-Received: by 2002:a17:90a:77c2:: with SMTP id e2mr6657864pjs.96.1631806246578; Thu, 16 Sep 2021 08:30:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 29/35] target/tricore: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:19 -0700 Message-Id: <20210916153025.1944763-30-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1036.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631808306149100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-29-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/tricore/cpu.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c index b95682b7f0..419fa624bd 100644 --- a/target/tricore/cpu.c +++ b/target/tricore/cpu.c @@ -62,10 +62,12 @@ static void tricore_cpu_reset(DeviceState *dev) cpu_state_reset(env); } =20 +#if !defined(CONFIG_USER_ONLY) static bool tricore_cpu_has_work(CPUState *cs) { return true; } +#endif /* !CONFIG_USER_ONLY */ =20 static void tricore_cpu_realizefn(DeviceState *dev, Error **errp) { @@ -154,6 +156,9 @@ static const struct TCGCPUOps tricore_tcg_ops =3D { .initialize =3D tricore_tcg_init, .synchronize_from_tb =3D tricore_cpu_synchronize_from_tb, .tlb_fill =3D tricore_cpu_tlb_fill, +#if !defined(CONFIG_USER_ONLY) + .has_work =3D tricore_cpu_has_work, +#endif }; =20 static void tricore_cpu_class_init(ObjectClass *c, void *data) @@ -167,7 +172,6 @@ static void tricore_cpu_class_init(ObjectClass *c, void= *data) =20 device_class_set_parent_reset(dc, tricore_cpu_reset, &mcc->parent_rese= t); cc->class_by_name =3D tricore_cpu_class_by_name; - cc->has_work =3D tricore_cpu_has_work; =20 cc->gdb_read_register =3D tricore_cpu_gdb_read_register; cc->gdb_write_register =3D tricore_cpu_gdb_write_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631808818; cv=none; d=zohomail.com; s=zohoarc; b=daNs6qBizGTJpslWYexVQO8Ek6ifYs7/rh3sNsB4G43UXX8IiZR3mRa1+srKw1xbOPfg0O76BVkFTW/eBlK023z0qv+H9mvgGJzacFKF7yHp+N75ZsZDDXtUYTge6JnRhRpZCzXXMI2Ky6J4dDKSs5Ji+DjvMKvWFZcQW21YtWE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631808818; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lh58yC+MNXGB83pjMDOt8lSKa0ARivzdvFCovau9CGE=; b=SLCe6NOndRyUBBCBWntCrAt3PN6a6vqvUgyDlbzW31CgfxduJzuMURoVSOfb3hJU+jLF00ufoA4/MefVk2vLyPXyBUp+qr1oyc5NuuxYDKWLrR+nypWE7uT5kTEzyhJld6VLQrUjaeTAj1Ysm9Z2cWar6NMke1oA5eerwtpxBlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 163180881875386.47344158599867; Thu, 16 Sep 2021 09:13:38 -0700 (PDT) Received: from localhost ([::1]:53976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQu11-0006fI-U1 for importer@patchew.org; Thu, 16 Sep 2021 12:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLm-0001jk-VJ for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:58 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:50734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLd-0002dZ-09 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:58 -0400 Received: by mail-pj1-x1035.google.com with SMTP id k23so4848326pji.0 for ; Thu, 16 Sep 2021 08:30:47 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lh58yC+MNXGB83pjMDOt8lSKa0ARivzdvFCovau9CGE=; b=mK2Jb/xK63uu+DOM7jKHEWX1FjOQX29E9Pe5eA6couddCpOTuoc0EOkJkoSexh7fFC veS9D7KsUHf+awpEy6A7ji10DeAsj6FZjm8LzKCQfv6uX9FEcSrEOX8jr7gVLUJM5wzK ucUS9bF4oyW4vOEe5Mb3XuudIqmzcLzCIC91PpehrVgN+NwJxZ/Xie5tu8ik3uapWYNt e2kG26Sz/mOCVkxtT4LEc29h491oxWAB7/4sGb49CfZHmOYb6Fo0RQ7n6OIB2AQB5h9s tC3qJ/xQm6AHlqUTSdUgfhTC3DAR61mE7H1/UDov5svuOZXCYPUolzwGfPsxO6bN7NH+ Atpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lh58yC+MNXGB83pjMDOt8lSKa0ARivzdvFCovau9CGE=; b=V8pID7sD42dZ1ELjwJTIpnwLVb8KSi0nQsSNOfnoBGsoK42HmQXOk8D11ZdqFnql91 kXJ1qGBmy+lOFmNib+W0mZFjq9wOxujISC8JnKwFnYOMN8XDlRtcx0H9cn+91Oogyb3X 1gSPxpcvRdgrSkKCKK9jIR0ubfOBOhKr49ow2b4MRD5LuXz8rLeBWB/Jt0UlGFp7cpU8 r0Vl+2eSa0BBccpRa1/LAjs2XM8LfogB7H/cLziBrfH+nqJXdFG+0sMSiQ3lv7IJmgXX Ik/Mq044YT1qfJidM+ILTl7EeokQvlmrB8q816C1AbXWqa9Sv0MpLU84GLkDCcu3TzBa a5bQ== X-Gm-Message-State: AOAM53147ialblcaNQMBAImv3PUF7RRLF/imS92vDqWBeZCZIo36bF4p SXojSUpjhKvHbB+anmLZLpfbAew7i8WS3Q== X-Google-Smtp-Source: ABdhPJz9zhix/V/l+/svKxBzi3yEEecByTxPStrfM+93lYmQ751vsO/5e6CjKP+m0x6adT4I3Y53Yw== X-Received: by 2002:a17:902:9689:b0:138:d2ac:44f with SMTP id n9-20020a170902968900b00138d2ac044fmr5313337plp.85.1631806247195; Thu, 16 Sep 2021 08:30:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 30/35] target/xtensa: Restrict has_work() handler to sysemu Date: Thu, 16 Sep 2021 08:30:20 -0700 Message-Id: <20210916153025.1944763-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1035.google.com X-Spam_score_int: -1 X-Spam_score: -0.2 X-Spam_bar: / X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631808820482100001 From: Philippe Mathieu-Daud=C3=A9 Restrict has_work() to sysemu. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20210912172731.789788-30-f4bug@amsat.org> Signed-off-by: Richard Henderson --- target/xtensa/cpu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index c1cbd03595..5cb19a8881 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -43,18 +43,17 @@ static void xtensa_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc =3D value; } =20 +#ifndef CONFIG_USER_ONLY + static bool xtensa_cpu_has_work(CPUState *cs) { -#ifndef CONFIG_USER_ONLY XtensaCPU *cpu =3D XTENSA_CPU(cs); =20 return !cpu->env.runstall && cpu->env.pending_irq_level; -#else - return true; -#endif } =20 -#ifdef CONFIG_USER_ONLY +#else /* CONFIG_USER_ONLY*/ + static bool abi_call0; =20 void xtensa_set_abi_call0(void) @@ -66,7 +65,8 @@ bool xtensa_abi_call0(void) { return abi_call0; } -#endif + +#endif /* CONFIG_USER_ONLY */ =20 static void xtensa_cpu_reset(DeviceState *dev) { @@ -196,6 +196,7 @@ static const struct TCGCPUOps xtensa_tcg_ops =3D { .debug_excp_handler =3D xtensa_breakpoint_handler, =20 #ifndef CONFIG_USER_ONLY + .has_work =3D xtensa_cpu_has_work, .cpu_exec_interrupt =3D xtensa_cpu_exec_interrupt, .do_interrupt =3D xtensa_cpu_do_interrupt, .do_transaction_failed =3D xtensa_cpu_do_transaction_failed, @@ -215,7 +216,6 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void= *data) device_class_set_parent_reset(dc, xtensa_cpu_reset, &xcc->parent_reset= ); =20 cc->class_by_name =3D xtensa_cpu_class_by_name; - cc->has_work =3D xtensa_cpu_has_work; cc->dump_state =3D xtensa_cpu_dump_state; cc->set_pc =3D xtensa_cpu_set_pc; cc->gdb_read_register =3D xtensa_cpu_gdb_read_register; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631808246; cv=none; d=zohomail.com; s=zohoarc; b=jy00gXduY28hIC+azYPwYXEJcmcfsxyz5ARxENUpWtzpaMP7s8nb2X5WPDQnxemw08VsdzuY3VkrFnoZJaNDUiiX0GZtDmU3zFhNf6kY+TutZbk9JafoiFZIGN45b3vqj9WLo28jPRwD+mLdMOkdMXDtXd1pR3N4rsTjUtWEoQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631808246; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pv5WSTG+D7D0H6LWYGDgFu80+f0Xh3zAIIrMYFZZVwg=; b=nGmHyh41i6wUnAW7LwNuJPeWXphR78gbgBZINYveF1R8u84gUs6558+QSX6Ce0tuo26xE6zm6yul/YxVGZbU+mbMWIEx92kQCaNua2Py5lnMuEUPrMOvU7bIXnCGMu2akR238YYC/izKWyftNLbU+RG/45+5oSZBe0JSxPQEPnI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631808246494472.5220652850936; Thu, 16 Sep 2021 09:04:06 -0700 (PDT) Received: from localhost ([::1]:35440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtrp-0001WV-9K for importer@patchew.org; Thu, 16 Sep 2021 12:04:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLo-0001q0-UN for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:00 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]:40907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLf-0002dh-1S for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:00 -0400 Received: by mail-pf1-x429.google.com with SMTP id y8so6211238pfa.7 for ; Thu, 16 Sep 2021 08:30:48 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pv5WSTG+D7D0H6LWYGDgFu80+f0Xh3zAIIrMYFZZVwg=; b=uVnnWtrEhdpZ1DDpC5jP48KC9ewhAJ36uWBAEbe1Rvcl13XVtuqKAZzbsT0FZ76wX6 2zBHhMc96EbznfEN3hdFgZusNHjYB7NDjsnP+EoQqxiRrfei24b93FdGiqLUMlEcCFxk GPZo3dwwRNcWG5mFsLrCsoDuXf1duYoDztYjBCzjoSLvl8wfanx+5Wgjjl+E9lWVI6n8 3AinT0oHaxGR5jzh3gKFLAl9Guf5D1pX5xdckOH0f3Hsa0meqINmFBHKE23eyRnO0BHZ GnaZgNo/T9Jk+bbgQNsCjDPo1ZKcodz52JYAZbcWITuFCxIOxB7TYuv5wJyQsA+dOuak XzMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pv5WSTG+D7D0H6LWYGDgFu80+f0Xh3zAIIrMYFZZVwg=; b=owjDzJidie1zruSX1q5l0Z0nZkgMNnkYz+cJIsdsQZi9hY2+cr7CfqOgocagDlF2pK 7GLtQXCPuawcNeAofxgLpvqmEB/BN0GYmF4Z/9N8NkW1SxzzcmrHPHiHVL5z+Rq+6wmb 4TppH/vEUfgddqeWn28IljZCZePqiphqnRByHBFEmLDHBjmIO5RE2cRo6KQMjhZlSEQm DEMa865wN4dfnKhmdrn0gynlPNT02kNA6LJ0GOy5qqkKhc2IcARDvv4SwVmGrounlgDS ZPy6/x6Qeki6HU6AHx1psfGr7BoYFPfrcd5rJ4iJ4fOzyEjzLfEpfBGSECTqWNcr7swu oBuQ== X-Gm-Message-State: AOAM531noIL4ME0a6gLaegPdt66QFPbTEI8TrSUmUar9lX9BwI8rWbh7 V8EZQjbLxAi0NXi/vnmcK0pC3VLE/KRASA== X-Google-Smtp-Source: ABdhPJwwl3NflkQa6+rheHjsVt3lpSM5CXjYI1E7x08oSnC6t4McNjLSeavV9jzS08sk9o6gmVcAIQ== X-Received: by 2002:aa7:9395:0:b0:438:9980:5c94 with SMTP id t21-20020aa79395000000b0043899805c94mr5754411pfe.81.1631806247872; Thu, 16 Sep 2021 08:30:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 31/35] accel: Add missing AccelOpsClass::has_work() and drop SysemuCPUOps one Date: Thu, 16 Sep 2021 08:30:21 -0700 Message-Id: <20210916153025.1944763-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paul Durrant Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631808247434100001 From: Philippe Mathieu-Daud=C3=A9 cpu_common_has_work() is the default has_work() implementation and returns 'false'. Explicit it for the QTest / HAX / HVF / NVMM / Xen accelerators and remove cpu_common_has_work(). Since there are no more implementations of SysemuCPUOps::has_work, remove it along with the assertion in cpu_has_work(). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paul Durrant Message-Id: <20210912172731.789788-31-f4bug@amsat.org> Signed-off-by: Richard Henderson --- include/hw/core/cpu.h | 2 -- accel/hvf/hvf-accel-ops.c | 6 ++++++ accel/qtest/qtest.c | 6 ++++++ accel/xen/xen-all.c | 6 ++++++ hw/core/cpu-common.c | 6 ------ softmmu/cpus.c | 9 ++------- target/i386/hax/hax-accel-ops.c | 6 ++++++ target/i386/nvmm/nvmm-accel-ops.c | 6 ++++++ 8 files changed, 32 insertions(+), 15 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index e2dd171a13..c64709b898 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -89,7 +89,6 @@ struct SysemuCPUOps; * instantiatable CPU type. * @parse_features: Callback to parse command line arguments. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. - * @has_work: Callback for checking if there is work to do. * @memory_rw_debug: Callback for GDB memory access. * @dump_state: Callback for dumping state. * @get_arch_id: Callback for getting architecture-dependent CPU ID. @@ -132,7 +131,6 @@ struct CPUClass { void (*parse_features)(const char *typename, char *str, Error **errp); =20 int reset_dump_flags; - bool (*has_work)(CPUState *cpu); int (*memory_rw_debug)(CPUState *cpu, vaddr addr, uint8_t *buf, int len, bool is_write); void (*dump_state)(CPUState *cpu, FILE *, int flags); diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index d1691be989..53c427ee42 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -446,6 +446,11 @@ static void hvf_start_vcpu_thread(CPUState *cpu) cpu, QEMU_THREAD_JOINABLE); } =20 +static bool hvf_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hvf_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -456,6 +461,7 @@ static void hvf_accel_ops_class_init(ObjectClass *oc, v= oid *data) ops->synchronize_post_init =3D hvf_cpu_synchronize_post_init; ops->synchronize_state =3D hvf_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hvf_cpu_synchronize_pre_loadvm; + ops->has_work =3D hvf_cpu_has_work; }; static const TypeInfo hvf_accel_ops_type =3D { .name =3D ACCEL_OPS_NAME("hvf"), diff --git a/accel/qtest/qtest.c b/accel/qtest/qtest.c index 7e6b8110d5..eb5a17cef1 100644 --- a/accel/qtest/qtest.c +++ b/accel/qtest/qtest.c @@ -47,12 +47,18 @@ static const TypeInfo qtest_accel_type =3D { }; module_obj(TYPE_QTEST_ACCEL); =20 +static bool qtest_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void qtest_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; ops->get_virtual_clock =3D qtest_get_virtual_clock; + ops->has_work =3D qtest_cpu_has_work; }; =20 static const TypeInfo qtest_accel_ops_type =3D { diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c index 69aa7d018b..fe5a37fa2e 100644 --- a/accel/xen/xen-all.c +++ b/accel/xen/xen-all.c @@ -215,11 +215,17 @@ static const TypeInfo xen_accel_type =3D { .class_init =3D xen_accel_class_init, }; =20 +static bool xen_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void xen_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); =20 ops->create_vcpu_thread =3D dummy_start_vcpu_thread; + ops->has_work =3D xen_cpu_has_work; } =20 static const TypeInfo xen_accel_ops_type =3D { diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index e2f5a64604..5ed1ccdfdd 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -143,11 +143,6 @@ static void cpu_common_reset(DeviceState *dev) } } =20 -static bool cpu_common_has_work(CPUState *cs) -{ - return false; -} - ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model) { CPUClass *cc =3D CPU_CLASS(object_class_by_name(typename)); @@ -279,7 +274,6 @@ static void cpu_class_init(ObjectClass *klass, void *da= ta) =20 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->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); diff --git a/softmmu/cpus.c b/softmmu/cpus.c index 6bce52ce56..e6dad2243c 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -251,13 +251,8 @@ void cpu_interrupt(CPUState *cpu, int mask) =20 bool cpu_has_work(CPUState *cpu) { - CPUClass *cc =3D CPU_GET_CLASS(cpu); - - if (cpus_accel->has_work) { - return cpus_accel->has_work(cpu); - } - g_assert(cc->has_work); - return cc->has_work(cpu); + g_assert(cpus_accel->has_work); + return cpus_accel->has_work(cpu); } =20 static int do_vm_stop(RunState state, bool send_stop) diff --git a/target/i386/hax/hax-accel-ops.c b/target/i386/hax/hax-accel-op= s.c index 136630e9b2..5407ba17ea 100644 --- a/target/i386/hax/hax-accel-ops.c +++ b/target/i386/hax/hax-accel-ops.c @@ -74,6 +74,11 @@ static void hax_start_vcpu_thread(CPUState *cpu) #endif } =20 +static bool hax_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void hax_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -85,6 +90,7 @@ static void hax_accel_ops_class_init(ObjectClass *oc, voi= d *data) ops->synchronize_post_init =3D hax_cpu_synchronize_post_init; ops->synchronize_state =3D hax_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D hax_cpu_synchronize_pre_loadvm; + ops->has_work =3D hax_cpu_has_work; } =20 static const TypeInfo hax_accel_ops_type =3D { diff --git a/target/i386/nvmm/nvmm-accel-ops.c b/target/i386/nvmm/nvmm-acce= l-ops.c index f788f75289..36296f79ff 100644 --- a/target/i386/nvmm/nvmm-accel-ops.c +++ b/target/i386/nvmm/nvmm-accel-ops.c @@ -83,6 +83,11 @@ static void nvmm_kick_vcpu_thread(CPUState *cpu) cpus_kick_thread(cpu); } =20 +static bool nvmm_cpu_has_work(CPUState *cpu) +{ + return false; +} + static void nvmm_accel_ops_class_init(ObjectClass *oc, void *data) { AccelOpsClass *ops =3D ACCEL_OPS_CLASS(oc); @@ -94,6 +99,7 @@ static void nvmm_accel_ops_class_init(ObjectClass *oc, vo= id *data) ops->synchronize_post_init =3D nvmm_cpu_synchronize_post_init; ops->synchronize_state =3D nvmm_cpu_synchronize_state; ops->synchronize_pre_loadvm =3D nvmm_cpu_synchronize_pre_loadvm; + ops->has_work =3D nvmm_cpu_has_work; } =20 static const TypeInfo nvmm_accel_ops_type =3D { --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807981; cv=none; d=zohomail.com; s=zohoarc; b=YXYxuiE0tQ25O57Olk8IJco3BwqLL8+AzBBZueRJ9urfC0HR6Dpk8LDGJ7Z1T/hH8n34pNGTZtv9vFKo8kK4pvT2ga+IYfU+kyLQeAXqHCzdzfScezERLQsWNbU3BGXeXwawHu1382AOEQJWFI9Azsij3ggBRz/aqc44dpDTmCw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807981; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5xOsJ/q61bGEcfr8bVryci8I2a76P5P5Z/hHe2uiGQU=; b=jPbxM/eE9+WiB40MvbTGGJ0+czSqt47KKrW7mM+ba/peRJQCSruwdKxkN7dd1nkSeeQ7FUWAcZPjgBOqB+Z3WLypFsFBaUeuDFTuPf9Wuc9SFjGRSuqScJrXFMfapFzQc8dKKVGhDaLof00HOY+0s5iNheb/Y8VKYp8xoCVd5IA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807981242403.127417044003; Thu, 16 Sep 2021 08:59:41 -0700 (PDT) Received: from localhost ([::1]:55052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtnY-00049i-8j for importer@patchew.org; Thu, 16 Sep 2021 11:59:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLo-0001oY-EZ for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:00 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]:41879) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLe-0002e4-Vy for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:00 -0400 Received: by mail-pj1-x1033.google.com with SMTP id m21-20020a17090a859500b00197688449c4so5077647pjn.0 for ; Thu, 16 Sep 2021 08:30:49 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5xOsJ/q61bGEcfr8bVryci8I2a76P5P5Z/hHe2uiGQU=; b=X5Bj0xlWqkjbhNdkvMen8D+0vTEV/wPMyOe5ySGvZGeTpwuSsddlyiW7gPEoYAwvJw 1O49OUjgiRJ1ARv721m1snsbiCGrgeWHUTsCzA318bD2i7KcOyP3F7bAil3E0bsWj3c1 Pm/Raqih2UIaz9G46EJtjUFcObygQFxbuCxFybZjYE1DwyZ+Xf1X9RrUhDX+aXf8HpPW YJ1+vap8C6vSt+xB6nE/GdK6+OTLav5RhIlxdS7+s4idYQ7j2UB31/7ydjZS0rYPwg+3 qEWF2mnz1e6vzxCRiK4xaRkp/IF3Id6PNDOcljPOeXlyGe3tIVgLtdZEWSUrR/DEa/Md c7hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5xOsJ/q61bGEcfr8bVryci8I2a76P5P5Z/hHe2uiGQU=; b=vdas28vKRg5IpVp3ViMm8rZCyWk7DujtDQqjYYi5NFvuyB2n7rdW7W5zQeypb0Aj3Z wml+xTWfSaegzaR0+rWyeA25I9evYH+KpVUHgqKzfs89A1TgQyE1aB4DggLI9Z0y3dmX 4Bp9SPAvJ1SpirSAwZ91peX7o0RcSKk5z3NboBC+KkleF6xG6dNo3uYdjAuIFC92d/hO La9G/HL+n/uCwhn+vs8PXg/ANLojwqf4XEWe/HHPlADWQef6slgq5rwYcwxQW7IOFS+o hUnO14atUnGMmkEMa/8+3qZhS76oRoQoSb4CLKzpnbIPy1/Yfe3O/5zuhtPwbzKVQvf8 MFTA== X-Gm-Message-State: AOAM533uLdIiPyETlRRnD7x3pWUVE3CAwxQFvnzhh6pOaB9CZDRiViHO edKNwPaDg50J3fAZTs43zzbPmrgC/7+7RQ== X-Google-Smtp-Source: ABdhPJyhNdOYiGmEfmh/U0oFO8q7IjkWPwWik8erLEjMuoEm3/h4L7ROeXY49NfQ2bjrE91oJXInwQ== X-Received: by 2002:a17:902:680d:b0:13a:503f:f381 with SMTP id h13-20020a170902680d00b0013a503ff381mr5353832plk.30.1631806248651; Thu, 16 Sep 2021 08:30:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 32/35] tcg/mips: Drop inline markers Date: Thu, 16 Sep 2021 08:30:22 -0700 Message-Id: <20210916153025.1944763-33-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1033.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807983402100001 Let the compiler decide about inlining. Remove tcg_out_ext8s and tcg_out_ext16s as unused. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.c.inc | 76 ++++++++++++++------------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index bf0eb84e2d..320795a637 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -187,7 +187,7 @@ static bool patch_reloc(tcg_insn_unit *code_ptr, int ty= pe, #endif =20 =20 -static inline bool is_p2m1(tcg_target_long val) +static bool is_p2m1(tcg_target_long val) { return val && ((val + 1) & val) =3D=3D 0; } @@ -361,8 +361,8 @@ typedef enum { /* * Type reg */ -static inline void tcg_out_opc_reg(TCGContext *s, MIPSInsn opc, - TCGReg rd, TCGReg rs, TCGReg rt) +static void tcg_out_opc_reg(TCGContext *s, MIPSInsn opc, + TCGReg rd, TCGReg rs, TCGReg rt) { int32_t inst; =20 @@ -376,8 +376,8 @@ static inline void tcg_out_opc_reg(TCGContext *s, MIPSI= nsn opc, /* * Type immediate */ -static inline void tcg_out_opc_imm(TCGContext *s, MIPSInsn opc, - TCGReg rt, TCGReg rs, TCGArg imm) +static void tcg_out_opc_imm(TCGContext *s, MIPSInsn opc, + TCGReg rt, TCGReg rs, TCGArg imm) { int32_t inst; =20 @@ -391,8 +391,8 @@ static inline void tcg_out_opc_imm(TCGContext *s, MIPSI= nsn opc, /* * Type bitfield */ -static inline void tcg_out_opc_bf(TCGContext *s, MIPSInsn opc, TCGReg rt, - TCGReg rs, int msb, int lsb) +static void tcg_out_opc_bf(TCGContext *s, MIPSInsn opc, TCGReg rt, + TCGReg rs, int msb, int lsb) { int32_t inst; =20 @@ -404,8 +404,8 @@ static inline void tcg_out_opc_bf(TCGContext *s, MIPSIn= sn opc, TCGReg rt, tcg_out32(s, inst); } =20 -static inline void tcg_out_opc_bf64(TCGContext *s, MIPSInsn opc, MIPSInsn = opm, - MIPSInsn oph, TCGReg rt, TCGReg rs, +static void tcg_out_opc_bf64(TCGContext *s, MIPSInsn opc, MIPSInsn opm, + MIPSInsn oph, TCGReg rt, TCGReg rs, int msb, int lsb) { if (lsb >=3D 32) { @@ -422,8 +422,7 @@ static inline void tcg_out_opc_bf64(TCGContext *s, MIPS= Insn opc, MIPSInsn opm, /* * Type branch */ -static inline void tcg_out_opc_br(TCGContext *s, MIPSInsn opc, - TCGReg rt, TCGReg rs) +static void tcg_out_opc_br(TCGContext *s, MIPSInsn opc, TCGReg rt, TCGReg = rs) { tcg_out_opc_imm(s, opc, rt, rs, 0); } @@ -431,8 +430,8 @@ static inline void tcg_out_opc_br(TCGContext *s, MIPSIn= sn opc, /* * Type sa */ -static inline void tcg_out_opc_sa(TCGContext *s, MIPSInsn opc, - TCGReg rd, TCGReg rt, TCGArg sa) +static void tcg_out_opc_sa(TCGContext *s, MIPSInsn opc, + TCGReg rd, TCGReg rt, TCGArg sa) { int32_t inst; =20 @@ -479,28 +478,27 @@ static bool tcg_out_opc_jmp(TCGContext *s, MIPSInsn o= pc, const void *target) return true; } =20 -static inline void tcg_out_nop(TCGContext *s) +static void tcg_out_nop(TCGContext *s) { tcg_out32(s, 0); } =20 -static inline void tcg_out_dsll(TCGContext *s, TCGReg rd, TCGReg rt, TCGAr= g sa) +static void tcg_out_dsll(TCGContext *s, TCGReg rd, TCGReg rt, TCGArg sa) { tcg_out_opc_sa64(s, OPC_DSLL, OPC_DSLL32, rd, rt, sa); } =20 -static inline void tcg_out_dsrl(TCGContext *s, TCGReg rd, TCGReg rt, TCGAr= g sa) +static void tcg_out_dsrl(TCGContext *s, TCGReg rd, TCGReg rt, TCGArg sa) { tcg_out_opc_sa64(s, OPC_DSRL, OPC_DSRL32, rd, rt, sa); } =20 -static inline void tcg_out_dsra(TCGContext *s, TCGReg rd, TCGReg rt, TCGAr= g sa) +static void tcg_out_dsra(TCGContext *s, TCGReg rd, TCGReg rt, TCGArg sa) { tcg_out_opc_sa64(s, OPC_DSRA, OPC_DSRA32, rd, rt, sa); } =20 -static inline bool tcg_out_mov(TCGContext *s, TCGType type, - TCGReg ret, TCGReg arg) +static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg ar= g) { /* Simple reg-reg move, optimising out the 'do nothing' case */ if (ret !=3D arg) { @@ -612,27 +610,7 @@ static void tcg_out_bswap64(TCGContext *s, TCGReg ret,= TCGReg arg) } } =20 -static inline void tcg_out_ext8s(TCGContext *s, TCGReg ret, TCGReg arg) -{ - if (use_mips32r2_instructions) { - tcg_out_opc_reg(s, OPC_SEB, ret, 0, arg); - } else { - tcg_out_opc_sa(s, OPC_SLL, ret, arg, 24); - tcg_out_opc_sa(s, OPC_SRA, ret, ret, 24); - } -} - -static inline void tcg_out_ext16s(TCGContext *s, TCGReg ret, TCGReg arg) -{ - if (use_mips32r2_instructions) { - tcg_out_opc_reg(s, OPC_SEH, ret, 0, arg); - } else { - tcg_out_opc_sa(s, OPC_SLL, ret, arg, 16); - tcg_out_opc_sa(s, OPC_SRA, ret, ret, 16); - } -} - -static inline void tcg_out_ext32u(TCGContext *s, TCGReg ret, TCGReg arg) +static void tcg_out_ext32u(TCGContext *s, TCGReg ret, TCGReg arg) { if (use_mips32r2_instructions) { tcg_out_opc_bf(s, OPC_DEXT, ret, arg, 31, 0); @@ -656,8 +634,8 @@ static void tcg_out_ldst(TCGContext *s, MIPSInsn opc, T= CGReg data, tcg_out_opc_imm(s, opc, data, addr, lo); } =20 -static inline void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg, - TCGReg arg1, intptr_t arg2) +static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg arg, + TCGReg arg1, intptr_t arg2) { MIPSInsn opc =3D OPC_LD; if (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I32) { @@ -666,8 +644,8 @@ static inline void tcg_out_ld(TCGContext *s, TCGType ty= pe, TCGReg arg, tcg_out_ldst(s, opc, arg, arg1, arg2); } =20 -static inline void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, - TCGReg arg1, intptr_t arg2) +static void tcg_out_st(TCGContext *s, TCGType type, TCGReg arg, + TCGReg arg1, intptr_t arg2) { MIPSInsn opc =3D OPC_SD; if (TCG_TARGET_REG_BITS =3D=3D 32 || type =3D=3D TCG_TYPE_I32) { @@ -676,8 +654,8 @@ static inline void tcg_out_st(TCGContext *s, TCGType ty= pe, TCGReg arg, tcg_out_ldst(s, opc, arg, arg1, arg2); } =20 -static inline bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val, - TCGReg base, intptr_t ofs) +static bool tcg_out_sti(TCGContext *s, TCGType type, TCGArg val, + TCGReg base, intptr_t ofs) { if (val =3D=3D 0) { tcg_out_st(s, type, TCG_REG_ZERO, base, ofs); @@ -1637,9 +1615,9 @@ static void tcg_out_clz(TCGContext *s, MIPSInsn opcv2= , MIPSInsn opcv6, } } =20 -static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, - const TCGArg args[TCG_MAX_OP_ARGS], - const int const_args[TCG_MAX_OP_ARGS]) +static void tcg_out_op(TCGContext *s, TCGOpcode opc, + const TCGArg args[TCG_MAX_OP_ARGS], + const int const_args[TCG_MAX_OP_ARGS]) { MIPSInsn i1, i2; TCGArg a0, a1, a2; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807849; cv=none; d=zohomail.com; s=zohoarc; b=NZwz59gi3uFKgE8N3tlLaxMvyG+wxNVlmHYAMVNRK30Bh/6SCLHGDdAdQdaI7saMjpVD8xVeqEMkPRc3KCCCUUCQwnnmLyb1mhPSr0wue3PTVdlS+evVaHi96Oz0Dk6/O59q8hJXaqEm8xbOHrSQrjVYTQTfRc6nZAbT/eEqb2s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807849; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=boBYT/QiHeueJZHokksNQvqeAcOMVEQaXWz4csao3Kg=; b=aQ83/YAnkObDwt/F35brq+DMm4RyhxfGujGoJ60HBkJs6NP3JnSic00yrLdqZgBq3WOslUqozQfnAVyT+Geh8inBB0+KrymX2HvG5XVaAzdZorNN4O/07zrPcFrHVJM5Vb/w3tcrliGLLiyJrsNS+9Zi4HUD1PhhH/FV7EOxxqA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807849824967.5418174368627; Thu, 16 Sep 2021 08:57:29 -0700 (PDT) Received: from localhost ([::1]:46694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtlQ-00072q-Jx for importer@patchew.org; Thu, 16 Sep 2021 11:57:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLn-0001lW-Ia for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:59 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:42619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLf-0002eM-10 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:30:59 -0400 Received: by mail-pf1-x430.google.com with SMTP id q23so4149690pfs.9 for ; Thu, 16 Sep 2021 08:30:50 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=boBYT/QiHeueJZHokksNQvqeAcOMVEQaXWz4csao3Kg=; b=TZpfsdUUSIg1OPfVjhAs+xnvlBPhlHTRlz0aqyDT+4B2+bpIcVg09ZIkUdOC9MWLdR LelQdWAK1nojTOzs7Z2FrQzo/cYJWXSF+YQgBvrdjuGzdb2CNN9T7D4oiMly0myFtBK+ ytGSerNPIOEW34H4cRNSMLCkIdhS2VKt3ijNqvkLWTD+3DuYvUWUlHSHW7GCqLynbTlv eQ/jb3FCsflgGP4r8IVuYmgnqTiftv+BFBQK4+n+46Gq8l5DqBvLZ+mkrVYV9EQyUrsO C8RSiAJPE1TtVFvlvTOw3nsbXquOuU9gi8rcUueTxtvsmxlPMhQN7moyDdYk/NG4mwl9 AubQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=boBYT/QiHeueJZHokksNQvqeAcOMVEQaXWz4csao3Kg=; b=GZMX12+dVrTxZHc0sVhsqKYBeymPyZ1hL9tJbt1xm2RZ5mt+ID+kDNnTScpG7S9Wnz XzoLknexO3De/171i9xub2/RVpV35bML2WSE4WzwopVhDRJOCounX18NpLxcVv53OnsH 1eEEEKm3anZtKHSikOWeyhKNmelPK0+XJVrJJLUoGjhpJDg1wv6ERmYfhW16PaDvtbFW A8fTF+KOKehVCwYE63E8KsenK/RUiYTHKlYgm+EEa3RhONezVdtJreFJp7oTfxNGvYIu 7fUGlNv3YbL/d6XRHICMX/GgPk2la54+8T9hxgBtPwlIb8gDgBjofuFypdAg26g7sPnN XhIg== X-Gm-Message-State: AOAM530qKY3gTVO14n50Q55VbcJ4xIsDCVvkEPhFNxZFBHVQ6e6I+/7K U7ow7bQTYQMILymM1ZTAtZc80uj6BUVrrg== X-Google-Smtp-Source: ABdhPJwOnRr3RMQR+NrjcmoL/iDhM8I8uoueq6EpXmiB9VLHv2lXFj7yvaqE094zJsD3UUiWddz8AQ== X-Received: by 2002:a63:c10b:: with SMTP id w11mr5553924pgf.228.1631806249237; Thu, 16 Sep 2021 08:30:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 33/35] tcg/mips: Allow JAL to be out of range in tcg_out_bswap_subr Date: Thu, 16 Sep 2021 08:30:23 -0700 Message-Id: <20210916153025.1944763-34-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807851872100001 Content-Type: text/plain; charset="utf-8" Weaning off of unique alignment requirements, so allow JAL to not reach the target. TCG_TMP1 is always available for use as a scratch because it is clobbered by the subroutine being called. Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.c.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 320795a637..3a40af8799 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -573,8 +573,10 @@ static void tcg_out_bswap16(TCGContext *s, TCGReg ret,= TCGReg arg, int flags) =20 static void tcg_out_bswap_subr(TCGContext *s, const tcg_insn_unit *sub) { - bool ok =3D tcg_out_opc_jmp(s, OPC_JAL, sub); - tcg_debug_assert(ok); + if (!tcg_out_opc_jmp(s, OPC_JAL, sub)) { + tcg_out_movi(s, TCG_TYPE_PTR, TCG_TMP1, (uintptr_t)sub); + tcg_out_opc_reg(s, OPC_JALR, TCG_REG_RA, TCG_TMP1, 0); + } } =20 static void tcg_out_bswap32(TCGContext *s, TCGReg ret, TCGReg arg, int fla= gs) --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631807540; cv=none; d=zohomail.com; s=zohoarc; b=B7u7dUav/aFmpyCS3qt4TCtk9d71tw63jZbOoO+L9sZA5oO/UDTOUzYea6HZMA96ZiUBd2owz9jHkC3Ssu2dKy8O9Wi0aR6JvNWbyYQletm6IGZgeVqafqPgnPR1y82u8Dc8TUJHwlsDIqoX3ua8FFAimN8NEfoz2zQcIDCQ+Mw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631807540; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sx9OxIFdY4NzqELX94oh/fd9umRX24uKGyg1w/4NOWY=; b=Its62wMV5q9E2MZqF89zl58DSGq8oSS/aTM4Lz7UATkllHVJlj3fuQWBvrdBQF9DVNGdRcsF9FcE2yrG5CudNcg0GxApkTkz6nAf4YNdtGLvJqS6ejry+XFtr/NlQPRMyqi73trkZwRLnQsW4c9JPsRNMpH52ZZ5CGw4NOBiYQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631807540226322.8205129666982; Thu, 16 Sep 2021 08:52:20 -0700 (PDT) Received: from localhost ([::1]:33138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtgP-0006Cn-Pw for importer@patchew.org; Thu, 16 Sep 2021 11:52:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtLp-0001qh-5Z for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:01 -0400 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]:37696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLh-0002gA-AB for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:00 -0400 Received: by mail-pj1-x1030.google.com with SMTP id me5-20020a17090b17c500b0019af76b7bb4so7131443pjb.2 for ; Thu, 16 Sep 2021 08:30:50 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sx9OxIFdY4NzqELX94oh/fd9umRX24uKGyg1w/4NOWY=; b=Chb+4yuw/cV/lINWg6Sl4dc0FB6+1UBfYkzhS8JQP+pwvygJY+lyZOsPClNuDIH1tx +0hNGBMv9DCpqAQ1fV4McEOflYjNBL1Knrnt1qPOzPnI/PAfU25zPsmalmKduLNMY+K3 LendHxwOPJzc80QpxF+9spGYNJ+8EjO9BUkufu8l0PeyjZ9dDVnqL7RBFrOT4k87/G8B 1DGUPW9Z+XXqZOo1u9jX21aQGLIM5fnv3nIJ2hpSdEJ9XFkZNEq0G7Xqt5TSROrWkZ/h kKhb/2Dfm1/xTLlAkw9Lo3A5znuXW4nPanuonEuCWzcVEiMc+NMU2B+p+N2QNKQvBtdE 9E1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sx9OxIFdY4NzqELX94oh/fd9umRX24uKGyg1w/4NOWY=; b=NkQ/dGEviQh7lJcKwTeNEmoe5S5rbBYyP03XFj+zDeLCm2XSMcJWI2aaPdc/1VFIDB vD11xzYU2yMV4sK0rnUdhPNvOvHXyf4p8mR1JZwfaAP4KR5MrAr6Rt63FCyY1AleeEYS 3oxonXL0ulbinqcokyNxgXDaWbfXjuVrNoAY08rjRD/JeBO3Ya8ijsczxL46jPgo8bu9 hMkHjawsPMc7nLkCysJ01k9eoz9lJ7fHLmo8TIZbRYObcbEyIjLeMVZamR6Kl7Ie5Wal VrutFSShlfLNosvqeMfMycwDzsVB+7RnW+Kj12O9V64Czd6+iKDPVM4a93oznTW0Cvme rxBg== X-Gm-Message-State: AOAM5327+TL7d889gXZ/+1IBlXfuuHTkdYhuYfMtHeMD4c4o4NRDM/Xu +0FSqj269hCqCr15hvW1tzjNfHt0Udcj9w== X-Google-Smtp-Source: ABdhPJxMU9Sl8YaryB3bc9SocGSr7sr1CGTu61RdnZkqQmDQYuWgCa6X1gKKc2/4FgkF9MzVSSFFow== X-Received: by 2002:a17:902:ceca:b0:13c:8366:deac with SMTP id d10-20020a170902ceca00b0013c8366deacmr5210440plg.68.1631806249862; Thu, 16 Sep 2021 08:30:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 34/35] tcg/mips: Unset TCG_TARGET_HAS_direct_jump Date: Thu, 16 Sep 2021 08:30:24 -0700 Message-Id: <20210916153025.1944763-35-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1030.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631807541231100001 Only use indirect jumps. Finish weaning away from the unique alignment requirements for code_gen_buffer. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.h | 12 +++++------- tcg/mips/tcg-target.c.inc | 23 +++++------------------ 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/tcg/mips/tcg-target.h b/tcg/mips/tcg-target.h index 3a62055f04..c366fdf74b 100644 --- a/tcg/mips/tcg-target.h +++ b/tcg/mips/tcg-target.h @@ -39,11 +39,7 @@ #define TCG_TARGET_TLB_DISPLACEMENT_BITS 16 #define TCG_TARGET_NB_REGS 32 =20 -/* - * We have a 256MB branch region, but leave room to make sure the - * main executable is also within that region. - */ -#define MAX_CODE_GEN_BUFFER_SIZE (128 * MiB) +#define MAX_CODE_GEN_BUFFER_SIZE ((size_t)-1) =20 typedef enum { TCG_REG_ZERO =3D 0, @@ -136,7 +132,7 @@ extern bool use_mips32r2_instructions; #define TCG_TARGET_HAS_muluh_i32 1 #define TCG_TARGET_HAS_mulsh_i32 1 #define TCG_TARGET_HAS_bswap32_i32 1 -#define TCG_TARGET_HAS_direct_jump 1 +#define TCG_TARGET_HAS_direct_jump 0 =20 #if TCG_TARGET_REG_BITS =3D=3D 64 #define TCG_TARGET_HAS_add2_i32 0 @@ -207,7 +203,9 @@ extern bool use_mips32r2_instructions; #define TCG_TARGET_DEFAULT_MO (0) #define TCG_TARGET_HAS_MEMORY_BSWAP 1 =20 -void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t); +/* not defined -- call should be eliminated at compile time */ +void tb_target_set_jmp_target(uintptr_t, uintptr_t, uintptr_t, uintptr_t) + QEMU_ERROR("code path is reachable"); =20 #ifdef CONFIG_SOFTMMU #define TCG_TARGET_NEED_LDST_LABELS diff --git a/tcg/mips/tcg-target.c.inc b/tcg/mips/tcg-target.c.inc index 3a40af8799..41ffa28394 100644 --- a/tcg/mips/tcg-target.c.inc +++ b/tcg/mips/tcg-target.c.inc @@ -1654,17 +1654,11 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, } break; case INDEX_op_goto_tb: - if (s->tb_jmp_insn_offset) { - /* direct jump method */ - s->tb_jmp_insn_offset[a0] =3D tcg_current_code_size(s); - /* Avoid clobbering the address during retranslation. */ - tcg_out32(s, OPC_J | (*(uint32_t *)s->code_ptr & 0x3ffffff)); - } else { - /* indirect jump method */ - tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP0, TCG_REG_ZERO, - (uintptr_t)(s->tb_jmp_target_addr + a0)); - tcg_out_opc_reg(s, OPC_JR, 0, TCG_TMP0, 0); - } + /* indirect jump method */ + tcg_debug_assert(s->tb_jmp_insn_offset =3D=3D 0); + tcg_out_ld(s, TCG_TYPE_PTR, TCG_TMP0, TCG_REG_ZERO, + (uintptr_t)(s->tb_jmp_target_addr + a0)); + tcg_out_opc_reg(s, OPC_JR, 0, TCG_TMP0, 0); tcg_out_nop(s); set_jmp_reset_offset(s, a0); break; @@ -2538,13 +2532,6 @@ static void tcg_target_init(TCGContext *s) tcg_regset_set_reg(s->reserved_regs, TCG_REG_GP); /* global pointer = */ } =20 -void tb_target_set_jmp_target(uintptr_t tc_ptr, uintptr_t jmp_rx, - uintptr_t jmp_rw, uintptr_t addr) -{ - qatomic_set((uint32_t *)jmp_rw, deposit32(OPC_J, 0, 26, addr >> 2)); - flush_idcache_range(jmp_rx, jmp_rw, 4); -} - typedef struct { DebugFrameHeader h; uint8_t fde_def_cfa[4]; --=20 2.25.1 From nobody Mon Apr 29 11:27:24 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1631808596; cv=none; d=zohomail.com; s=zohoarc; b=DbJeCDrALTUUHRYp+wJIqlFNY6eMqKLo6AWCu9aNzCcjqqOYBAWfiDGsPjJLSg4LZLw/bIffsGDvtngBR7oDqPq0+FDVZX/K5Kk94jbz8Z7irspAoay59STq4Y4SMRDP/Ia1pPRal47E+j0FcgsppRmBQZExmmjehCSK+vMVelM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631808596; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zxXZyIG+Pw01TAIshh/v24ac5SJa+rYMBmTa7I6pYe8=; b=AJGssw5B0JPgFrIFyNtJpRVfmY7SQTWlflKa5uBCKcTEy5N1fEy94lyd4EFl2rxDo7ad8ZWJia6NJxJ8TkLdi4R0eDlGFpmKf83HpYxo0xxKFrPWhi0O8/z/pl7pLx2pgzsBxqGqSLPu6308820rHL/v2kzmxFMKqALqPjJ6+ug= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631808596160391.04697837440483; Thu, 16 Sep 2021 09:09:56 -0700 (PDT) Received: from localhost ([::1]:46136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQtxS-0000nE-RN for importer@patchew.org; Thu, 16 Sep 2021 12:09:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQtM5-00029T-UH for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:19 -0400 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]:38894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQtLj-0002gF-G6 for qemu-devel@nongnu.org; Thu, 16 Sep 2021 11:31:14 -0400 Received: by mail-pg1-x529.google.com with SMTP id w8so6486608pgf.5 for ; Thu, 16 Sep 2021 08:30:51 -0700 (PDT) Received: from localhost.localdomain ([71.212.134.125]) by smtp.gmail.com with ESMTPSA id b7sm3779447pgs.64.2021.09.16.08.30.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Sep 2021 08:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zxXZyIG+Pw01TAIshh/v24ac5SJa+rYMBmTa7I6pYe8=; b=i3qy1MUF7NrohW/phU3qwMsmnhqBGpAQOZditdLxgWX/87KuQvGf4+gkmcaRKOI/Tf rlLPYQIGFNDGtqePfAomKnMQxIPtjdQXolV8UHXhrPDGkIOa1kbKyEVR59zATPHuxwFt bolX28j/6PQkvolQ6zYB/m4Ltx4Lf7/uiR3dTYMk6J1SrWs3+iNDr6zHCNDZVsJqGlNU zJKmXsIJQuDZNZw09ZfDySV/R7T7yvcdrvrKO0a70IgH+cZkR2bxs8EdW9M3CLsZRmoC JWAyJJ4Qis+wNy8sc76BGbY8mYU+MUDHMcytssbRhZhAVXNji/sfXkSHf5SomUPqiTQ5 madg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zxXZyIG+Pw01TAIshh/v24ac5SJa+rYMBmTa7I6pYe8=; b=8ERAok5lL4nR9t7ZF/5sXH3+5I63teLvMqfkYEZuyFCjFLi1J9Iy1ybxDwbVE1N/uq RZuq49tSl7Mc2cyBBO8S6QklgXbT3Uqc1VQ3+mPqrj/EQjtLmo1lYz0IGtbvfsOXIkvg TueiNZufT382rS/ngaAoArrr5gPDs33u2QX0Jwtmon6QhQ7TsWC0jZFaUzWVUn8L41+2 3L886sYlZdOU76834puCo0yJkllqQGG/HZHpgra27BpP89VHrl2hQ1prS+RA3dig5OmL s1WnFxOYpgXr3pjbr6x2H2dBGFe5j3IQsy/EsikWZDZQA+ZnynjO6E5uI+zSmFGk1k9o /s5w== X-Gm-Message-State: AOAM531wH6NkUtwx+J0EURGEcWfBQODXho8/byS/R0NQC4WZHFjO/FHK pgu5Cmqq0bCDNUUBVNmB7PWawi6ER9ehcg== X-Google-Smtp-Source: ABdhPJyonU3OOXhpNRCPrjHbrneBCRUB91ytAALUHljZF4sDGUR3wagTwvK99CBHVp/K7v8dJVxrVw== X-Received: by 2002:a63:150e:: with SMTP id v14mr5507189pgl.126.1631806250492; Thu, 16 Sep 2021 08:30:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 35/35] tcg/mips: Drop special alignment for code_gen_buffer Date: Thu, 16 Sep 2021 08:30:25 -0700 Message-Id: <20210916153025.1944763-36-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210916153025.1944763-1-richard.henderson@linaro.org> References: <20210916153025.1944763-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1631808597730100003 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- tcg/region.c | 91 ---------------------------------------------------- 1 file changed, 91 deletions(-) diff --git a/tcg/region.c b/tcg/region.c index e64c3ea230..9cc30d4922 100644 --- a/tcg/region.c +++ b/tcg/region.c @@ -467,38 +467,6 @@ static size_t tcg_n_regions(size_t tb_size, unsigned m= ax_cpus) (DEFAULT_CODE_GEN_BUFFER_SIZE_1 < MAX_CODE_GEN_BUFFER_SIZE \ ? DEFAULT_CODE_GEN_BUFFER_SIZE_1 : MAX_CODE_GEN_BUFFER_SIZE) =20 -#ifdef __mips__ -/* - * In order to use J and JAL within the code_gen_buffer, we require - * that the buffer not cross a 256MB boundary. - */ -static inline bool cross_256mb(void *addr, size_t size) -{ - return ((uintptr_t)addr ^ ((uintptr_t)addr + size)) & ~0x0ffffffful; -} - -/* - * We weren't able to allocate a buffer without crossing that boundary, - * so make do with the larger portion of the buffer that doesn't cross. - * Returns the new base and size of the buffer in *obuf and *osize. - */ -static inline void split_cross_256mb(void **obuf, size_t *osize, - void *buf1, size_t size1) -{ - void *buf2 =3D (void *)(((uintptr_t)buf1 + size1) & ~0x0ffffffful); - size_t size2 =3D buf1 + size1 - buf2; - - size1 =3D buf2 - buf1; - if (size1 < size2) { - size1 =3D size2; - buf1 =3D buf2; - } - - *obuf =3D buf1; - *osize =3D size1; -} -#endif - #ifdef USE_STATIC_CODE_GEN_BUFFER static uint8_t static_code_gen_buffer[DEFAULT_CODE_GEN_BUFFER_SIZE] __attribute__((aligned(CODE_GEN_ALIGN))); @@ -526,12 +494,6 @@ static int alloc_code_gen_buffer(size_t tb_size, int s= plitwx, Error **errp) size =3D QEMU_ALIGN_DOWN(tb_size, qemu_real_host_page_size); } =20 -#ifdef __mips__ - if (cross_256mb(buf, size)) { - split_cross_256mb(&buf, &size, buf, size); - } -#endif - region.start_aligned =3D buf; region.total_size =3D size; =20 @@ -573,39 +535,6 @@ static int alloc_code_gen_buffer_anon(size_t size, int= prot, return -1; } =20 -#ifdef __mips__ - if (cross_256mb(buf, size)) { - /* - * Try again, with the original still mapped, to avoid re-acquiring - * the same 256mb crossing. - */ - size_t size2; - void *buf2 =3D mmap(NULL, size, prot, flags, -1, 0); - switch ((int)(buf2 !=3D MAP_FAILED)) { - case 1: - if (!cross_256mb(buf2, size)) { - /* Success! Use the new buffer. */ - munmap(buf, size); - break; - } - /* Failure. Work with what we had. */ - munmap(buf2, size); - /* fallthru */ - default: - /* Split the original buffer. Free the smaller half. */ - split_cross_256mb(&buf2, &size2, buf, size); - if (buf =3D=3D buf2) { - munmap(buf + size2, size - size2); - } else { - munmap(buf, size - size2); - } - size =3D size2; - break; - } - buf =3D buf2; - } -#endif - region.start_aligned =3D buf; region.total_size =3D size; return prot; @@ -620,35 +549,15 @@ static bool alloc_code_gen_buffer_splitwx_memfd(size_= t size, Error **errp) void *buf_rw =3D NULL, *buf_rx =3D MAP_FAILED; int fd =3D -1; =20 -#ifdef __mips__ - /* Find space for the RX mapping, vs the 256MiB regions. */ - if (alloc_code_gen_buffer_anon(size, PROT_NONE, - MAP_PRIVATE | MAP_ANONYMOUS | - MAP_NORESERVE, errp) < 0) { - return false; - } - /* The size of the mapping may have been adjusted. */ - buf_rx =3D region.start_aligned; - size =3D region.total_size; -#endif - buf_rw =3D qemu_memfd_alloc("tcg-jit", size, 0, &fd, errp); if (buf_rw =3D=3D NULL) { goto fail; } =20 -#ifdef __mips__ - void *tmp =3D mmap(buf_rx, size, PROT_READ | PROT_EXEC, - MAP_SHARED | MAP_FIXED, fd, 0); - if (tmp !=3D buf_rx) { - goto fail_rx; - } -#else buf_rx =3D mmap(NULL, size, PROT_READ | PROT_EXEC, MAP_SHARED, fd, 0); if (buf_rx =3D=3D MAP_FAILED) { goto fail_rx; } -#endif =20 close(fd); region.start_aligned =3D buf_rw; --=20 2.25.1