From owner-svn-src-all@FreeBSD.ORG Wed Mar 27 00:18:23 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E4BD2432; Wed, 27 Mar 2013 00:18:23 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (bird.sbone.de [46.4.1.90]) by mx1.freebsd.org (Postfix) with ESMTP id 70B7BF0; Wed, 27 Mar 2013 00:18:20 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 9FDFF25D387C; Wed, 27 Mar 2013 00:18:12 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 96C5EBE84DE; Wed, 27 Mar 2013 00:18:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id RngscBC9b841; Wed, 27 Mar 2013 00:18:10 +0000 (UTC) Received: from nv.sbone.de (nv.sbone.de [IPv6:fde9:577b:c1a9:31::2013:138]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id CE934BE84DB; Wed, 27 Mar 2013 00:18:09 +0000 (UTC) Date: Wed, 27 Mar 2013 00:18:08 +0000 (UTC) From: "Bjoern A. Zeeb" To: Jim Harris Subject: Re: svn commit: r248773 - head/sys/dev/nvme In-Reply-To: <201303262217.r2QMHBvn034633@svn.freebsd.org> Message-ID: References: <201303262217.r2QMHBvn034633@svn.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Mar 2013 00:18:24 -0000 On Tue, 26 Mar 2013, Jim Harris wrote: > Author: jimharris > Date: Tue Mar 26 22:17:10 2013 > New Revision: 248773 > URL: http://svnweb.freebsd.org/changeset/base/248773 > > Log: > Clean up debug prints. > > 1) Consistently use device_printf. > 2) Make dump_completion and dump_command into something more > human-readable. > > Sponsored by: Intel > Reviewed by: carl > > Modified: > head/sys/dev/nvme/nvme_ctrlr.c > head/sys/dev/nvme/nvme_ctrlr_cmd.c > head/sys/dev/nvme/nvme_ns.c > head/sys/dev/nvme/nvme_private.h > head/sys/dev/nvme/nvme_qpair.c I am not sure which one it is but I guess it's one of these, which breaks i386 builds: /sys/modules/nvme/../../dev/nvme/nvme_qpair.c:130:18: error: format specifies type 'unsigned long' but the argument has type 'unsigned long long' [-Werror,-Wformat] /sys/modules/nvme/../../dev/nvme/nvme_private.h:358:38: note: expanded from macro 'nvme_printf' > ============================================================================== > --- head/sys/dev/nvme/nvme_qpair.c Tue Mar 26 22:14:47 2013 (r248772) > +++ head/sys/dev/nvme/nvme_qpair.c Tue Mar 26 22:17:10 2013 (r248773) .... > + > +static void > +nvme_admin_qpair_print_command(struct nvme_qpair *qpair, > + struct nvme_command *cmd) > +{ > + > + nvme_printf(qpair->ctrlr, "%s (%02x) sqid:%d cid:%d nsid:%x " > + "cdw10:%08x cdw11:%08x\n", > + get_admin_opcode_string(cmd->opc), cmd->opc, qpair->id, cmd->cid, > + cmd->nsid, cmd->cdw10, cmd->cdw11); > +} > + > +static void > +nvme_io_qpair_print_command(struct nvme_qpair *qpair, > + struct nvme_command *cmd) > +{ > + > + switch (cmd->opc) { > + case NVME_OPC_WRITE: > + case NVME_OPC_READ: > + case NVME_OPC_WRITE_UNCORRECTABLE: > + case NVME_OPC_COMPARE: > + nvme_printf(qpair->ctrlr, "%s sqid:%d cid:%d nsid:%d " > + "lba:%lu len:%d\n", > + get_io_opcode_string(cmd->opc), qpair->id, cmd->cid, > + cmd->nsid, ((uint64_t)cmd->cdw11 << 32) | cmd->cdw10, > + (cmd->cdw12 & 0xFFFF) + 1); > + break; > + case NVME_OPC_FLUSH: > + case NVME_OPC_DATASET_MANAGEMENT: > + nvme_printf(qpair->ctrlr, "%s sqid:%d cid:%d nsid:%d\n", > + get_io_opcode_string(cmd->opc), qpair->id, cmd->cid, > + cmd->nsid); > + break; > + default: > + nvme_printf(qpair->ctrlr, "%s (%02x) sqid:%d cid:%d nsid:%d\n", > + get_io_opcode_string(cmd->opc), cmd->opc, qpair->id, > + cmd->cid, cmd->nsid); > + break; > + } > +} > + -- Bjoern A. Zeeb Charles Haddon Spurgeon: "Friendship is one of the sweetest joys of life. Many might have failed beneath the bitterness of their trial had they not found a friend."