proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-21 10:02:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Support additional e1000 variants for VM machines

Browse Source 
It is required for OS X on qemu

Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
This commit is contained in:
Kamil Trzcinski 2015-01-17 13:46:32 +01:00 committed by Dietmar Maurer
parent 6271650ec8
commit 55034103fe
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/QemuServer.pm
View File

@ -504,7 +504,8 @@ for (my $i = 0; $i < $MAX_NUMA; $i++) {
} }
my $nic_model_list = ['rtl8139', 'ne2k_pci', 'e1000', 'pcnet', 'virtio', my $nic_model_list = ['rtl8139', 'ne2k_pci', 'e1000', 'pcnet', 'virtio',
'ne2k_isa', 'i82551', 'i82557b', 'i82559er', 'vmxnet3']; 'ne2k_isa', 'i82551', 'i82557b', 'i82559er', 'vmxnet3',
'e1000-82540em', 'e1000-82544gc', 'e1000-82545em'];
my $nic_model_list_txt = join(' ', sort @$nic_model_list); my $nic_model_list_txt = join(' ', sort @$nic_model_list);
my $netdesc = { my $netdesc = {
@ -1360,7 +1361,7 @@ sub parse_net {
foreach my $kvp (split(/,/, $data)) { foreach my $kvp (split(/,/, $data)) {
if ($kvp =~ m/^(ne2k_pci|e1000|rtl8139|pcnet|virtio|ne2k_isa|i82551|i82557b|i82559er|vmxnet3)(=([0-9a-f]{2}(:[0-9a-f]{2}){5}))?$/i) { if ($kvp =~ m/^(ne2k_pci|e1000|e1000-82540em|e1000-82544gc|e1000-82545em|rtl8139|pcnet|virtio|ne2k_isa|i82551|i82557b|i82559er|vmxnet3)(=([0-9a-f]{2}(:[0-9a-f]{2}){5}))?$/i) {
my $model = lc($1); my $model = lc($1);
my $mac = defined($3) ? uc($3) : PVE::Tools::random_ether_addr(); my $mac = defined($3) ? uc($3) : PVE::Tools::random_ether_addr();
$res->{model} = $model; $res->{model} = $model;