From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org, Eduardo Habkost <eduardo@habkost.net>
Cc: "Jason Wang" <jasowang@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Stefan Weil" <sw@weilnetz.de>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 5/7] hw/net/eepro100: Remove instance EEPRO100State::has_extended_tcb_support
Date: Mon, 13 Feb 2023 11:10:46 +0100 [thread overview]
Message-ID: <20230213101048.94519-6-philmd@linaro.org> (raw)
In-Reply-To: <20230213101048.94519-1-philmd@linaro.org>
'has_extended_tcb_support' is accessed read-only and is present
in the class definition. No need to duplicate it in the instance
state. Directly access the class field.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/net/eepro100.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c
index ab20558a18..d7757907c3 100644
--- a/hw/net/eepro100.c
+++ b/hw/net/eepro100.c
@@ -292,7 +292,6 @@ struct EEPRO100State {
/* Quasi static device properties (no need to save them). */
uint16_t stats_size;
- bool has_extended_tcb_support;
};
/* Word indices in EEPROM. */
@@ -511,7 +510,6 @@ static void e100_pci_reset(DeviceState *dev)
pci_set_byte(pci_conf + PCI_MAX_LAT, 0x18);
s->stats_size = info->stats_size;
- s->has_extended_tcb_support = info->has_extended_tcb_support;
switch (device) {
case i82550:
@@ -746,6 +744,8 @@ static void read_cb(EEPRO100State *s)
static void tx_command(EEPRO100State *s)
{
+ EEPRO100Class *ek = EEPRO100_GET_CLASS(s);
+ const E100PCIDeviceInfo *info = ek->info;
const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED;
uint32_t tbd_array = s->tx.tbd_array_addr;
uint16_t tcb_bytes = s->tx.tcb_bytes & 0x3fff;
@@ -782,7 +782,7 @@ static void tx_command(EEPRO100State *s)
uint16_t tx_buffer_size;
uint16_t tx_buffer_el;
- if (s->has_extended_tcb_support && !(s->configuration[6] & BIT(4))) {
+ if (info->has_extended_tcb_support && !(s->configuration[6] & BIT(4))) {
/* Extended Flexible TCB. */
for (; tbd_count < 2; tbd_count++) {
ldl_le_pci_dma(&s->dev, tbd_address, &tx_buffer_address, attrs);
--
2.38.1
next prev parent reply other threads:[~2023-02-13 10:12 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 10:10 [PATCH v2 0/7] hw/net/eepro100: Finish QDev conversion Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 1/7] hw/net/eepro100: Abort if pci_add_capability() ever fail Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 2/7] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 3/7] hw/net/eepro100: Convert reset handler to DeviceReset Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 4/7] hw/net/eepro100: Pass E100PCIDeviceInfo as class init data Philippe Mathieu-Daudé
2023-02-13 10:10 ` Philippe Mathieu-Daudé [this message]
2023-02-13 10:10 ` [PATCH v2 6/7] hw/net/eepro100: Remove instance's EEPRO100State::device Philippe Mathieu-Daudé
2023-02-13 10:10 ` [PATCH v2 7/7] hw/net/eepro100: Replace DO_UPCAST(EEPRO100State) by EEPRO100() Philippe Mathieu-Daudé
2023-02-23 15:16 ` [PATCH v2 0/7] hw/net/eepro100: Finish QDev conversion Philippe Mathieu-Daudé
2023-02-28 13:40 ` Philippe Mathieu-Daudé
2023-03-03 8:01 ` Jason Wang
2023-03-03 10:32 ` Philippe Mathieu-Daudé
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=20230213101048.94519-6-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=eduardo@habkost.net \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
--cc=thuth@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).