proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-07 10:39:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use methods from PVE::QemuConfig

Browse Source 
use config_file and load_config from PVE::QemuConfig
This commit is contained in:
Fabian Grünbichler 2016-03-07 12:43:07 +01:00 committed by Dietmar Maurer
parent a9f712828d
commit 7141ae254a
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/API2/Nodes.pm
View File

@ -25,6 +25,7 @@ use PVE::APLInfo;
use PVE::Report; use PVE::Report;
use PVE::HA::Env::PVE2; use PVE::HA::Env::PVE2;
use PVE::HA::Config; use PVE::HA::Config;
use PVE::QemuConfig;
use PVE::QemuServer; use PVE::QemuServer;
use PVE::API2::Subscription; use PVE::API2::Subscription;
use PVE::API2::Services; use PVE::API2::Services;
@ -1193,7 +1194,7 @@ my $get_start_stop_list = sub {
if ($d->{type} eq 'lxc') { if ($d->{type} eq 'lxc') {
$conf = PVE::LXC::Config->load_config($vmid); $conf = PVE::LXC::Config->load_config($vmid);
} elsif ($d->{type} eq 'qemu') { } elsif ($d->{type} eq 'qemu') {
$conf = PVE::QemuServer::load_config($vmid); $conf = PVE::QemuConfig->load_config($vmid);
} else { } else {
die "unknown VM type '$d->{type}'\n"; die "unknown VM type '$d->{type}'\n";
} }

7
bin/ocf/pvevm
View File

@ -15,6 +15,7 @@ use PVE::INotify;
use PVE::RPCEnvironment; use PVE::RPCEnvironment;
use PVE::OpenVZ; use PVE::OpenVZ;
use PVE::API2::OpenVZ; use PVE::API2::OpenVZ;
use PVE::QemuConfig;
use PVE::QemuServer; use PVE::QemuServer;
use PVE::API2::Qemu; use PVE::API2::Qemu;
@ -209,8 +210,8 @@ if ($cmd eq 'start') {
ocf_log('info', "Move config for $status->{name} to local node"); ocf_log('info', "Move config for $status->{name} to local node");
my ($oldconfig, $newconfig, $oldfiles, $newfiles); my ($oldconfig, $newconfig, $oldfiles, $newfiles);
if ($status->{type} eq 'qemu') { if ($status->{type} eq 'qemu') {
$oldconfig = PVE::QemuServer::config_file($status->{vmid}, $status->{node}); $oldconfig = PVE::QemuConfig->config_file($status->{vmid}, $status->{node});
$newconfig = PVE::QemuServer::config_file($status->{vmid}, $nodename); $newconfig = PVE::QemuConfig->config_file($status->{vmid}, $nodename);
} else { } else {
$oldconfig = PVE::OpenVZ::config_file($status->{vmid}, $status->{node}); $oldconfig = PVE::OpenVZ::config_file($status->{vmid}, $status->{node});
$newconfig = PVE::OpenVZ::config_file($status->{vmid}, $nodename); $newconfig = PVE::OpenVZ::config_file($status->{vmid}, $nodename);
@ -349,7 +350,7 @@ if ($cmd eq 'start') {
my $oldconfig; my $oldconfig;
if ($status->{type} eq 'qemu') { if ($status->{type} eq 'qemu') {
$oldconfig = PVE::QemuServer::config_file($status->{vmid}, $status->{node}); $oldconfig = PVE::QemuConfig->config_file($status->{vmid}, $status->{node});
$upid = PVE::API2::Qemu->migrate_vm($params); $upid = PVE::API2::Qemu->migrate_vm($params);
} else { } else {
$oldconfig = PVE::OpenVZ::config_file($status->{vmid}, $status->{node}); $oldconfig = PVE::OpenVZ::config_file($status->{vmid}, $status->{node});