From: Mark Cave-Ayland Date: Sun, 24 Mar 2024 19:16:52 +0000 (+0000) Subject: esp.c: replace esp_fifo_pop_buf() with esp_fifo8_pop_buf() in do_message_phase() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2260402be14a1e1e64d479e378e583239d70de58;p=qemu.git esp.c: replace esp_fifo_pop_buf() with esp_fifo8_pop_buf() in do_message_phase() The aim is to restrict the esp_fifo_*() functions so that they only operate on the hardware FIFO. When reading from cmdfifo in do_message_phase() use the underlying esp_fifo8_pop_buf() function directly. Signed-off-by: Mark Cave-Ayland Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20240324191707.623175-4-mark.cave-ayland@ilande.co.uk> Signed-off-by: Mark Cave-Ayland --- diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index ff51145da7..9386704a58 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -325,7 +325,7 @@ static void do_message_phase(ESPState *s) /* Ignore extended messages for now */ if (s->cmdfifo_cdb_offset) { int len = MIN(s->cmdfifo_cdb_offset, fifo8_num_used(&s->cmdfifo)); - esp_fifo_pop_buf(&s->cmdfifo, NULL, len); + esp_fifo8_pop_buf(&s->cmdfifo, NULL, len); s->cmdfifo_cdb_offset = 0; } }