From 5f261285e88c1ca556ea561364a2b1d49474c577 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 28 Oct 2009 11:23:58 +0000 Subject: [PATCH] stellaris_enet: intermediate merge fixup This commit doesn't build: commit 540f006a23085230c12c3cbcbd2bd774be0eb28e stellaris_enet: use qdev properties for configuration. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori because NET_CLIENT_TYPE_NIC isn't yet defined and qemu_new_vlan_client() doesn't yet have a receive_raw parameter. Signed-off-by: Mark McLoughlin --- hw/stellaris_enet.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index 2252f1a5f3..fe2cffe994 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -406,11 +406,10 @@ 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, + s->vc = qemu_new_vlan_client(s->conf.vlan, s->conf.peer, dev->qdev.info->name, dev->qdev.id, stellaris_enet_can_receive, - stellaris_enet_receive, NULL, NULL, + stellaris_enet_receive, NULL, stellaris_enet_cleanup, s); qemu_format_nic_info_str(s->vc, s->conf.macaddr.a); -- 2.11.4.GIT