aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-08-14 11:20:47 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-24 08:46:48 -0500
commit0d6b0b1d8190738b820955bf749741c1ae60e7d7 (patch)
treec2b6aa158de3ecf67ac9c8c533c6697354041e12
parent5ec4d682d27afad912a3f7866fa0d87d37912aa3 (diff)
downloadqemu-0d6b0b1d8190738b820955bf749741c1ae60e7d7.zip
qemu-0d6b0b1d8190738b820955bf749741c1ae60e7d7.tar.gz
qemu-0d6b0b1d8190738b820955bf749741c1ae60e7d7.tar.bz2
Make the e1000 the default network adapter for the pc target.
The ne2k is an ancient card that performs pretty terribly under QEMU. In many modern OSes, there is no longer drivers available for the ne2k. Switch the default network adapter to e1000. This card is more widely suppported and performs rather well under QEMU. There may be very old OSes that had a ne2k driver but not an e1000 driver but I think this is likely the exception. I think the average user is better served with an e1000 vs ne2k. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/pc.c4
-rw-r--r--qemu-options.hx2
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/pc.c b/hw/pc.c
index 5664d1b..11b8618 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1264,7 +1264,7 @@ static void pc_init1(ram_addr_t ram_size,
continue;
if (model == NULL)
- model = "ne2k_pci";
+ model = "e1000";
snprintf(nic_oprom, sizeof(nic_oprom), "pxe-%s.bin", model);
oprom_area_size += load_option_rom(nic_oprom, 0xc0000 + oprom_area_size,
@@ -1347,7 +1347,7 @@ static void pc_init1(ram_addr_t ram_size,
if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
pc_init_ne2k_isa(nd, isa_irq);
else
- pci_nic_init(nd, "ne2k_pci", NULL);
+ pci_nic_init(nd, "e1000", NULL);
}
piix4_acpi_system_hot_add_init();
diff --git a/qemu-options.hx b/qemu-options.hx
index 03abb5c..e3bd314 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -828,7 +828,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
STEXI
@item -net nic[,vlan=@var{n}][,macaddr=@var{mac}][,model=@var{type}][,name=@var{name}][,addr=@var{addr}][,vectors=@var{v}]
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 e1000 by default on the PC
target. Optionally, the MAC address can be changed to @var{mac}, the
device address set to @var{addr} (PCI cards only),
and a @var{name} can be assigned for use in monitor commands.