andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

smart: obtain disk size in blocks. 

Also drop pre 7.0 support as any earlier version was not supported.
This commit is contained in:
Andrius Štikonas 2019-06-05 00:50:07 +01:00
parent 9565ef61ab
commit 6a3b1e02b6
4 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/smartattributeparseddata.cpp
View File

@ -260,7 +260,7 @@ void SmartAttributeParsedData::verifySectors()
if (prettyUnit() != SmartAttributeUnit::Sectors)
return;
quint64 maxSectors = disk()->size() / 512ULL;
quint64 maxSectors = disk()->sectors();
if (prettyValue() == 0xFFFFFFFFULL || prettyValue() == 0xFFFFFFFFFFFFULL || (maxSectors > 0
&& prettyValue() > maxSectors))

4
src/core/smartdiskinformation.cpp
View File

@ -27,7 +27,7 @@ SmartDiskInformation::SmartDiskInformation() :
m_ModelName(QString()),
m_FirmwareVersion(QString()),
m_SerialNumber(QString()),
m_Size(0),
m_Sectors(0),
m_Temperature(0),
m_BadSectors(0),
m_PoweredOn(0),
@ -64,7 +64,7 @@ void SmartDiskInformation::updateOverall()
return;
}
quint64 sector_threshold = u64log2(size() / 512) * 1024;
quint64 sector_threshold = u64log2(sectors()) * 1024;
if (badSectors() >= sector_threshold) {
m_Overall = SmartStatus::Overall::BadSectorsMany;

10
src/core/smartdiskinformation.h
View File

@ -66,9 +66,9 @@ public:
return m_SerialNumber; /**< @return the disk serial number */
}
quint64 size() const
quint64 sectors() const
{
return m_Size; /**< @return disk size */
return m_Sectors; /**< @return disk size */
}
bool smartStatus() const
@ -127,9 +127,9 @@ public:
m_SerialNumber = serial;
}
void setSize(quint64 size)
void setSectors(quint64 numSectors)
{
m_Size = size;
m_Sectors = numSectors;
}
void setPowerCycles(quint64 powerCycleCt)
@ -159,7 +159,7 @@ private:
QString m_ModelName;
QString m_FirmwareVersion;
QString m_SerialNumber;
quint64 m_Size;
quint64 m_Sectors;
quint64 m_Temperature;
quint64 m_BadSectors;
quint64 m_PoweredOn;

14
src/core/smartparser.cpp
View File

@ -64,6 +64,7 @@ bool SmartParser::init()
QString status = QStringLiteral("status");
QString value = QStringLiteral("value");
QString user_capacity = QStringLiteral("user_capacity");
QString blocks = QStringLiteral("blocks");
if (!smartJson.contains(device)) {
qDebug() << "smart disk open failed for " << devicePath() << ": " << strerror(errno);
@ -91,15 +92,10 @@ bool SmartParser::init()
m_DiskInformation->setModel(smartJson[model_name].toString());
m_DiskInformation->setFirmware(smartJson[firmware].toString());
m_DiskInformation->setSerial(smartJson[serial_number].toString());
if (smartJson[user_capacity].isObject()) {
// smartmontools 7.0+
const auto user_capacity_object = smartJson[user_capacity].toObject();
QString user_capacity_bytes = QStringLiteral("bytes");
m_DiskInformation->setSize(user_capacity_object[user_capacity_bytes].toVariant().toULongLong());
} else {
m_DiskInformation->setSize(smartJson[user_capacity].toVariant().toULongLong());
}
const auto user_capacity_object = smartJson[user_capacity].toObject();
QString user_capacity_blocks = QStringLiteral("bytes");
m_DiskInformation->setSectors(user_capacity_object[user_capacity_blocks].toVariant().toULongLong());
QJsonObject selfTest = smartJson[self_test].toObject();
QJsonObject selfTestStatus = selfTest[status].toObject();