From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7dzY-0000Gu-C3 for qemu-devel@nongnu.org; Tue, 31 May 2016 03:21:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7dzW-0008UQ-6m for qemu-devel@nongnu.org; Tue, 31 May 2016 03:21:31 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33689) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7dzV-0008UK-PD for qemu-devel@nongnu.org; Tue, 31 May 2016 03:21:30 -0400 Received: by mail-wm0-x241.google.com with SMTP id a136so29734320wme.0 for ; Tue, 31 May 2016 00:21:29 -0700 (PDT) From: Dmitry Fleytman Date: Tue, 31 May 2016 10:20:51 +0300 Message-Id: <1464679259-1378-10-git-send-email-dmitry@daynix.com> In-Reply-To: <1464679259-1378-1-git-send-email-dmitry@daynix.com> References: <1464679259-1378-1-git-send-email-dmitry@daynix.com> Subject: [Qemu-devel] [PATCH v7 09/17] vmxnet3: Use common MAC address tracing macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Jason Wang , "Michael S. Tsirkin" , Yan Vugenfirer , Leonid Bloch , Shmulik Ladkani From: Dmitry Fleytman Signed-off-by: Dmitry Fleytman Signed-off-by: Leonid Bloch --- 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.5.5