From patchwork Thu Dec 17 14:46:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 41321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6B495B6F0C for ; Fri, 18 Dec 2009 01:57:59 +1100 (EST) Received: from localhost ([127.0.0.1]:46510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLHng-00070l-NA for incoming@patchwork.ozlabs.org; Thu, 17 Dec 2009 09:57:56 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLHcd-0003BV-IE for qemu-devel@nongnu.org; Thu, 17 Dec 2009 09:46:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLHcY-00034X-Qw for qemu-devel@nongnu.org; Thu, 17 Dec 2009 09:46:30 -0500 Received: from [199.232.76.173] (port=50839 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLHcY-00033a-HT for qemu-devel@nongnu.org; Thu, 17 Dec 2009 09:46:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22528) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLHcX-0005RL-Ke for qemu-devel@nongnu.org; Thu, 17 Dec 2009 09:46:26 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBHEkOnr031695 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 17 Dec 2009 09:46:24 -0500 Received: from zweiblum.home.kraxel.org (vpn2-10-48.ams2.redhat.com [10.36.10.48]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBHEkKAI004357 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 17 Dec 2009 09:46:22 -0500 Message-ID: <4B2A443B.6090407@redhat.com> Date: Thu, 17 Dec 2009 15:46:19 +0100 From: Gerd Hoffmann User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20090922 Fedora/3.0-3.9.b4.fc12 Lightning/1.0pre Thunderbird/3.0b4 MIME-Version: 1.0 To: Gerd Hoffmann References: <1261053168-8079-1-git-send-email-kraxel@redhat.com> In-Reply-To: <1261053168-8079-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] Re: [PATCH 0/6] option rom patches, next round X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On 12/17/09 13:32, Gerd Hoffmann wrote: > Hi, > > All in one patch series for pci rom bar support and option rom loading > via fw_cfg for the non-pci roms. This time the fw_cfg interface is > actually tested with a little linux userspace app (attached below). Now some seabios bits. I got the naming of *both* vga and optionrom directories wrong, so there is first an incremental fix for this patch series. Also attached are two seabios patches (go on top of the two ones from anthony) which implement the seabios side of the file interface. '-kernel' and '-vga std' are working again ;) cheers, Gerd From 517fd48fdddfe93b5ef4081c11e87b250892cd49 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 17 Dec 2009 15:32:03 +0100 Subject: [PATCH] loader: fix dirname tyops Signed-off-by: Gerd Hoffmann --- hw/loader.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 451ee54..ccc0ccc 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -628,7 +628,7 @@ int rom_add_vga(const char *file) { if (!rom_enable_driver_roms) return 0; - return rom_add_file(file, "vgabios", file, + return rom_add_file(file, "vgaroms", file, PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN); } @@ -636,7 +636,7 @@ int rom_add_option(const char *file) { if (!rom_enable_driver_roms) return 0; - return rom_add_file(file, "genrom", file, + return rom_add_file(file, "genroms", file, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN); }