summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Jones <rjones@trick.home.annexia.org>2009-08-06 13:38:17 +0100
committerRichard Jones <rjones@trick.home.annexia.org>2009-08-06 13:40:08 +0100
commit5d78de834c53bfe29d2cc0397ac093428abe8425 (patch)
treeee2d92b2f3e9c7aebfd7ffaf925f64874d3edb97
parentfbb3482a48b46f2ae51fb7600926fc04dc2c5ef1 (diff)
downloadlibguestfs-5d78de834c53bfe29d2cc0397ac093428abe8425.tar.gz
libguestfs-5d78de834c53bfe29d2cc0397ac093428abe8425.tar.xz
libguestfs-5d78de834c53bfe29d2cc0397ac093428abe8425.zip
Add ne2k-pci driver to the appliance.
This allows people to use the ne2k-pci network driver, for those situations where the virtio_net driver is broken (cough 516022 cough).
-rw-r--r--appliance/kmod.whitelist.in4
-rw-r--r--src/guestfs.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/appliance/kmod.whitelist.in b/appliance/kmod.whitelist.in
index 6fb5eff2..3901a57e 100644
--- a/appliance/kmod.whitelist.in
+++ b/appliance/kmod.whitelist.in
@@ -7,6 +7,10 @@
virtio*.ko
+# We normally use virtio_net, but keep these in reserve.
+8390.ko
+ne2k-pci.ko
+
# drivers for QEMUs IDE/SCSI device emulation
cdrom.ko
i2c-piix4.ko
diff --git a/src/guestfs.c b/src/guestfs.c
index edff8eb5..de632751 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1103,7 +1103,7 @@ guestfs_launch (guestfs_h *g)
}
#endif
add_cmdline (g, "-net");
- add_cmdline (g, "nic,model=virtio,vlan=0");
+ add_cmdline (g, "nic,model=virtio,vlan=0"); /* model=ne2k_pci also works */
/* These options recommended by KVM developers to improve reliability. */
if (qemu_supports (g, "-no-hpet"))