Message ID | 20231003173052.1601813-1-richard.henderson@linaro.org |
---|---|
State | New |
Headers | show |
On Tue, 3 Oct 2023 at 13:31, Richard Henderson <richard.henderson@linaro.org> wrote: > > The following changes since commit da1034094d375afe9e3d8ec8980550ea0f06f7e0: > > Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2023-10-03 07:43:44 -0400) > > are available in the Git repository at: > > https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20231003 > > for you to fetch changes up to 971537eca2e6c7aaf185bbf10d4cbd84cf9d8a38: > > tcg/loongarch64: Fix buid error (2023-10-03 08:53:17 -0700) > > ---------------------------------------------------------------- > accel: Introduce AccelClass::cpu_common_[un]realize > accel: Target agnostic code movement > accel/tcg: Cleanups to use CPUState instead of CPUArchState > accel/tcg: Move CPUNegativeOffsetState into CPUState > tcg: Split out tcg init functions to tcg/startup.h > linux-user/hppa: Fix struct target_sigcontext layout > build: Remove --enable-gprof > > ---------------------------------------------------------------- > Anton Johansson (9): > target/arm: Replace TARGET_PAGE_ENTRY_EXTRA > accel/tcg: Modify tlb_*() to use CPUState > accel/tcg: Modify probe_access_internal() to use CPUState > accel/tcg: Modify memory access functions to use CPUState > accel/tcg: Modify atomic_mmu_lookup() to use CPUState > accel/tcg: Use CPUState in atomicity helpers > accel/tcg: Remove env_tlb() > accel/tcg: Unify user and softmmu do_[st|ld]*_mmu() > accel/tcg: move ld/st helpers to ldst_common.c.inc > > Philippe Mathieu-Daudé (19): > accel: Rename accel_cpu_realizefn() -> accel_cpu_realize() > accel: Rename AccelCPUClass::cpu_realizefn() -> cpu_target_realize() > accel: Rename accel_cpu_realize() -> accel_cpu_common_realize() > accel: Introduce accel_cpu_common_unrealize() stub > accel: Declare AccelClass::cpu_common_[un]realize() handlers > accel/tcg: Have tcg_exec_realizefn() return a boolean > accel/tcg: Restrict tcg_exec_[un]realizefn() to TCG > exec: Make EXCP_FOO definitions target agnostic > exec: Move cpu_loop_foo() target agnostic functions to 'cpu-common.h' > accel/tcg: Restrict dump_exec_info() declaration > accel: Make accel-blocker.o target agnostic > accel: Rename accel-common.c -> accel-target.c > exec: Rename cpu.c -> cpu-target.c > exec: Rename target specific page-vary.c -> page-vary-target.c > accel/tcg: Rename target-specific 'internal.h' -> 'internal-target.h' > accel/tcg: Make monitor.c a target-agnostic unit > accel/tcg: Make icount.o a target agnostic unit > accel/tcg: Make cpu-exec-common.c a target agnostic unit > tests/avocado: Re-enable MIPS Malta tests (GitLab issue #1884 fixed) > > Richard Henderson (18): > accel/tcg: Move CPUTLB definitions from cpu-defs.h > qom: Propagate alignment through type system > target/arm: Remove size and alignment for cpu subclasses > target/*: Add instance_align to all cpu base classes > accel/tcg: Validate placement of CPUNegativeOffsetState > accel/tcg: Move CPUNegativeOffsetState into CPUState > accel/tcg: Remove CPUState.icount_decr_ptr > accel/tcg: Move can_do_io to CPUNegativeOffsetState > accel/tcg: Remove cpu_neg() > tcg: Rename cpu_env to tcg_env > accel/tcg: Replace CPUState.env_ptr with cpu_env() This commit breaks the build: ../bsd-user/signal.c:479:19: error: unused variable 'env' [-Werror,-Wunused-variable] CPUArchState *env = cpu_env(cpu); ^ https://gitlab.com/qemu-project/qemu/-/jobs/5222693462 Please resend the pull request with a fix. Thanks, Stefan > accel/tcg: Remove cpu_set_cpustate_pointers > accel/tcg: Remove env_neg() > tcg: Remove TCGContext.tlb_fast_offset > tcg: Remove argument to tcg_prologue_init > tcg: Split out tcg init functions to tcg/startup.h > linux-user/hppa: Fix struct target_sigcontext layout > build: Remove --enable-gprof > > gaosong (1): > tcg/loongarch64: Fix buid error > > MAINTAINERS | 7 +- > docs/about/deprecated.rst | 14 - > meson.build | 18 +- > accel/tcg/atomic_template.h | 20 +- > accel/tcg/internal-common.h | 28 + > accel/tcg/{internal.h => internal-target.h} | 21 +- > bsd-user/bsd-proc.h | 3 - > include/exec/cpu-all.h | 67 +- > include/exec/cpu-common.h | 39 + > include/exec/cpu-defs.h | 138 --- > include/exec/cpu_ldst.h | 8 +- > include/exec/exec-all.h | 32 +- > include/hw/core/accel-cpu.h | 2 +- > include/hw/core/cpu.h | 171 ++- > include/qemu/accel.h | 12 +- > include/tcg/startup.h | 58 + > include/tcg/tcg.h | 6 +- > target/alpha/cpu.h | 1 - > target/arm/common-semi-target.h | 2 +- > target/arm/cpu-param.h | 12 - > target/arm/cpu.h | 1 - > target/arm/tcg/translate-a32.h | 2 +- > target/arm/tcg/translate-a64.h | 4 +- > target/arm/tcg/translate.h | 16 +- > target/avr/cpu.h | 1 - > target/cris/cpu.h | 1 - > target/hexagon/cpu.h | 2 +- > target/hexagon/gen_tcg.h | 120 +- > target/hexagon/gen_tcg_hvx.h | 20 +- > target/hexagon/macros.h | 8 +- > target/hppa/cpu.h | 1 - > target/i386/cpu.h | 1 - > target/loongarch/cpu.h | 1 - > target/m68k/cpu.h | 1 - > target/microblaze/cpu.h | 6 +- > target/mips/cpu.h | 4 +- > target/mips/tcg/translate.h | 6 +- > target/nios2/cpu.h | 1 - > target/openrisc/cpu.h | 1 - > target/ppc/cpu.h | 1 - > target/riscv/cpu.h | 2 +- > target/rx/cpu.h | 1 - > target/s390x/cpu.h | 1 - > target/sh4/cpu.h | 1 - > target/sparc/cpu.h | 1 - > target/tricore/cpu.h | 1 - > target/xtensa/cpu.h | 3 +- > accel/{accel-common.c => accel-target.c} | 27 +- > accel/dummy-cpus.c | 2 +- > accel/hvf/hvf-accel-ops.c | 2 +- > accel/kvm/kvm-accel-ops.c | 2 +- > accel/tcg/cpu-exec-common.c | 5 +- > accel/tcg/cpu-exec.c | 31 +- > accel/tcg/cputlb.c | 787 +++++------- > softmmu/icount.c => accel/tcg/icount-common.c | 7 +- > accel/tcg/monitor.c | 2 +- > accel/tcg/plugin-gen.c | 10 +- > accel/tcg/tb-maint.c | 3 +- > accel/tcg/tcg-accel-ops-icount.c | 8 +- > accel/tcg/tcg-accel-ops-mttcg.c | 4 +- > accel/tcg/tcg-accel-ops-rr.c | 6 +- > accel/tcg/tcg-accel-ops.c | 2 +- > accel/tcg/tcg-all.c | 8 +- > accel/tcg/translate-all.c | 15 +- > accel/tcg/translator.c | 24 +- > accel/tcg/user-exec.c | 279 +---- > bsd-user/main.c | 6 +- > bsd-user/signal.c | 15 +- > cpus-common.c => cpu-common.c | 0 > cpu.c => cpu-target.c | 13 +- > gdbstub/gdbstub.c | 4 +- > gdbstub/user-target.c | 2 +- > hw/core/cpu-common.c | 6 +- > hw/i386/kvm/clock.c | 2 +- > hw/intc/mips_gic.c | 2 +- > hw/intc/riscv_aclint.c | 12 +- > hw/intc/riscv_imsic.c | 2 +- > hw/ppc/e500.c | 4 +- > hw/ppc/spapr.c | 2 +- > linux-user/elfload.c | 4 +- > linux-user/exit.c | 6 - > linux-user/hppa/signal.c | 2 +- > linux-user/i386/cpu_loop.c | 2 +- > linux-user/main.c | 8 +- > linux-user/signal.c | 20 +- > linux-user/syscall.c | 2 +- > monitor/hmp-cmds-target.c | 2 +- > page-vary.c => page-vary-target.c | 0 > qom/object.c | 14 + > semihosting/arm-compat-semi.c | 6 +- > semihosting/syscalls.c | 28 +- > softmmu/watchpoint.c | 2 +- > target/alpha/cpu.c | 3 +- > target/alpha/translate.c | 146 +-- > target/arm/cpu.c | 12 +- > target/arm/cpu64.c | 4 - > target/arm/helper.c | 2 +- > target/arm/ptw.c | 4 +- > target/arm/tcg/mte_helper.c | 2 +- > target/arm/tcg/sve_helper.c | 2 +- > target/arm/tcg/tlb_helper.c | 4 +- > target/arm/tcg/translate-a64.c | 384 +++--- > target/arm/tcg/translate-m-nocp.c | 24 +- > target/arm/tcg/translate-mve.c | 52 +- > target/arm/tcg/translate-neon.c | 78 +- > target/arm/tcg/translate-sme.c | 8 +- > target/arm/tcg/translate-sve.c | 172 +-- > target/arm/tcg/translate-vfp.c | 56 +- > target/arm/tcg/translate.c | 234 ++-- > target/avr/cpu.c | 3 +- > target/avr/translate.c | 66 +- > target/cris/cpu.c | 3 +- > target/cris/translate.c | 72 +- > target/hexagon/cpu.c | 4 +- > target/hexagon/genptr.c | 36 +- > target/hexagon/idef-parser/parser-helpers.c | 2 +- > target/hexagon/translate.c | 52 +- > target/hppa/cpu.c | 2 +- > target/hppa/mem_helper.c | 2 +- > target/hppa/translate.c | 161 ++- > target/i386/cpu.c | 2 +- > target/i386/hvf/hvf-cpu.c | 2 +- > target/i386/kvm/kvm-cpu.c | 4 +- > target/i386/nvmm/nvmm-all.c | 14 +- > target/i386/tcg/sysemu/excp_helper.c | 2 +- > target/i386/tcg/tcg-cpu.c | 4 +- > target/i386/tcg/translate.c | 584 ++++----- > target/i386/whpx/whpx-all.c | 26 +- > target/loongarch/cpu.c | 9 +- > target/loongarch/translate.c | 22 +- > target/m68k/cpu.c | 9 +- > target/m68k/translate.c | 306 ++--- > target/microblaze/cpu.c | 2 +- > target/microblaze/translate.c | 52 +- > target/mips/cpu.c | 2 +- > target/mips/tcg/lcsr_translate.c | 6 +- > target/mips/tcg/msa_translate.c | 34 +- > target/mips/tcg/mxu_translate.c | 4 +- > target/mips/tcg/sysemu/mips-semi.c | 4 +- > target/mips/tcg/translate.c | 1288 ++++++++++---------- > target/mips/tcg/vr54xx_translate.c | 2 +- > target/nios2/cpu.c | 5 +- > target/nios2/translate.c | 52 +- > target/openrisc/cpu.c | 7 +- > target/openrisc/translate.c | 86 +- > target/ppc/cpu_init.c | 1 - > target/ppc/excp_helper.c | 10 +- > target/ppc/translate.c | 366 +++--- > target/riscv/cpu.c | 8 +- > target/riscv/translate.c | 56 +- > target/rx/cpu.c | 5 +- > target/rx/translate.c | 58 +- > target/s390x/cpu.c | 2 - > target/s390x/tcg/translate.c | 426 +++---- > target/sh4/cpu.c | 3 +- > target/sh4/op_helper.c | 2 +- > target/sh4/translate.c | 128 +- > target/sparc/cpu.c | 3 +- > target/sparc/translate.c | 332 ++--- > target/tricore/cpu.c | 10 +- > target/tricore/translate.c | 230 ++-- > target/xtensa/cpu.c | 2 +- > target/xtensa/translate.c | 192 +-- > tcg/tcg-op-gvec.c | 300 ++--- > tcg/tcg-op-ldst.c | 22 +- > tcg/tcg-op.c | 2 +- > tcg/tcg.c | 23 +- > accel/tcg/ldst_atomicity.c.inc | 88 +- > accel/tcg/ldst_common.c.inc | 225 ++++ > target/cris/translate_v10.c.inc | 28 +- > target/i386/tcg/decode-new.c.inc | 4 +- > target/i386/tcg/emit.c.inc | 262 ++-- > target/loongarch/insn_trans/trans_atomic.c.inc | 4 +- > target/loongarch/insn_trans/trans_branch.c.inc | 2 +- > target/loongarch/insn_trans/trans_extra.c.inc | 10 +- > target/loongarch/insn_trans/trans_farith.c.inc | 6 +- > target/loongarch/insn_trans/trans_fcmp.c.inc | 8 +- > target/loongarch/insn_trans/trans_fmemory.c.inc | 8 +- > target/loongarch/insn_trans/trans_fmov.c.inc | 20 +- > target/loongarch/insn_trans/trans_memory.c.inc | 8 +- > target/loongarch/insn_trans/trans_privileged.c.inc | 52 +- > target/loongarch/insn_trans/trans_vec.c.inc | 24 +- > target/mips/tcg/micromips_translate.c.inc | 12 +- > target/mips/tcg/nanomips_translate.c.inc | 200 +-- > target/ppc/power8-pmu-regs.c.inc | 8 +- > target/ppc/translate/branch-impl.c.inc | 2 +- > target/ppc/translate/dfp-impl.c.inc | 22 +- > target/ppc/translate/fixedpoint-impl.c.inc | 2 +- > target/ppc/translate/fp-impl.c.inc | 50 +- > target/ppc/translate/processor-ctrl-impl.c.inc | 8 +- > target/ppc/translate/spe-impl.c.inc | 30 +- > target/ppc/translate/storage-ctrl-impl.c.inc | 26 +- > target/ppc/translate/vmx-impl.c.inc | 34 +- > target/ppc/translate/vsx-impl.c.inc | 54 +- > target/riscv/insn_trans/trans_privileged.c.inc | 8 +- > target/riscv/insn_trans/trans_rvbf16.c.inc | 10 +- > target/riscv/insn_trans/trans_rvd.c.inc | 48 +- > target/riscv/insn_trans/trans_rvf.c.inc | 46 +- > target/riscv/insn_trans/trans_rvh.c.inc | 8 +- > target/riscv/insn_trans/trans_rvi.c.inc | 16 +- > target/riscv/insn_trans/trans_rvm.c.inc | 16 +- > target/riscv/insn_trans/trans_rvv.c.inc | 130 +- > target/riscv/insn_trans/trans_rvvk.c.inc | 30 +- > target/riscv/insn_trans/trans_rvzce.c.inc | 2 +- > target/riscv/insn_trans/trans_rvzfa.c.inc | 38 +- > target/riscv/insn_trans/trans_rvzfh.c.inc | 54 +- > target/riscv/insn_trans/trans_rvzicbo.c.inc | 8 +- > target/riscv/insn_trans/trans_svinval.c.inc | 6 +- > target/riscv/insn_trans/trans_xthead.c.inc | 2 +- > target/s390x/tcg/translate_vx.c.inc | 104 +- > tcg/aarch64/tcg-target.c.inc | 2 +- > tcg/arm/tcg-target.c.inc | 2 +- > tcg/loongarch64/tcg-target.c.inc | 68 +- > accel/meson.build | 4 +- > accel/tcg/meson.build | 8 +- > meson_options.txt | 3 - > scripts/meson-buildoptions.sh | 3 - > softmmu/meson.build | 4 - > target/hexagon/README | 10 +- > target/hexagon/gen_tcg_funcs.py | 16 +- > tests/avocado/boot_linux_console.py | 7 - > tests/avocado/machine_mips_malta.py | 6 - > tests/avocado/replay_kernel.py | 7 - > tests/avocado/tuxrun_baselines.py | 4 - > tests/qemu-iotests/meson.build | 2 +- > 225 files changed, 5102 insertions(+), 5323 deletions(-) > create mode 100644 accel/tcg/internal-common.h > rename accel/tcg/{internal.h => internal-target.h} (89%) > create mode 100644 include/tcg/startup.h > rename accel/{accel-common.c => accel-target.c} (86%) > rename softmmu/icount.c => accel/tcg/icount-common.c (99%) > rename cpus-common.c => cpu-common.c (100%) > rename cpu.c => cpu-target.c (97%) > rename page-vary.c => page-vary-target.c (100%) >
On 10/4/23 07:57, Stefan Hajnoczi wrote: > This commit breaks the build: > > ../bsd-user/signal.c:479:19: error: unused variable 'env' > [-Werror,-Wunused-variable] > CPUArchState *env = cpu_env(cpu); > ^ > > https://gitlab.com/qemu-project/qemu/-/jobs/5222693462 > > Please resend the pull request with a fix. The line number quoted above does not correspond to my source. Did you attempt to merge multiple pulls simultaneously? There must be a conflict between them. My guess is Warner's bsd-user PR. Please just apply that first and I'll re-roll mine afterward. r~
On Wed, 4 Oct 2023 at 12:28, Richard Henderson <richard.henderson@linaro.org> wrote: > > On 10/4/23 07:57, Stefan Hajnoczi wrote: > > This commit breaks the build: > > > > ../bsd-user/signal.c:479:19: error: unused variable 'env' > > [-Werror,-Wunused-variable] > > CPUArchState *env = cpu_env(cpu); > > ^ > > > > https://gitlab.com/qemu-project/qemu/-/jobs/5222693462 > > > > Please resend the pull request with a fix. > > The line number quoted above does not correspond to my source. > Did you attempt to merge multiple pulls simultaneously? > There must be a conflict between them. > > My guess is Warner's bsd-user PR. > Please just apply that first and I'll re-roll mine afterward. Okay. Note that host_signal_handler()'s env local variable looks unused in your tag: https://gitlab.com/rth7680/qemu/-/blob/pull-tcg-20231003/bsd-user/signal.c?ref_type=tags#L473
On 10/4/23 09:46, Stefan Hajnoczi wrote: > On Wed, 4 Oct 2023 at 12:28, Richard Henderson > <richard.henderson@linaro.org> wrote: >> >> On 10/4/23 07:57, Stefan Hajnoczi wrote: >>> This commit breaks the build: >>> >>> ../bsd-user/signal.c:479:19: error: unused variable 'env' >>> [-Werror,-Wunused-variable] >>> CPUArchState *env = cpu_env(cpu); >>> ^ >>> >>> https://gitlab.com/qemu-project/qemu/-/jobs/5222693462 >>> >>> Please resend the pull request with a fix. >> >> The line number quoted above does not correspond to my source. >> Did you attempt to merge multiple pulls simultaneously? >> There must be a conflict between them. >> >> My guess is Warner's bsd-user PR. >> Please just apply that first and I'll re-roll mine afterward. > > Okay. Note that host_signal_handler()'s env local variable looks > unused in your tag: > https://gitlab.com/rth7680/qemu/-/blob/pull-tcg-20231003/bsd-user/signal.c?ref_type=tags#L473 You're right, it does appear to be unused. And yet "make vm-build-freebsd" succeeds, as does a native build on a freebsd install. r~