diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 0b62d5eb..806763ff 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -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=][,rate=][,vlan=]", + typetext => "MODEL=XX:XX:XX:XX:XX:XX [,bridge=][,rate=][,tag=]", description => <{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; } diff --git a/pve-bridge b/pve-bridge index faf50fa4..73f2b34f 100755 --- a/pve-bridge +++ b/pve-bridge @@ -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