From 7cb7434b1e4aee549b55536208abe56e35159763 Mon Sep 17 00:00:00 2001 From: aliguori Date: Wed, 7 Jan 2009 17:46:21 +0000 Subject: Add qemu_format_nic_info_str() (Mark McLoughlin) Factor out a simple little function for formatting a NIC's info_str and make all NICs use it. Signed-off-by: Mark McLoughlin Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6218 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/usb-net.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'hw/usb-net.c') diff --git a/hw/usb-net.c b/hw/usb-net.c index 40ee41b..5539336 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1456,14 +1456,12 @@ USBDevice *usb_net_init(NICInfo *nd) s->vc = qemu_new_vlan_client(nd->vlan, nd->model, usbnet_receive, usbnet_can_receive, s); + qemu_format_nic_info_str(s->vc, s->mac); + snprintf(s->usbstring_mac, sizeof(s->usbstring_mac), "%02x%02x%02x%02x%02x%02x", 0x40, s->mac[1], s->mac[2], s->mac[3], s->mac[4], s->mac[5]); - snprintf(s->vc->info_str, sizeof(s->vc->info_str), - "usbnet macaddr=%02x:%02x:%02x:%02x:%02x:%02x", - s->mac[0], s->mac[1], s->mac[2], - s->mac[3], s->mac[4], s->mac[5]); fprintf(stderr, "usbnet: initialized mac %02x:%02x:%02x:%02x:%02x:%02x\n", s->mac[0], s->mac[1], s->mac[2], s->mac[3], s->mac[4], s->mac[5]); -- cgit v1.1