From patchwork Wed Dec 16 17:46:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 41279 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 29EF1B70B3 for ; Thu, 17 Dec 2009 04:48:49 +1100 (EST) Received: from localhost ([127.0.0.1]:49115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKxzR-0007ZB-Sv for incoming@patchwork.ozlabs.org; Wed, 16 Dec 2009 12:48:45 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NKxxB-0006Qc-I7 for qemu-devel@nongnu.org; Wed, 16 Dec 2009 12:46:25 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NKxx6-0006LD-Jk for qemu-devel@nongnu.org; Wed, 16 Dec 2009 12:46:24 -0500 Received: from [199.232.76.173] (port=52485 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NKxx6-0006L0-Aa for qemu-devel@nongnu.org; Wed, 16 Dec 2009 12:46:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4995) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NKxx5-0005hw-NB for qemu-devel@nongnu.org; Wed, 16 Dec 2009 12:46:20 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBGHkJJc031311 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 16 Dec 2009 12:46:19 -0500 Received: from zweiblum.home.kraxel.org (vpn2-9-244.ams2.redhat.com [10.36.9.244]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBGHkH9K000474; Wed, 16 Dec 2009 12:46:18 -0500 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id 5605870FCC; Wed, 16 Dec 2009 18:46:16 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 16 Dec 2009 18:46:16 +0100 Message-Id: <1260985576-10736-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1260985576-10736-1-git-send-email-kraxel@redhat.com> References: <1260985576-10736-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 3/3] roms: use fw_cfg file xfer api 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 Signed-off-by: Gerd Hoffmann --- hw/loader.c | 23 ++++++++++++++++++++--- hw/loader.h | 5 +++-- hw/pc.c | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 2d7a2c4..d1d05ed 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -48,6 +48,7 @@ #include "sysemu.h" #include "uboot_image.h" #include "loader.h" +#include "fw_cfg.h" #include @@ -528,6 +529,7 @@ struct Rom { uint8_t *data; int align; int isrom; + int type; target_phys_addr_t min; target_phys_addr_t max; @@ -556,7 +558,7 @@ static void rom_insert(Rom *rom) QTAILQ_INSERT_TAIL(&roms, rom, next); } -int rom_add_file(const char *file, +int rom_add_file(const char *file, int fw_file_type, target_phys_addr_t min, target_phys_addr_t max, int align) { Rom *rom; @@ -576,6 +578,7 @@ int rom_add_file(const char *file, goto err; } + rom->type = fw_file_type; rom->align = align; rom->min = min; rom->max = max; @@ -623,14 +626,16 @@ int rom_add_vga(const char *file) { if (!rom_enable_driver_roms) return 0; - return rom_add_file(file, PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN); + return rom_add_file(file, FW_CFG_FILE_TYPE_VGABIOS, + PC_ROM_MIN_VGA, PC_ROM_MAX, PC_ROM_ALIGN); } int rom_add_option(const char *file) { if (!rom_enable_driver_roms) return 0; - return rom_add_file(file, PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN); + return rom_add_file(file, FW_CFG_FILE_TYPE_OPTIONROM, + PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN); } static void rom_reset(void *unused) @@ -692,6 +697,18 @@ int rom_load_all(void) return 0; } +int rom_load_fw(void *fw_cfg) +{ + Rom *rom; + + QTAILQ_FOREACH(rom, &roms, next) { + if (!rom->type) + continue; + fw_cfg_add_file(fw_cfg, rom->type, rom->data, rom->romsize); + } + return 0; +} + static Rom *find_rom(target_phys_addr_t addr) { Rom *rom; diff --git a/hw/loader.h b/hw/loader.h index b3311a3..2de52e1 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -19,17 +19,18 @@ void pstrcpy_targphys(const char *name, target_phys_addr_t dest, int buf_size, const char *source); -int rom_add_file(const char *file, +int rom_add_file(const char *file, int fw_file_type, target_phys_addr_t min, target_phys_addr_t max, int align); int rom_add_blob(const char *name, const void *blob, size_t len, target_phys_addr_t min, target_phys_addr_t max, int align); int rom_load_all(void); +int rom_load_fw(void *fw_cfg); int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size); void *rom_ptr(target_phys_addr_t addr); void do_info_roms(Monitor *mon); #define rom_add_file_fixed(_f, _a) \ - rom_add_file(_f, _a, 0, 0) + rom_add_file(_f, 0, _a, 0, 0) #define rom_add_blob_fixed(_f, _b, _l, _a) \ rom_add_blob(_f, _b, _l, _a, 0, 0) diff --git a/hw/pc.c b/hw/pc.c index 147a9a7..be70f50 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1248,6 +1248,8 @@ static void pc_init1(ram_addr_t ram_size, } } } + + rom_load_fw(fw_cfg); } static void pc_init_pci(ram_addr_t ram_size,