From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39314 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoOA5-0005fS-82 for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:41:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PoOA3-0008Ba-M2 for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:41:52 -0500 Received: from mail-vx0-f173.google.com ([209.85.220.173]:47992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PoOA3-0008BU-Gt for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:41:51 -0500 Received: by vxb40 with SMTP id 40so1996543vxb.4 for ; Sat, 12 Feb 2011 14:41:51 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 13 Feb 2011 00:41:31 +0200 Message-ID: Content-Type: multipart/mixed; boundary=0016e64699a44ada54049c1d85c3 Subject: [Qemu-devel] [PATCH 04/10] ne2000_isa: make optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --0016e64699a44ada54049c1d85c3 Content-Type: text/plain; charset=UTF-8 Ignore failure with ne2000_isa device creation. Signed-off-by: Blue Swirl --- 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 --0016e64699a44ada54049c1d85c3 Content-Type: application/mbox; name="0004-ne2000_isa-make-optional.patch" Content-Disposition: attachment; filename="0004-ne2000_isa-make-optional.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gk341u9i0 RnJvbSBlNzk1NmFlMTEzYWNmM2I1OWJkMDU4ZTI5OTJlOTJhZGFjM2Q3ZDA5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8ZTc5NTZhZTExM2FjZjNiNTliZDA1OGUyOTkyZTky YWRhYzNkN2QwOS4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KSW4tUmVwbHkt VG86IDw1MzNmNThkNTEyZDZhNGM0ZTAwNGU5ZWZkZmI4MDdiMWJhODRhNWRlLjEyOTc1NTAyMjgu Z2l0LmJsYXV3aXJiZWxAZ21haWwuY29tPgpSZWZlcmVuY2VzOiA8NTMzZjU4ZDUxMmQ2YTRjNGUw MDRlOWVmZGZiODA3YjFiYTg0YTVkZS4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNv bT4KRnJvbTogQmx1ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFNhdCwgNSBG ZWIgMjAxMSAxNTo0NDo0NSArMDAwMApTdWJqZWN0OiBbUEFUQ0ggMDQvMTBdIG5lMjAwMF9pc2E6 IG1ha2Ugb3B0aW9uYWwKCklnbm9yZSBmYWlsdXJlIHdpdGggbmUyMDAwX2lzYSBkZXZpY2UgY3Jl YXRpb24uCgpTaWduZWQtb2ZmLWJ5OiBCbHVlIFN3aXJsIDxibGF1d2lyYmVsQGdtYWlsLmNvbT4K LS0tCiBody9wYy5oIHwgICAgOSArKysrKysrLS0KIDEgZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRp b25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L3BjLmggYi9ody9wYy5oCmlu ZGV4IGFiZGYzMDcuLjUwZDk5NDMgMTAwNjQ0Ci0tLSBhL2h3L3BjLmgKKysrIGIvaHcvcGMuaApA QCAtNSw2ICs1LDcgQEAKICNpbmNsdWRlICJpb3BvcnQuaCIKICNpbmNsdWRlICJpc2EuaCIKICNp bmNsdWRlICJmZGMuaCIKKyNpbmNsdWRlICJuZXQuaCIKIAogLyogUEMtc3R5bGUgcGVyaXBoZXJh bHMgKGFsc28gdXNlZCBieSBvdGhlciBtYWNoaW5lcykuICAqLwogCkBAIC0xNzYsMTcgKzE3Nywy MSBAQCB2b2lkIHBjaV9jaXJydXNfdmdhX2luaXQoUENJQnVzICpidXMpOwogdm9pZCBpc2FfY2ly cnVzX3ZnYV9pbml0KHZvaWQpOwogCiAvKiBuZTIwMDAuYyAqLwotc3RhdGljIGlubGluZSB2b2lk IGlzYV9uZTIwMDBfaW5pdChpbnQgYmFzZSwgaW50IGlycSwgTklDSW5mbyAqbmQpCitzdGF0aWMg aW5saW5lIGJvb2wgaXNhX25lMjAwMF9pbml0KGludCBiYXNlLCBpbnQgaXJxLCBOSUNJbmZvICpu ZCkKIHsKICAgICBJU0FEZXZpY2UgKmRldjsKIAogICAgIHFlbXVfY2hlY2tfbmljX21vZGVsKG5k LCAibmUya19pc2EiKTsKIAotICAgIGRldiA9IGlzYV9jcmVhdGUoIm5lMmtfaXNhIik7CisgICAg ZGV2ID0gaXNhX3RyeV9jcmVhdGUoIm5lMmtfaXNhIik7CisgICAgaWYgKCFkZXYpIHsKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAgICBxZGV2X3Byb3Bfc2V0X3VpbnQzMigmZGV2LT5x ZGV2LCAiaW9iYXNlIiwgYmFzZSk7CiAgICAgcWRldl9wcm9wX3NldF91aW50MzIoJmRldi0+cWRl diwgImlycSIsICAgIGlycSk7CiAgICAgcWRldl9zZXRfbmljX3Byb3BlcnRpZXMoJmRldi0+cWRl diwgbmQpOwogICAgIHFkZXZfaW5pdF9ub2ZhaWwoJmRldi0+cWRldik7CisgICAgcmV0dXJuIHRy dWU7CiB9CiAKIC8qIGU4MjAgdHlwZXMgKi8KLS0gCjEuNy4yLjMKCg== --0016e64699a44ada54049c1d85c3--