proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-14 12:30:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use new PVE::Cluster::vm_is_ha_managed

Browse Source
This commit is contained in:
Dietmar Maurer 2015-03-02 10:31:46 +01:00
parent 4841125d66
commit 5b584381dd
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/API2/Qemu.pm
View File

@ -1500,16 +1500,6 @@ __PACKAGE__->register_method({
return $res; return $res;
}}); }});
my $vm_is_ha_managed = sub {
my ($vmid) = @_;
my $cc = PVE::Cluster::cfs_read_file('cluster.conf');
if (PVE::Cluster::cluster_conf_lookup_pvevm($cc, 0, $vmid, 1)) {
return 1;
}
return 0;
};
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'vm_status', name => 'vm_status',
path => '{vmid}/status/current', path => '{vmid}/status/current',
@ -1537,7 +1527,7 @@ __PACKAGE__->register_method({
my $vmstatus = PVE::QemuServer::vmstatus($param->{vmid}, 1); my $vmstatus = PVE::QemuServer::vmstatus($param->{vmid}, 1);
my $status = $vmstatus->{$param->{vmid}}; my $status = $vmstatus->{$param->{vmid}};
$status->{ha} = &$vm_is_ha_managed($param->{vmid}); $status->{ha} = PVE::Cluster::vm_is_ha_managed($param->{vmid});
$status->{spice} = 1 if PVE::QemuServer::vga_conf_has_spice($conf->{vga}); $status->{spice} = 1 if PVE::QemuServer::vga_conf_has_spice($conf->{vga});
@ -1604,7 +1594,7 @@ __PACKAGE__->register_method({
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
if (&$vm_is_ha_managed($vmid) && !$stateuri && if (PVE::Cluster::vm_is_ha_managed($vmid) && !$stateuri &&
$rpcenv->{type} ne 'ha') { $rpcenv->{type} ne 'ha') {
my $hacmd = sub { my $hacmd = sub {
@ -1700,7 +1690,7 @@ __PACKAGE__->register_method({
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
if (&$vm_is_ha_managed($vmid) && ($rpcenv->{type} ne 'ha') && !defined($migratedfrom)) { if (PVE::Cluster::vm_is_ha_managed($vmid) && ($rpcenv->{type} ne 'ha') && !defined($migratedfrom)) {
my $hacmd = sub { my $hacmd = sub {
my $upid = shift; my $upid = shift;
@ -2572,7 +2562,7 @@ __PACKAGE__->register_method({
my $storecfg = PVE::Storage::config(); my $storecfg = PVE::Storage::config();
PVE::QemuServer::check_storage_availability($storecfg, $conf, $target); PVE::QemuServer::check_storage_availability($storecfg, $conf, $target);
if (&$vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') { if (PVE::Cluster::vm_is_ha_managed($vmid) && $rpcenv->{type} ne 'ha') {
my $hacmd = sub { my $hacmd = sub {
my $upid = shift; my $upid = shift;