qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Jason Wang" <jasowang@redhat.com>
Subject: [PULL 49/51] hw/net/eepro100: Remove instance EEPRO100State::has_extended_tcb_support
Date: Tue,  7 Mar 2023 15:08:14 +0800	[thread overview]
Message-ID: <20230307070816.34833-50-jasowang@redhat.com> (raw)
In-Reply-To: <20230307070816.34833-1-jasowang@redhat.com>

From: Philippe Mathieu-Daudé <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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 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 ab20558..d775790 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.7.4



  parent reply	other threads:[~2023-03-07  7:14 UTC|newest]

Thread overview: 61+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-07  7:07 [PULL 00/51] Net patches Jason Wang
2023-03-07  7:07 ` [PULL 01/51] e1000e: Fix the code style Jason Wang
2023-03-07  7:07 ` [PULL 02/51] hw/net: Add more MII definitions Jason Wang
2023-03-07  7:07 ` [PULL 03/51] fsl_etsec: Use hw/net/mii.h Jason Wang
2023-03-07  7:07 ` [PULL 04/51] e1000: " Jason Wang
2023-03-07  7:07 ` [PULL 05/51] e1000: Mask registers when writing Jason Wang
2023-03-07  7:07 ` [PULL 06/51] e1000e: Introduce E1000E_LOW_BITS_SET_FUNC Jason Wang
2023-03-07  7:07 ` [PULL 07/51] e1000e: Mask registers when writing Jason Wang
2023-03-07  7:07 ` [PULL 08/51] e1000: Use more constant definitions Jason Wang
2023-03-07  7:07 ` [PULL 09/51] e1000e: " Jason Wang
2023-03-07  7:07 ` [PULL 10/51] e1000: Use memcpy to intialize registers Jason Wang
2023-03-07  7:07 ` [PULL 11/51] e1000e: " Jason Wang
2023-03-07  7:07 ` [PULL 12/51] e1000e: Remove pending interrupt flags Jason Wang
2023-03-07  7:07 ` [PULL 13/51] e1000e: Improve software reset Jason Wang
2023-03-07  7:07 ` [PULL 14/51] e1000: Configure ResettableClass Jason Wang
2023-03-07  7:07 ` [PULL 15/51] e1000e: " Jason Wang
2023-03-07  7:07 ` [PULL 16/51] e1000e: Introduce e1000_rx_desc_union Jason Wang
2023-03-07  7:07 ` [PULL 17/51] e1000e: Set MII_ANER_NWAY Jason Wang
2023-03-07  7:07 ` [PULL 18/51] e1000e: Remove extra pointer indirection Jason Wang
2023-03-07  7:07 ` [PULL 19/51] net: Check L4 header size Jason Wang
2023-03-07  7:07 ` [PULL 20/51] e1000x: Alter the signature of e1000x_is_vlan_packet Jason Wang
2023-03-07  7:07 ` [PULL 21/51] net: Strip virtio-net header when dumping Jason Wang
2023-03-07  7:07 ` [PULL 22/51] hw/net/net_tx_pkt: Automatically determine if virtio-net header is used Jason Wang
2023-03-07  7:07 ` [PULL 23/51] hw/net/net_rx_pkt: Remove net_rx_pkt_has_virt_hdr Jason Wang
2023-03-07  7:07 ` [PULL 24/51] e1000e: Perform software segmentation for loopback Jason Wang
2023-03-07  7:07 ` [PULL 25/51] hw/net/net_tx_pkt: Implement TCP segmentation Jason Wang
2023-03-07  7:07 ` [PULL 26/51] hw/net/net_tx_pkt: Check the payload length Jason Wang
2023-03-07  7:07 ` [PULL 27/51] e1000e: Do not assert when MSI-X is disabled later Jason Wang
2023-03-07  7:07 ` [PULL 28/51] MAINTAINERS: Add Akihiko Odaki as a e1000e reviewer Jason Wang
2023-03-07  7:07 ` [PULL 29/51] MAINTAINERS: Add e1000e test files Jason Wang
2023-03-07  7:07 ` [PULL 30/51] e1000e: Combine rx traces Jason Wang
2023-03-07  7:07 ` [PULL 31/51] e1000: Count CRC in Tx statistics Jason Wang
2023-03-07  7:07 ` [PULL 32/51] e1000e: " Jason Wang
2023-03-07  7:07 ` [PULL 33/51] net/eth: Report if headers are actually present Jason Wang
2023-03-07  7:07 ` [PULL 34/51] e1000e: Implement system clock Jason Wang
2023-03-07  7:08 ` [PULL 35/51] net/eth: Introduce EthL4HdrProto Jason Wang
2023-03-07  7:08 ` [PULL 36/51] pcie: Introduce pcie_sriov_num_vfs Jason Wang
2023-03-07  7:08 ` [PULL 37/51] e1000: Split header files Jason Wang
2023-03-07  7:08 ` [PULL 38/51] Intrdocue igb device emulation Jason Wang
2023-03-07  7:08 ` [PULL 39/51] tests/qtest/e1000e-test: Fabricate ethernet header Jason Wang
2023-03-07  7:08 ` [PULL 40/51] tests/qtest/libqos/e1000e: Export macreg functions Jason Wang
2023-03-07  7:08 ` [PULL 41/51] igb: Introduce qtest for igb device Jason Wang
2023-03-07  7:08 ` [PULL 42/51] tests/avocado: Add igb test Jason Wang
2023-03-07  7:08 ` [PULL 43/51] docs/system/devices/igb: Add igb documentation Jason Wang
2023-03-07  7:08 ` [PULL 44/51] ebpf: fix compatibility with libbpf 1.0+ Jason Wang
2023-03-07  7:08 ` [PULL 45/51] hw/net/eepro100: Abort if pci_add_capability() ever fail Jason Wang
2023-03-07  7:08 ` [PULL 46/51] hw/net/eepro100: Introduce TYPE_EEPRO100 QOM abstract parent Jason Wang
2023-03-07  7:08 ` [PULL 47/51] hw/net/eepro100: Convert reset handler to DeviceReset Jason Wang
2023-03-07  7:08 ` [PULL 48/51] hw/net/eepro100: Pass E100PCIDeviceInfo as class init data Jason Wang
2023-03-07  7:08 ` Jason Wang [this message]
2023-03-07  7:08 ` [PULL 50/51] hw/net/eepro100: Remove instance's EEPRO100State::device Jason Wang
2023-03-07  7:08 ` [PULL 51/51] hw/net/eepro100: Replace DO_UPCAST(EEPRO100State) by EEPRO100() Jason Wang
2023-03-07 17:01 ` [PULL 00/51] Net patches Peter Maydell
2023-03-07 20:43   ` Philippe Mathieu-Daudé
2023-03-08  6:56     ` Jason Wang
2023-03-08  7:40       ` Philippe Mathieu-Daudé
2023-03-08 12:17         ` Michael S. Tsirkin
2023-03-08 12:21           ` Philippe Mathieu-Daudé
2023-03-08 12:25             ` Michael S. Tsirkin
2023-03-09  1:13               ` Jason Wang
2023-03-08  6:57   ` Jason Wang

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=20230307070816.34833-50-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@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 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).