From patchwork Tue May 31 07:20:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Fleytman X-Patchwork-Id: 9143687 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BDD3F60757 for ; Tue, 31 May 2016 07:30:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B074B25D97 for ; Tue, 31 May 2016 07:30:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A555F2821C; Tue, 31 May 2016 07:30:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4B32D25D97 for ; Tue, 31 May 2016 07:30:38 +0000 (UTC) Received: from localhost ([::1]:34807 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7e8L-00007p-B0 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 31 May 2016 03:30:37 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nSHwip65nZE/iUOooBayzbs0/kyJkgbUTSM5j7koCzY=; b=LuC34TApatRvg8jGgNsTVZyDO+Qk4/2EY8YsBLx16+X58cgYswhaQg/oRoZd6x+iOi TzjWHNqnPBuY1z9Wi09CdqoxhIJ7veAOkj/Dv5QlgF7ZgC7bnnbJHj/srYT3A6NkwDK1 TRNWegqjJWMG3cVTqdvEy0M2/IlGU+wzsCUbOUv5CSH6vwxXLureoZfw3dK59njW6134 NshSVK6dhPB6s+vYkNz4yIbz7+OfVw+85vCbQ3QaVoXRs0vcKaf6ErCxfuIDLZuVZ/dy wyzC0kEdzB5WZXhipR/K4y9X0GpNwMmZokj/brE8h3mv/HJy2t0RU6xb5M0bnWhYlwwq TLwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nSHwip65nZE/iUOooBayzbs0/kyJkgbUTSM5j7koCzY=; b=kccqzmsqHDZOWbnN49KS3+nl2/iJWKK3TssHX3mI/1VJ3y3z0geCsCuqN5SHXRqE47 a986pd4QcdfzVdzcaPn+lNTBJsHERgJFWb3wd/yj3h/pr7xRsQEdlCsqN9aH6U367zf8 teU2jd/gvzLTwguDSIwr3rGv3Y3gcFfdMqIbZWmYcjF+mFQ816uWWxH/pOSYxEu4KaZd 18jkxDagIp5WHzPKGvBsgpCEQLZQbRscBKe7zynJCuJSAqOiB1dPMA/4MTfCts2hGRSf MV71x/1DFI8Y8pBubWA/FstBgqYn7i5TvK06gB8erPNARP9F9efBLOUe/UI8NMZ9Tk6E xn2w== X-Gm-Message-State: ALyK8tILE/RPE735rmgxaFqakn9aathO3ONdVe/Al7ZJ8JIqOQgMOLRW6GbraRoaTLtjLQ== X-Received: by 10.28.14.19 with SMTP id 19mr1760802wmo.11.1464679289186; Tue, 31 May 2016 00:21:29 -0700 (PDT) Received: from bark.daynix ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id d5sm38256188wje.20.2016.05.31.00.21.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 May 2016 00:21:28 -0700 (PDT) From: Dmitry Fleytman To: qemu-devel@nongnu.org Date: Tue, 31 May 2016 10:20:51 +0300 Message-Id: <1464679259-1378-10-git-send-email-dmitry@daynix.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464679259-1378-1-git-send-email-dmitry@daynix.com> References: <1464679259-1378-1-git-send-email-dmitry@daynix.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH v7 09/17] vmxnet3: Use common MAC address tracing macros X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer , Jason Wang , Leonid Bloch , Shmulik Ladkani , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 */