From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDNqW-0007oi-SE for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:48:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDNqS-0007l2-Qu for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:48:12 -0500 Received: from [199.232.76.173] (port=46638 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDNqS-0007kn-GN for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:48:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33431) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDNqR-0006E4-Qd for qemu-devel@nongnu.org; Wed, 25 Nov 2009 14:48:08 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAPIqPSY023385 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 25 Nov 2009 13:52:25 -0500 From: Mark McLoughlin Date: Wed, 25 Nov 2009 18:49:24 +0000 Message-Id: <1259174977-26212-32-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> Subject: [Qemu-devel] [PATCH 31/44] net: convert stellaris to NICState List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin Signed-off-by: Mark McLoughlin --- hw/stellaris_enet.c | 34 +++++++++++++++++++--------------- 1 files changed, 19 insertions(+), 15 deletions(-) diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index 2252f1a..d1d755e 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -66,7 +66,7 @@ typedef struct { uint8_t *rx_fifo; int rx_fifo_len; int next_packet; - VLANClientState *vc; + NICState *nic; NICConf conf; qemu_irq irq; int mmio_index; @@ -78,9 +78,9 @@ static void stellaris_enet_update(stellaris_enet_state *s) } /* TODO: Implement MAC address filtering. */ -static ssize_t stellaris_enet_receive(VLANClientState *vc, const uint8_t *buf, size_t size) +static ssize_t stellaris_enet_receive(VLANClientState *nc, const uint8_t *buf, size_t size) { - stellaris_enet_state *s = vc->opaque; + stellaris_enet_state *s = DO_UPCAST(NICState, nc, nc)->opaque; int n; uint8_t *p; uint32_t crc; @@ -120,9 +120,9 @@ static ssize_t stellaris_enet_receive(VLANClientState *vc, const uint8_t *buf, s return size; } -static int stellaris_enet_can_receive(VLANClientState *vc) +static int stellaris_enet_can_receive(VLANClientState *nc) { - stellaris_enet_state *s = vc->opaque; + stellaris_enet_state *s = DO_UPCAST(NICState, nc, nc)->opaque; if ((s->rctl & SE_RCTL_RXEN) == 0) return 1; @@ -258,7 +258,7 @@ static void stellaris_enet_write(void *opaque, target_phys_addr_t offset, memset(&s->tx_fifo[s->tx_frame_len], 0, 60 - s->tx_frame_len); s->tx_fifo_len = 60; } - qemu_send_packet(s->vc, s->tx_fifo, s->tx_frame_len); + qemu_send_packet(&s->nic->nc, s->tx_fifo, s->tx_frame_len); s->tx_frame_len = -1; s->ris |= SE_INT_TXEMP; stellaris_enet_update(s); @@ -385,9 +385,9 @@ static int stellaris_enet_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static void stellaris_enet_cleanup(VLANClientState *vc) +static void stellaris_enet_cleanup(VLANClientState *nc) { - stellaris_enet_state *s = vc->opaque; + stellaris_enet_state *s = DO_UPCAST(NICState, nc, nc)->opaque; unregister_savevm("stellaris_enet", s); @@ -396,6 +396,14 @@ static void stellaris_enet_cleanup(VLANClientState *vc) qemu_free(s); } +static NetClientInfo net_stellaris_enet_info = { + .type = NET_CLIENT_TYPE_NIC, + .size = sizeof(NICState), + .can_receive = stellaris_enet_can_receive, + .receive = stellaris_enet_receive, + .cleanup = stellaris_enet_cleanup, +}; + static int stellaris_enet_init(SysBusDevice *dev) { stellaris_enet_state *s = FROM_SYSBUS(stellaris_enet_state, dev); @@ -406,13 +414,9 @@ static int stellaris_enet_init(SysBusDevice *dev) sysbus_init_irq(dev, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); - s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, - s->conf.vlan, s->conf.peer, - dev->qdev.info->name, dev->qdev.id, - stellaris_enet_can_receive, - stellaris_enet_receive, NULL, NULL, - stellaris_enet_cleanup, s); - qemu_format_nic_info_str(s->vc, s->conf.macaddr.a); + s->nic = qemu_new_nic(&net_stellaris_enet_info, &s->conf, + dev->qdev.info->name, dev->qdev.id, s); + qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a); stellaris_enet_reset(s); register_savevm("stellaris_enet", -1, 1, -- 1.6.5.2