]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
hw/net/e1000e: Remove duplicated write handler for FLSWDATA register
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Fri, 4 Sep 2020 13:14:02 +0000 (15:14 +0200)
committerLaurent Vivier <laurent@vivier.eu>
Thu, 10 Sep 2020 14:20:49 +0000 (16:20 +0200)
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

index 5170e6a45633936a89d4fe07ac113153bf36fb1b..bcfd46696ff7b65103eac390a288a11012b5f26c 100644 (file)
@@ -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),