소스 검색

VM-Flag implementiert

Rind 3 년 전
부모
커밋
82c6c93b21
4개의 변경된 파일18개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 1
      README.md
  2. 1 1
      gfaqt.pro
  3. 5 2
      src/qappctrl.h
  4. 8 1
      src/qsysinfo.cpp

+ 4 - 1
README.md

@@ -5,7 +5,7 @@ Allgemeine Bibliothek für QML-Objekte und Objekte mit QT-Bindung, mit Ausnahme
 ---
 
 ***Version:***  
-libgfaqt.so.1.3.0  
+libgfaqt.so.1.4.0  
 
 ***SO-Name:***  
 libgfaqt.so.1
@@ -49,3 +49,6 @@ libgfaqt.so (-lgfaqt)
 
 * **1.3.0**
 	* Tiva-Erkennung implementiert.
+
+* **1.4.0**
+	* VM-Erkennung implementiert.

+ 1 - 1
gfaqt.pro

@@ -1,5 +1,5 @@
 TEMPLATE = lib
-VERSION = 1.3
+VERSION = 1.4
 QT += qml quick core
 CONFIG -= app_bundle
 CONFIG += c++11 shared thread

+ 5 - 2
src/qappctrl.h

@@ -828,9 +828,10 @@ class QGfaSysInfo : public QObject
 	Q_PROPERTY(quint64 memBuffers READ memBuffers NOTIFY memBuffersChanged)
 	Q_PROPERTY(quint64 memCached READ memCached NOTIFY memCachedChanged)
     Q_PROPERTY(QGfaStgDevList *stgDev READ stgDev CONSTANT)
-    Q_PROPERTY(bool bootFromEmmc READ bootFromEmmc NOTIFY bootFromEmmcChanged)
     Q_PROPERTY(QTivaInfo *tivaInfo READ tivaInfo CONSTANT)
     Q_PROPERTY(QNetworkInterfaces *netInterfaceInfo READ netInterfaceInfo CONSTANT)
+    Q_PROPERTY(bool bootFromEmmc READ bootFromEmmc NOTIFY bootFromEmmcChanged)
+    Q_PROPERTY(bool hypervised READ hypervised CONSTANT)
 
 public:
 	explicit QGfaSysInfo(QObject *pParent = NULL);
@@ -853,9 +854,10 @@ private:
 	quint64 memBuffers(void) const;
 	quint64 memCached(void) const;
 	QGfaStgDevList* stgDev(void);
-	bool bootFromEmmc(void) const;
 	QTivaInfo* tivaInfo(void);
 	QNetworkInterfaces* netInterfaceInfo(void);
+	bool bootFromEmmc(void) const;
+	bool hypervised(void) const;
 
 public:
 	void setSysMemInfo(LPCGFA_APPCTRL_SYSMEM psm, bool bDoHeavyLoadUpdate = false);
@@ -906,6 +908,7 @@ private:
 	QTivaInfo m_tivaInfo;
 	QNetworkInterfaces m_netInterfaces;
 	bool m_bootFromEmmc;
+	bool m_isHypervised;
 };
 
 /////////////////////////////////////////////////////////////////////////////

+ 8 - 1
src/qsysinfo.cpp

@@ -490,7 +490,8 @@ QGfaSysInfo::QGfaSysInfo(QObject *pParent) : 	QObject(pParent),
 												m_nMemAvailable(0),
 												m_nMemBuffers(0),
 												m_nMemCached(0),
-												m_bootFromEmmc(false)
+												m_bootFromEmmc(false),
+												m_isHypervised(false)
 {
 	m_netInterfaces.initialize();
 }
@@ -498,6 +499,7 @@ QGfaSysInfo::QGfaSysInfo(QObject *pParent) : 	QObject(pParent),
 QGfaSysInfo::~QGfaSysInfo(void)
 {
     setObjectName("QGfaSysInfo");
+    m_isHypervised = ::GfAIpcSystemIsHypervised();
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -661,3 +663,8 @@ void QGfaSysInfo::setBootFromEmmc(bool bootFromEmmc)
 		emit bootFromEmmcChanged(m_bootFromEmmc);
 	}
 }
+
+bool QGfaSysInfo::hypervised(void) const
+{
+	return m_isHypervised;
+}