From patchwork Wed Oct 21 13:25:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 36579 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 1271AB7BB6 for ; Thu, 22 Oct 2009 01:25:44 +1100 (EST) Received: from localhost ([127.0.0.1]:33215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0c8D-0002DH-6P for incoming@patchwork.ozlabs.org; Wed, 21 Oct 2009 10:25:41 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0bCc-00085c-Tu for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0bCX-0007yQ-BN for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:10 -0400 Received: from [199.232.76.173] (port=55733 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0bCX-0007yB-5m for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59792) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0bCW-0007S0-3v for qemu-devel@nongnu.org; Wed, 21 Oct 2009 09:26:04 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9LDQ3Bl031542 for ; Wed, 21 Oct 2009 09:26:03 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-113.ams2.redhat.com [10.36.9.113]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n9LDPonJ025887; Wed, 21 Oct 2009 09:26:01 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 17D6770117; Wed, 21 Oct 2009 15:25:44 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 21 Oct 2009 15:25:38 +0200 Message-Id: <1256131543-28416-18-git-send-email-kraxel@redhat.com> In-Reply-To: <1256131543-28416-1-git-send-email-kraxel@redhat.com> References: <1256131543-28416-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 17/22] xilinx_ethlite: use qdev properties for configuration. 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: Gerd Hoffmann --- hw/xilinx.h | 2 +- hw/xilinx_ethlite.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 5e6aeea..705ff5b 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -40,7 +40,7 @@ xilinx_ethlite_create(NICInfo *nd, target_phys_addr_t base, qemu_irq irq, qemu_check_nic_model(nd, "xilinx-ethlite"); dev = qdev_create(NULL, "xilinx,ethlite"); - dev->nd = nd; + qdev_set_nic_properties(dev, nd); qdev_prop_set_uint32(dev, "txpingpong", txpingpong); qdev_prop_set_uint32(dev, "rxpingpong", rxpingpong); qdev_init_nofail(dev); diff --git a/hw/xilinx_ethlite.c b/hw/xilinx_ethlite.c index 9b0074c..994e0e2 100644 --- a/hw/xilinx_ethlite.c +++ b/hw/xilinx_ethlite.c @@ -52,13 +52,13 @@ struct xlx_ethlite SysBusDevice busdev; qemu_irq irq; VLANClientState *vc; + NICConf conf; uint32_t c_tx_pingpong; uint32_t c_rx_pingpong; unsigned int txbuf; unsigned int rxbuf; - uint8_t macaddr[6]; uint32_t regs[R_MAX]; }; @@ -125,7 +125,7 @@ eth_writel (void *opaque, target_phys_addr_t addr, uint32_t value) if (s->regs[base + R_TX_CTRL0] & CTRL_I) eth_pulse_irq(s); } else if ((value & (CTRL_P | CTRL_S)) == (CTRL_P | CTRL_S)) { - memcpy(&s->macaddr[0], &s->regs[base], 6); + memcpy(&s->conf.macaddr.a[0], &s->regs[base], 6); if (s->regs[base + R_TX_CTRL0] & CTRL_I) eth_pulse_irq(s); } @@ -175,7 +175,7 @@ static ssize_t eth_rx(VLANClientState *vc, const uint8_t *buf, size_t size) int i; /* DA filter. */ - if (!(buf[0] & 0x80) && memcmp(&s->macaddr[0], buf, 6)) + if (!(buf[0] & 0x80) && memcmp(&s->conf.macaddr.a[0], buf, 6)) return size; if (s->regs[rxbase + R_RX_CTRL0] & CTRL_S) { @@ -204,7 +204,8 @@ static ssize_t eth_rx(VLANClientState *vc, const uint8_t *buf, size_t size) static void eth_cleanup(VLANClientState *vc) { struct xlx_ethlite *s = vc->opaque; - qemu_free(s); + + s->vc = NULL; } static int xilinx_ethlite_init(SysBusDevice *dev) @@ -218,9 +219,11 @@ static int xilinx_ethlite_init(SysBusDevice *dev) regs = cpu_register_io_memory(eth_read, eth_write, s); sysbus_init_mmio(dev, R_MAX * 4, regs); - qdev_get_macaddr(&dev->qdev, s->macaddr); - s->vc = qdev_get_vlan_client(&dev->qdev, + qemu_macaddr_default_if_unset(&s->conf.macaddr); + s->vc = qemu_new_vlan_client(s->conf.vlan, s->conf.peer, + dev->qdev.info->name, dev->qdev.id, eth_can_rx, eth_rx, NULL, eth_cleanup, s); + qemu_format_nic_info_str(s->vc, s->conf.macaddr.a); return 0; } @@ -231,6 +234,7 @@ static SysBusDeviceInfo xilinx_ethlite_info = { .qdev.props = (Property[]) { DEFINE_PROP_UINT32("txpingpong", struct xlx_ethlite, c_tx_pingpong, 1), DEFINE_PROP_UINT32("rxpingpong", struct xlx_ethlite, c_rx_pingpong, 1), + DEFINE_NIC_PROPERTIES(struct xlx_ethlite, conf), DEFINE_PROP_END_OF_LIST(), } };