From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NLFXZ-0006XA-Op for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:33:09 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NLFXV-0006Ug-23 for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:33:09 -0500 Received: from [199.232.76.173] (port=37131 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NLFXU-0006Ub-St for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:33:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56509) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NLFXU-0008Fn-8t for qemu-devel@nongnu.org; Thu, 17 Dec 2009 07:33:04 -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 nBHCX3ed016172 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 17 Dec 2009 07:33:03 -0500 From: Gerd Hoffmann Date: Thu, 17 Dec 2009 13:32:48 +0100 Message-Id: <1261053168-8079-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1261053168-8079-1-git-send-email-kraxel@redhat.com> References: <1261053168-8079-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 6/6] roms: use fw_cfg file. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/loader.c | 25 ++++++++++++++++++++++--- hw/loader.h | 5 +++-- hw/pc.c | 2 ++ 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 2d7a2c4..451ee54 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,8 @@ struct Rom { uint8_t *data; int align; int isrom; + char *fw_dir; + char *fw_file; target_phys_addr_t min; target_phys_addr_t max; @@ -556,7 +559,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, const char *fw_dir, const char *fw_file, target_phys_addr_t min, target_phys_addr_t max, int align) { Rom *rom; @@ -576,6 +579,8 @@ int rom_add_file(const char *file, goto err; } + rom->fw_dir = fw_dir ? qemu_strdup(fw_dir) : NULL; + rom->fw_file = fw_file ? qemu_strdup(fw_file) : NULL; rom->align = align; rom->min = min; rom->max = max; @@ -623,14 +628,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, "vgabios", file, + 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, "genrom", file, + PC_ROM_MIN_OPTION, PC_ROM_MAX, PC_ROM_ALIGN); } static void rom_reset(void *unused) @@ -692,6 +699,18 @@ int rom_load_all(void) return 0; } +int rom_load_fw(void *fw_cfg) +{ + Rom *rom; + + QTAILQ_FOREACH(rom, &roms, next) { + if (!rom->fw_file) + continue; + fw_cfg_add_file(fw_cfg, rom->fw_dir, rom->fw_file, 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..634f7d5 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, const char *fw_dir, const char *fw_file, 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, NULL, NULL, _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, -- 1.6.5.2