[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/23] loader: support for unmapped ROM blobs
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH v4 06/23] loader: support for unmapped ROM blobs |
Date: |
Sun, 22 Sep 2013 16:37:20 +0300 |
Support ROM blobs not mapped into guest memory:
same as ROM files really but use caller's buffer.
Support incoking callback on access and
return memory pointer making it easier
for caller to update memory if necessary.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
---
hw/lm32/lm32_hwsetup.h | 2 +-
include/hw/loader.h | 7 ++++---
hw/core/loader.c | 23 ++++++++++++++++++++---
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/hw/lm32/lm32_hwsetup.h b/hw/lm32/lm32_hwsetup.h
index 3449bd8..9fd5e69 100644
--- a/hw/lm32/lm32_hwsetup.h
+++ b/hw/lm32/lm32_hwsetup.h
@@ -73,7 +73,7 @@ static inline void hwsetup_free(HWSetup *hw)
static inline void hwsetup_create_rom(HWSetup *hw,
hwaddr base)
{
- rom_add_blob("hwsetup", hw->data, TARGET_PAGE_SIZE, base);
+ rom_add_blob("hwsetup", hw->data, TARGET_PAGE_SIZE, base, NULL, NULL,
NULL);
}
static inline void hwsetup_add_u8(HWSetup *hw, uint8_t u)
diff --git a/include/hw/loader.h b/include/hw/loader.h
index 6145736..e0c576b 100644
--- a/include/hw/loader.h
+++ b/include/hw/loader.h
@@ -40,8 +40,9 @@ extern bool rom_file_in_ram;
int rom_add_file(const char *file, const char *fw_dir,
hwaddr addr, int32_t bootindex);
-int rom_add_blob(const char *name, const void *blob, size_t len,
- hwaddr addr);
+void *rom_add_blob(const char *name, const void *blob, size_t len,
+ hwaddr addr, const char *fw_file_name,
+ FWCfgReadCallback fw_callback, void *callback_opaque);
int rom_add_elf_program(const char *name, void *data, size_t datasize,
size_t romsize, hwaddr addr);
int rom_load_all(void);
@@ -53,7 +54,7 @@ void do_info_roms(Monitor *mon, const QDict *qdict);
#define rom_add_file_fixed(_f, _a, _i) \
rom_add_file(_f, NULL, _a, _i)
#define rom_add_blob_fixed(_f, _b, _l, _a) \
- rom_add_blob(_f, _b, _l, _a)
+ (rom_add_blob(_f, _b, _l, _a, NULL, NULL, NULL) ? 0 : -1)
#define PC_ROM_MIN_VGA 0xc0000
#define PC_ROM_MIN_OPTION 0xc8000
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 7b3d3ee..449bd4c 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -700,10 +700,12 @@ err:
return -1;
}
-int rom_add_blob(const char *name, const void *blob, size_t len,
- hwaddr addr)
+void *rom_add_blob(const char *name, const void *blob, size_t len,
+ hwaddr addr, const char *fw_file_name,
+ FWCfgReadCallback fw_callback, void *callback_opaque)
{
Rom *rom;
+ void *data = NULL;
rom = g_malloc0(sizeof(*rom));
rom->name = g_strdup(name);
@@ -713,7 +715,22 @@ int rom_add_blob(const char *name, const void *blob,
size_t len,
rom->data = g_malloc0(rom->datasize);
memcpy(rom->data, blob, len);
rom_insert(rom);
- return 0;
+ if (fw_file_name && fw_cfg) {
+ char devpath[100];
+
+ snprintf(devpath, sizeof(devpath), "/address@hidden", fw_file_name);
+
+ if (rom_file_in_ram) {
+ data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
+ } else {
+ data = rom->data;
+ }
+
+ fw_cfg_add_file_callback(fw_cfg, fw_file_name,
+ fw_callback, callback_opaque,
+ data, rom->romsize);
+ }
+ return data;
}
/* This function is specific for elf program because we don't need to allocate
--
MST
- [Qemu-devel] [PATCH v4 00/23] qemu: generate acpi tables for the guest, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 01/23] qemu: add Error to typedefs, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 02/23] qom: pull in qemu/typedefs, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 03/23] qom: cleanup struct Error references, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 04/23] qom: add pointer to int property helpers, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 05/23] fw_cfg: interface to trigger callback on read, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 06/23] loader: support for unmapped ROM blobs,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH v4 07/23] pcie_host: expose UNMAPPED macro, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 08/23] pcie_host: expose address format, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 09/23] q35: use macro for MCFG property name, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 10/23] q35: expose mmcfg size as a property, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 12/23] acpi: add rules to compile ASL source, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 14/23] loader: use file path size from fw_cfg.h, Michael S. Tsirkin, 2013/09/22
- [Qemu-devel] [PATCH v4 11/23] i386: add ACPI table files from seabios, Michael S. Tsirkin, 2013/09/22