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

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