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

pve-bridge-hotplug code deduplication

Browse Source
This commit is contained in:
Wolfgang Bumiller 2015-11-13 16:16:01 +01:00 committed by Dietmar Maurer
parent 03575e8a7c
commit 50669ed5c0
2 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pve-bridge
View File

@ -8,6 +8,12 @@ use PVE::Network;
my $iface = shift; my $iface = shift;
my $hotplug = 0;
if ($iface eq '--hotplug') {
$hotplug = 1;
$iface = shift;
}
die "no interface specified\n" if !$iface; die "no interface specified\n" if !$iface;
die "got strange interface name '$iface'\n" die "got strange interface name '$iface'\n"
@ -16,7 +22,7 @@ die "got strange interface name '$iface'\n"
my $vmid = $1; my $vmid = $1;
my $netid = "net$2"; my $netid = "net$2";
my $migratedfrom = $ENV{PVE_MIGRATED_FROM}; my $migratedfrom = $hotplug ? undef : $ENV{PVE_MIGRATED_FROM};
my $conf = PVE::QemuServer::load_config($vmid, $migratedfrom); my $conf = PVE::QemuServer::load_config($vmid, $migratedfrom);

40
pve-bridge-hotplug
View File

@ -1,39 +1,3 @@
#!/usr/bin/perl #!/bin/sh
use strict; exec /var/lib/qemu-server/pve-bridge --hotplug "$@"
use warnings;
use PVE::QemuServer;
use PVE::Tools qw(run_command);
use PVE::Network;
my $iface = shift;
die "no interface specified\n" if !$iface;
die "got strange interface name '$iface'\n"
if $iface !~ m/^tap(\d+)i(\d+)$/;
my $vmid = $1;
my $netid = "net$2";
my $conf = PVE::QemuServer::load_config($vmid);
my $netconf = $conf->{$netid};
$netconf = $conf->{pending}->{$netid} if defined($conf->{pending}->{$netid});
die "unable to get network config '$netid'\n"
if !defined($netconf);
my $net = PVE::QemuServer::parse_net($netconf);
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};
exit 0;