[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/18] hw/net/e1000e: Remove duplicated write handler for FLSWDATA
From: |
Laurent Vivier |
Subject: |
[PULL 09/18] hw/net/e1000e: Remove duplicated write handler for FLSWDATA register |
Date: |
Fri, 11 Sep 2020 21:33:21 +0200 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The FLSWDATA register writeop handler is initialized twice:
3067 #define e1000e_putreg(x) [x] = e1000e_mac_writereg
3068 typedef void (*writeops)(E1000ECore *, int, uint32_t);
3069 static const writeops e1000e_macreg_writeops[] = {
....
3102 e1000e_putreg(FLSWDATA),
....
3145 e1000e_putreg(FLSWDATA),
To avoid confusion, remove the duplicated initialization.
Fixes: 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-3-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 5170e6a45633..bcfd46696ff7 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -3141,7 +3141,6 @@ static const writeops e1000e_macreg_writeops[] = {
e1000e_putreg(RXCFGL),
e1000e_putreg(TSYNCRXCTL),
e1000e_putreg(TSYNCTXCTL),
- e1000e_putreg(FLSWDATA),
e1000e_putreg(EXTCNF_SIZE),
e1000e_putreg(EEMNGCTL),
e1000e_putreg(RA),
--
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, 2020/09/11
- [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 <=
- [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
- [PULL 16/18] util/hexdump: Convert to take a void pointer argument, Laurent Vivier, 2020/09/11
- Re: [PULL 00/18] Trivial branch for 5.2 patches, Peter Maydell, 2020/09/12