1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2 changes: dropped the patch that enables the new 'notcg' CI test: |
---|---|---|---|
2 | it doesn't pass on our aarch64 runner because the CI runner doesn't | ||
3 | have access to /dev/kvm. | ||
2 | 4 | ||
3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) | 5 | thanks |
6 | -- PMM | ||
7 | |||
8 | The following changes since commit 7c18f2d663521f1b31b821a13358ce38075eaf7d: | ||
9 | |||
10 | Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2023-04-29 23:07:17 +0100) | ||
4 | 11 | ||
5 | are available in the Git repository at: | 12 | are available in the Git repository at: |
6 | 13 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 14 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230502-2 |
8 | 15 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 16 | for you to fetch changes up to a4ae17e5ec512862bf73e40dfbb1e7db71f2c1e7: |
10 | 17 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 18 | hw/net/allwinner-sun8i-emac: Correctly byteswap descriptor fields (2023-05-02 15:47:41 +0100) |
12 | 19 | ||
13 | ---------------------------------------------------------------- | 20 | ---------------------------------------------------------------- |
14 | target-arm queue: | 21 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 22 | * Support building Arm targets with CONFIG_TCG=no (ie KVM only) |
23 | * hw/net: npcm7xx_emc: set MAC in register space | ||
24 | * hw/arm/bcm2835_property: Implement "get command line" message | ||
25 | * Deprecate the '-singlestep' command line option in favour of | ||
26 | '-one-insn-per-tb' and '-accel one-insn-per-tb=on' | ||
27 | * Deprecate 'singlestep' member of QMP StatusInfo struct | ||
28 | * docs/about/deprecated.rst: Add "since 7.1" tag to dtb-kaslr-seed deprecation | ||
29 | * hw/net/msf2-emac: Don't modify descriptor in-place in emac_store_desc() | ||
30 | * raspi, aspeed: Write bootloader code correctly on big-endian hosts | ||
31 | * hw/intc/allwinner-a10-pic: Fix bug on big-endian hosts | ||
32 | * Fix bug in A32 ERET on big-endian hosts that caused guest crash | ||
33 | * hw/sd/allwinner-sdhost: Correctly byteswap descriptor fields | ||
34 | * hw/net/allwinner-sun8i-emac: Correctly byteswap descriptor fields | ||
16 | 35 | ||
17 | ---------------------------------------------------------------- | 36 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 37 | Claudio Fontana (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 38 | target/arm: move cpu_tcg to tcg/cpu32.c |
20 | 39 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 40 | Cédric Le Goater (2): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 41 | hw/arm/boot: Make write_bootloader() public as arm_write_bootloader() |
42 | hw/arm/aspeed: Use arm_write_bootloader() to write the bootloader | ||
23 | 43 | ||
44 | Daniel Bertalan (1): | ||
45 | hw/arm/bcm2835_property: Implement "get command line" message | ||
46 | |||
47 | Fabiano Rosas (11): | ||
48 | target/arm: Move cortex sysregs into a separate file | ||
49 | target/arm: Remove dead code from cpu_max_set_sve_max_vq | ||
50 | target/arm: Extract TCG -cpu max code into a function | ||
51 | target/arm: Do not expose all -cpu max features to qtests | ||
52 | target/arm: Move 64-bit TCG CPUs into tcg/ | ||
53 | tests/qtest: Adjust and document query-cpu-model-expansion test for arm | ||
54 | tests/qtest: Fix tests when no KVM or TCG are present | ||
55 | tests/avocado: Pass parameters to migration test | ||
56 | arm/Kconfig: Always select SEMIHOSTING when TCG is present | ||
57 | arm/Kconfig: Do not build TCG-only boards on a KVM-only build | ||
58 | tests/qtest: Restrict tpm-tis-i2c-test to CONFIG_TCG | ||
59 | |||
60 | Patrick Venture (1): | ||
61 | hw/net: npcm7xx_emc: set MAC in register space | ||
62 | |||
63 | Peter Maydell (18): | ||
64 | make one-insn-per-tb an accel option | ||
65 | softmmu: Don't use 'singlestep' global in QMP and HMP commands | ||
66 | accel/tcg: Use one_insn_per_tb global instead of old singlestep global | ||
67 | linux-user: Add '-one-insn-per-tb' option equivalent to '-singlestep' | ||
68 | bsd-user: Add '-one-insn-per-tb' option equivalent to '-singlestep' | ||
69 | Document that -singlestep command line option is deprecated | ||
70 | accel/tcg: Report one-insn-per-tb in 'info jit', not 'info status' | ||
71 | hmp: Add 'one-insn-per-tb' command equivalent to 'singlestep' | ||
72 | qapi/run-state.json: Fix missing newline at end of file | ||
73 | qmp: Deprecate 'singlestep' member of StatusInfo | ||
74 | docs/about/deprecated.rst: Add "since 7.1" tag to dtb-kaslr-seed deprecation | ||
75 | hw/net/msf2-emac: Don't modify descriptor in-place in emac_store_desc() | ||
76 | hw/arm/raspi: Use arm_write_bootloader() to write boot code | ||
77 | hw/intc/allwinner-a10-pic: Don't use set_bit()/clear_bit() | ||
78 | target/arm: Define and use new load_cpu_field_low32() | ||
79 | target/arm: Add compile time asserts to load/store_cpu_field macros | ||
80 | hw/sd/allwinner-sdhost: Correctly byteswap descriptor fields | ||
81 | hw/net/allwinner-sun8i-emac: Correctly byteswap descriptor fields | ||
82 | |||
83 | docs/about/deprecated.rst | 43 +- | ||
84 | docs/user/main.rst | 14 +- | ||
85 | configs/devices/aarch64-softmmu/default.mak | 4 - | ||
86 | configs/devices/arm-softmmu/default.mak | 39 -- | ||
87 | qapi/run-state.json | 16 +- | ||
88 | accel/tcg/internal.h | 2 + | ||
89 | include/exec/cpu-common.h | 2 - | ||
90 | include/hw/arm/boot.h | 49 ++ | ||
91 | include/hw/misc/bcm2835_property.h | 1 + | ||
92 | include/monitor/hmp.h | 2 +- | ||
93 | target/arm/cpregs.h | 6 + | ||
94 | target/arm/internals.h | 10 +- | ||
95 | target/arm/translate-a32.h | 24 +- | ||
96 | accel/tcg/cpu-exec.c | 2 +- | ||
97 | accel/tcg/monitor.c | 14 + | ||
98 | accel/tcg/tcg-all.c | 23 + | ||
99 | bsd-user/main.c | 14 +- | ||
100 | hw/arm/aspeed.c | 38 +- | ||
101 | hw/arm/bcm2835_peripherals.c | 2 + | ||
102 | hw/arm/bcm2836.c | 2 + | ||
103 | hw/arm/boot.c | 35 +- | ||
104 | hw/arm/raspi.c | 66 +-- | ||
105 | hw/arm/virt.c | 6 +- | ||
106 | hw/intc/allwinner-a10-pic.c | 7 +- | ||
107 | hw/misc/bcm2835_property.c | 13 +- | ||
108 | hw/net/allwinner-sun8i-emac.c | 22 +- | ||
109 | hw/net/msf2-emac.c | 16 +- | ||
110 | hw/net/npcm7xx_emc.c | 32 +- | ||
111 | hw/sd/allwinner-sdhost.c | 31 +- | ||
112 | linux-user/main.c | 18 +- | ||
113 | softmmu/globals.c | 1 - | ||
114 | softmmu/runstate-hmp-cmds.c | 25 +- | ||
115 | softmmu/runstate.c | 10 +- | ||
116 | softmmu/vl.c | 17 +- | ||
117 | target/arm/cortex-regs.c | 69 +++ | ||
118 | target/arm/cpu64.c | 702 +-------------------------- | ||
119 | target/arm/{cpu_tcg.c => tcg/cpu32.c} | 72 +-- | ||
120 | target/arm/tcg/cpu64.c | 723 ++++++++++++++++++++++++++++ | ||
121 | target/arm/tcg/translate.c | 4 +- | ||
122 | tests/qtest/arm-cpu-features.c | 20 +- | ||
123 | tests/qtest/bios-tables-test.c | 11 +- | ||
124 | tests/qtest/boot-serial-test.c | 5 + | ||
125 | tests/qtest/migration-test.c | 9 +- | ||
126 | tests/qtest/pxe-test.c | 8 +- | ||
127 | tests/qtest/test-hmp.c | 1 + | ||
128 | tests/qtest/vmgenid-test.c | 9 +- | ||
129 | hmp-commands.hx | 25 +- | ||
130 | hw/arm/Kconfig | 43 +- | ||
131 | qemu-options.hx | 12 +- | ||
132 | target/arm/Kconfig | 7 + | ||
133 | target/arm/meson.build | 2 +- | ||
134 | target/arm/tcg/meson.build | 2 + | ||
135 | tcg/tci/README | 2 +- | ||
136 | tests/avocado/migration.py | 83 +++- | ||
137 | tests/qtest/meson.build | 3 +- | ||
138 | 55 files changed, 1438 insertions(+), 980 deletions(-) | ||
139 | create mode 100644 target/arm/cortex-regs.c | ||
140 | rename target/arm/{cpu_tcg.c => tcg/cpu32.c} (93%) | ||
141 | create mode 100644 target/arm/tcg/cpu64.c | ||
142 | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Philippe Mathieu-Daudé <philmd@linaro.org> | ||
2 | 1 | ||
3 | Cortex-M profile is only emulable from TCG accelerator. Restrict | ||
4 | the GDBstub features to its availability in order to avoid a link | ||
5 | error when TCG is not enabled: | ||
6 | |||
7 | Undefined symbols for architecture arm64: | ||
8 | "_arm_v7m_get_sp_ptr", referenced from: | ||
9 | _m_sysreg_get in target_arm_gdbstub.c.o | ||
10 | "_arm_v7m_mrs_control", referenced from: | ||
11 | _arm_gdb_get_m_systemreg in target_arm_gdbstub.c.o | ||
12 | ld: symbol(s) not found for architecture arm64 | ||
13 | clang: error: linker command failed with exit code 1 (use -v to see invocation) | ||
14 | |||
15 | Fixes: 7d8b28b8b5 ("target/arm: Implement gdbstub m-profile systemreg and secext") | ||
16 | Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> | ||
17 | Reviewed-by: Richard Henderson <richard.henderson@linaro.org> | ||
18 | Reviewed-by: Alex Bennée <alex.bennee@linaro.org> | ||
19 | Message-id: 20230322142902.69511-3-philmd@linaro.org | ||
20 | [PMM: add #include since I cherry-picked this patch from the series] | ||
21 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
22 | --- | ||
23 | target/arm/gdbstub.c | 5 +++-- | ||
24 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
25 | |||
26 | diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c | ||
27 | index XXXXXXX..XXXXXXX 100644 | ||
28 | --- a/target/arm/gdbstub.c | ||
29 | +++ b/target/arm/gdbstub.c | ||
30 | @@ -XXX,XX +XXX,XX @@ | ||
31 | #include "cpu.h" | ||
32 | #include "exec/gdbstub.h" | ||
33 | #include "gdbstub/helpers.h" | ||
34 | +#include "sysemu/tcg.h" | ||
35 | #include "internals.h" | ||
36 | #include "cpregs.h" | ||
37 | |||
38 | @@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) | ||
39 | 2, "arm-vfp-sysregs.xml", 0); | ||
40 | } | ||
41 | } | ||
42 | - if (cpu_isar_feature(aa32_mve, cpu)) { | ||
43 | + if (cpu_isar_feature(aa32_mve, cpu) && tcg_enabled()) { | ||
44 | gdb_register_coprocessor(cs, mve_gdb_get_reg, mve_gdb_set_reg, | ||
45 | 1, "arm-m-profile-mve.xml", 0); | ||
46 | } | ||
47 | @@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu) | ||
48 | arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs), | ||
49 | "system-registers.xml", 0); | ||
50 | |||
51 | - if (arm_feature(env, ARM_FEATURE_M)) { | ||
52 | + if (arm_feature(env, ARM_FEATURE_M) && tcg_enabled()) { | ||
53 | gdb_register_coprocessor(cs, | ||
54 | arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg, | ||
55 | arm_gen_dynamic_m_systemreg_xml(cs, cs->gdb_num_regs), | ||
56 | -- | ||
57 | 2.34.1 | ||
58 | |||
59 | diff view generated by jsdifflib |