From 07caea315a85ebfe90851f9c2e4ef3fdd24117b5 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 25 Sep 2009 03:53:51 +0200 Subject: Fix pci_add nic not to exit on bad model Monitor command "pci_add ADDR nic model=MODEL" uses pci_nic_init() to create the NIC. When MODEL is unknown or "?", this prints to stderr and terminates the program. Change pci_nic_init() not to treat "?" specially, and to return NULL on failure. Switch uses during startup to new convenience wrapper pci_nic_init_nofail(), which behaves just like pci_nic_init() used to do. Bonus bug fix: we now check for qdev_init() failing there. Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- hw/mips_malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/mips_malta.c') diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 4b5e470..d0266d5 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -489,7 +489,7 @@ static void network_init(void) /* The malta board has a PCNet card using PCI SLOT 11 */ default_devaddr = "0b"; - pci_nic_init(nd, "pcnet", default_devaddr); + pci_nic_init_nofail(nd, "pcnet", default_devaddr); } } -- cgit v1.1