From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=38834 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PoOD9-00085o-Is for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:45:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PoOD6-0000VL-5E for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:45:01 -0500 Received: from mail-vw0-f45.google.com ([209.85.212.45]:50340) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PoOD6-0000Rm-0p for qemu-devel@nongnu.org; Sat, 12 Feb 2011 17:45:00 -0500 Received: by mail-vw0-f45.google.com with SMTP id 12so2378214vws.4 for ; Sat, 12 Feb 2011 14:44:59 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 13 Feb 2011 00:44:39 +0200 Message-ID: Content-Type: multipart/mixed; boundary=0023547c96218a03fc049c1d90f3 Subject: [Qemu-devel] [PATCH 10/10] fdc: make optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --0023547c96218a03fc049c1d90f3 Content-Type: text/plain; charset=UTF-8 Ignore failure with fdc device creation. Signed-off-by: Blue Swirl --- hw/fdc.h | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/fdc.h b/hw/fdc.h index 3b2fb3b..09f73c6 100644 --- a/hw/fdc.h +++ b/hw/fdc.h @@ -11,7 +11,10 @@ static inline void fdctrl_init_isa(DriveInfo **fds) { ISADevice *dev; - dev = isa_create("isa-fdc"); + dev = isa_try_create("isa-fdc"); + if (!dev) { + return; + } if (fds[0]) { qdev_prop_set_drive_nofail(&dev->qdev, "driveA", fds[0]->bdrv); } -- 1.6.2.4 --0023547c96218a03fc049c1d90f3 Content-Type: application/mbox; name="0010-fdc-make-optional.patch" Content-Disposition: attachment; filename="0010-fdc-make-optional.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gk345rry0 RnJvbSAyYzEyNDU0OWUxMDU2Yjc0MGZmZDg5NGFjNWJhYTRkMThkOWQ3YzNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8MmMxMjQ1NDllMTA1NmI3NDBmZmQ4OTRhYzViYWE0 ZDE4ZDlkN2MzZS4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KSW4tUmVwbHkt VG86IDw1MzNmNThkNTEyZDZhNGM0ZTAwNGU5ZWZkZmI4MDdiMWJhODRhNWRlLjEyOTc1NTAyMjgu Z2l0LmJsYXV3aXJiZWxAZ21haWwuY29tPgpSZWZlcmVuY2VzOiA8NTMzZjU4ZDUxMmQ2YTRjNGUw MDRlOWVmZGZiODA3YjFiYTg0YTVkZS4xMjk3NTUwMjI4LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNv bT4KRnJvbTogQmx1ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFNhdCwgMTIg RmViIDIwMTEgMjI6MjU6MjYgKzAwMDAKU3ViamVjdDogW1BBVENIIDEwLzEwXSBmZGM6IG1ha2Ug b3B0aW9uYWwKCklnbm9yZSBmYWlsdXJlIHdpdGggZmRjIGRldmljZSBjcmVhdGlvbi4KClNpZ25l ZC1vZmYtYnk6IEJsdWUgU3dpcmwgPGJsYXV3aXJiZWxAZ21haWwuY29tPgotLS0KIGh3L2ZkYy5o IHwgICAgNSArKysrLQogMSBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDEgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvZmRjLmggYi9ody9mZGMuaAppbmRleCAzYjJmYjNiLi4w OWY3M2M2IDEwMDY0NAotLS0gYS9ody9mZGMuaAorKysgYi9ody9mZGMuaApAQCAtMTEsNyArMTEs MTAgQEAgc3RhdGljIGlubGluZSB2b2lkIGZkY3RybF9pbml0X2lzYShEcml2ZUluZm8gKipmZHMp CiB7CiAgICAgSVNBRGV2aWNlICpkZXY7CiAKLSAgICBkZXYgPSBpc2FfY3JlYXRlKCJpc2EtZmRj Iik7CisgICAgZGV2ID0gaXNhX3RyeV9jcmVhdGUoImlzYS1mZGMiKTsKKyAgICBpZiAoIWRldikg eworICAgICAgICByZXR1cm47CisgICAgfQogICAgIGlmIChmZHNbMF0pIHsKICAgICAgICAgcWRl dl9wcm9wX3NldF9kcml2ZV9ub2ZhaWwoJmRldi0+cWRldiwgImRyaXZlQSIsIGZkc1swXS0+YmRy dik7CiAgICAgfQotLSAKMS43LjIuMwoK --0023547c96218a03fc049c1d90f3--