[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] ne2000_isa: make optional
From: |
Blue Swirl |
Subject: |
[Qemu-devel] [PATCH 04/10] ne2000_isa: make optional |
Date: |
Sun, 13 Feb 2011 00:41:31 +0200 |
Ignore failure with ne2000_isa device creation.
Signed-off-by: Blue Swirl <address@hidden>
---
hw/pc.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
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 */
--
1.6.2.4
0004-ne2000_isa-make-optional.patch
Description: application/mbox
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH 04/10] ne2000_isa: make optional,
Blue Swirl <=