mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
dasdview: Use libdasd provided functions
GitHub-ID: #19 Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com> Acked-by: Jan Höppner <hoeppner@linux.vnet.ibm.com> Signed-off-by: Stefan Haberland <sth@linux.vnet.ibm.com>
This commit is contained in:
Rafael Fonseca
committed by
Stefan Haberland
Stefan Haberland
parent
68b0b4c268
commit
e7d3638c6b
@@ -25,6 +25,8 @@
|
||||
#include <sys/utsname.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "lib/dasd_base.h"
|
||||
#include "lib/dasd_sys.h"
|
||||
#include "lib/libzds.h"
|
||||
#include "lib/u2s.h"
|
||||
#include "lib/util_base.h"
|
||||
@@ -144,75 +146,33 @@ static void dot(char label[])
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Attempts to find the sysfs entry for the given busid and reads
|
||||
* the contents of a specified attribute to the buffer
|
||||
*/
|
||||
static int dasdview_read_attribute(char *busid, char *attribute, char *buffer,
|
||||
size_t count)
|
||||
{
|
||||
char path[100];
|
||||
int rc, fd;
|
||||
ssize_t rcount;
|
||||
|
||||
rc = 0;
|
||||
snprintf(path, sizeof(path), "/sys/bus/ccw/devices/%s/%s",
|
||||
busid, attribute);
|
||||
fd = open(path, O_RDONLY);
|
||||
if (fd < 0)
|
||||
return errno;
|
||||
rcount = read(fd, buffer, count);
|
||||
if (rcount < 0)
|
||||
rc = errno;
|
||||
close(fd);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static void
|
||||
dasdview_get_info(dasdview_info_t *info)
|
||||
{
|
||||
int fd;
|
||||
struct dasd_eckd_characteristics *characteristics;
|
||||
char buffer[10];
|
||||
int rc;
|
||||
int err;
|
||||
|
||||
fd = open(info->device, O_RDONLY);
|
||||
if (fd == -1) {
|
||||
zt_error_print("dasdview: open error\n"
|
||||
"Could not open device '%s'.\n"
|
||||
"Maybe you have specified an unknown device or \n"
|
||||
"you are not authorized to do that.\n",
|
||||
info->device);
|
||||
err = dasd_get_geo(info->device, &info->geo);
|
||||
if (err != 0) {
|
||||
/* Test for unknown device in the first call to libdasd to avoid
|
||||
* spitting out two different error messages to the user
|
||||
*/
|
||||
if (err != EBADF)
|
||||
zt_error_print("dasdview: "
|
||||
"Could not retrieve geo information!\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
/* get disk geometry */
|
||||
if (ioctl(fd, HDIO_GETGEO, &info->geo) != 0) {
|
||||
close(fd);
|
||||
zt_error_print("dasdview: ioctl error\n"
|
||||
"Could not retrieve disk geometry "
|
||||
"information.");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
if (ioctl(fd, BLKSSZGET, &info->blksize) != 0) {
|
||||
close(fd);
|
||||
zt_error_print("dasdview: ioctl error\n"
|
||||
if (dasd_get_blocksize(info->device, &info->blksize) != 0) {
|
||||
zt_error_print("dasdview: "
|
||||
"Could not retrieve blocksize information!\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
/* get disk information */
|
||||
if (ioctl(fd, BIODASDINFO2, &info->dasd_info) == 0) {
|
||||
info->dasd_info_version = 2;
|
||||
} else {
|
||||
/* INFO2 failed - try INFO using the same (larger) buffer */
|
||||
if (ioctl(fd, BIODASDINFO, &info->dasd_info) != 0) {
|
||||
close(fd);
|
||||
zt_error_print("dasdview: ioctl error\n"
|
||||
"Could not retrieve disk information.");
|
||||
exit(-1);
|
||||
}
|
||||
if (dasd_get_info(info->device, &info->dasd_info) != 0) {
|
||||
zt_error_print("dasdview: "
|
||||
"Could not retrieve disk information!\n");
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
characteristics = (struct dasd_eckd_characteristics *)
|
||||
@@ -222,22 +182,13 @@ dasdview_get_info(dasdview_info_t *info)
|
||||
info->hw_cylinders = characteristics->long_no_cyl;
|
||||
else
|
||||
info->hw_cylinders = characteristics->no_cyl;
|
||||
close(fd);
|
||||
|
||||
if (u2s_getbusid(info->device, info->busid) == -1)
|
||||
info->busid_valid = 0;
|
||||
else
|
||||
info->busid_valid = 1;
|
||||
|
||||
rc = dasdview_read_attribute(info->busid, "raw_track_access", buffer,
|
||||
sizeof(buffer));
|
||||
if (rc) {
|
||||
zt_error_print("dasdview: Could not retrieve raw_track_access"
|
||||
" mode information.");
|
||||
return;
|
||||
}
|
||||
if ('1' == buffer[0])
|
||||
info->raw_track_access = 1;
|
||||
info->raw_track_access = dasd_sys_raw_track_access(info->device);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -439,26 +390,24 @@ dasdview_print_extended_info(dasdview_info_t *info)
|
||||
printf("confdata_size : hex %x \tdec %d\n",
|
||||
dasd_info->confdata_size, dasd_info->confdata_size);
|
||||
|
||||
if (info->dasd_info_version >= 2) {
|
||||
printf("format : hex %x \tdec %d \t%s\n",
|
||||
dasd_info->format, dasd_info->format,
|
||||
dasd_info->format == DASD_FORMAT_NONE ?
|
||||
"NOT formatted" :
|
||||
dasd_info->format == DASD_FORMAT_LDL ?
|
||||
"LDL formatted" :
|
||||
dasd_info->format == DASD_FORMAT_CDL ?
|
||||
"CDL formatted" : "unknown format");
|
||||
printf("format : hex %x \tdec %d \t%s\n",
|
||||
dasd_info->format, dasd_info->format,
|
||||
dasd_info->format == DASD_FORMAT_NONE ?
|
||||
"NOT formatted" :
|
||||
dasd_info->format == DASD_FORMAT_LDL ?
|
||||
"LDL formatted" :
|
||||
dasd_info->format == DASD_FORMAT_CDL ?
|
||||
"CDL formatted" : "unknown format");
|
||||
|
||||
printf("features : hex %x \tdec %d \t",
|
||||
dasd_info->features, dasd_info->features);
|
||||
if (dasd_info->features == DASD_FEATURE_DEFAULT) {
|
||||
printf("default\n");
|
||||
} else {
|
||||
for (i = 0; i < UTIL_ARRAY_SIZE(flist); i++)
|
||||
if (dasd_info->features & flist[i].mask)
|
||||
printf("%s ", flist[i].name);
|
||||
printf("\n");
|
||||
}
|
||||
printf("features : hex %x \tdec %d \t",
|
||||
dasd_info->features, dasd_info->features);
|
||||
if (dasd_info->features == DASD_FEATURE_DEFAULT) {
|
||||
printf("default\n");
|
||||
} else {
|
||||
for (i = 0; i < UTIL_ARRAY_SIZE(flist); i++)
|
||||
if (dasd_info->features & flist[i].mask)
|
||||
printf("%s ", flist[i].name);
|
||||
printf("\n");
|
||||
}
|
||||
printf("\n");
|
||||
dasdview_dump_array("characteristics",
|
||||
@@ -2347,6 +2296,7 @@ int main(int argc, char *argv[])
|
||||
strcpy(info.device, argv[info.device_id]);
|
||||
|
||||
dasdview_get_info(&info);
|
||||
|
||||
if (info.raw_track_access) {
|
||||
rc = lzds_zdsroot_alloc(&info.zdsroot);
|
||||
if (rc) {
|
||||
|
||||
@@ -17,139 +17,6 @@
|
||||
* SECTION: Definitions needed for DASD-API (see dasd.h)
|
||||
*******************************************************************************/
|
||||
|
||||
#define DASD_IOCTL_LETTER 'D'
|
||||
|
||||
/*
|
||||
* struct dasd_information_t
|
||||
* represents any data about the device, which is visible to userspace.
|
||||
* including foramt and features.
|
||||
*/
|
||||
typedef struct dasd_information_t {
|
||||
unsigned int devno; /* S/390 devno */
|
||||
unsigned int real_devno; /* for aliases */
|
||||
unsigned int schid; /* S/390 subchannel identifier */
|
||||
unsigned int cu_type : 16; /* from SenseID */
|
||||
unsigned int cu_model : 8; /* from SenseID */
|
||||
unsigned int dev_type : 16; /* from SenseID */
|
||||
unsigned int dev_model : 8; /* from SenseID */
|
||||
unsigned int open_count;
|
||||
unsigned int req_queue_len;
|
||||
unsigned int chanq_len; /* length of chanq */
|
||||
char type[4]; /* from discipline.name, 'none' for unknown */
|
||||
unsigned int status; /* current device level */
|
||||
unsigned int label_block; /* where to find the VOLSER */
|
||||
unsigned int FBA_layout; /* fixed block size (like AIXVOL) */
|
||||
unsigned int characteristics_size;
|
||||
unsigned int confdata_size;
|
||||
char characteristics[64]; /* from read_device_characteristics */
|
||||
char configuration_data[256]; /* from read_configuration_data */
|
||||
} dasd_information_t;
|
||||
|
||||
typedef struct dasd_information2_t {
|
||||
unsigned int devno; /* S/390 devno */
|
||||
unsigned int real_devno; /* for aliases */
|
||||
unsigned int schid; /* S/390 subchannel identifier */
|
||||
unsigned int cu_type : 16; /* from SenseID */
|
||||
unsigned int cu_model : 8; /* from SenseID */
|
||||
unsigned int dev_type : 16; /* from SenseID */
|
||||
unsigned int dev_model : 8; /* from SenseID */
|
||||
unsigned int open_count;
|
||||
unsigned int req_queue_len;
|
||||
unsigned int chanq_len; /* length of chanq */
|
||||
char type[4]; /* from discipline.name, 'none' for unknown */
|
||||
unsigned int status; /* current device level */
|
||||
unsigned int label_block; /* where to find the VOLSER */
|
||||
unsigned int FBA_layout; /* fixed block size (like AIXVOL) */
|
||||
unsigned int characteristics_size;
|
||||
unsigned int confdata_size;
|
||||
unsigned char characteristics[64];/*from read_device_characteristics */
|
||||
unsigned char configuration_data[256];/*from read_configuration_data */
|
||||
unsigned int format; /* format info like formatted/cdl/ldl/... */
|
||||
unsigned int features; /* dasd features like 'ro',... */
|
||||
unsigned int reserved0; /* reserved for further use ,... */
|
||||
unsigned int reserved1; /* reserved for further use ,... */
|
||||
unsigned int reserved2; /* reserved for further use ,... */
|
||||
unsigned int reserved3; /* reserved for further use ,... */
|
||||
unsigned int reserved4; /* reserved for further use ,... */
|
||||
unsigned int reserved5; /* reserved for further use ,... */
|
||||
unsigned int reserved6; /* reserved for further use ,... */
|
||||
unsigned int reserved7; /* reserved for further use ,... */
|
||||
} dasd_information2_t;
|
||||
|
||||
struct dasd_eckd_characteristics {
|
||||
unsigned short cu_type;
|
||||
struct {
|
||||
unsigned char support:2;
|
||||
unsigned char async:1;
|
||||
unsigned char reserved:1;
|
||||
unsigned char cache_info:1;
|
||||
unsigned char model:3;
|
||||
} __attribute__ ((packed)) cu_model;
|
||||
unsigned short dev_type;
|
||||
unsigned char dev_model;
|
||||
struct {
|
||||
unsigned char mult_burst:1;
|
||||
unsigned char RT_in_LR:1;
|
||||
unsigned char reserved1:1;
|
||||
unsigned char RD_IN_LR:1;
|
||||
unsigned char reserved2:4;
|
||||
unsigned char reserved3:8;
|
||||
unsigned char defect_wr:1;
|
||||
unsigned char XRC_supported:1;
|
||||
unsigned char reserved4:1;
|
||||
unsigned char striping:1;
|
||||
unsigned char reserved5:4;
|
||||
unsigned char cfw:1;
|
||||
unsigned char reserved6:2;
|
||||
unsigned char cache:1;
|
||||
unsigned char dual_copy:1;
|
||||
unsigned char dfw:1;
|
||||
unsigned char reset_alleg:1;
|
||||
unsigned char sense_down:1;
|
||||
} __attribute__ ((packed)) facilities;
|
||||
unsigned char dev_class;
|
||||
unsigned char unit_type;
|
||||
unsigned short no_cyl;
|
||||
unsigned short trk_per_cyl;
|
||||
unsigned char sec_per_trk;
|
||||
unsigned char byte_per_track[3];
|
||||
unsigned short home_bytes;
|
||||
unsigned char formula;
|
||||
union {
|
||||
struct {
|
||||
unsigned char f1;
|
||||
unsigned short f2;
|
||||
unsigned short f3;
|
||||
} __attribute__ ((packed)) f_0x01;
|
||||
struct {
|
||||
unsigned char f1;
|
||||
unsigned char f2;
|
||||
unsigned char f3;
|
||||
unsigned char f4;
|
||||
unsigned char f5;
|
||||
} __attribute__ ((packed)) f_0x02;
|
||||
} __attribute__ ((packed)) factors;
|
||||
unsigned short first_alt_trk;
|
||||
unsigned short no_alt_trk;
|
||||
unsigned short first_dia_trk;
|
||||
unsigned short no_dia_trk;
|
||||
unsigned short first_sup_trk;
|
||||
unsigned short no_sup_trk;
|
||||
unsigned char MDR_ID;
|
||||
unsigned char OBR_ID;
|
||||
unsigned char director;
|
||||
unsigned char rd_trk_set;
|
||||
unsigned short max_rec_zero;
|
||||
unsigned char reserved1;
|
||||
unsigned char RWANY_in_LR;
|
||||
unsigned char factor6;
|
||||
unsigned char factor7;
|
||||
unsigned char factor8;
|
||||
unsigned char reserved2[3];
|
||||
unsigned char reserved3[6];
|
||||
unsigned int long_no_cyl;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
/*
|
||||
* values to be used for dasd_information2_t.format
|
||||
* 0x00: NOT formatted
|
||||
@@ -170,21 +37,6 @@ struct dasd_eckd_characteristics {
|
||||
#define DASD_FEATURE_READONLY 1
|
||||
#define DASD_FEATURE_USEDIAG 2
|
||||
|
||||
/* Get information on a dasd device (enhanced) */
|
||||
#define BIODASDINFO _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
|
||||
#define BIODASDINFO2 _IOR(DASD_IOCTL_LETTER,3,dasd_information2_t)
|
||||
|
||||
/********************************************************************************
|
||||
* SECTION: Further IOCTL Definitions (see fs.h and hdreq.h)
|
||||
*******************************************************************************/
|
||||
/* get block device sector size */
|
||||
#define BLKSSZGET _IO(0x12,104)
|
||||
/* return device size in bytes (u64 *arg) */
|
||||
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
|
||||
|
||||
/* get device geometry */
|
||||
#define HDIO_GETGEO 0x0301
|
||||
|
||||
/********************************************************************************
|
||||
* SECTION: DASDVIEW internal types
|
||||
*******************************************************************************/
|
||||
@@ -215,7 +67,7 @@ typedef struct dasdview_info
|
||||
char device[PATH_MAX];
|
||||
dasd_information2_t dasd_info;
|
||||
int dasd_info_version;
|
||||
int blksize;
|
||||
unsigned int blksize;
|
||||
struct hd_geometry geo;
|
||||
u_int32_t hw_cylinders;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user