[pve-devel] [PATCH firewall] Use cfs_config_path from PVE::QemuConfig

Fabian Grünbichler f.gruenbichler at proxmox.com
Mon Mar 7 12:42:02 CET 2016


update after refactoring
---
Note: depends on the patch series refactoring qemu-server

 src/PVE/Firewall.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index a7faeaf..428ffb2 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -28,6 +28,7 @@ my $clusterfw_conf_filename = "$pvefw_conf_dir/cluster.fw";
 my $have_qemu_server;
 eval {
     require PVE::QemuServer;
+    require PVE::QemuConfig;
     $have_qemu_server = 1;
 };
 
@@ -2707,7 +2708,7 @@ sub read_local_vm_config {
 	next if !$d->{type};
 	if ($d->{type} eq 'qemu') {
 	    if ($have_qemu_server) {
-		my $cfspath = PVE::QemuServer::cfs_config_path($vmid);
+		my $cfspath = PVE::QemuConfig->cfs_config_path($vmid);
 		if (my $conf = PVE::Cluster::cfs_read_file($cfspath)) {
 		    $qemu->{$vmid} = $conf;
 		}
-- 
2.1.4





More information about the pve-devel mailing list