From e0f1258cd0941030944c99eba18f2ff402cc88ef 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/versatilepb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/versatilepb.c') diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 29b85ae7b8..e8ebdf1758 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -213,7 +213,7 @@ static void versatile_init(ram_addr_t ram_size, smc91c111_init(nd, 0x10010000, sic[25]); done_smc = 1; } else { - pci_nic_init(nd, "rtl8139", NULL); + pci_nic_init_nofail(nd, "rtl8139", NULL); } } if (usb_enabled) { -- cgit v1.2.3