diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rwxr-xr-x | make-initramfs.sh.in | 9 | ||||
| -rw-r--r-- | src/guestfs.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index f2f26e70..452a0368 100644 --- a/Makefile.am +++ b/Makefile.am @@ -197,7 +197,7 @@ test-boot-realistic: emptydisk -serial stdio \ -net channel,6666:unix:/tmp/sock,server,nowait \ -net user,vlan=0 \ - -net nic,vlan=0 + -net nic,model=virtio,vlan=0 # Make clean. diff --git a/make-initramfs.sh.in b/make-initramfs.sh.in index 690ca51a..f641cd00 100755 --- a/make-initramfs.sh.in +++ b/make-initramfs.sh.in @@ -83,8 +83,10 @@ find initramfs -name '*python*' -print0 | xargs -0 rm -rf # we don't need many drivers (which take up most of the space). find initramfs/lib/modules/*/kernel \ -name '*.ko' \ - -a ! -name 'mii.ko' \ - -a ! -name '8139cp.ko' \ + -a ! -name 'virtio.ko' \ + -a ! -name 'virtio_net.ko' \ + -a ! -name 'virtio_pci.ko' \ + -a ! -name 'virtio_ring.ko' \ -a ! -name 'ext2.ko' \ -a ! -name 'ext4.ko' \ -a ! -name 'crc16.ko' \ @@ -132,7 +134,8 @@ MAKEDEV mem null port zero core full ram tty console fd \ mount -t proc /proc /proc mount -t sysfs /sys /sys mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts -modprobe 8139cp +modprobe virtio_pci +modprobe virtio_net /sbin/ifconfig lo 127.0.0.1 /sbin/ifconfig eth0 10.0.2.10 /sbin/route add default gw 10.0.2.2 diff --git a/src/guestfs.c b/src/guestfs.c index c2d58e82..395bc97c 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -809,7 +809,7 @@ guestfs_launch (guestfs_h *g) add_cmdline (g, "-net"); add_cmdline (g, "user,vlan=0"); add_cmdline (g, "-net"); - add_cmdline (g, "nic,model=rtl8139,vlan=0"); + add_cmdline (g, "nic,model=virtio,vlan=0"); incr_cmdline_size (g); g->cmdline[g->cmdline_size-1] = NULL; |