From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, "Li Qiang" <liq3ea@gmail.com>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 08/18] hw/net/e1000e: Remove overwritten read handler for STATUS register
Date: Fri, 11 Sep 2020 21:33:20 +0200 [thread overview]
Message-ID: <20200911193330.1148942-9-laurent@vivier.eu> (raw)
In-Reply-To: <20200911193330.1148942-1-laurent@vivier.eu>
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
next prev parent reply other threads:[~2020-09-11 19:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-11 19:33 [PULL 00/18] Trivial branch for 5.2 patches Laurent Vivier
2020-09-11 19:33 ` [PULL 01/18] hw/mips/fuloong2e: Convert pointless error message to an assert() Laurent Vivier
2020-09-11 19:33 ` [PULL 02/18] hw/isa/isa-bus: Replace hw_error() by assert() Laurent Vivier
2020-09-11 19:33 ` [PULL 03/18] hw/acpi/tco: Remove unused definitions Laurent Vivier
2020-09-11 19:33 ` [PULL 04/18] hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR) Laurent Vivier
2020-09-11 19:33 ` [PULL 05/18] hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP) Laurent Vivier
2020-09-11 19:33 ` [PULL 06/18] Makefile: Drop extra phony cscope Laurent Vivier
2020-09-11 19:33 ` [PULL 07/18] Makefile: Skip the meson subdir in cscope/TAGS/ctags Laurent Vivier
2020-09-11 19:33 ` Laurent Vivier [this message]
2020-09-11 19:33 ` [PULL 09/18] hw/net/e1000e: Remove duplicated write handler for FLSWDATA register Laurent Vivier
2020-09-11 19:33 ` [PULL 10/18] meson.build: tweak sdl-image error message Laurent Vivier
2020-09-11 19:33 ` [PULL 11/18] kconfig: fix comment referring to old Makefiles Laurent Vivier
2020-09-11 19:33 ` [PULL 12/18] hw: hyperv: vmbus: Fix 32bit compilation Laurent Vivier
2020-09-11 19:33 ` [PULL 13/18] test-vmstate: remove unnecessary code in match_interval_mapping_node Laurent Vivier
2020-09-11 19:33 ` [PULL 14/18] target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken() Laurent Vivier
2020-09-11 19:33 ` [PULL 15/18] hw/arm/pxa2xx: Add missing fallthrough comment Laurent Vivier
2020-09-11 19:33 ` [PULL 16/18] util/hexdump: Convert to take a void pointer argument Laurent Vivier
2020-09-11 19:33 ` [PULL 17/18] util/hexdump: Reorder qemu_hexdump() arguments Laurent Vivier
2020-09-11 19:33 ` [PULL 18/18] target/i386/kvm: Add missing fallthrough comment Laurent Vivier
2020-09-12 20:16 ` [PULL 00/18] Trivial branch for 5.2 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200911193330.1148942-9-laurent@vivier.eu \
--to=laurent@vivier.eu \
--cc=f4bug@amsat.org \
--cc=liq3ea@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.