[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/18] hw/net/e1000e: Remove overwritten read handler for STATUS r
From: |
Laurent Vivier |
Subject: |
[PULL 08/18] hw/net/e1000e: Remove overwritten read handler for STATUS register |
Date: |
Fri, 11 Sep 2020 21:33:20 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The STATUS register readop handler is initialized first with
the generic e1000e_mac_readreg() handler:
2861 #define e1000e_getreg(x) [x] = e1000e_mac_readreg
2862 typedef uint32_t (*readops)(E1000ECore *, int);
2863 static const readops e1000e_macreg_readops[] = {
....
2919 e1000e_getreg(STATUS),
Then overwritten with the specific e1000e_get_status handler:
3018 [STATUS] = e1000e_get_status,
To avoid confusion, remove the overwritten initialization.
6f3fbe4ed0 ("net: Introduce e1000e device emulation")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200904131402.590055-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/net/e1000e_core.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index bcd186cac524..5170e6a45633 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -2916,7 +2916,6 @@ static const readops e1000e_macreg_readops[] = {
e1000e_getreg(TSYNCRXCTL),
e1000e_getreg(TDH),
e1000e_getreg(LEDCTL),
- e1000e_getreg(STATUS),
e1000e_getreg(TCTL),
e1000e_getreg(TDBAL),
e1000e_getreg(TDLEN),
--
2.26.2
- [PULL 00/18] Trivial branch for 5.2 patches, Laurent Vivier, 2020/09/11
- [PULL 02/18] hw/isa/isa-bus: Replace hw_error() by assert(), Laurent Vivier, 2020/09/11
- [PULL 04/18] hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR), Laurent Vivier, 2020/09/11
- [PULL 03/18] hw/acpi/tco: Remove unused definitions, Laurent Vivier, 2020/09/11
- [PULL 05/18] hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP), Laurent Vivier, 2020/09/11
- [PULL 06/18] Makefile: Drop extra phony cscope, Laurent Vivier, 2020/09/11
- [PULL 01/18] hw/mips/fuloong2e: Convert pointless error message to an assert(), Laurent Vivier, 2020/09/11
- [PULL 08/18] hw/net/e1000e: Remove overwritten read handler for STATUS register,
Laurent Vivier <=
- [PULL 07/18] Makefile: Skip the meson subdir in cscope/TAGS/ctags, Laurent Vivier, 2020/09/11
- [PULL 09/18] hw/net/e1000e: Remove duplicated write handler for FLSWDATA register, Laurent Vivier, 2020/09/11
- [PULL 11/18] kconfig: fix comment referring to old Makefiles, Laurent Vivier, 2020/09/11
- [PULL 14/18] target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken(), Laurent Vivier, 2020/09/11
- [PULL 12/18] hw: hyperv: vmbus: Fix 32bit compilation, Laurent Vivier, 2020/09/11
- [PULL 15/18] hw/arm/pxa2xx: Add missing fallthrough comment, Laurent Vivier, 2020/09/11
- [PULL 18/18] target/i386/kvm: Add missing fallthrough comment, Laurent Vivier, 2020/09/11
- [PULL 13/18] test-vmstate: remove unnecessary code in match_interval_mapping_node, Laurent Vivier, 2020/09/11
- [PULL 10/18] meson.build: tweak sdl-image error message, Laurent Vivier, 2020/09/11
- [PULL 17/18] util/hexdump: Reorder qemu_hexdump() arguments, Laurent Vivier, 2020/09/11