proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-03 18:49:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

renamme vlan option to tag

Browse Source 
Signed-off-by: Derumier Alexandre <aderumier@odiso.com>
This commit is contained in:
Derumier Alexandre 2012-03-21 13:58:04 +01:00 committed by Dietmar Maurer
parent fc1ddcdcae
commit 5070f384d1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/QemuServer.pm
View File

@ -404,7 +404,7 @@ my $nic_model_list_txt = join(' ', sort @$nic_model_list);
my $netdesc = {
optional => 1,
type => 'string', format => 'pve-qm-net',
typetext => "MODEL=XX:XX:XX:XX:XX:XX [,bridge=<dev>][,rate=<mbps>][,vlan=<vlanid>]",
typetext => "MODEL=XX:XX:XX:XX:XX:XX [,bridge=<dev>][,rate=<mbps>][,tag=<vlanid>]",
description => <<EODESCR,
Specify network devices.
@ -1108,8 +1108,8 @@ sub parse_net {
$res->{bridge} = $1;
} elsif ($kvp =~ m/^rate=(\d+(\.\d+)?)$/) {
$res->{rate} = $1;
} elsif ($kvp =~ m/^vlan=(\d+)$/) {
$res->{vlan} = $1;
} elsif ($kvp =~ m/^tag=(\d+)$/) {
$res->{tag} = $1;
} else {
return undef;
}
@ -1128,7 +1128,7 @@ sub print_net {
$res .= "=$net->{macaddr}" if $net->{macaddr};
$res .= ",bridge=$net->{bridge}" if $net->{bridge};
$res .= ",rate=$net->{rate}" if $net->{rate};
$res .= ",vlan=$net->{vlan}" if $net->{vlan};
$res .= ",vlan=$net->{tag}" if $net->{tag};
return $res;
}

4
pve-bridge
View File

@ -63,9 +63,9 @@ if ($net->{rate}) {
}
if ($net->{vlan}) {
if ($net->{tag}) {
my $vlan = $net->{vlan};
my $vlan = $net->{tag};
my $bridgevlan = $bridge."v".$vlan;
#check if we have an only one ethX or bondX interface in the bridge