diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-27 19:41:17 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-05-27 19:41:17 +0000 |
| commit | c4a7060cf70e2e72f44a98307f453eba07e09bea (patch) | |
| tree | 9021e71365a50d0a36f85d842acd1c6f9b7b9c3c /hw | |
| parent | 7f75ffd39e4857dbeea32594e7523bf311aecf87 (diff) | |
New option -net nic,model=? (Mark Glines)
Network documentation update (Mark Glines)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2880 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/integratorcp.c | 3 | ||||
| -rw-r--r-- | hw/mips_r4k.c | 3 | ||||
| -rw-r--r-- | hw/pc.c | 5 | ||||
| -rw-r--r-- | hw/pci.c | 4 | ||||
| -rw-r--r-- | hw/ppc_prep.c | 3 | ||||
| -rw-r--r-- | hw/sun4m.c | 3 |
6 files changed, 21 insertions, 0 deletions
diff --git a/hw/integratorcp.c b/hw/integratorcp.c index c9e1715f37..6572af8ec9 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -500,6 +500,9 @@ static void integratorcp_init(int ram_size, int vga_ram_size, int boot_device, if (nd_table[0].model == NULL || strcmp(nd_table[0].model, "smc91c111") == 0) { smc91c111_init(&nd_table[0], 0xc8000000, pic[27]); + } else if (strcmp(nd_table[0].model, "?") == 0) { + fprintf(stderr, "qemu: Supported NICs: smc91c111\n"); + exit (1); } else { fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd_table[0].model); exit (1); diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 72e9ac8a68..d600dbbb00 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -227,6 +227,9 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, if (nd_table[0].model == NULL || strcmp(nd_table[0].model, "ne2k_isa") == 0) { isa_ne2000_init(0x300, i8259[9], &nd_table[0]); + } else if (strcmp(nd_table[0].model, "?") == 0) { + fprintf(stderr, "qemu: Supported NICs: ne2k_isa\n"); + exit (1); } else { fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd_table[0].model); exit (1); @@ -865,7 +865,12 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device, if (strcmp(nd->model, "ne2k_isa") == 0) { pc_init_ne2k_isa(nd, i8259); } else if (pci_enabled) { + if (strcmp(nd->model, "?") == 0) + fprintf(stderr, "qemu: Supported ISA NICs: ne2k_isa\n"); pci_nic_init(pci_bus, nd, -1); + } else if (strcmp(nd->model, "?") == 0) { + fprintf(stderr, "qemu: Supported ISA NICs: ne2k_isa\n"); + exit(1); } else { fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model); exit(1); @@ -588,6 +588,10 @@ void pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn) pci_rtl8139_init(bus, nd, devfn); } else if (strcmp(nd->model, "pcnet") == 0) { pci_pcnet_init(bus, nd, devfn); + } else if (strcmp(nd->model, "?") == 0) { + fprintf(stderr, "qemu: Supported PCI NICs: i82551 i82557b i82559er" + " ne2k_pci pcnet rtl8139\n"); + exit (1); } else { fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd->model); exit (1); diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 6a3cd907b9..4b9d9d13f0 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -626,6 +626,9 @@ static void ppc_prep_init (int ram_size, int vga_ram_size, int boot_device, if (nd_table[0].model == NULL || strcmp(nd_table[0].model, "ne2k_isa") == 0) { isa_ne2000_init(ne2000_io[i], i8259[ne2000_irq[i]], &nd_table[i]); + } else if (strcmp(nd_table[0].model, "?") == 0) { + fprintf(stderr, "qemu: Supported NICs: ne2k_isa\n"); + exit (1); } else { /* Why ? */ cpu_abort(env, "qemu: Unsupported NIC: %s\n", nd_table[0].model); diff --git a/hw/sun4m.c b/hw/sun4m.c index 9efcdd62d2..2f7f22e4cc 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -353,6 +353,9 @@ static void sun4m_hw_init(const struct hwdef *hwdef, int ram_size, if (nd_table[0].model == NULL || strcmp(nd_table[0].model, "lance") == 0) { lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq); + } else if (strcmp(nd_table[0].model, "?") == 0) { + fprintf(stderr, "qemu: Supported NICs: lance\n"); + exit (1); } else { fprintf(stderr, "qemu: Unsupported NIC: %s\n", nd_table[0].model); exit (1); |