fix some issue
This commit is contained in:
parent
6eabd0c2d0
commit
e8bf69ad49
@ -513,11 +513,37 @@ diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
|
||||
index ce5012e0..ef8bf035 100644
|
||||
--- a/PVE/QemuServer.pm
|
||||
+++ b/PVE/QemuServer.pm
|
||||
@@ -3108,6 +3108,7 @@ sub vmstatus {
|
||||
@@ -3108,6 +3108,8 @@ sub vmstatus {
|
||||
$d->{cpus} = $conf->{vcpus} if $conf->{vcpus};
|
||||
|
||||
$d->{name} = $conf->{name} || "VM $vmid";
|
||||
+ $d->{pxclouduuid} = $conf->{pxclouduuid} || generate_vm_uuid($vmid,0);
|
||||
+ $d->{arch} = $conf->{arch} || get_host_arch();
|
||||
$d->{maxmem} = get_current_memory($conf->{memory})*(1024*1024);
|
||||
|
||||
if ($conf->{balloon}) {
|
||||
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
|
||||
index b38c863f..e5a97d75 100644
|
||||
--- a/PVE/API2/Qemu.pm
|
||||
+++ b/PVE/API2/Qemu.pm
|
||||
@@ -663,6 +663,7 @@ my $hwtypeoptions = {
|
||||
|
||||
my $generaloptions = {
|
||||
'agent' => 1,
|
||||
+ 'arch' => 1,
|
||||
'autostart' => 1,
|
||||
'bios' => 1,
|
||||
'description' => 1,
|
||||
diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
|
||||
index fe9c8241..a9fdd18e 100755
|
||||
--- a/PVE/CLI/qm.pm
|
||||
+++ b/PVE/CLI/qm.pm
|
||||
@@ -1125,7 +1125,7 @@ our $cmddef = {
|
||||
qw(VMID NAME PXCLOUDUUID ARCH STATUS MEM(MB) BOOTDISK(GB) PID);
|
||||
|
||||
foreach my $rec (sort { $a->{vmid} <=> $b->{vmid} } @$vmlist) {
|
||||
- printf "%10s %-20s %-10s %-10s %12.2f %-10s\n", $rec->{vmid}, $rec->{name},
|
||||
+ printf "%10s %-20s %-40s %-12s %-10s %-10s %12.2f %-10s\n", $rec->{vmid}, $rec->{name},
|
||||
$rec->{pxclouduuid},
|
||||
$rec->{arch},
|
||||
$rec->{qmpstatus} || $rec->{status},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user