From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37516 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoOAw-0006Iu-Dd for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:42:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PoOAr-0008Nq-UM for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:42:43 -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 1PoOAr-0008BU-OA for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:42:41 -0500 Received: by mail-vx0-f173.google.com with SMTP id 40so1996543vxb.4 for ; Sat, 12 Feb 2011 14:42:41 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 13 Feb 2011 00:42:21 +0200 Message-ID: Content-Type: multipart/mixed; boundary=90e6ba53a5464b0a6d049c1d881d Subject: [Qemu-devel] [PATCH 06/10] serial: make optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --90e6ba53a5464b0a6d049c1d881d Content-Type: text/plain; charset=UTF-8 Ignore failure with serial device creation. Signed-off-by: Blue Swirl --- hw/pc.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 09f63f0..89b43ea 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -21,7 +21,10 @@ static inline bool serial_isa_init(int index, CharDriverState *chr) { ISADevice *dev; - dev = isa_create("isa-serial"); + dev = isa_try_create("isa-serial"); + if (!dev) { + return false; + } qdev_prop_set_uint32(&dev->qdev, "index", index); qdev_prop_set_chr(&dev->qdev, "chardev", chr); if (qdev_init(&dev->qdev) < 0) { -- 1.6.2.4 --90e6ba53a5464b0a6d049c1d881d Content-Type: application/mbox; name="0006-serial-make-optional.patch" Content-Disposition: attachment; filename="0006-serial-make-optional.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gk3431g50 RnJvbSBjZGQ2YzM0YzVmMzYzNTE4ZTczMmEwYjBmZmQ4MTg2MWZkMTIxZmY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8Y2RkNmMzNGM1ZjM2MzUxOGU3MzJhMGIwZmZkODE4 NjFmZDEyMWZmNy4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KSW4tUmVwbHkt VG86IDw1MzNmNThkNTEyZDZhNGM0ZTAwNGU5ZWZkZmI4MDdiMWJhODRhNWRlLjEyOTc1NTAyMjgu Z2l0LmJsYXV3aXJiZWxAZ21haWwuY29tPgpSZWZlcmVuY2VzOiA8NTMzZjU4ZDUxMmQ2YTRjNGUw MDRlOWVmZGZiODA3YjFiYTg0YTVkZS4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNv bT4KRnJvbTogQmx1ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFNhdCwgNSBG ZWIgMjAxMSAyMTozMDo0MiArMDAwMApTdWJqZWN0OiBbUEFUQ0ggMDYvMTBdIHNlcmlhbDogbWFr ZSBvcHRpb25hbAoKSWdub3JlIGZhaWx1cmUgd2l0aCBzZXJpYWwgZGV2aWNlIGNyZWF0aW9uLgoK U2lnbmVkLW9mZi1ieTogQmx1ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+Ci0tLQogaHcv cGMuaCB8ICAgIDUgKysrKy0KIDEgZmlsZXMgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCAxIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L3BjLmggYi9ody9wYy5oCmluZGV4IDA5ZjYzZjAu Ljg5YjQzZWEgMTAwNjQ0Ci0tLSBhL2h3L3BjLmgKKysrIGIvaHcvcGMuaApAQCAtMjEsNyArMjEs MTAgQEAgc3RhdGljIGlubGluZSBib29sIHNlcmlhbF9pc2FfaW5pdChpbnQgaW5kZXgsIENoYXJE cml2ZXJTdGF0ZSAqY2hyKQogewogICAgIElTQURldmljZSAqZGV2OwogCi0gICAgZGV2ID0gaXNh X2NyZWF0ZSgiaXNhLXNlcmlhbCIpOworICAgIGRldiA9IGlzYV90cnlfY3JlYXRlKCJpc2Etc2Vy aWFsIik7CisgICAgaWYgKCFkZXYpIHsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KICAg ICBxZGV2X3Byb3Bfc2V0X3VpbnQzMigmZGV2LT5xZGV2LCAiaW5kZXgiLCBpbmRleCk7CiAgICAg cWRldl9wcm9wX3NldF9jaHIoJmRldi0+cWRldiwgImNoYXJkZXYiLCBjaHIpOwogICAgIGlmIChx ZGV2X2luaXQoJmRldi0+cWRldikgPCAwKSB7Ci0tIAoxLjcuMi4zCgo= --90e6ba53a5464b0a6d049c1d881d--