a8263c0693
- Include upstream patches designated as stable material and reviewed for applicability to include here block-Separate-blk_is_writable-and-blk_s.patch hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch hw-net-lan9118-Fix-RX-Status-FIFO-PEEK-v.patch hw-timer-slavio_timer-Allow-64-bit-acces.patch net-Fix-handling-of-id-in-netdev_add-and.patch target-arm-Don-t-decode-insns-in-the-XSc.patch target-arm-Fix-MTE0_ACTIVE.patch target-arm-Introduce-PREDDESC-field-defi.patch target-arm-Update-PFIRST-PNEXT-for-pred_.patch target-arm-Update-REV-PUNPK-for-pred_des.patch target-arm-Update-ZIP-UZP-TRN-for-pred_d.patch tcg-Use-memset-for-large-vector-byte-rep.patch ui-vnc-Add-missing-lock-for-send_color_m.patch virtio-move-use-disabled-flag-property-t.patch - binutils v2.36 has changed the handling of the assembler's -mx86-used-note, resulting in a build failure. To compensate, we now explicitly specify -mx86-used-note=no in the seabios Makefile (boo#1181775) build-be-explicit-about-mx86-used-note-n.patch OBS-URL: https://build.opensuse.org/request/show/869843 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=614
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From: Peter Maydell <peter.maydell@linaro.org>
|
|
Date: Fri, 8 Jan 2021 18:04:00 +0000
|
|
Subject: hw/net/lan9118: Fix RX Status FIFO PEEK value
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: e7e29fdbbe07fb762d85af9c4d8eeff9b0f52a8e
|
|
|
|
A copy-and-paste error meant that the return value for register offset 0x44
|
|
(the RX Status FIFO PEEK register) returned a byte from a bogus offset in
|
|
the rx status FIFO. Fix the typo.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: https://bugs.launchpad.net/qemu/+bug/1904954
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
|
|
Message-id: 20210108180401.2263-2-peter.maydell@linaro.org
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/net/lan9118.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
|
|
index ab57c02c8e10d3ea1feb258fa4c5..13d469fe24fd8dd3a03eb2b60a58 100644
|
|
--- a/hw/net/lan9118.c
|
|
+++ b/hw/net/lan9118.c
|
|
@@ -1206,7 +1206,7 @@ static uint64_t lan9118_readl(void *opaque, hwaddr offset,
|
|
case 0x40:
|
|
return rx_status_fifo_pop(s);
|
|
case 0x44:
|
|
- return s->rx_status_fifo[s->tx_status_fifo_head];
|
|
+ return s->rx_status_fifo[s->rx_status_fifo_head];
|
|
case 0x48:
|
|
return tx_status_fifo_pop(s);
|
|
case 0x4c:
|