From patchwork Thu Nov 12 20:53:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 38287 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 0FF83B7B6C for ; Fri, 13 Nov 2009 08:16:20 +1100 (EST) Received: from localhost ([127.0.0.1]:44583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8h1d-0005oG-4K for incoming@patchwork.ozlabs.org; Thu, 12 Nov 2009 16:16:17 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8gfT-0005Ap-FX for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:53:23 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8gfO-00056A-35 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:53:22 -0500 Received: from [199.232.76.173] (port=48094 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8gfN-000561-UZ for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:53:17 -0500 Received: from cantor2.suse.de ([195.135.220.15]:43662 helo=mx2.suse.de) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8gfN-0008Ec-9E for qemu-devel@nongnu.org; Thu, 12 Nov 2009 15:53:17 -0500 Received: from relay2.suse.de (relay-ext.suse.de [195.135.221.8]) by mx2.suse.de (Postfix) with ESMTP id D3B4186391; Thu, 12 Nov 2009 21:53:15 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Thu, 12 Nov 2009 21:53:11 +0100 Message-Id: <1258059195-17582-3-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1258059195-17582-1-git-send-email-agraf@suse.de> References: <1258059195-17582-1-git-send-email-agraf@suse.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.4-2.6 Cc: Glauber Costa , Juan Quintela , Avi Kivity , Christoph Hellwig Subject: [Qemu-devel] [PATCH 2/6] Introduce rom_rom 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 We have several rom helpers currently, but none of them can get us code that spans several roms into a pointer. This patch introduces a function that copies over rom contents. Signed-off-by: Alexander Graf --- v1 -> v2: - rename copy_rom -> rom_copy --- hw/loader.c | 38 ++++++++++++++++++++++++++++++++++++++ hw/loader.h | 1 + 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/hw/loader.c b/hw/loader.c index 9153b38..d854947 100644 --- a/hw/loader.c +++ b/hw/loader.c @@ -701,6 +701,44 @@ static Rom *find_rom(target_phys_addr_t addr) return NULL; } +int rom_copy(uint8_t *dest, target_phys_addr_t addr, size_t size) +{ + target_phys_addr_t end = addr + size; + uint8_t *s, *d = dest; + size_t l = 0; + Rom *rom; + + QTAILQ_FOREACH(rom, &roms, next) { + if (rom->max) + continue; + if (rom->min > addr) + continue; + if (rom->min + rom->romsize < addr) + continue; + if (rom->min > end) + break; + if (!rom->data) + continue; + + d = dest + (rom->min - addr); + s = rom->data; + l = rom->romsize; + + if (rom->min < addr) { + d = dest; + s += (addr - rom->min); + l -= (addr - rom->min); + } + if ((d + l) > (dest + size)) { + l = dest - d; + } + + memcpy(d, s, l); + } + + return (d + l) - dest; +} + void *rom_ptr(target_phys_addr_t addr) { Rom *rom; diff --git a/hw/loader.h b/hw/loader.h index 67dae57..b3311a3 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -24,6 +24,7 @@ int rom_add_file(const char *file, 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_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);