From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54730 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5OZD-0003Fj-9T for qemu-devel@nongnu.org; Thu, 31 Mar 2011 16:34:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5OZ9-00020r-Uf for qemu-devel@nongnu.org; Thu, 31 Mar 2011 16:34:07 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:52377) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5OZ9-0001xL-HC for qemu-devel@nongnu.org; Thu, 31 Mar 2011 16:34:03 -0400 From: Stefan Weil Date: Thu, 31 Mar 2011 22:33:31 +0200 Message-Id: <1301603611-7964-10-git-send-email-weil@mail.berlios.de> In-Reply-To: <1301603611-7964-1-git-send-email-weil@mail.berlios.de> References: <1301603611-7964-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH 9/9] eepro100: Simplify receive data structure List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: QEMU Developers The packet data part of this structure was only used to calculate the size of the preceding data. This can be simplified. Signed-off-by: Stefan Weil --- hw/eepro100.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index a740d2e..d4d315b 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -180,7 +180,7 @@ typedef struct { uint32_t rx_buf_addr; /* void * */ uint16_t count; uint16_t size; - char packet[MAX_ETH_FRAME_SIZE + 4]; + /* Ethernet frame data follows. */ } eepro100_rx_t; typedef enum { @@ -1859,7 +1859,7 @@ static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size /* !!! */ eepro100_rx_t rx; cpu_physical_memory_read(s->ru_base + s->ru_offset, (uint8_t *) & rx, - offsetof(eepro100_rx_t, packet)); + sizeof(eepro100_rx_t)); uint16_t rfd_command = le16_to_cpu(rx.command); uint16_t rfd_size = le16_to_cpu(rx.size); @@ -1893,7 +1893,7 @@ static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size assert(!(s->configuration[17] & BIT(0))); #endif cpu_physical_memory_write(s->ru_base + s->ru_offset + - offsetof(eepro100_rx_t, packet), buf, size); + sizeof(eepro100_rx_t), buf, size); s->statistics.rx_good_frames++; eepro100_fr_interrupt(s); s->ru_offset = le32_to_cpu(rx.link); -- 1.7.2.5