提交 7c23b892 编写于 作者: B balrog

E1000 NIC emulation (Nir Peleg, patch from Dor Laor).

Applied %s/^\([^I ]*\)^I/\1    /g on e1000.c and added e1000 to help message.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3949 c046a42c-6fe2-441c-8c8c-71466251a162
上级 dd48594e
...@@ -524,6 +524,7 @@ OBJS += eepro100.o ...@@ -524,6 +524,7 @@ OBJS += eepro100.o
OBJS += ne2000.o OBJS += ne2000.o
OBJS += pcnet.o OBJS += pcnet.o
OBJS += rtl8139.o OBJS += rtl8139.o
OBJS += e1000.o
ifeq ($(TARGET_BASE_ARCH), i386) ifeq ($(TARGET_BASE_ARCH), i386)
# Hardware support # Hardware support
......
此差异已折叠。
此差异已折叠。
...@@ -636,11 +636,13 @@ void pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn) ...@@ -636,11 +636,13 @@ void pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn)
pci_i82559er_init(bus, nd, devfn); pci_i82559er_init(bus, nd, devfn);
} else if (strcmp(nd->model, "rtl8139") == 0) { } else if (strcmp(nd->model, "rtl8139") == 0) {
pci_rtl8139_init(bus, nd, devfn); pci_rtl8139_init(bus, nd, devfn);
} else if (strcmp(nd->model, "e1000") == 0) {
pci_e1000_init(bus, nd, devfn);
} else if (strcmp(nd->model, "pcnet") == 0) { } else if (strcmp(nd->model, "pcnet") == 0) {
pci_pcnet_init(bus, nd, devfn); pci_pcnet_init(bus, nd, devfn);
} else if (strcmp(nd->model, "?") == 0) { } else if (strcmp(nd->model, "?") == 0) {
fprintf(stderr, "qemu: Supported PCI NICs: i82551 i82557b i82559er" fprintf(stderr, "qemu: Supported PCI NICs: i82551 i82557b i82559er"
" ne2k_pci pcnet rtl8139\n"); " ne2k_pci pcnet rtl8139 e1000\n");
exit (1); exit (1);
} else { } else {
fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model); fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model);
......
...@@ -126,6 +126,9 @@ void pci_ne2000_init(PCIBus *bus, NICInfo *nd, int devfn); ...@@ -126,6 +126,9 @@ void pci_ne2000_init(PCIBus *bus, NICInfo *nd, int devfn);
void pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn); void pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn);
/* e1000.c */
void pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn);
/* pcnet.c */ /* pcnet.c */
void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn); void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn);
......
...@@ -549,7 +549,7 @@ Qemu can emulate several different models of network card. ...@@ -549,7 +549,7 @@ Qemu can emulate several different models of network card.
Valid values for @var{type} are Valid values for @var{type} are
@code{i82551}, @code{i82557b}, @code{i82559er}, @code{i82551}, @code{i82557b}, @code{i82559er},
@code{ne2k_pci}, @code{ne2k_isa}, @code{pcnet}, @code{rtl8139}, @code{ne2k_pci}, @code{ne2k_isa}, @code{pcnet}, @code{rtl8139},
@code{smc91c111}, @code{lance} and @code{mcf_fec}. @code{e1000}, @code{smc91c111}, @code{lance} and @code{mcf_fec}.
Not all devices are supported on all targets. Use -net nic,model=? Not all devices are supported on all targets. Use -net nic,model=?
for a list of available devices for your target. for a list of available devices for your target.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册