From owner-freebsd-current@FreeBSD.ORG Mon Aug 26 13:22:46 2013 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 6C2CB13A for ; Mon, 26 Aug 2013 13:22:46 +0000 (UTC) (envelope-from andre@freebsd.org) Received: from c00l3r.networx.ch (c00l3r.networx.ch [62.48.2.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D283623F6 for ; Mon, 26 Aug 2013 13:22:45 +0000 (UTC) Received: (qmail 6511 invoked from network); 26 Aug 2013 14:04:51 -0000 Received: from c00l3r.networx.ch (HELO [127.0.0.1]) ([62.48.2.2]) (envelope-sender ) by c00l3r.networx.ch (qmail-ldap-1.03) with SMTP for ; 26 Aug 2013 14:04:51 -0000 Message-ID: <521B569C.4080906@freebsd.org> Date: Mon, 26 Aug 2013 15:22:36 +0200 From: Andre Oppermann User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: Roger Pau Monne Subject: Re: [PATCH] xen-netback: fix compile errors introduced by r254804 and r254807 References: <1377514921-2132-1-git-send-email-roger.pau@citrix.com> In-Reply-To: <1377514921-2132-1-git-send-email-roger.pau@citrix.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Aug 2013 13:22:46 -0000 On 26.08.2013 13:02, Roger Pau Monne wrote: > r254804 and r254807 changed the types of some of the members of the > mbuf struct, and introduced some compile time errors in netback > debug messages that prevented compiling a XENHVM kernel. Thanks, I fixed the printf's with r254910 in a slightly different way just before I saw your email. There's a dedicated m_print() function upcoming that can/should replace all those hand-grown variants. -- Andre > Cc: andre@freebsd.org > --- > sys/dev/xen/netback/netback.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c > index f18b791..16a54d9 100644 > --- a/sys/dev/xen/netback/netback.c > +++ b/sys/dev/xen/netback/netback.c > @@ -585,16 +585,16 @@ xnb_dump_mbuf(const struct mbuf *m) > > printf("xnb_dump_mbuf:\n"); > if (m->m_flags & M_PKTHDR) { > - printf(" flowid=%10d, csum_flags=%#8x, csum_data=%#8x, " > + printf(" flowid=%10d, csum_flags=%b, csum_data=%#8x, " > "tso_segsz=%5hd\n", > - m->m_pkthdr.flowid, m->m_pkthdr.csum_flags, > + m->m_pkthdr.flowid, (int)m->m_pkthdr.csum_flags, CSUM_BITS, > m->m_pkthdr.csum_data, m->m_pkthdr.tso_segsz); > printf(" rcvif=%16p, header=%18p, len=%19d\n", > - m->m_pkthdr.rcvif, m->m_pkthdr.header, m->m_pkthdr.len); > + m->m_pkthdr.rcvif, m->m_pkthdr.PH_loc.ptr, m->m_pkthdr.len); > } > printf(" m_next=%16p, m_nextpk=%16p, m_data=%16p\n", > m->m_next, m->m_nextpkt, m->m_data); > - printf(" m_len=%17d, m_flags=%#15x, m_type=%18hd\n", > + printf(" m_len=%17d, m_flags=%#15x, m_type=%u\n", > m->m_len, m->m_flags, m->m_type); > > len = m->m_len; >