From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJGJz-0001yg-97 for qemu-devel@nongnu.org; Thu, 05 Feb 2015 01:53:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YJGJq-0006tH-GK for qemu-devel@nongnu.org; Thu, 05 Feb 2015 01:53:51 -0500 Received: from mail-pd0-f178.google.com ([209.85.192.178]:44450) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YJGJk-0006qU-C3 for qemu-devel@nongnu.org; Thu, 05 Feb 2015 01:53:42 -0500 Received: by pdbft15 with SMTP id ft15so5921173pdb.11 for ; Wed, 04 Feb 2015 22:53:35 -0800 (PST) From: sfeldma@gmail.com Date: Wed, 4 Feb 2015 22:54:13 -0800 Message-Id: <1423119261-60904-3-git-send-email-sfeldma@gmail.com> In-Reply-To: <1423119261-60904-1-git-send-email-sfeldma@gmail.com> References: <1423119261-60904-1-git-send-email-sfeldma@gmail.com> Subject: [Qemu-devel] [PATCH v6 02/10] virtio-net: use qemu_mac_strdup_printf List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, jiri@resnulli.us, roopa@cumulusnetworks.com, john.fastabend@gmail.com, eblake@redhat.com, pbonzini@redhat.com, stefanha@gmail.com, dsahern@gmail.com, jasowang@redhat.com From: Scott Feldman Signed-off-by: Scott Feldman Reviewed-by: Eric Blake --- hw/net/virtio-net.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 45da34a..698156f 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -226,12 +226,6 @@ static void rxfilter_notify(NetClientState *nc) } } -static char *mac_strdup_printf(const uint8_t *mac) -{ - return g_strdup_printf("%.2x:%.2x:%.2x:%.2x:%.2x:%.2x", mac[0], - mac[1], mac[2], mac[3], mac[4], mac[5]); -} - static intList *get_vlan_table(VirtIONet *n) { intList *list, *entry; @@ -284,12 +278,12 @@ static RxFilterInfo *virtio_net_query_rxfilter(NetClientState *nc) info->multicast_overflow = n->mac_table.multi_overflow; info->unicast_overflow = n->mac_table.uni_overflow; - info->main_mac = mac_strdup_printf(n->mac); + info->main_mac = qemu_mac_strdup_printf(n->mac); str_list = NULL; for (i = 0; i < n->mac_table.first_multi; i++) { entry = g_malloc0(sizeof(*entry)); - entry->value = mac_strdup_printf(n->mac_table.macs + i * ETH_ALEN); + entry->value = qemu_mac_strdup_printf(n->mac_table.macs + i * ETH_ALEN); entry->next = str_list; str_list = entry; } @@ -298,7 +292,7 @@ static RxFilterInfo *virtio_net_query_rxfilter(NetClientState *nc) str_list = NULL; for (i = n->mac_table.first_multi; i < n->mac_table.in_use; i++) { entry = g_malloc0(sizeof(*entry)); - entry->value = mac_strdup_printf(n->mac_table.macs + i * ETH_ALEN); + entry->value = qemu_mac_strdup_printf(n->mac_table.macs + i * ETH_ALEN); entry->next = str_list; str_list = entry; } -- 1.7.10.4