From patchwork Sun Apr 10 15:14:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Fleytman X-Patchwork-Id: 8789481 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B6F499F39A for ; Sun, 10 Apr 2016 15:20:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08B7C20212 for ; Sun, 10 Apr 2016 15:20:21 +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 52209201CD for ; Sun, 10 Apr 2016 15:20:20 +0000 (UTC) Received: from localhost ([::1]:35263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apH9v-0008Fi-Fq for patchwork-qemu-devel@patchwork.kernel.org; Sun, 10 Apr 2016 11:20:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apH5O-0007cl-8j for qemu-devel@nongnu.org; Sun, 10 Apr 2016 11:15:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apH5N-00088f-6j for qemu-devel@nongnu.org; Sun, 10 Apr 2016 11:15:38 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:34735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apH5M-00088J-VP for qemu-devel@nongnu.org; Sun, 10 Apr 2016 11:15:37 -0400 Received: by mail-wm0-x22c.google.com with SMTP id l6so116303935wml.1 for ; Sun, 10 Apr 2016 08:15:36 -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=t8P67WfmASoBnlKPZXj60mLs0cBCC/KZOhWMUnQXDEY=; b=govJx7woBPkAxpjU/jwDgsM72Hp2f2xfiwqcfGklVECz05XLP5DcnFsyWHzJz/zBhx d1k78OFpOUCCt3gX8F3WfMpRIW7mnd0CS3klQl56PixcQkTU9VXG51MSRTZ8kx6F0oKJ M0qHBmACq2HFDxZqbIBuWMwb7Vjj4wuhZ71yXs1fb1izav/G3yQCCoBdLaNcvvFPdg7W DTzyzgo3y3RxameNUG1f89VWge74nI1JErB0aYXuU9tdghbVMDEldyEeXptRXxNZk+5h W1j8GgqMRk5FDDKcLYJJ3EQ23J6P1I/lCAcpFCMmugXXGzuLjU3tDhQh0XkLz8V8xCs9 1jDw== 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=t8P67WfmASoBnlKPZXj60mLs0cBCC/KZOhWMUnQXDEY=; b=JJkiSdIdQR/VLA6UUuMVmj+eNpVpMsG7C66RpoPe3w+8M9y4pB7aRXx2ZizrG1oR17 NHh7b/Re7vFH20Btr0mwgqbeoD40pKHnE0Avss0/ojDBdLqzs2BZrQz8zYKvNeoSextJ +1HzKNvnxeph12+57rm9Lhpq+vHZ8VANfxRthQE/uahtuSlbJAeylJM+hcGypJ1ZSSqK LrRvjpqJWZTbpRKkjOGaS80BSwLydYFwTDPDAVJzATRdMebzB6Yz0EgtWMZQNvJTKqf2 wUCtSRCBROxjosRsYIcQcWL0U6wT1jnI67z5M+Jtnyh6Q8MhWC+ECY5sJAmScUjhPOO8 CKFQ== X-Gm-Message-State: AD7BkJLeyX3KsaAN9oLP4nxEcga3RjNaxltdxkYwUIjUUT83eucpDwko+9eP+eOvi5uxWg== X-Received: by 10.194.9.34 with SMTP id w2mr18937544wja.170.1460301336462; Sun, 10 Apr 2016 08:15:36 -0700 (PDT) Received: from bark.daynix ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id j71sm12685874wmj.21.2016.04.10.08.15.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Apr 2016 08:15:35 -0700 (PDT) From: Dmitry Fleytman To: qemu-devel@nongnu.org Date: Sun, 10 Apr 2016 18:14:57 +0300 Message-Id: <1460301305-5321-9-git-send-email-dmitry@daynix.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460301305-5321-1-git-send-email-dmitry@daynix.com> References: <1460301305-5321-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::22c Subject: [Qemu-devel] [PATCH v4 08/16] 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-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 0a4db4d..26f6f90 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 */