Include CPU flags in read_cpuinfo

[pve-common.git] / src / PVE / ProcFSTools.pm

diff --git a/src/PVE/ProcFSTools.pm b/src/PVE/ProcFSTools.pm
index 05fd744367a9780fa80a719751bb897eb4296ecd..027aa3ad1bc5140926e8367dc07f76b7f6469bf9 100644 (file)
--- a/src/PVE/ProcFSTools.pm
+++ b/src/PVE/ProcFSTools.pm
@@ -29,6 +29,7 @@ sub read_cpuinfo {
        mhz => 0,
        cpus => 1,
        sockets => 1,
+       flags => '',
     };
 
     my $fh = IO::File->new ($fn, "r");
@@ -43,19 +44,22 @@ sub read_cpuinfo {
            $res->{model} = $1 if $res->{model} eq 'unknown';
        } elsif ($line =~ m/^cpu\s+MHz\s*:\s*(\d+\.\d+)\s*$/i) {
            $res->{mhz} = $1 if !$res->{mhz};
-       } elsif ($line =~ m/^flags\s*:.*(vmx|svm)/) {
-           $res->{hvm} = 1; # Hardware Virtual Machine (Intel VT / AMD-V)
+       } elsif ($line =~ m/^flags\s*:\s*(.*)$/) {
+           $res->{flags} = $1 if !length $res->{flags};
        } elsif ($line =~ m/^physical id\s*:\s*(\d+)\s*$/i) {
            $idhash->{$1} = 1;
        }
     }
 
+    # Hardware Virtual Machine (Intel VT / AMD-V)
+    $res->{hvm} = $res->{flags} =~ m/\s(vmx|svm)\s/;
+
     $res->{sockets} = scalar(keys %$idhash) || 1;
 
     $res->{cpus} = $count;
 
     $fh->close;
-    
+
     $cpuinfo = $res;
 
     return $res;
@@ -292,7 +296,7 @@ sub read_proc_net_route {
 }
 
 sub read_proc_mounts {
-    return PVE::Tools::file_get_contents("/proc/mounts");
+    return PVE::Tools::file_get_contents("/proc/mounts", 512*1024);
 }
 
 # mounts encode spaces (\040), tabs (\011), newlines (\012), backslashes (\\ or \134)