From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=54387 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PojDM-0005Fk-2s for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:10:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PojDK-0004hp-AO for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:10:39 -0500 Received: from mail-vx0-f173.google.com ([209.85.220.173]:44605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PojDK-0004Tr-18 for qemu-devel@nongnu.org; Sun, 13 Feb 2011 16:10:38 -0500 Received: by mail-vx0-f173.google.com with SMTP id 40so2284418vxb.4 for ; Sun, 13 Feb 2011 13:10:38 -0800 (PST) MIME-Version: 1.0 From: Blue Swirl Date: Sun, 13 Feb 2011 23:10:16 +0200 Message-ID: Content-Type: multipart/mixed; boundary=90e6ba53b434e793c1049c305c72 Subject: [Qemu-devel] [PATCH 3/4] vga-isa: make optional List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel --90e6ba53b434e793c1049c305c72 Content-Type: text/plain; charset=UTF-8 Ignore failure with vga-isa device creation, but print a warning message. Signed-off-by: Blue Swirl --- hw/pc.h | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/pc.h b/hw/pc.h index 475484a..60f8c42 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -183,9 +183,15 @@ extern enum vga_retrace_method vga_retrace_method; static inline int isa_vga_init(void) { - isa_create_simple("isa-vga"); + ISADevice *dev; - return 0; + dev = isa_try_create("isa-vga"); + if (!dev) { + fprintf(stderr, "Warning: isa-vga not available\n"); + return 0; + } + qdev_init_nofail(&dev->qdev); + return 1; } int pci_vga_init(PCIBus *bus); -- 1.6.2.4 --90e6ba53b434e793c1049c305c72 Content-Type: application/mbox; name="0003-vga-isa-make-optional.patch" Content-Disposition: attachment; filename="0003-vga-isa-make-optional.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gk4g8inn0 RnJvbSA0MTI4Y2FlMTc5MTE3MzRlNGI1ZmFiOTU5ZDAyZWRlZTEwZDQzMThmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlkOiA8NDEyOGNhZTE3OTExNzM0ZTRiNWZhYjk1OWQwMmVk ZWUxMGQ0MzE4Zi4xMjk3NjMxMjg2LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNvbT4KSW4tUmVwbHkt VG86IDxiNmE2ZGExNzc0YjY2YWEwNmEwYzhjNjFmNWUzY2M3MjlkM2YwM2UxLjEyOTc2MzEyODYu Z2l0LmJsYXV3aXJiZWxAZ21haWwuY29tPgpSZWZlcmVuY2VzOiA8YjZhNmRhMTc3NGI2NmFhMDZh MGM4YzYxZjVlM2NjNzI5ZDNmMDNlMS4xMjk3NjMxMjg2LmdpdC5ibGF1d2lyYmVsQGdtYWlsLmNv bT4KRnJvbTogQmx1ZSBTd2lybCA8YmxhdXdpcmJlbEBnbWFpbC5jb20+CkRhdGU6IFN1biwgMTMg RmViIDIwMTEgMTQ6MTc6MDAgKzAwMDAKU3ViamVjdDogW1BBVENIIDMvNF0gdmdhLWlzYTogbWFr ZSBvcHRpb25hbAoKSWdub3JlIGZhaWx1cmUgd2l0aCB2Z2EtaXNhIGRldmljZSBjcmVhdGlvbiwg YnV0IHByaW50IGEgd2FybmluZwptZXNzYWdlLgoKU2lnbmVkLW9mZi1ieTogQmx1ZSBTd2lybCA8 YmxhdXdpcmJlbEBnbWFpbC5jb20+Ci0tLQogaHcvcGMuaCB8ICAgMTAgKysrKysrKystLQogMSBm aWxlcyBjaGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvaHcvcGMuaCBiL2h3L3BjLmgKaW5kZXggNDc1NDg0YS4uNjBmOGM0MiAxMDA2NDQKLS0tIGEv aHcvcGMuaAorKysgYi9ody9wYy5oCkBAIC0xODMsOSArMTgzLDE1IEBAIGV4dGVybiBlbnVtIHZn YV9yZXRyYWNlX21ldGhvZCB2Z2FfcmV0cmFjZV9tZXRob2Q7CiAKIHN0YXRpYyBpbmxpbmUgaW50 IGlzYV92Z2FfaW5pdCh2b2lkKQogewotICAgIGlzYV9jcmVhdGVfc2ltcGxlKCJpc2EtdmdhIik7 CisgICAgSVNBRGV2aWNlICpkZXY7CiAKLSAgICByZXR1cm4gMDsKKyAgICBkZXYgPSBpc2FfdHJ5 X2NyZWF0ZSgiaXNhLXZnYSIpOworICAgIGlmICghZGV2KSB7CisgICAgICAgIGZwcmludGYoc3Rk ZXJyLCAiV2FybmluZzogaXNhLXZnYSBub3QgYXZhaWxhYmxlXG4iKTsKKyAgICAgICAgcmV0dXJu IDA7CisgICAgfQorICAgIHFkZXZfaW5pdF9ub2ZhaWwoJmRldi0+cWRldik7CisgICAgcmV0dXJu IDE7CiB9CiAKIGludCBwY2lfdmdhX2luaXQoUENJQnVzICpidXMpOwotLSAKMS43LjIuMwoK --90e6ba53b434e793c1049c305c72--