This is an automated email from Gerrit. "Tomas Vanek <[email protected]>" just uploaded a new patch set to Gerrit, which you can find at https://review.openocd.org/c/openocd/+/9171
-- gerrit commit db04cb87afc20d5f18be2cd071652af027c0d84b Author: Tomas Vanek <[email protected]> Date: Tue Oct 14 15:29:55 2025 +0200 target/riscv: return ERROR_TARGET_NOT_HALTED instead of ERROR_FAIL where appropriate. Change-Id: I1881c0c6c437355007c3844556489162666023dc Signed-off-by: Tomas Vanek <[email protected]> diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c index f2713bf096..2c55334947 100644 --- a/src/target/riscv/riscv-013.c +++ b/src/target/riscv/riscv-013.c @@ -2344,7 +2344,7 @@ static int prep_for_vector_access(struct target *target, if (target->state != TARGET_HALTED) { LOG_TARGET_ERROR(target, "Unable to access vector register: target not halted"); - return ERROR_FAIL; + return ERROR_TARGET_NOT_HALTED; } if (prep_for_register_access(target, orig_mstatus, GDB_REGNO_VL) != ERROR_OK) return ERROR_FAIL; @@ -5498,7 +5498,7 @@ static int riscv013_step_or_resume_current_hart(struct target *target, { if (target->state != TARGET_HALTED) { LOG_TARGET_ERROR(target, "Hart is not halted!"); - return ERROR_FAIL; + return ERROR_TARGET_NOT_HALTED; } LOG_TARGET_DEBUG(target, "resuming (operation=%s)", diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c index f7e0b4221d..d7d5b488bb 100644 --- a/src/target/riscv/riscv.c +++ b/src/target/riscv/riscv.c @@ -5425,7 +5425,7 @@ COMMAND_HANDLER(riscv_exec_progbuf) if (target->state != TARGET_HALTED) { LOG_TARGET_ERROR(target, "exec_progbuf: Can't execute " "program buffer, target not halted."); - return ERROR_FAIL; + return ERROR_TARGET_NOT_HALTED; } if (riscv_progbuf_size(target) == 0) { @@ -6050,7 +6050,7 @@ static int riscv_step_rtos_hart(struct target *target) if (target->state != TARGET_HALTED) { LOG_TARGET_ERROR(target, "Hart isn't halted before single step!"); - return ERROR_FAIL; + return ERROR_TARGET_NOT_HALTED; } r->on_step(target); if (r->step_current_hart(target) != ERROR_OK) @@ -6240,7 +6240,7 @@ int riscv_enumerate_triggers(struct target *target) if (target->state != TARGET_HALTED) { LOG_TARGET_ERROR(target, "Unable to enumerate triggers: target not halted."); - return ERROR_FAIL; + return ERROR_TARGET_NOT_HALTED; } riscv_reg_t orig_tselect; --
