From owner-svn-src-all@FreeBSD.ORG Thu Jan 6 07:13:23 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B95E91065670; Thu, 6 Jan 2011 07:13:23 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A98688FC0A; Thu, 6 Jan 2011 07:13:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p067DNss006350; Thu, 6 Jan 2011 07:13:23 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p067DNfw006348; Thu, 6 Jan 2011 07:13:23 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201101060713.p067DNfw006348@svn.freebsd.org> From: Stanislav Sedov Date: Thu, 6 Jan 2011 07:13:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217046 - head/usr.sbin/cpucontrol X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 06 Jan 2011 07:13:23 -0000 Author: stas Date: Thu Jan 6 07:13:23 2011 New Revision: 217046 URL: http://svn.freebsd.org/changeset/base/217046 Log: - Show textual representation of ioctl command in warning message if ioctl(4) is failed besides the command number. Suggested by: delphij MFC after: 2 weeks Modified: head/usr.sbin/cpucontrol/cpucontrol.c Modified: head/usr.sbin/cpucontrol/cpucontrol.c ============================================================================== --- head/usr.sbin/cpucontrol/cpucontrol.c Thu Jan 6 04:38:10 2011 (r217045) +++ head/usr.sbin/cpucontrol/cpucontrol.c Thu Jan 6 07:13:23 2011 (r217046) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Stanislav Sedov . + * Copyright (c) 2008-2011 Stanislav Sedov . * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -177,6 +177,7 @@ do_msr(const char *cmdarg, const char *d unsigned long command; int do_invert = 0, op; int fd, error; + const char *command_name; char *endptr; char *p; @@ -245,15 +246,19 @@ do_msr(const char *cmdarg, const char *d switch (op) { case OP_READ: command = CPUCTL_RDMSR; + command_name = "CPUCTL_RDMSR"; break; case OP_WRITE: command = CPUCTL_WRMSR; + command_name = "CPUCTL_WRMSR"; break; case OP_OR: command = CPUCTL_MSRSBIT; + command_name = "CPUCTL_MSRSBIT"; break; case OP_AND: command = CPUCTL_MSRCBIT; + command_name = "CPUCTL_MSRCBIT"; break; default: abort(); @@ -266,7 +271,7 @@ do_msr(const char *cmdarg, const char *d } error = ioctl(fd, command, &args); if (error < 0) { - WARN(0, "ioctl(%s, %lu)", dev, command); + WARN(0, "ioctl(%s, %s (%lu))", dev, command_name, command); close(fd); return (1); }