[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] Introduce rom_rom
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 2/6] Introduce rom_rom |
Date: |
Thu, 12 Nov 2009 21:53:11 +0100 |
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 <address@hidden>
---
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);
--
1.6.0.2
[Qemu-devel] [PATCH 4/6] Move common option rom code to header file, Alexander Graf, 2009/11/12
[Qemu-devel] [PATCH 3/6] Convert multiboot to fw_cfg backed data storage, Alexander Graf, 2009/11/12
[Qemu-devel] [PATCH 1/6] Make fw_cfg interface 32-bit aware, Alexander Graf, 2009/11/12