From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGohK-0005S2-SR for qemu-devel@nongnu.org; Thu, 29 Jan 2015 07:59:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGohH-000312-Ke for qemu-devel@nongnu.org; Thu, 29 Jan 2015 07:59:50 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:37329) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGohH-00030y-Ex for qemu-devel@nongnu.org; Thu, 29 Jan 2015 07:59:47 -0500 From: Sebastian Huber Date: Thu, 29 Jan 2015 13:59:39 +0100 Message-Id: <1422536379-18116-1-git-send-email-sebastian.huber@embedded-brains.de> Subject: [Qemu-devel] [PATCH] net: cadence_gem: Set initial MAC address List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Sebastian Huber , peter.crosthwaite@xilinx.com Set initial MAC address to the one specified by the command line. Signed-off-by: Sebastian Huber --- hw/net/cadence_gem.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index de26609..a1aa91b 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1005,6 +1005,7 @@ static void gem_reset(DeviceState *d) { int i; GemState *s = GEM(d); + const uint8_t *a; DB_PRINT("\n"); @@ -1023,6 +1024,11 @@ static void gem_reset(DeviceState *d) s->regs[GEM_DESCONF5] = 0x002f2145; s->regs[GEM_DESCONF6] = 0x00000200; + /* Set MAC address */ + a = &s->conf.macaddr.a[0]; + s->regs[GEM_SPADDR1LO] = a[0] | (a[1] << 8) | (a[2] << 16) | (a[3] << 24); + s->regs[GEM_SPADDR1HI] = a[4] | (a[5] << 8); + for (i = 0; i < 4; i++) { s->sar_active[i] = false; } @@ -1245,7 +1251,6 @@ static int gem_init(SysBusDevice *sbd) sysbus_init_mmio(sbd, &s->iomem); sysbus_init_irq(sbd, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); - s->nic = qemu_new_nic(&net_gem_info, &s->conf, object_get_typename(OBJECT(dev)), dev->id, s); -- 1.8.4.5