[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/9] virtio-net: use qemu_mac_strdup_printf
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 2/9] virtio-net: use qemu_mac_strdup_printf |
Date: |
Mon, 11 May 2015 16:26:12 +0100 |
From: Scott Feldman <address@hidden>
Signed-off-by: Scott Feldman <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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 67ab228..9829ad0 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
- [Qemu-devel] [PULL 0/9] Net patches, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 1/9] net: add MAC address string printer, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 2/9] virtio-net: use qemu_mac_strdup_printf,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 4/9] pci: add rocker device ID, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 3/9] rocker: add register programming guide, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 5/9] pci: add network device class 'other' for network switches, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 8/9] MAINTAINERS: add rocker, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 7/9] rocker: add tests, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 9/9] rocker: timestamp on the debug logs helps correlate with events in the VM, Stefan Hajnoczi, 2015/05/11
- [Qemu-devel] [PULL 6/9] rocker: add new rocker switch device, Stefan Hajnoczi, 2015/05/11
- Re: [Qemu-devel] [PULL 0/9] Net patches, Peter Maydell, 2015/05/12