From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43538 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl6Js-0000hE-G1 for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:02:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl6Ja-00054X-QE for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:02:07 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:37153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl6Ja-00054O-KS for qemu-devel@nongnu.org; Thu, 03 Feb 2011 16:02:06 -0500 Received: by pwj6 with SMTP id 6so405076pwj.4 for ; Thu, 03 Feb 2011 13:02:05 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Thu, 3 Feb 2011 21:01:44 +0000 Message-ID: Content-Type: text/plain; charset=UTF-8 Subject: [Qemu-devel] [PATCH 07/10] isa: add creation function that may fail List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Signed-off-by: Blue Swirl --- hw/isa-bus.c | 12 ++++++++++++ hw/isa.h | 1 + 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 0cb1afb..6f349a5 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -146,6 +146,18 @@ ISADevice *isa_create(const char *name) return DO_UPCAST(ISADevice, qdev, dev); } +ISADevice *isa_try_create(const char *name) +{ + DeviceState *dev; + + if (!isabus) { + hw_error("Tried to create isa device %s with no isa bus present.", + name); + } + dev = qdev_try_create(&isabus->qbus, name); + return DO_UPCAST(ISADevice, qdev, dev); +} + ISADevice *isa_create_simple(const char *name) { ISADevice *dev; diff --git a/hw/isa.h b/hw/isa.h index 19aa94c..e26abfa 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -32,6 +32,7 @@ void isa_init_ioport(ISADevice *dev, uint16_t ioport); void isa_init_ioport_range(ISADevice *dev, uint16_t start, uint16_t length); void isa_qdev_register(ISADeviceInfo *info); ISADevice *isa_create(const char *name); +ISADevice *isa_try_create(const char *name); ISADevice *isa_create_simple(const char *name); extern target_phys_addr_t isa_mem_base; -- 1.6.2.4