From c4a7060cf70e2e72f44a98307f453eba07e09bea Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Sun, 27 May 2007 19:41:17 +0000 Subject: [PATCH] =?utf8?q?New=20option=20-net=20nic,model=3D=3F=20(Mark=20?= =?utf8?q?Glines)=20Network=20documentation=20update=20(Mark=20Glines)?= git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2880 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/integratorcp.c | 3 +++ hw/mips_r4k.c | 3 +++ hw/pc.c | 5 +++++ hw/pci.c | 4 ++++ hw/ppc_prep.c | 3 +++ hw/sun4m.c | 3 +++ qemu-doc.texi | 9 +++++---- 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/hw/integratorcp.c b/hw/integratorcp.c index c9e1715f3..6572af8ec 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 72e9ac8a6..d600dbbb0 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); diff --git a/hw/pc.c b/hw/pc.c index 388d65729..b91b64fae 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -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); diff --git a/hw/pci.c b/hw/pci.c index def2dc088..c7ea31469 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -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 6a3cd907b..4b9d9d13f 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 9efcdd62d..2f7f22e4c 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); diff --git a/qemu-doc.texi b/qemu-doc.texi index 81ddfb047..3a4481b8e 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -153,7 +153,7 @@ PS/2 mouse and keyboard @item Floppy disk @item -NE2000 PCI network adapters +PCI/ISA PCI network adapters @item Serial ports @item @@ -355,7 +355,7 @@ Network options: @item -net nic[,vlan=n][,macaddr=addr][,model=type] Create a new Network Interface Card and connect it to VLAN @var{n} (@var{n} -= 0 is the default). The NIC is currently an NE2000 on the PC += 0 is the default). The NIC is an ne2k_pci 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. @@ -363,7 +363,8 @@ Valid values for @var{type} are @code{i82551}, @code{i82557b}, @code{i82559er}, @code{ne2k_pci}, @code{ne2k_isa}, @code{pcnet}, @code{rtl8139}, @code{smc91c111} and @code{lance}. -Not all devices are supported on all targets. +Not all devices are supported on all targets. Use -net nic,model=? +for a list of available devices for your target. @item -net user[,vlan=n][,hostname=name] Use the user mode network stack which requires no administrator @@ -1208,7 +1209,7 @@ What you should @emph{never} do: @node pcsys_network @section Network emulation -QEMU can simulate several networks cards (NE2000 boards on the PC +QEMU can simulate several networks cards (PCI or ISA cards on the PC target) and can connect them to an arbitrary number of Virtual Local Area Networks (VLANs). Host TAP devices can be connected to any QEMU VLAN. VLAN can be connected between separate instances of QEMU to -- 2.39.5