disable kvm cpu signature if x-vga is enabled

[qemu-server.git] / pve-bridge

diff --git a/pve-bridge b/pve-bridge
index 8e50112c5a55b33bcca1f88adb703a438ffd60c8..d6c5eb8732a8a1a753307dff889259f744576ac9 100755 (executable)
--- a/pve-bridge
+++ b/pve-bridge
@@ -1,6 +1,7 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 
 use strict;
+use warnings;
 use PVE::QemuServer;
 use PVE::Tools qw(run_command);
 use PVE::Network;
@@ -25,28 +26,10 @@ die "unable to get network config '$netid'\n"
 my $net = PVE::QemuServer::parse_net($conf->{$netid});
 die "unable to parse network config '$netid'\n" if !$net;
 
-my $bridge = $net->{bridge};
-die "unable to get bridge setting\n" if !$bridge;
+PVE::Network::tap_create($iface, $net->{bridge});
 
-my $bridgemtu = PVE::Tools::file_read_firstline("/sys/class/net/$bridge/mtu");
-die "bridge '$bridge' does not exist\n" if !$bridgemtu;
+PVE::Network::tap_rate_limit($iface, $net->{rate}) if $net->{rate};
 
-system ("/sbin/ifconfig $iface 0.0.0.0 promisc up mtu $bridgemtu") == 0 ||
-    die "interface activation failed\n";
-
-if ($net->{rate}) {
-
-    my $debug = 0;
-    my $rate = int($net->{rate}*1024*1024);
-    my $burst = 1024*1024;
-
-    PVE::Network::setup_tc_rate_limit($iface, $rate, $burst, $debug);
-}
-
-my $newbridge = PVE::Network::activate_bridge_vlan($bridge, $net->{tag});
-PVE::Network::copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
-
-system ("/usr/sbin/brctl addif $newbridge $iface") == 0 ||
-    die "can't add interface to bridge\n";
+PVE::Network::tap_plug($iface, $net->{bridge}, $net->{tag}, $net->{firewall});
 
 exit 0;