svn commit: r248773 - head/sys/dev/nvme

[Bjoern A. Zeeb]

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."