[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/17] esp.c: replace cmdfifo use of esp_fifo_pop() in do_message_
From: |
Mark Cave-Ayland |
Subject: |
[PULL 04/17] esp.c: replace cmdfifo use of esp_fifo_pop() in do_message_phase() |
Date: |
Thu, 4 Apr 2024 15:25:26 +0100 |
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20240324191707.623175-5-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/scsi/esp.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index 9386704a58..5b169b3720 100644
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -315,7 +315,8 @@ static void do_command_phase(ESPState *s)
static void do_message_phase(ESPState *s)
{
if (s->cmdfifo_cdb_offset) {
- uint8_t message = esp_fifo_pop(&s->cmdfifo);
+ uint8_t message = fifo8_is_empty(&s->cmdfifo) ? 0 :
+ fifo8_pop(&s->cmdfifo);
trace_esp_do_identify(message);
s->lun = message & 7;
--
2.39.2
- [PULL 00/17] qemu-sparc queue 20240404, Mark Cave-Ayland, 2024/04/04
- [PULL 01/17] esp.c: move esp_fifo_pop_buf() internals to new esp_fifo8_pop_buf() function, Mark Cave-Ayland, 2024/04/04
- [PULL 02/17] esp.c: replace esp_fifo_pop_buf() with esp_fifo8_pop_buf() in do_command_phase(), Mark Cave-Ayland, 2024/04/04
- [PULL 03/17] esp.c: replace esp_fifo_pop_buf() with esp_fifo8_pop_buf() in do_message_phase(), Mark Cave-Ayland, 2024/04/04
- [PULL 04/17] esp.c: replace cmdfifo use of esp_fifo_pop() in do_message_phase(),
Mark Cave-Ayland <=
- [PULL 05/17] esp.c: change esp_fifo_push() to take ESPState, Mark Cave-Ayland, 2024/04/04
- [PULL 06/17] esp.c: change esp_fifo_pop() to take ESPState, Mark Cave-Ayland, 2024/04/04
- [PULL 07/17] esp.c: use esp_fifo_push() instead of fifo8_push(), Mark Cave-Ayland, 2024/04/04
- [PULL 08/17] esp.c: change esp_fifo_pop_buf() to take ESPState, Mark Cave-Ayland, 2024/04/04
- [PULL 09/17] esp.c: introduce esp_fifo_push_buf() function for pushing to the FIFO, Mark Cave-Ayland, 2024/04/04
- [PULL 10/17] esp.c: don't assert() if FIFO empty when executing non-DMA SELATNS, Mark Cave-Ayland, 2024/04/04
- [PULL 11/17] esp.c: rework esp_cdb_length() into esp_cdb_ready(), Mark Cave-Ayland, 2024/04/04
- [PULL 12/17] esp.c: prevent cmdfifo overflow in esp_cdb_ready(), Mark Cave-Ayland, 2024/04/04
- [PULL 13/17] esp.c: move esp_set_phase() and esp_get_phase() towards the beginning of the file, Mark Cave-Ayland, 2024/04/04
- [PULL 14/17] esp.c: introduce esp_update_drq() and update esp_fifo_{push, pop}_buf() to use it, Mark Cave-Ayland, 2024/04/04