From patchwork Sun May 15 13:49:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 9096401 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 794D99F372 for ; Sun, 15 May 2016 13:52:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C55B7202C8 for ; Sun, 15 May 2016 13:52:40 +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 1250A202AE for ; Sun, 15 May 2016 13:52:40 +0000 (UTC) Received: from localhost ([::1]:40413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1wTG-0002xo-Mb for patchwork-qemu-devel@patchwork.kernel.org; Sun, 15 May 2016 09:52:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54209) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1wR6-0007WI-0n for qemu-devel@nongnu.org; Sun, 15 May 2016 09:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1wR4-0007XE-OB for qemu-devel@nongnu.org; Sun, 15 May 2016 09:50:23 -0400 Received: from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232]:37908) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1wR4-0007X4-A0 for qemu-devel@nongnu.org; Sun, 15 May 2016 09:50:22 -0400 Received: by mail-wm0-x232.google.com with SMTP id g17so98338197wme.1 for ; Sun, 15 May 2016 06:50:22 -0700 (PDT) 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=K8klO6S7WisD+/py9bAgk7Il9Mp0UT2SIscfcbXRF5g=; b=MD5zwo9r4RfHKxYVaC7H0YVZfcbkQ4znZX26CLdXlryTPecAi5hFCm14qOQwkiKZ0I +tDFjhixx2HbW7F2ySyykbaDwo0+MH4F+8OtBsuhKlqzHAlewf2J/F8X7n7S4H2hMVOI LLbDXk2yKZjpiMPdjchVYAXf9+i5jVbq8rBFiQYEWtRYKoeXy6Gqo3UYqEtJr3gbR1Q1 lrwMZj544+at9b/XXfn0qock8fnxEZ/9U2TlxUIwKtmwr1DVvYGAGAlDcwdm/myMzils M/a/Q+4kua2nGVFZ49JxIpIiAUJ/P3QvEhKWIOXjcN/8kcVEkfFguIqVNN19tlhvFGiX qCFg== 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=K8klO6S7WisD+/py9bAgk7Il9Mp0UT2SIscfcbXRF5g=; b=kwnwMCfVaNMeKCF+o+T/YBwI3SKnMBqS5TPlQmq0iVbKkNvIWwcLWXgELd31FX5ueM 3oZSQsCmeDdCm+qhmrg8n6UyqXqRztWSA5F3RV2Odf/lIbb+eeuLoVRGb9b6tMuX+OdK xsS7U2QTXO1p6/BGSR0gDrCMNu9XN1tWnFIWQgBAx6cXNiD9uRSHeI89yQbV0n4xkK4O QYA5fvoP0V9Ikmmf5St3KTgBjZyJDzOmvC9NvlwWqimGSCnPcK+uatUVMBG/egZyWBWX TH3q4ConKyGsmn6WNyIcRlTMvJQ7TUtN5mXhyfvNvJHEQfVNh6xAqt5qpjeMgiehlzNi uU+Q== X-Gm-Message-State: AOPr4FUONZ6DAqdRMzpg04C2N9hYcH+XGhgZ1gDOxMyoqM5dl+CCC9C+DiRFPavt4SSY59zp X-Received: by 10.194.133.135 with SMTP id pc7mr25365999wjb.49.1463320221579; Sun, 15 May 2016 06:50:21 -0700 (PDT) Received: from bark.daynix ([5.102.236.99]) by smtp.gmail.com with ESMTPSA id c4sm28742403wjm.24.2016.05.15.06.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 May 2016 06:50:20 -0700 (PDT) From: Leonid Bloch To: qemu-devel@nongnu.org Date: Sun, 15 May 2016 16:49:41 +0300 Message-Id: <1463320189-14108-9-git-send-email-leonid.bloch@ravellosystems.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463320189-14108-1-git-send-email-leonid.bloch@ravellosystems.com> References: <1463320189-14108-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::232 Subject: [Qemu-devel] [PATCH v5 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: Dmitry Fleytman , 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 */