From patchwork Fri Oct 16 13:41:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 36222 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 E508BB7BB2 for ; Sat, 17 Oct 2009 01:28:59 +1100 (EST) Received: from localhost ([127.0.0.1]:54292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mynnd-0004rU-6q for incoming@patchwork.ozlabs.org; Fri, 16 Oct 2009 10:28:57 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Myn4b-0001xT-4z for qemu-devel@nongnu.org; Fri, 16 Oct 2009 09:42:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Myn4R-0001rb-Fj for qemu-devel@nongnu.org; Fri, 16 Oct 2009 09:42:19 -0400 Received: from [199.232.76.173] (port=40523 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Myn4Q-0001rH-KD for qemu-devel@nongnu.org; Fri, 16 Oct 2009 09:42:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19751) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Myn4Q-0007nt-0e for qemu-devel@nongnu.org; Fri, 16 Oct 2009 09:42:14 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9GDgCBQ013703 for ; Fri, 16 Oct 2009 09:42:13 -0400 Received: from zweiblum.home.kraxel.org (vpn2-9-112.ams2.redhat.com [10.36.9.112]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n9GDgAg4027749; Fri, 16 Oct 2009 09:42:10 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 1C28870107; Fri, 16 Oct 2009 15:42:03 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 16 Oct 2009 15:41:59 +0200 Message-Id: <1255700523-15270-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1255700523-15270-1-git-send-email-kraxel@redhat.com> References: <1255700523-15270-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [RfC PATCH v3 06/10] ne2k_isa: qdev-ify. 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/ne2000-isa.c | 12 ++++++++---- hw/ne2000.c | 6 +++--- hw/ne2000.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index e346731..1bed5d4 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -65,13 +65,14 @@ static int isa_ne2000_initfn(ISADevice *dev) isa_init_irq(dev, &s->irq, isa->isairq); - qdev_get_macaddr(&dev->qdev, s->macaddr); + qemu_macaddr_default_if_unset(&s->c.macaddr); ne2000_reset(s); - s->vc = qdev_get_vlan_client(&dev->qdev, + s->vc = qemu_new_vlan_client(s->c.vlan, s->c.peer, + dev->qdev.info->name, dev->qdev.id, ne2000_can_receive, ne2000_receive, NULL, isa_ne2000_cleanup, s); - qemu_format_nic_info_str(s->vc, s->macaddr); + qemu_format_nic_info_str(s->vc, s->c.macaddr.a); register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s); return 0; @@ -84,9 +85,11 @@ void isa_ne2000_init(int base, int irq, NICInfo *nd) qemu_check_nic_model(nd, "ne2k_isa"); dev = isa_create("ne2k_isa"); - dev->qdev.nd = nd; /* hack alert */ qdev_prop_set_uint32(&dev->qdev, "iobase", base); qdev_prop_set_uint32(&dev->qdev, "irq", irq); + qdev_prop_set_macaddr(&dev->qdev, "mac", nd->macaddr); + if (nd->vlan) + qdev_prop_set_int32(&dev->qdev, "vlan", nd->vlan->id); qdev_init_nofail(&dev->qdev); } @@ -97,6 +100,7 @@ static ISADeviceInfo ne2000_isa_info = { .qdev.props = (Property[]) { DEFINE_PROP_HEX32("iobase", ISANE2000State, iobase, 0x300), DEFINE_PROP_UINT32("irq", ISANE2000State, isairq, 9), + DEFINE_NIC_PROPERTIES(ISANE2000State, ne2000.c), DEFINE_PROP_END_OF_LIST(), }, }; diff --git a/hw/ne2000.c b/hw/ne2000.c index 87f1e59..7ce56ff 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -126,7 +126,7 @@ void ne2000_reset(NE2000State *s) int i; s->isr = ENISR_RESET; - memcpy(s->mem, s->macaddr, 6); + memcpy(s->mem, &s->c.macaddr, 6); s->mem[14] = 0x57; s->mem[15] = 0x57; @@ -758,13 +758,13 @@ static int pci_ne2000_init(PCIDevice *pci_dev) PCI_ADDRESS_SPACE_IO, ne2000_map); s = &d->ne2000; s->irq = d->dev.irq[0]; - qdev_get_macaddr(&d->dev.qdev, s->macaddr); + qdev_get_macaddr(&d->dev.qdev, s->c.macaddr.a); ne2000_reset(s); s->vc = qdev_get_vlan_client(&d->dev.qdev, ne2000_can_receive, ne2000_receive, NULL, ne2000_cleanup, s); - qemu_format_nic_info_str(s->vc, s->macaddr); + qemu_format_nic_info_str(s->vc, s->c.macaddr.a); register_savevm("ne2000", -1, 3, pci_ne2000_save, pci_ne2000_load, d); return 0; diff --git a/hw/ne2000.h b/hw/ne2000.h index 92a2ddb..7842246 100644 --- a/hw/ne2000.h +++ b/hw/ne2000.h @@ -23,7 +23,7 @@ typedef struct NE2000State { uint8_t mult[8]; /* multicast mask array */ qemu_irq irq; VLANClientState *vc; - uint8_t macaddr[6]; + NICConf c; uint8_t mem[NE2000_MEM_SIZE]; } NE2000State;