From patchwork Wed Nov 25 18:49:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark McLoughlin X-Patchwork-Id: 39455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 295C31007D1 for ; Thu, 26 Nov 2009 07:30:20 +1100 (EST) Received: from localhost ([127.0.0.1]:41842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDOVF-0001uD-8b for incoming@patchwork.ozlabs.org; Wed, 25 Nov 2009 15:30:17 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDNkV-00038f-KN for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:41:59 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDNkR-00031R-R6 for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:41:59 -0500 Received: from [199.232.76.173] (port=54185 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDNkR-00030y-N2 for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:41:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:18536) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDNkQ-0005Q4-G6 for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:41:55 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAPIqO2r028320 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Nov 2009 13:52:24 -0500 Received: from blaa.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAPIqN40030219; Wed, 25 Nov 2009 13:52:24 -0500 Received: by blaa.localdomain (Postfix, from userid 500) id DB061B0B0; Wed, 25 Nov 2009 18:49:41 +0000 (GMT) From: Mark McLoughlin To: qemu-devel@nongnu.org Date: Wed, 25 Nov 2009 18:49:17 +0000 Message-Id: <1259174977-26212-25-git-send-email-markmc@redhat.com> In-Reply-To: <1259174977-26212-1-git-send-email-markmc@redhat.com> References: <1259174977-26212-1-git-send-email-markmc@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Mark McLoughlin Subject: [Qemu-devel] [PATCH 24/44] net: convert dp8393x to NICState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Mark McLoughlin --- hw/dp8393x.c | 41 +++++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 16 deletions(-) diff --git a/hw/dp8393x.c b/hw/dp8393x.c index 5143cc8..be9714d 100644 --- a/hw/dp8393x.c +++ b/hw/dp8393x.c @@ -154,7 +154,8 @@ typedef struct dp8393xState { #endif QEMUTimer *watchdog; int64_t wt_last_update; - VLANClientState *vc; + NICConf conf; + NICState *nic; int mmio_index; /* Registers */ @@ -406,13 +407,13 @@ static void do_transmit_packets(dp8393xState *s) if (s->regs[SONIC_RCR] & (SONIC_RCR_LB1 | SONIC_RCR_LB0)) { /* Loopback */ s->regs[SONIC_TCR] |= SONIC_TCR_CRSL; - if (s->vc->can_receive(s->vc)) { + if (s->nic->nc.can_receive(&s->nic->nc)) { s->loopback_packet = 1; - s->vc->receive(s->vc, s->tx_buffer, tx_len); + s->nic->nc.receive(&s->nic->nc, s->tx_buffer, tx_len); } } else { /* Transmit packet */ - qemu_send_packet(s->vc, s->tx_buffer, tx_len); + qemu_send_packet(&s->nic->nc, s->tx_buffer, tx_len); } s->regs[SONIC_TCR] |= SONIC_TCR_PTX; @@ -675,9 +676,9 @@ static CPUWriteMemoryFunc * const dp8393x_write[3] = { dp8393x_writel, }; -static int nic_can_receive(VLANClientState *vc) +static int nic_can_receive(VLANClientState *nc) { - dp8393xState *s = vc->opaque; + dp8393xState *s = DO_UPCAST(NICState, nc, nc)->opaque; if (!(s->regs[SONIC_CR] & SONIC_CR_RXEN)) return 0; @@ -724,10 +725,10 @@ static int receive_filter(dp8393xState *s, const uint8_t * buf, int size) return -1; } -static ssize_t nic_receive(VLANClientState *vc, const uint8_t * buf, size_t size) +static ssize_t nic_receive(VLANClientState *nc, const uint8_t * buf, size_t size) { + dp8393xState *s = DO_UPCAST(NICState, nc, nc)->opaque; uint16_t data[10]; - dp8393xState *s = vc->opaque; int packet_type; uint32_t available, address; int width, rx_len = size; @@ -860,9 +861,9 @@ static void nic_reset(void *opaque) dp8393x_update_irq(s); } -static void nic_cleanup(VLANClientState *vc) +static void nic_cleanup(VLANClientState *nc) { - dp8393xState *s = vc->opaque; + dp8393xState *s = DO_UPCAST(NICState, nc, nc)->opaque; cpu_unregister_io_memory(s->mmio_index); @@ -872,6 +873,14 @@ static void nic_cleanup(VLANClientState *vc) qemu_free(s); } +static NetClientInfo net_dp83932_info = { + .type = NET_CLIENT_TYPE_NIC, + .size = sizeof(NICState), + .can_receive = nic_can_receive, + .receive = nic_receive, + .cleanup = nic_cleanup, +}; + void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, qemu_irq irq, void* mem_opaque, void (*memory_rw)(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write)) @@ -889,13 +898,13 @@ void dp83932_init(NICInfo *nd, target_phys_addr_t base, int it_shift, s->watchdog = qemu_new_timer(vm_clock, dp8393x_watchdog, s); s->regs[SONIC_SR] = 0x0004; /* only revision recognized by Linux */ - s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, - nd->vlan, nd->netdev, - nd->model, nd->name, - nic_can_receive, nic_receive, NULL, NULL, - nic_cleanup, s); + memcpy(s->conf.macaddr.a, nd->macaddr, sizeof(s->conf.macaddr)); + s->conf.vlan = nd->vlan; + s->conf.peer = nd->netdev; + + s->nic = qemu_new_nic(&net_dp83932_info, &s->conf, nd->model, nd->name, s); - qemu_format_nic_info_str(s->vc, nd->macaddr); + qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a); qemu_register_reset(nic_reset, s); nic_reset(s);