From patchwork Fri Mar 20 14:11:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leon Alrae X-Patchwork-Id: 452657 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id AF0BE1400F1 for ; Sat, 21 Mar 2015 01:12:43 +1100 (AEDT) Received: from localhost ([::1]:44016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYxfF-0006hn-Kw for incoming@patchwork.ozlabs.org; Fri, 20 Mar 2015 10:12:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYxe0-0004Nu-OK for qemu-devel@nongnu.org; Fri, 20 Mar 2015 10:11:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYxdx-0004rv-HE for qemu-devel@nongnu.org; Fri, 20 Mar 2015 10:11:24 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:35972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYxdx-0004rL-Bh for qemu-devel@nongnu.org; Fri, 20 Mar 2015 10:11:21 -0400 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 2ADE66AB26A5C; Fri, 20 Mar 2015 14:11:16 +0000 (GMT) Received: from lalrae-linux.kl.imgtec.org (192.168.14.163) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 20 Mar 2015 14:11:18 +0000 From: Leon Alrae To: Date: Fri, 20 Mar 2015 14:11:02 +0000 Message-ID: <1426860662-20843-1-git-send-email-leon.alrae@imgtec.com> X-Mailer: git-send-email 1.7.9.5 MIME-Version: 1.0 X-Originating-IP: [192.168.14.163] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 195.59.15.196 Cc: macro@linux-mips.org, aurelien@aurel32.net, kraxel@redhat.com Subject: [Qemu-devel] [PATCH] mips_malta: use compat props to avoid loading efi-pcnet.rom X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Currently qemu-system-mips aborts if it fails to find efi-pcnet.rom file which does not make sense. NIC on Malta board should not require x86 firmware. Reported-by: Maciej W. Rozycki Suggested-by: Gerd Hoffmann Signed-off-by: Leon Alrae --- Hi, This fixes a problem reported some time ago: http://lists.gnu.org/archive/html/qemu-devel/2014-12/msg01870.html Regards, Leon --- hw/mips/mips_malta.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 533b2e6..b857941 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1212,6 +1212,14 @@ static QEMUMachine mips_malta_machine = { .init = mips_malta_init, .max_cpus = 16, .is_default = 1, + .compat_props = (GlobalProperty[]) { + { + .driver = TYPE_PCI_DEVICE, + .property = "romfile", + .value = "", + }, + { /* end of list */ } + }, }; static void mips_malta_register_types(void)