Skip to content

Instantly share code, notes, and snippets.

@ayufan
Created January 17, 2015 12:34
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ayufan/b9001ba2232b5c74bd44 to your computer and use it in GitHub Desktop.
Save ayufan/b9001ba2232b5c74bd44 to your computer and use it in GitHub Desktop.
[PATCH] Support additional e1000 variants for VM machines
From 0de3204138bc48e57f6b7255651f185e1c64e941 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 17 Jan 2015 13:32:32 +0100
Subject: [PATCH] Support additional e1000 variants for VM machines
It is required for OS X on qemu
Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
---
PVE/QemuServer.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 55d3e0e..cb3044c 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -504,7 +504,8 @@ for (my $i = 0; $i < $MAX_NUMA; $i++) {
}
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 $netdesc = {
@@ -1360,7 +1361,7 @@ sub parse_net {
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 $mac = defined($3) ? uc($3) : PVE::Tools::random_ether_addr();
$res->{model} = $model;
--
1.8.4.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment