From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW4BI-000855-Od for qemu-devel@nongnu.org; Thu, 12 Mar 2015 10:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YW4BC-0000tj-Kf for qemu-devel@nongnu.org; Thu, 12 Mar 2015 10:33:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57313) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YW4BC-0000tJ-Bi for qemu-devel@nongnu.org; Thu, 12 Mar 2015 10:33:42 -0400 From: Stefan Hajnoczi Date: Thu, 12 Mar 2015 14:33:21 +0000 Message-Id: <1426170808-6343-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1426170808-6343-1-git-send-email-stefanha@redhat.com> References: <1426170808-6343-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL v4 04/11] virtio-net: use qemu_mac_strdup_printf List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Scott Feldman , Stefan Hajnoczi From: Scott Feldman Signed-off-by: Scott Feldman Reviewed-by: Eric Blake Message-id: 1424123271-7656-3-git-send-email-sfeldma@gmail.com Signed-off-by: Stefan Hajnoczi --- 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 27adcc5..321bef4 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; } -- 2.1.0