d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Belatedly catch up with the dev_t/cdev changes from a few months back.

Browse Source 
Extract the struct cdev pointer and the tty device from inside rather than
incorrectly casting the 'struct cdev *' pointer to a 'dev_t' int.  Not
that this was particularly important since it was only used for reading
vmcore files.
This commit is contained in:
peter 2004-10-11 21:56:27 +00:00
parent 46a2ab741b
commit 9213c0d6bf
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libkvm/kvm_proc.c
View File

@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/file.h>
#include <sys/conf.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -98,6 +99,7 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
struct kinfo_proc kinfo_proc, *kp;
struct pgrp pgrp;
struct session sess;
struct cdev t_cdev;
struct tty tty;
struct vmspace vmspace;
struct sigacts sigacts;
@ -272,7 +274,15 @@ kvm_proclist(kd, what, arg, p, bp, maxcnt)
"can't read tty at %x", sess.s_ttyp);
return (-1);
}
kp->ki_tdev = tty.t_dev; /* XXX: wrong */
if (tty.t_dev != NULL) {
if (KREAD(kd, (u_long)tty.t_dev, &t_cdev)) {
_kvm_err(kd, kd->program,
"can't read cdev at %x",
tty.t_dev);
return (-1);
}
kp->ki_tdev = t_cdev.si_udev;
}
if (tty.t_pgrp != NULL) {
if (KREAD(kd, (u_long)tty.t_pgrp, &pgrp)) {
_kvm_err(kd, kd->program,

5
sys/sys/conf.h
View File

@ -42,6 +42,9 @@
#ifdef _KERNEL
#include <sys/eventhandler.h>
#else
#include <sys/queue.h>
#endif
struct tty;
struct disk;
@ -107,6 +110,8 @@ struct cdev {
#define si_snapdata __si_u.__si_disk.__sid_snapdata
#define si_copyonwrite __si_u.__si_disk.__sid_copyonwrite
#ifdef _KERNEL
/*
* Definitions of device driver entry switches
*/