[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present
From: |
Kevin O'Connor |
Subject: |
[Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present |
Date: |
Mon, 2 Aug 2010 12:11:57 -0400 |
User-agent: |
Mutt/1.5.20 (2009-12-10) |
Load the "bootsplash.jpg" file into fw_cfg if it is found in the roms
directory.
Signed-off-by: Kevin O'Connor <address@hidden>
---
Changes v2->v3:
Fix coding style (missing braces).
Changes v1->v2:
Add signed-off-by line.
---
hw/fw_cfg.c | 9 +++++++--
hw/pc.c | 8 ++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/hw/fw_cfg.c b/hw/fw_cfg.c
index 72866ae..5a2c0aa 100644
--- a/hw/fw_cfg.c
+++ b/hw/fw_cfg.c
@@ -304,8 +304,13 @@ int fw_cfg_add_file(FWCfgState *s, const char *dir, const
char *filename,
basename = filename;
}
- snprintf(s->files->f[index].name, sizeof(s->files->f[index].name),
- "%s/%s", dir, basename);
+ if (dir && dir[0]) {
+ snprintf(s->files->f[index].name, sizeof(s->files->f[index].name),
+ "%s/%s", dir, basename);
+ } else {
+ strncpy(s->files->f[index].name, basename,
+ sizeof(s->files->f[index].name));
+ }
for (i = 0; i < index; i++) {
if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) {
FW_CFG_DPRINTF("%s: skip duplicate: %s\n", __FUNCTION__,
diff --git a/hw/pc.c b/hw/pc.c
index 58dea57..6893799 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -54,6 +54,7 @@
#endif
#define BIOS_FILENAME "bios.bin"
+#define BOOTSPLASH_FILENAME "bootsplash.jpg"
#define PC_MAX_BIOS_SIZE (4 * 1024 * 1024)
@@ -963,6 +964,13 @@ void pc_memory_init(ram_addr_t ram_size,
fw_cfg = bochs_bios_init();
rom_set_fw(fw_cfg);
+ /* Optional bootsplash file */
+ filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BOOTSPLASH_FILENAME);
+ if (filename) {
+ qemu_free(filename);
+ rom_add_file(BOOTSPLASH_FILENAME, "", 0);
+ }
+
if (linux_boot) {
load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline,
below_4g_mem_size);
}
--
1.7.2
- [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present,
Kevin O'Connor <=
- Re: [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present, Anthony Liguori, 2010/08/02
- Re: [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present, Richard W.M. Jones, 2010/08/03
- Re: [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present, Anthony Liguori, 2010/08/03
- Re: [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present, Richard W.M. Jones, 2010/08/03
- Re: [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present, Richard W.M. Jones, 2010/08/03
- Re: [Qemu-devel] [PATCHv3] Load "bootsplash.jpg" if present, Anthony Liguori, 2010/08/03