X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=pve-bridge;h=64490b0a9b70278fc22e4a22c4c8007758457663;hb=caab114a56997e49e6d56c489cfb4bd01c68e5ea;hp=c23c6439d9e3cc16a3f8ee83dad87ace81fb1e4a;hpb=50669ed5c0795abb672ec8ba7c243163b5d0f5f4;p=qemu-server.git

diff --git a/pve-bridge b/pve-bridge
index c23c643..64490b0 100755
--- a/pve-bridge
+++ b/pve-bridge
@@ -24,7 +24,7 @@ my $netid = "net$2";
 
 my $migratedfrom = $hotplug ? undef : $ENV{PVE_MIGRATED_FROM};
 
-my $conf = PVE::QemuServer::load_config($vmid, $migratedfrom);
+my $conf = PVE::QemuConfig->load_config($vmid, $migratedfrom);
 
 my $netconf = $conf->{$netid};
 
@@ -38,10 +38,6 @@ die "unable to parse network config '$netid'\n" if !$net;
 
 PVE::Network::tap_create($iface, $net->{bridge});
 
-# if ovs is under this bridge all traffic control settings will be flushed.
-# so we need to call tap_rate_limit after tap_plug
-PVE::Network::tap_plug($iface, $net->{bridge}, $net->{tag}, $net->{firewall});
-
-PVE::Network::tap_rate_limit($iface, $net->{rate}) if $net->{rate};
+PVE::Network::tap_plug($iface, $net->{bridge}, $net->{tag}, $net->{firewall}, $net->{trunks}, $net->{rate});
 
 exit 0;