From patchwork Thu Feb 18 10:07:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 8348221 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 76F27C0553 for ; Thu, 18 Feb 2016 10:10:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC57C2034A for ; Thu, 18 Feb 2016 10:10:18 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 992FE202FE for ; Thu, 18 Feb 2016 10:10:17 +0000 (UTC) Received: from localhost ([::1]:39411 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWLXM-0001Bo-SY for patchwork-qemu-devel@patchwork.kernel.org; Thu, 18 Feb 2016 05:10:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWLVN-0006fK-Pe for qemu-devel@nongnu.org; Thu, 18 Feb 2016 05:08:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWLVK-0001Sg-Hk for qemu-devel@nongnu.org; Thu, 18 Feb 2016 05:08:13 -0500 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:35184) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWLVK-0001SY-B0 for qemu-devel@nongnu.org; Thu, 18 Feb 2016 05:08:10 -0500 Received: by mail-wm0-x22a.google.com with SMTP id c200so18609004wme.0 for ; Thu, 18 Feb 2016 02:08:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravellosystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Sn4qaAsNrPy5HDAc8EG0I5pqYGIQsE6yKzK8bNxQvGE=; b=vrrzV8lxQKsOZuxosF+Akiw4yEjdsBfgS2p8//9dLG3PZ8rWzIvRLz+WWr9CPbqLTe SWRSiw+SR7S3a4uEWxoV0knwOhH9VqeJA5JQJ6MZ5+gtLYoP/HUnbBQzTfDIYhmO9WN3 L/+dEzAq317D6y7pCsMQNKltK+d3q5k39JwyXlzFxHHT7VOMRpvHeZsunY7iA95LMT+y RAxA/Y1vQ3tg819iV1nBdoK+8tdzzTCFyzuYwL8G6esJk2VCLJH+sbHPVinSRQUoxw71 CihSCfohNroWcPvkaCXoXYs8FM1jObugYpIqknWz1p0xycqtwk9gn2bm/6YDkMyiVrlr U6RQ== 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=Sn4qaAsNrPy5HDAc8EG0I5pqYGIQsE6yKzK8bNxQvGE=; b=VJmOkPhnkaVo6pOQNXNTCtSVURr43LOaKiRwsaZ07ADuAnF5YIShUBX0lhgZtrImEZ Z5YROFSqhwUHi01IecPonNrMnvZGEmIMvkeBi+rQOefAiOykfELbXRym705ZEHoMwzPE uADlcRyV9fJBeFpd9QQQZcNwx+4SLFzsaARhJr+6GrNoHK0ZA6+i19jJUKEVvM8QrDyN stXQIL+TjwI6Zbs1s4Q0SOtyplOg6ewljDhuod6JHxBXY/CDGLO/MPfAMwPrcqaoj8pL lqgesM1rGrW9Z+hZFwIDvCiqKb5qyh5f0oXk36eSHMwferJqIeIk6ep+E9cnSuyrF2cN tcbQ== X-Gm-Message-State: AG10YOTKP38bVeeRRGDGaVQmeGH2OCE1FjGP2Onqxc+6IKj/JhIAXbPJLBV0vBq5nLkMXKHN X-Received: by 10.194.248.163 with SMTP id yn3mr6461009wjc.179.1455790089804; Thu, 18 Feb 2016 02:08:09 -0800 (PST) Received: from bark.daynix ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id x65sm2214799wmg.4.2016.02.18.02.08.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Feb 2016 02:08:09 -0800 (PST) From: Leonid Bloch To: qemu-devel@nongnu.org Date: Thu, 18 Feb 2016 12:07:29 +0200 Message-Id: <1455790054-1952-9-git-send-email-leonid.bloch@ravellosystems.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455790054-1952-1-git-send-email-leonid.bloch@ravellosystems.com> References: <1455790054-1952-1-git-send-email-leonid.bloch@ravellosystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22a Cc: Dmitry Fleytman , Jason Wang , Leonid Bloch , Shmulik Ladkani , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 08/13] vmxnet3: Use common MAC address tracing macros X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org 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 43f7a34..690fa04 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 */