From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 5 Feb 2011 15:44:45 +0000 (+0000)
Subject: ne2000_isa: make optional
X-Git-Tag: TizenStudio_2.0_p2.3~3366
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75258b575c563a31fe05d81afae051bfac0fdf0a;p=sdk%2Femulator%2Fqemu.git

ne2000_isa: make optional

Ignore failure with ne2000_isa device creation.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/pc.h b/hw/pc.h
index abdf307..50d9943 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -5,6 +5,7 @@
 #include "ioport.h"
 #include "isa.h"
 #include "fdc.h"
+#include "net.h"
 
 /* PC-style peripherals (also used by other machines).  */
 
@@ -176,17 +177,21 @@ void pci_cirrus_vga_init(PCIBus *bus);
 void isa_cirrus_vga_init(void);
 
 /* ne2000.c */
-static inline void isa_ne2000_init(int base, int irq, NICInfo *nd)
+static inline bool isa_ne2000_init(int base, int irq, NICInfo *nd)
 {
     ISADevice *dev;
 
     qemu_check_nic_model(nd, "ne2k_isa");
 
-    dev = isa_create("ne2k_isa");
+    dev = isa_try_create("ne2k_isa");
+    if (!dev) {
+        return false;
+    }
     qdev_prop_set_uint32(&dev->qdev, "iobase", base);
     qdev_prop_set_uint32(&dev->qdev, "irq",    irq);
     qdev_set_nic_properties(&dev->qdev, nd);
     qdev_init_nofail(&dev->qdev);
+    return true;
 }
 
 /* e820 types */