From: Guido Guenther <[EMAIL PROTECTED]>
If we change the default nic, we should do so in all places. Without
this PXE booting is broken since we select the wrong pxe etherboot
image.
Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
diff --git a/qemu/qemu-doc.texi b/qemu/qemu-doc.texi
index ab017e3..3cce7b8 100644
--- a/qemu/qemu-doc.texi
+++ b/qemu/qemu-doc.texi
@@ -500,7 +500,7 @@ Network options:
@item -net nic[,[EMAIL PROTECTED],[EMAIL PROTECTED],[EMAIL PROTECTED]
Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n}
-= 0 is the default). The NIC is an ne2k_pci by default on the PC
+= 0 is the default). The NIC is an rtl8139 by default on the PC
target. Optionally, the MAC address can be changed. If no
@option{-net} option is specified, a single NIC is created.
Qemu can emulate several different models of network card.
diff --git a/qemu/vl.c b/qemu/vl.c
index 0f023ac..756e13d 100644
--- a/qemu/vl.c
+++ b/qemu/vl.c
@@ -9288,7 +9288,7 @@ int main(int argc, char **argv)
char buf[1024];
if (net_boot & (1 << i)) {
if (model == NULL)
- model = "ne2k_pci";
+ model = "rtl8139";
snprintf(buf, sizeof(buf), "%s/pxe-%s.bin", bios_dir, model);
if (get_image_size(buf) > 0) {
if (nb_option_roms >= MAX_OPTION_ROMS) {
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits
