From c5d7754d8714fb20c2a2f7040ff7c8677d86c107 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Wed, 28 Oct 2009 10:57:58 +0000 Subject: [PATCH] ne2k_isa: intermediate merge fixup This commit doesn't build: commit 93db6685 ne2k_isa: 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/ne2000-isa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ne2000-isa.c b/hw/ne2000-isa.c index abb9b97d55..1da0d54469 100644 --- a/hw/ne2000-isa.c +++ b/hw/ne2000-isa.c @@ -63,10 +63,10 @@ static int isa_ne2000_initfn(ISADevice *dev) qemu_macaddr_default_if_unset(&s->c.macaddr); ne2000_reset(s); - s->vc = qemu_new_vlan_client(NET_CLIENT_TYPE_NIC, s->c.vlan, s->c.peer, + 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, - NULL, isa_ne2000_cleanup, s); + isa_ne2000_cleanup, s); qemu_format_nic_info_str(s->vc, s->c.macaddr.a); register_savevm("ne2000", -1, 2, ne2000_save, ne2000_load, s); -- 2.11.4.GIT