diff options
| author | Markus Armbruster | 2009-09-25 03:53:51 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2009-10-05 16:32:53 +0200 |
| commit | 07caea315a85ebfe90851f9c2e4ef3fdd24117b5 (patch) | |
| tree | 153e42950d500a7c6219539941ff7c1f81a6487b /hw/realview.c | |
| parent | Make it obvious that pci_nic_init() can't fail (diff) | |
| download | qemu-07caea315a85ebfe90851f9c2e4ef3fdd24117b5.tar.gz qemu-07caea315a85ebfe90851f9c2e4ef3fdd24117b5.tar.xz qemu-07caea315a85ebfe90851f9c2e4ef3fdd24117b5.zip | |
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 <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/realview.c')
| -rw-r--r-- | hw/realview.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/realview.c b/hw/realview.c index a18e7735ca..c494a20c88 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -125,7 +125,7 @@ static void realview_init(ram_addr_t ram_size, smc91c111_init(nd, 0x4e000000, pic[28]); done_smc = 1; } else { - pci_nic_init(nd, "rtl8139", NULL); + pci_nic_init_nofail(nd, "rtl8139", NULL); } } |