2009-09-20 18:58:02 +04:00
|
|
|
#ifndef LOADER_H
|
|
|
|
#define LOADER_H
|
2013-01-14 10:06:25 +04:00
|
|
|
#include "qapi/qmp/qdict.h"
|
2013-04-16 04:24:08 +04:00
|
|
|
#include "hw/nvram/fw_cfg.h"
|
2009-09-20 18:58:02 +04:00
|
|
|
|
|
|
|
/* loader.c */
|
2014-02-05 23:57:55 +04:00
|
|
|
/**
|
|
|
|
* get_image_size: retrieve size of an image file
|
|
|
|
* @filename: Path to the image file
|
|
|
|
*
|
|
|
|
* Returns the size of the image file on success, -1 otherwise.
|
|
|
|
* On error, errno is also set as appropriate.
|
|
|
|
*/
|
2009-09-20 18:58:02 +04:00
|
|
|
int get_image_size(const char *filename);
|
|
|
|
int load_image(const char *filename, uint8_t *addr); /* deprecated */
|
2014-07-21 07:02:03 +04:00
|
|
|
ssize_t load_image_size(const char *filename, void *addr, size_t size);
|
2016-09-22 20:13:08 +03:00
|
|
|
|
|
|
|
/**load_image_targphys_as:
|
|
|
|
* @filename: Path to the image file
|
|
|
|
* @addr: Address to load the image to
|
|
|
|
* @max_sz: The maximum size of the image to load
|
|
|
|
* @as: The AddressSpace to load the ELF to. The value of address_space_memory
|
|
|
|
* is used if nothing is supplied here.
|
|
|
|
*
|
|
|
|
* Load a fixed image into memory.
|
|
|
|
*
|
|
|
|
* Returns the size of the loaded image on success, -1 otherwise.
|
|
|
|
*/
|
|
|
|
int load_image_targphys_as(const char *filename,
|
|
|
|
hwaddr addr, uint64_t max_sz, AddressSpace *as);
|
|
|
|
|
|
|
|
/** load_image_targphys:
|
|
|
|
* Same as load_image_targphys_as(), but doesn't allow the caller to specify
|
|
|
|
* an AddressSpace.
|
|
|
|
*/
|
2012-10-23 14:30:10 +04:00
|
|
|
int load_image_targphys(const char *filename, hwaddr,
|
2012-03-12 20:33:25 +04:00
|
|
|
uint64_t max_sz);
|
2016-09-22 20:13:08 +03:00
|
|
|
|
2016-03-04 14:30:17 +03:00
|
|
|
/**
|
|
|
|
* load_image_mr: load an image into a memory region
|
|
|
|
* @filename: Path to the image file
|
|
|
|
* @mr: Memory Region to load into
|
|
|
|
*
|
|
|
|
* Load the specified file into the memory region.
|
|
|
|
* The file loaded is registered as a ROM, so its contents will be
|
|
|
|
* reinstated whenever the system is reset.
|
|
|
|
* If the file is larger than the memory region's size the call will fail.
|
|
|
|
* Returns -1 on failure, or the size of the file.
|
|
|
|
*/
|
|
|
|
int load_image_mr(const char *filename, MemoryRegion *mr);
|
2014-12-22 15:11:43 +03:00
|
|
|
|
|
|
|
/* This is the limit on the maximum uncompressed image size that
|
|
|
|
* load_image_gzipped_buffer() and load_image_gzipped() will read. It prevents
|
|
|
|
* g_malloc() in those functions from allocating a huge amount of memory.
|
|
|
|
*/
|
|
|
|
#define LOAD_IMAGE_MAX_GUNZIP_BYTES (256 << 20)
|
|
|
|
|
|
|
|
int load_image_gzipped_buffer(const char *filename, uint64_t max_sz,
|
|
|
|
uint8_t **buffer);
|
2014-08-19 21:56:28 +04:00
|
|
|
int load_image_gzipped(const char *filename, hwaddr addr, uint64_t max_sz);
|
2014-02-04 08:04:18 +04:00
|
|
|
|
|
|
|
#define ELF_LOAD_FAILED -1
|
|
|
|
#define ELF_LOAD_NOT_ELF -2
|
|
|
|
#define ELF_LOAD_WRONG_ARCH -3
|
|
|
|
#define ELF_LOAD_WRONG_ENDIAN -4
|
|
|
|
const char *load_elf_strerror(int error);
|
2016-03-04 14:30:21 +03:00
|
|
|
|
2016-09-22 20:13:08 +03:00
|
|
|
/** load_elf_as:
|
2016-03-04 14:30:21 +03:00
|
|
|
* @filename: Path of ELF file
|
|
|
|
* @translate_fn: optional function to translate load addresses
|
|
|
|
* @translate_opaque: opaque data passed to @translate_fn
|
|
|
|
* @pentry: Populated with program entry point. Ignored if NULL.
|
|
|
|
* @lowaddr: Populated with lowest loaded address. Ignored if NULL.
|
|
|
|
* @highaddr: Populated with highest loaded address. Ignored if NULL.
|
|
|
|
* @bigendian: Expected ELF endianness. 0 for LE otherwise BE
|
|
|
|
* @elf_machine: Expected ELF machine type
|
|
|
|
* @clear_lsb: Set to mask off LSB of addresses (Some architectures use
|
|
|
|
* this for non-address data)
|
2016-03-04 14:30:21 +03:00
|
|
|
* @data_swab: Set to order of byte swapping for data. 0 for no swap, 1
|
|
|
|
* for swapping bytes within halfwords, 2 for bytes within
|
|
|
|
* words and 3 for within doublewords.
|
2016-09-22 20:13:08 +03:00
|
|
|
* @as: The AddressSpace to load the ELF to. The value of address_space_memory
|
|
|
|
* is used if nothing is supplied here.
|
2016-03-04 14:30:21 +03:00
|
|
|
*
|
|
|
|
* Load an ELF file's contents to the emulated system's address space.
|
|
|
|
* Clients may optionally specify a callback to perform address
|
|
|
|
* translations. @pentry, @lowaddr and @highaddr are optional pointers
|
|
|
|
* which will be populated with various load information. @bigendian and
|
|
|
|
* @elf_machine give the expected endianness and machine for the ELF the
|
|
|
|
* load will fail if the target ELF does not match. Some architectures
|
|
|
|
* have some architecture-specific behaviours that come into effect when
|
|
|
|
* their particular values for @elf_machine are set.
|
2016-09-22 20:13:07 +03:00
|
|
|
* If @elf_machine is EM_NONE then the machine type will be read from the
|
|
|
|
* ELF header and no checks will be carried out against the machine type.
|
2016-03-04 14:30:21 +03:00
|
|
|
*/
|
2016-09-22 20:13:08 +03:00
|
|
|
int load_elf_as(const char *filename,
|
|
|
|
uint64_t (*translate_fn)(void *, uint64_t),
|
|
|
|
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
|
|
|
uint64_t *highaddr, int big_endian, int elf_machine,
|
|
|
|
int clear_lsb, int data_swab, AddressSpace *as);
|
2016-03-04 14:30:21 +03:00
|
|
|
|
2016-09-22 20:13:08 +03:00
|
|
|
/** load_elf:
|
|
|
|
* Same as load_elf_as(), but doesn't allow the caller to specify an
|
|
|
|
* AddressSpace.
|
|
|
|
*/
|
2010-03-14 23:20:59 +03:00
|
|
|
int load_elf(const char *filename, uint64_t (*translate_fn)(void *, uint64_t),
|
|
|
|
void *translate_opaque, uint64_t *pentry, uint64_t *lowaddr,
|
|
|
|
uint64_t *highaddr, int big_endian, int elf_machine,
|
2016-03-04 14:30:21 +03:00
|
|
|
int clear_lsb, int data_swab);
|
2016-03-04 14:30:21 +03:00
|
|
|
|
|
|
|
/** load_elf_hdr:
|
|
|
|
* @filename: Path of ELF file
|
|
|
|
* @hdr: Buffer to populate with header data. Header data will not be
|
|
|
|
* filled if set to NULL.
|
|
|
|
* @is64: Set to true if the ELF is 64bit. Ignored if set to NULL
|
|
|
|
* @errp: Populated with an error in failure cases
|
|
|
|
*
|
|
|
|
* Inspect an ELF file's header. Read its full header contents into a
|
|
|
|
* buffer and/or determine if the ELF is 64bit.
|
|
|
|
*/
|
|
|
|
void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **errp);
|
|
|
|
|
2012-10-23 14:30:10 +04:00
|
|
|
int load_aout(const char *filename, hwaddr addr, int max_sz,
|
|
|
|
int bswap_needed, hwaddr target_page_size);
|
2016-09-22 20:13:08 +03:00
|
|
|
|
|
|
|
/** load_uimage_as:
|
|
|
|
* @filename: Path of uimage file
|
|
|
|
* @ep: Populated with program entry point. Ignored if NULL.
|
|
|
|
* @loadaddr: Populated with the load address. Ignored if NULL.
|
|
|
|
* @is_linux: Is set to true if the image loaded is Linux. Ignored if NULL.
|
|
|
|
* @translate_fn: optional function to translate load addresses
|
|
|
|
* @translate_opaque: opaque data passed to @translate_fn
|
|
|
|
* @as: The AddressSpace to load the ELF to. The value of address_space_memory
|
|
|
|
* is used if nothing is supplied here.
|
|
|
|
*
|
|
|
|
* Loads a u-boot image into memory.
|
|
|
|
*
|
|
|
|
* Returns the size of the loaded image on success, -1 otherwise.
|
|
|
|
*/
|
|
|
|
int load_uimage_as(const char *filename, hwaddr *ep,
|
|
|
|
hwaddr *loadaddr, int *is_linux,
|
|
|
|
uint64_t (*translate_fn)(void *, uint64_t),
|
|
|
|
void *translate_opaque, AddressSpace *as);
|
|
|
|
|
|
|
|
/** load_uimage:
|
|
|
|
* Same as load_uimage_as(), but doesn't allow the caller to specify an
|
|
|
|
* AddressSpace.
|
|
|
|
*/
|
2012-10-23 14:30:10 +04:00
|
|
|
int load_uimage(const char *filename, hwaddr *ep,
|
2014-10-19 07:42:22 +04:00
|
|
|
hwaddr *loadaddr, int *is_linux,
|
|
|
|
uint64_t (*translate_fn)(void *, uint64_t),
|
|
|
|
void *translate_opaque);
|
2009-09-20 18:58:02 +04:00
|
|
|
|
2013-07-09 02:40:01 +04:00
|
|
|
/**
|
|
|
|
* load_ramdisk:
|
|
|
|
* @filename: Path to the ramdisk image
|
|
|
|
* @addr: Memory address to load the ramdisk to
|
|
|
|
* @max_sz: Maximum allowed ramdisk size (for non-u-boot ramdisks)
|
|
|
|
*
|
|
|
|
* Load a ramdisk image with U-Boot header to the specified memory
|
|
|
|
* address.
|
|
|
|
*
|
|
|
|
* Returns the size of the loaded image on success, -1 otherwise.
|
|
|
|
*/
|
|
|
|
int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz);
|
|
|
|
|
2011-11-16 22:41:56 +04:00
|
|
|
ssize_t read_targphys(const char *name,
|
2012-10-23 14:30:10 +04:00
|
|
|
int fd, hwaddr dst_addr, size_t nbytes);
|
2009-10-07 15:37:06 +04:00
|
|
|
void pstrcpy_targphys(const char *name,
|
2012-10-23 14:30:10 +04:00
|
|
|
hwaddr dest, int buf_size,
|
2009-09-20 18:58:02 +04:00
|
|
|
const char *source);
|
2009-10-01 18:42:33 +04:00
|
|
|
|
2014-03-06 16:57:09 +04:00
|
|
|
extern bool option_rom_has_mr;
|
2014-03-09 20:42:06 +04:00
|
|
|
extern bool rom_file_has_mr;
|
2010-01-08 17:25:38 +03:00
|
|
|
|
|
|
|
int rom_add_file(const char *file, const char *fw_dir,
|
2014-03-06 16:57:09 +04:00
|
|
|
hwaddr addr, int32_t bootindex,
|
2016-09-22 20:13:08 +03:00
|
|
|
bool option_rom, MemoryRegion *mr, AddressSpace *as);
|
2015-03-23 12:24:16 +03:00
|
|
|
MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len,
|
|
|
|
size_t max_len, hwaddr addr,
|
|
|
|
const char *fw_file_name,
|
|
|
|
FWCfgReadCallback fw_callback,
|
loader: fix handling of custom address spaces when adding ROM blobs
* Commit 3e76099aacb4 ("loader: Allow a custom AddressSpace when loading
ROMs") introduced the "Rom.as" field:
(1) It modified the utility callers of rom_insert() to take "as" as a
new parameter from *their* callers, and set "rom->as" from that
parameter. The functions covered were rom_add_file() and
rom_add_elf_program().
(2) It also modified rom_insert() itself, to auto-assign
"&address_space_memory", in case the external caller passed -- and
the utility caller forwarded -- as=NULL.
Except, commit 3e76099aacb4 forgot to update the third utility caller of
rom_insert(), under point (1), namely rom_add_blob().
* Later, commit 5e774eb3bd264 ("loader: Add AddressSpace loading support
to uImages") added the load_uimage_as() function, and the
rom_add_blob_fixed_as() function-like macro, with the necessary changes
elsewhere to propagate the new "as" parameter to rom_add_blob():
load_uimage_as()
load_uboot_image()
rom_add_blob_fixed_as()
rom_add_blob()
At this point, the signature (and workings) of rom_add_blob() had been
broken already, and the rom_add_blob_fixed_as() macro passed its "_as"
parameter to rom_add_blob() as "callback_opaque". Given that the
"fw_callback" parameter itself was set to NULL (correctly), this did no
additional damage (the opaque arg would never be used), but ultimately
it broke the new functionality of load_uimage_as().
* The load_uimage_as() function would be put to use in one of the later
patches, commit e481a1f63c93 ("generic-loader: Add a generic loader").
* We can fix this only in a unified patch now. Append "AddressSpace *as"
to the signature of rom_add_blob(), and handle the new parameter. Pass
NULL from all current callers, except from rom_add_blob_fixed_as(),
where "_as" has to be bumped to the proper position.
* Note that rom_add_file() rejects the case when both "mr" and "as" are
passed in as non-NULL. The action that this is apparently supposed to
prevent is the
rom->mr = mr;
assignment (that's the only place where the "mr" parameter is used in
rom_add_file()). In rom_add_blob() though, we have no "mr" parameter,
and the actions done on the fw_cfg branch:
if (fw_file_name && fw_cfg) {
if (mc->rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
mr = rom->mr;
} else {
data = rom->data;
}
reflect those that are performed by rom_add_file() too (with mr==NULL):
if (rom->fw_file && fw_cfg) {
if ((!option_rom || mc->option_rom_has_mr) &&
mc->rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
} else {
data = rom->data;
}
Hence we need no additional restrictions in rom_add_blob().
* Stable is not affected as both problematic commits appeared first in
v2.8.0-rc0.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org
Fixes: 3e76099aacb4dae0d37ebf95305369e03d1491e6
Fixes: 5e774eb3bd264c76484906f4bd0fb38e00b8090e
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2016-11-29 22:55:32 +03:00
|
|
|
void *callback_opaque, AddressSpace *as);
|
2013-02-19 08:41:11 +04:00
|
|
|
int rom_add_elf_program(const char *name, void *data, size_t datasize,
|
2016-09-22 20:13:08 +03:00
|
|
|
size_t romsize, hwaddr addr, AddressSpace *as);
|
2015-06-16 19:07:54 +03:00
|
|
|
int rom_check_and_register_reset(void);
|
2013-04-16 04:24:08 +04:00
|
|
|
void rom_set_fw(FWCfgState *f);
|
2016-04-07 17:12:58 +03:00
|
|
|
void rom_set_order_override(int order);
|
|
|
|
void rom_reset_order_override(void);
|
2012-10-23 14:30:10 +04:00
|
|
|
int rom_copy(uint8_t *dest, hwaddr addr, size_t size);
|
|
|
|
void *rom_ptr(hwaddr addr);
|
2015-02-06 16:18:24 +03:00
|
|
|
void hmp_info_roms(Monitor *mon, const QDict *qdict);
|
2009-10-01 18:42:33 +04:00
|
|
|
|
2010-12-08 14:35:07 +03:00
|
|
|
#define rom_add_file_fixed(_f, _a, _i) \
|
2016-09-22 20:13:08 +03:00
|
|
|
rom_add_file(_f, NULL, _a, _i, false, NULL, NULL)
|
2009-10-01 18:42:33 +04:00
|
|
|
#define rom_add_blob_fixed(_f, _b, _l, _a) \
|
loader: fix handling of custom address spaces when adding ROM blobs
* Commit 3e76099aacb4 ("loader: Allow a custom AddressSpace when loading
ROMs") introduced the "Rom.as" field:
(1) It modified the utility callers of rom_insert() to take "as" as a
new parameter from *their* callers, and set "rom->as" from that
parameter. The functions covered were rom_add_file() and
rom_add_elf_program().
(2) It also modified rom_insert() itself, to auto-assign
"&address_space_memory", in case the external caller passed -- and
the utility caller forwarded -- as=NULL.
Except, commit 3e76099aacb4 forgot to update the third utility caller of
rom_insert(), under point (1), namely rom_add_blob().
* Later, commit 5e774eb3bd264 ("loader: Add AddressSpace loading support
to uImages") added the load_uimage_as() function, and the
rom_add_blob_fixed_as() function-like macro, with the necessary changes
elsewhere to propagate the new "as" parameter to rom_add_blob():
load_uimage_as()
load_uboot_image()
rom_add_blob_fixed_as()
rom_add_blob()
At this point, the signature (and workings) of rom_add_blob() had been
broken already, and the rom_add_blob_fixed_as() macro passed its "_as"
parameter to rom_add_blob() as "callback_opaque". Given that the
"fw_callback" parameter itself was set to NULL (correctly), this did no
additional damage (the opaque arg would never be used), but ultimately
it broke the new functionality of load_uimage_as().
* The load_uimage_as() function would be put to use in one of the later
patches, commit e481a1f63c93 ("generic-loader: Add a generic loader").
* We can fix this only in a unified patch now. Append "AddressSpace *as"
to the signature of rom_add_blob(), and handle the new parameter. Pass
NULL from all current callers, except from rom_add_blob_fixed_as(),
where "_as" has to be bumped to the proper position.
* Note that rom_add_file() rejects the case when both "mr" and "as" are
passed in as non-NULL. The action that this is apparently supposed to
prevent is the
rom->mr = mr;
assignment (that's the only place where the "mr" parameter is used in
rom_add_file()). In rom_add_blob() though, we have no "mr" parameter,
and the actions done on the fw_cfg branch:
if (fw_file_name && fw_cfg) {
if (mc->rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
mr = rom->mr;
} else {
data = rom->data;
}
reflect those that are performed by rom_add_file() too (with mr==NULL):
if (rom->fw_file && fw_cfg) {
if ((!option_rom || mc->option_rom_has_mr) &&
mc->rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
} else {
data = rom->data;
}
Hence we need no additional restrictions in rom_add_blob().
* Stable is not affected as both problematic commits appeared first in
v2.8.0-rc0.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org
Fixes: 3e76099aacb4dae0d37ebf95305369e03d1491e6
Fixes: 5e774eb3bd264c76484906f4bd0fb38e00b8090e
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2016-11-29 22:55:32 +03:00
|
|
|
rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, NULL)
|
2016-03-04 14:30:17 +03:00
|
|
|
#define rom_add_file_mr(_f, _mr, _i) \
|
2016-09-22 20:13:08 +03:00
|
|
|
rom_add_file(_f, NULL, 0, _i, false, _mr, NULL)
|
|
|
|
#define rom_add_file_as(_f, _as, _i) \
|
|
|
|
rom_add_file(_f, NULL, 0, _i, false, NULL, _as)
|
2016-09-22 20:13:08 +03:00
|
|
|
#define rom_add_file_fixed_as(_f, _a, _i, _as) \
|
|
|
|
rom_add_file(_f, NULL, _a, _i, false, NULL, _as)
|
2016-09-22 20:13:08 +03:00
|
|
|
#define rom_add_blob_fixed_as(_f, _b, _l, _a, _as) \
|
loader: fix handling of custom address spaces when adding ROM blobs
* Commit 3e76099aacb4 ("loader: Allow a custom AddressSpace when loading
ROMs") introduced the "Rom.as" field:
(1) It modified the utility callers of rom_insert() to take "as" as a
new parameter from *their* callers, and set "rom->as" from that
parameter. The functions covered were rom_add_file() and
rom_add_elf_program().
(2) It also modified rom_insert() itself, to auto-assign
"&address_space_memory", in case the external caller passed -- and
the utility caller forwarded -- as=NULL.
Except, commit 3e76099aacb4 forgot to update the third utility caller of
rom_insert(), under point (1), namely rom_add_blob().
* Later, commit 5e774eb3bd264 ("loader: Add AddressSpace loading support
to uImages") added the load_uimage_as() function, and the
rom_add_blob_fixed_as() function-like macro, with the necessary changes
elsewhere to propagate the new "as" parameter to rom_add_blob():
load_uimage_as()
load_uboot_image()
rom_add_blob_fixed_as()
rom_add_blob()
At this point, the signature (and workings) of rom_add_blob() had been
broken already, and the rom_add_blob_fixed_as() macro passed its "_as"
parameter to rom_add_blob() as "callback_opaque". Given that the
"fw_callback" parameter itself was set to NULL (correctly), this did no
additional damage (the opaque arg would never be used), but ultimately
it broke the new functionality of load_uimage_as().
* The load_uimage_as() function would be put to use in one of the later
patches, commit e481a1f63c93 ("generic-loader: Add a generic loader").
* We can fix this only in a unified patch now. Append "AddressSpace *as"
to the signature of rom_add_blob(), and handle the new parameter. Pass
NULL from all current callers, except from rom_add_blob_fixed_as(),
where "_as" has to be bumped to the proper position.
* Note that rom_add_file() rejects the case when both "mr" and "as" are
passed in as non-NULL. The action that this is apparently supposed to
prevent is the
rom->mr = mr;
assignment (that's the only place where the "mr" parameter is used in
rom_add_file()). In rom_add_blob() though, we have no "mr" parameter,
and the actions done on the fw_cfg branch:
if (fw_file_name && fw_cfg) {
if (mc->rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
mr = rom->mr;
} else {
data = rom->data;
}
reflect those that are performed by rom_add_file() too (with mr==NULL):
if (rom->fw_file && fw_cfg) {
if ((!option_rom || mc->option_rom_has_mr) &&
mc->rom_file_has_mr) {
data = rom_set_mr(rom, OBJECT(fw_cfg), devpath);
} else {
data = rom->data;
}
Hence we need no additional restrictions in rom_add_blob().
* Stable is not affected as both problematic commits appeared first in
v2.8.0-rc0.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Michael Walle <michael@walle.cc>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: qemu-arm@nongnu.org
Cc: qemu-devel@nongnu.org
Fixes: 3e76099aacb4dae0d37ebf95305369e03d1491e6
Fixes: 5e774eb3bd264c76484906f4bd0fb38e00b8090e
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2016-11-29 22:55:32 +03:00
|
|
|
rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as)
|
2009-10-01 18:42:33 +04:00
|
|
|
|
|
|
|
#define PC_ROM_MIN_VGA 0xc0000
|
|
|
|
#define PC_ROM_MIN_OPTION 0xc8000
|
|
|
|
#define PC_ROM_MAX 0xe0000
|
|
|
|
#define PC_ROM_ALIGN 0x800
|
|
|
|
#define PC_ROM_SIZE (PC_ROM_MAX - PC_ROM_MIN_VGA)
|
|
|
|
|
2009-10-26 14:18:25 +03:00
|
|
|
int rom_add_vga(const char *file);
|
2010-12-08 14:35:07 +03:00
|
|
|
int rom_add_option(const char *file, int32_t bootindex);
|
2009-10-01 18:42:33 +04:00
|
|
|
|
2009-09-20 18:58:02 +04:00
|
|
|
#endif
|