fix yumaojun03#22

chennqqi · Oct 21, 2023 · a9abb2d · a9abb2d
1 parent 78622fc
commit a9abb2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/parser/system/parse.go b/parser/system/parse.go
@@ -8,16 +8,15 @@ import (
 )
 
 // Parse 解析smbios struct数据
-func Parse(s *smbios.Structure) (info *Information, err error) {
+func Parse(entry *smbios.EntryPoint, s *smbios.Structure) (info *Information, err error) {
 	defer smbios.ParseRecovery(s, &err)
-
 	info = &Information{
 		Header:       s.Header,
 		Manufacturer: s.GetString(0x0),
 		ProductName:  s.GetString(0x1),
 		Version:      s.GetString(0x2),
 		SerialNumber: s.GetString(0x3),
-		UUID:         uuid(s.GetBytes(0x04, 0x14), s.GetString(2)),
+		UUID:         uuid(s.GetBytes(0x04, 0x14), entry.HexVersion()),
 		WakeUpType:   WakeUpType(s.GetByte(0x14)),
 		SKUNumber:    s.GetString(0x15),
 		Family:       s.GetString(0x16),

diff --git a/smbios/structure.go b/smbios/structure.go
@@ -28,6 +28,10 @@ type EntryPoint struct {
 	Revision int `json:"revision,omitempty"`
 }
 
+func (e EntryPoint) HexVersion() uint32 {
+	return 0xFF & (uint32(e.Major)<<8 | (uint32(e.Minor) & 0xFF))
+}
+
 // A Header is a Structure's header.
 type Header struct {
 	Type   uint8