From: Guido G. <ag...@si...> - 2008-01-08 11:23:54
|
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. Cheers, -- Guido diff --git a/qemu/qemu-doc.texi b/qemu/qemu-doc.texi index 04529a1..accf360 100644 --- a/qemu/qemu-doc.texi +++ b/qemu/qemu-doc.texi @@ -498,7 +498,7 @@ Network options: @item -net nic[,vlan=@var{n}][,macaddr=@var{addr}][,model=@var{type}] 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 b84ddd5..64f2709 100644 --- a/qemu/vl.c +++ b/qemu/vl.c @@ -9217,7 +9217,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) { |