From: Philippe Mathieu-Daudé Date: Fri, 4 Sep 2020 13:14:02 +0000 (+0200) Subject: hw/net/e1000e: Remove duplicated write handler for FLSWDATA register X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fb1953b22a871d5b4f049d1f2fbf2ff00b4a0c50;p=qemu.git hw/net/e1000e: Remove duplicated write handler for FLSWDATA register 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é Reviewed-by: Li Qiang Message-Id: <20200904131402.590055-3-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 5170e6a456..bcfd46696f 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),