[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL V4 13/31] vmxnet3: Use common MAC address tracing mac
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL V4 13/31] vmxnet3: Use common MAC address tracing macros |
Date: |
Thu, 2 Jun 2016 14:48:04 +0800 |
From: Dmitry Fleytman <address@hidden>
Signed-off-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/vmxnet3.c | 8 ++++----
hw/net/vmxnet_debug.h | 3 ---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 586e915..200d2ea 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -474,7 +474,7 @@ static void vmxnet3_set_variable_mac(VMXNET3State *s,
uint32_t h, uint32_t l)
s->conf.macaddr.a[4] = VMXNET3_GET_BYTE(h, 0);
s->conf.macaddr.a[5] = VMXNET3_GET_BYTE(h, 1);
- VMW_CFPRN("Variable MAC: " VMXNET_MF, VMXNET_MA(s->conf.macaddr.a));
+ VMW_CFPRN("Variable MAC: " MAC_FMT, MAC_ARG(s->conf.macaddr.a));
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
}
@@ -1219,7 +1219,7 @@ static void vmxnet3_reset_interrupt_states(VMXNET3State
*s)
static void vmxnet3_reset_mac(VMXNET3State *s)
{
memcpy(&s->conf.macaddr.a, &s->perm_mac.a, sizeof(s->perm_mac.a));
- VMW_CFPRN("MAC address set to: " VMXNET_MF, VMXNET_MA(s->conf.macaddr.a));
+ VMW_CFPRN("MAC address set to: " MAC_FMT, MAC_ARG(s->conf.macaddr.a));
}
static void vmxnet3_deactivate_device(VMXNET3State *s)
@@ -1301,7 +1301,7 @@ static void vmxnet3_update_mcast_filters(VMXNET3State *s)
cpu_physical_memory_read(mcast_list_pa, s->mcast_list, list_bytes);
VMW_CFPRN("Current multicast list len is %d:", s->mcast_list_len);
for (i = 0; i < s->mcast_list_len; i++) {
- VMW_CFPRN("\t" VMXNET_MF, VMXNET_MA(s->mcast_list[i].a));
+ VMW_CFPRN("\t" MAC_FMT, MAC_ARG(s->mcast_list[i].a));
}
}
}
@@ -2102,7 +2102,7 @@ static void vmxnet3_net_init(VMXNET3State *s)
s->link_status_and_speed = VMXNET3_LINK_SPEED | VMXNET3_LINK_STATUS_UP;
- VMW_CFPRN("Permanent MAC: " VMXNET_MF, VMXNET_MA(s->perm_mac.a));
+ VMW_CFPRN("Permanent MAC: " MAC_FMT, MAC_ARG(s->perm_mac.a));
s->nic = qemu_new_nic(&net_vmxnet3_info, &s->conf,
object_get_typename(OBJECT(s)),
diff --git a/hw/net/vmxnet_debug.h b/hw/net/vmxnet_debug.h
index 96495db..5aab00b 100644
--- a/hw/net/vmxnet_debug.h
+++ b/hw/net/vmxnet_debug.h
@@ -142,7 +142,4 @@
} \
} while (0)
-#define VMXNET_MF "%02X:%02X:%02X:%02X:%02X:%02X"
-#define VMXNET_MA(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-
#endif /* _QEMU_VMXNET3_DEBUG_H */
--
2.7.4
- [Qemu-devel] [PULL V4 03/31] net: vl: Move default_net to vl.c, (continued)
- [Qemu-devel] [PULL V4 03/31] net: vl: Move default_net to vl.c, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 05/31] pci: fix unaligned access in pci_xxx_quad(), Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 04/31] net/net: Add SocketReadState for reuse codes, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 06/31] msix: make msix_clr_pending() visible for clients, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 07/31] pci: Introduce define for PM capability version 1.1, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 08/31] pcie: Add support for PCIe CAP v1, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 10/31] vmxnet3: Use generic function for DSN capability definition, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 09/31] pcie: Introduce function for DSN capability creation, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 11/31] net: Introduce Toeplitz hash calculator, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 12/31] net: Add macros for MAC address tracing, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 13/31] vmxnet3: Use common MAC address tracing macros,
Jason Wang <=
- [Qemu-devel] [PULL V4 15/31] rtl8139: Move more TCP definitions to common header, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 14/31] net_pkt: Name vmxnet3 packet abstractions more generic, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 17/31] vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 16/31] net_pkt: Extend packet abstraction as required by e1000e functionality, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 18/31] e1000_regs: Add definitions for Intel 82574-specific bits, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 19/31] e1000: Move out code that will be reused in e1000e, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 22/31] net: improve UDP/TCP checksum computation., Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 21/31] e1000e: Introduce qtest for e1000e device, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 24/31] i.MX: Fix FEC code for MDIO operation selection, Jason Wang, 2016/06/02
- [Qemu-devel] [PULL V4 23/31] net: handle optional VLAN header in checksum computation., Jason Wang, 2016/06/02