mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

- Show textual representation of ioctl command in warning message

Browse Source 
if ioctl(4) is failed besides the command number.

Suggested by:	delphij
MFC after:	2 weeks
This commit is contained in:
Stanislav Sedov 2011-01-06 07:13:23 +00:00
parent 03479763b2
commit f264409aea
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=217046
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/cpucontrol/cpucontrol.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2008 Stanislav Sedov <stas@FreeBSD.org>. * Copyright (c) 2008-2011 Stanislav Sedov <stas@FreeBSD.org>.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -177,6 +177,7 @@ do_msr(const char *cmdarg, const char *dev)
unsigned long command; unsigned long command;
int do_invert = 0, op; int do_invert = 0, op;
int fd, error; int fd, error;
const char *command_name;
char *endptr; char *endptr;
char *p; char *p;
@ -245,15 +246,19 @@ do_msr(const char *cmdarg, const char *dev)
switch (op) { switch (op) {
case OP_READ: case OP_READ:
command = CPUCTL_RDMSR; command = CPUCTL_RDMSR;
command_name = "CPUCTL_RDMSR";
break; break;
case OP_WRITE: case OP_WRITE:
command = CPUCTL_WRMSR; command = CPUCTL_WRMSR;
command_name = "CPUCTL_WRMSR";
break; break;
case OP_OR: case OP_OR:
command = CPUCTL_MSRSBIT; command = CPUCTL_MSRSBIT;
command_name = "CPUCTL_MSRSBIT";
break; break;
case OP_AND: case OP_AND:
command = CPUCTL_MSRCBIT; command = CPUCTL_MSRCBIT;
command_name = "CPUCTL_MSRCBIT";
break; break;
default: default:
abort(); abort();
@ -266,7 +271,7 @@ do_msr(const char *cmdarg, const char *dev)
} }
error = ioctl(fd, command, &args); error = ioctl(fd, command, &args);
if (error < 0) { if (error < 0) {
WARN(0, "ioctl(%s, %lu)", dev, command); WARN(0, "ioctl(%s, %s (%lu))", dev, command_name, command);
close(fd); close(fd);
return (1); return (1);
} }