| 1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2: added a missing #include qemu/error-report.h which only causes |
|---|---|---|---|
| 2 | build failure in some configs, not all. | ||
| 2 | 3 | ||
| 3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) | 4 | The following changes since commit 853546f8128476eefb701d4a55b2781bb3a46faa: |
| 5 | |||
| 6 | Merge tag 'pull-loongarch-20240322' of https://gitlab.com/gaosong/qemu into staging (2024-03-22 10:59:57 +0000) | ||
| 4 | 7 | ||
| 5 | are available in the Git repository at: | 8 | are available in the Git repository at: |
| 6 | 9 | ||
| 7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 10 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20240325-1 |
| 8 | 11 | ||
| 9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 12 | for you to fetch changes up to fe3e38390126c2202292911c49d46fc7ee4a163a: |
| 10 | 13 | ||
| 11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 14 | tests/qtest/libqtest.c: Check for g_setenv() failure (2024-03-25 14:17:07 +0000) |
| 12 | 15 | ||
| 13 | ---------------------------------------------------------------- | 16 | ---------------------------------------------------------------- |
| 14 | target-arm queue: | 17 | target-arm queue: |
| 15 | * fix part of the "TCG-disabled builds are broken" issue | 18 | * Fixes for seven minor coverity issues |
| 16 | 19 | ||
| 17 | ---------------------------------------------------------------- | 20 | ---------------------------------------------------------------- |
| 18 | Philippe Mathieu-Daudé (1): | 21 | Peter Maydell (7): |
| 19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 22 | tests/qtest/npcm7xx_emc_test: Don't leak cmd_line |
| 23 | tests/unit/socket-helpers: Don't close(-1) | ||
| 24 | net/af-xdp.c: Don't leak sock_fds array in net_init_af_xdp() | ||
| 25 | hw/misc/pca9554: Correct error check bounds in get/set pin functions | ||
| 26 | hw/nvram/mac_nvram: Report failure to write data | ||
| 27 | tests/unit/test-throttle: Avoid unintended integer division | ||
| 28 | tests/qtest/libqtest.c: Check for g_setenv() failure | ||
| 20 | 29 | ||
| 21 | target/arm/gdbstub.c | 5 +++-- | 30 | hw/misc/pca9554.c | 4 ++-- |
| 22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 31 | hw/nvram/mac_nvram.c | 6 +++++- |
| 23 | 32 | net/af-xdp.c | 3 +-- | |
| 33 | tests/qtest/libqtest.c | 6 +++++- | ||
| 34 | tests/qtest/npcm7xx_emc-test.c | 4 ++-- | ||
| 35 | tests/unit/socket-helpers.c | 4 +++- | ||
| 36 | tests/unit/test-throttle.c | 4 ++-- | ||
| 37 | 7 files changed, 20 insertions(+), 11 deletions(-) | 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 |