Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8HdR-0005wj-IT for qemu-devel@nongnu.org; Wed, 11 Nov 2009 13:09:37 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8HdL-0005kW-JV for qemu-devel@nongnu.org; Wed, 11 Nov 2009 13:09:36 -0500 Received: from [199.232.76.173] (port=55917 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8HdK-0005jL-Ln for qemu-devel@nongnu.org; Wed, 11 Nov 2009 13:09:30 -0500 Received: from cantor.suse.de ([195.135.220.2]:44947 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N8HdJ-0008UE-OH for qemu-devel@nongnu.org; Wed, 11 Nov 2009 13:09:30 -0500 From: Alexander Graf Date: Wed, 11 Nov 2009 19:09:22 +0100 Message-Id: <1257962966-22902-3-git-send-email-agraf@suse.de> In-Reply-To: <1257962966-22902-1-git-send-email-agraf@suse.de> References: <1257962966-22902-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 2/6] Introduce copy_rom List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: glommer@redhat.com, avi@redhat.com 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 --- 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..cab53c1 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 copy_rom(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..6cfb03a 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 copy_rom(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); -- 1.6.0.2