Merge pull request jiangcuo#161 from jiangcuo/pve-common2

add cpuname parse on arm64

Author: jiangcuo

packages/pve-common/patches/002-add-cpuname-parse-on-arm64.patch

@@ -0,0 +1,36 @@
+diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm
+index 3826fcc..8d7151b 100644
+--- a/src/PVE/ProcFSTools.pm
++++ b/src/PVE/ProcFSTools.pm
+@@ -10,7 +10,8 @@ use POSIX;
+ use Socket qw(PF_INET PF_INET6 SOCK_DGRAM IPPROTO_IP);
+ use Time::HiRes qw (gettimeofday);
+ 
+-use PVE::Tools;
++use PVE::Tools qw(get_host_arch);
++use JSON;
+ 
+ use constant IFF_UP => 1;
+ use constant IFNAMSIZ => 16;
+@@ -57,6 +58,21 @@ sub read_cpuinfo {
+ 	}
+     }
+ 
++    my $arch = get_host_arch();
++    my $hardinfo = '/run/pve/query-machine-info';
++
++    if ($arch eq 'aarch64'  && $res->{model} eq 'unknown' && -e $hardinfo){
++	$hardinfo = IO::File->new ($hardinfo, "r");
++	return if !$hardinfo;
++	my $data = do { local $/; <$hardinfo> };
++	$data = decode_json($data);
++	foreach my $item (@$data) {
++		if (exists $item->{cpu}) {
++			$res->{model} = $item->{cpu};
++		}
++	}
++	$hardinfo->close;
++    }
+     # Hardware Virtual Machine (Intel VT / AMD-V)
+     $res->{hvm} = $res->{flags} =~ m/\s(vmx|svm)\s/;
+ 

packages/pve-common/series

@@ -1,2 +1,3 @@
 patches/001-add-for-port.patch
 patches/changelog/001-add-changlog.patch
+patches/002-add-cpuname-parse-on-arm64.patch